Fixed multiple uses of LET in BASIC

Author: totalspectrum

Changelog.txt

@@ -1,3 +1,6 @@
+Version 6.1.8
+- Fixed multiple uses of LET in BASIC programs
+
 Version 6.1.7
 - Added `DEBUG_DISABLE` constant to disable DEBUG() in Spin2 objects
 - Added %b flag for binary output in printf

Test/Expect/stest300.pasm

@@ -0,0 +1,30 @@
+pub main
+  coginit(0, @entry, 0)
+dat
+	org	0
+entry
+
+_program
+	mov	arg01, #1
+	wrlong	arg01, objptr
+	mov	arg01, #2
+	wrlong	arg01, objptr
+	or	dira, #4
+	or	outa, #4
+	mov	arg01, #3
+	wrlong	arg01, objptr
+	or	dira, #8
+	or	outa, #8
+_program_ret
+	ret
+
+objptr
+	long	@@@objmem
+COG_BSS_START
+	fit	496
+objmem
+	long	0[1]
+	org	COG_BSS_START
+arg01
+	res	1
+	fit	496

Test/stest300.bas

@@ -0,0 +1,9 @@
+' test for multiple lets not throwing issues
+' with redeclaration
+let r = 1
+let r = r+1
+
+_drvh(r)
+
+let r = r+1
+_drvh(r)

frontends/common.c

@@ -2088,18 +2088,29 @@ DeclareOneMemberVar(Module *P, AST *ident, AST *type, int is_private)
 // check to see if an identifier is already declared
 // if it is, return the typ of it
 // slightly different from FindDeclaration, which returns
-// the declaration itself
+// the declaration itself; also expects a different
+// list structure, so we cannot re-implement AlreadyDeclared
+// in terms of FindDeclaration :(
 //
 static AST *
 AlreadyDeclared(AST *pendinglist, AST *newIdentifier)
 {
-    const char *name = GetIdentifierName(newIdentifier);
-    AST *decl = FindDeclaration(pendinglist, name);
-    if (!decl) return decl;
-    if (decl && decl->kind == AST_DECLARE_VAR) {
-        AST *typ = decl->left;
-        if (!typ) typ = ast_type_generic;
-        return typ;
+    AST *entry;
+    AST *ident;
+    AST *typ;
+    while (pendinglist) {
+        entry = pendinglist->left;
+        pendinglist = pendinglist->right;
+        if (entry && entry->kind == AST_DECLARE_VAR) {
+            ident = entry->right;
+            if (AstUses(ident, newIdentifier)) {
+                typ = entry->right;
+                if (typ == NULL) {
+                    typ = ast_type_generic;
+                }
+                return typ;
+            }
+        }
     }
     return NULL;
 }

version.h

@@ -5,9 +5,9 @@
 #define str_(x) str__(x)
 
 #define VERSION_MAJOR 6
-#define VERSION_MINOR 2
-#define VERSION_REV   0
-#define BETA "-beta"
+#define VERSION_MINOR 1
+#define VERSION_REV   8
+//#define BETA "-beta"
 
 #define VERSIONSTR version_string