Basic: implement CALL in basicpp.py and use it.

[jackhill/mal.git] / basic / env.in.bas

diff --git a/basic/env.in.bas b/basic/env.in.bas
index 792f378..a637732 100644 (file)
--- a/basic/env.in.bas
+++ b/basic/env.in.bas
@@ -69,7 +69,7 @@ ENV_SET_S:
 REM ENV_FIND(E, K) -> R
 REM   Returns environment (R) containing K. If found, value found is
 REM   in T4
-ENV_FIND:
+SUB ENV_FIND
   EF=E
   ENV_FIND_LOOP:
     H=Z%(EF,1)
@@ -81,12 +81,12 @@ ENV_FIND:
     IF EF<>-1 THEN GOTO ENV_FIND_LOOP
   ENV_FIND_DONE:
     R=EF
-    RETURN
+END SUB
 
 REM ENV_GET(E, K) -> R
 ENV_GET:
-  GOSUB ENV_FIND
-  IF R=-1 THEN R=0:ER=-1:ER$="'"+S$(Z%(K,1))+"' not found":RETURN
+  CALL ENV_FIND
+  IF R=-1 THEN R=0:ER=-1:ER$="'"+S$(Z%(K,1))+"' not found":GOTO ENV_GET_RETURN
   R=T4:GOSUB DEREF_R
   Z%(R,0)=Z%(R,0)+32
-  RETURN
+  GOTO ENV_GET_RETURN