From: Aaron Taylor <ataylor@subgeniuskitty.com>
Date: Mon, 30 Mar 2020 03:44:11 +0000 (-0700)
Subject: Replaced get_line() from wumpus with get_user_string() from stdlib.
X-Git-Url: http://git.subgeniuskitty.com/vvhitespace/.git/commitdiff_plain/00ec7afcb1111d36f334292f8575660af92d3432

Replaced get_line() from wumpus with get_user_string() from stdlib.
---

diff --git a/examples/wump/README.txt b/examples/wump/README.txt
index 78f7783..c001660 100644
--- a/examples/wump/README.txt
+++ b/examples/wump/README.txt
@@ -47,7 +47,7 @@ NSSVTSSTSTSTN         | MARK: 10010101 (place_player)
 NSSVTSSTSTTSN         | MARK: 10010110 (build_random_tunnels)
 NSSVTSSTSTTTN         | MARK: 10010111 (get_next_tunnel_slot)
 NSSVTSSTTSSSN         | MARK: 10011000 (get_answer)
-NSSVTSSTTSSTN         | MARK: 10011001 (get_line)
+!!!NSSVTSSTTSSTN         | MARK: 10011001 (get_line)
 NSSVTSSTTSTSN         | MARK: 10011010 (wump_loop)
 NSSVTSSTTSTTN         | MARK: 10011011 (print_cave_description)
 NSSVTSSTTTSSN         | MARK: 10011100 (are_bats_near)
diff --git a/examples/wump/wump_ui.pvvs b/examples/wump/wump_ui.pvvs
index fa5c2a7..2b9c268 100644
--- a/examples/wump/wump_ui.pvvs
+++ b/examples/wump/wump_ui.pvvs
@@ -119,12 +119,15 @@ NTN                   | RTS
 #include <stdio.pvvs>
 #include <convert.pvvs>
 #include <math.pvvs>
+#include <string.pvvs>
 NSSVTSTSSSTTN         | MARK: 10100011 (move_player)
 
 A"To which room do you wish to move?\n"
 SSSSN                 | PUSH 0 (number of string substitutions)
 NSTTSSSN              | JSR > 1000 (printf)
-NSTTSSTTSSTN          | JSR > 10011001 (get_line)
+SSSTTSSSSSSSSSSSSN    | PUSH 0x3000 (buffer address)
+SSSTTSSSSSSSSSSSSN    | PUSH 0x3000 (buffer size)
+NSTTSSSTSN            | JSR > 100010 (get_user_string)
 SSSTTSSSSSSSSSSSSN    | PUSH 0x3000 (USER_INPUT_BUFFER address)
 NSTTTSSSSN            | JSR > 110000 (atoi)
 SNN                   | DROP
@@ -234,9 +237,12 @@ NTN                   | RTS
 @   <empty>
 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 #include <stdio.pvvs>
+#include <string.pvvs>
 NSSVTSTSSSTSN         | MARK: 10100010 (move_or_shoot)
 
-NSTTSSTTSSTN          | JSR > 10011001 (get_line)
+SSSTTSSSSSSSSSSSSN    | PUSH 0x3000 (buffer address)
+SSSTTSSSSSSSSSSSSN    | PUSH 0x3000 (buffer size)
+NSTTSSSTSN            | JSR > 100010 (get_user_string)
 
 @ Examine the first character of the user input buffer for 'm' or 's'.
 @ If character is something else, prompt user to try again.
@@ -277,13 +283,16 @@ NTN                   | RTS
 @   (1 or 0 for True/False)   <--- TOS
 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 #include <stdio.pvvs>
+#include <string.pvvs>
 NSSVTSSTTSSSN         | MARK: 10011000 (get_answer)
 
 @ TODO: Consider extending the GETCHAR instruction in VVS to indicate an empty
 @       buffer instead of blocking. This would allow a character by character
 @       check without printing a slew of retry messages if the buffer is
 @       non-empty.
-NSTTSSTTSSTN          | JSR > 10011001 (get_line)
+SSSTTSSSSSSSSSSSSN    | PUSH 0x3000 (buffer address)
+SSSTTSSSSSSSSSSSSN    | PUSH 0x3000 (buffer size)
+NSTTSSSTSN            | JSR > 100010 (get_user_string)
 
 @ Examine the first character of the user input buffer for 'y' or 'n'.
 @ If character is something else, prompt user to try again.
@@ -312,43 +321,6 @@ NSSVTSSTTSSSSSSSSSSTN | MARK: 10011000 00000001 (answer: no)
 SSSSN                 | PUSH 0
 NTN                   | RTS
 
-@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-@ Name:
-@   get_line
-@ Description:
-@   Read one line of user input and store in buffer.
-@   Appends null terminator to end of string.
-@   This function does not perform any boundary checks/limits.
-@ Call Stack:
-@   <empty>
-@ Return Stack:
-@   <empty>
-@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-NSSVTSSTTSSTN         | MARK: 10011001 (get_line)
-
-@ Get one character from user on each pass through this loop.
-@ Terminate loop when line break character is received.
-SSSTTSSSSSSSSSSSSN    | PUSH 0x3000 (USER_INPUT_BUFFER address)
-NSSVTSSTTSSTSSSSSSSSN | MARK: 10011001 00000000 (input loop)
-SNS                   | DUP
-SNS                   | DUP
-TNTS                  | GETCHAR
-TTT                   | LOAD
-SNS                   | DUP
-TNSS                  | PUTCHAR
-SSSTSTSN              | PUSH 10 (ASCII '\n')
-TSST                  | SUBTRACT
-NTSTSSTTSSTSSSSSSSTN  | BRZ > 10011001 00000001 (input loop:terminate)
-@ Character was not ENTER. Increment buffer pointer and loop again.
-SSSTN                 | PUSH 1
-TSSS                  | ADD
-NSNTSSTTSSTSSSSSSSSN  | JMP > 10011001 00000000 (input loop)
-@ Character was ENTER. Overwrite the line feed with a null term and return.
-NSSVTSSTTSSTSSSSSSSTN | MARK: 10011001 00000001 (input loop:terminate)
-SSSSN                 | PUSH 0 (ASCII '\0')
-TTS                   | STORE
-NTN                   | RTS
-
 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 @ Name:
 @   print_cave_description