Merge branch 'topic-fix-varptr-crash'

Author: robhagemans

pcbasic/basic/memory/memory.py

@@ -515,6 +515,10 @@ def varptr_(self, args):
             name = arg0
             error.throw_if(not name, error.STX)
             indices, = args
+            name = self.complete_name(name)
+            if indices != []:
+                # pre-allocate array elements, but not scalars which instead throw IFC if undefined
+                self.arrays.check_dim(name, indices)
             var_ptr = self.varptr(name, indices)
         return self.values.new_integer().from_int(var_ptr, unsigned=True)
 
@@ -524,6 +528,7 @@ def varptr_str_(self, args):
         error.throw_if(not name, error.STX)
         indices = next(args)
         list(args)
+        name = self.complete_name(name)
         if indices != []:
             # pre-allocate array elements, but not scalars which instead throw IFC if undefined
             self.arrays.check_dim(name, indices)

tests/basic/gwbasic/VARPTR_on_undefined_variables/PCBASIC.INI

@@ -0,0 +1,5 @@
+[pcbasic]
+font=default
+quit=True
+run=TEST.BAS
+soft-linefeed=True

tests/basic/gwbasic/VARPTR_on_undefined_variables/TEST.BAS

@@ -0,0 +1,14 @@
+10 ' test VARPTR and VARPTR$ on undefined variables 
+20 OPEN "OUTPUT.TXT" FOR OUTPUT AS 1
+30 ON ERROR GOTO 1000
+100 PRINT#1, VARPTR(A)
+110 PRINT#1, VARPTR(B(9))
+120 PRINT#1, VARPTR(C(12))
+200 PRINT#1, VARPTR$(D)
+210 PRINT#1, VARPTR$(E(9))
+220 PRINT#1, VARPTR$(F(12))
+300 CLOSE
+999 END
+1000 PRINT#1, "error:" err " in " erl
+1010 RESUME NEXT
+

tests/basic/gwbasic/VARPTR_on_undefined_variables/model/OUTPUT.TXT

@@ -0,0 +1,7 @@
+error: 5  in  100 
+ 5018 
+error: 9  in  120 
+error: 5  in  200 
+
+error: 9  in  220 
+