Merge pull request #498 from boriel/bugfix/dim_at_must_not_allow_initialization

Do not allow to declare initted arrays with AT

Author: boriel

src/parsetab/tabs.dbm.bak

@@ -1,4 +1,4 @@
 'zxbpp', (0, 73193)
 'asmparse', (73216, 271961)
 'zxnext_asmparse', (345600, 302573)
-'zxbparser', (648192, 703233)
+'zxbparser', (648192, 703160)

src/parsetab/tabs.dbm.dat

@@ -1,4 +1,4 @@
 'zxbpp', (0, 73193)
 'asmparse', (73216, 271961)
 'zxnext_asmparse', (345600, 302573)
-'zxbparser', (648192, 703233)
+'zxbparser', (648192, 703160)

src/parsetab/tabs.dbm.dir

@@ -815,8 +815,8 @@ def p_decl_arr(p):
 
 
 def p_arr_decl_initialized(p):
-    """ var_arr_decl : DIM idlist LP bound_list RP typedef RIGHTARROW const_vector
-                     | DIM idlist LP bound_list RP typedef EQ const_vector
+    """ var_decl : DIM idlist LP bound_list RP typedef RIGHTARROW const_vector
+                 | DIM idlist LP bound_list RP typedef EQ const_vector
     """
 
     def check_bound(boundlist, remaining):
@@ -844,16 +844,14 @@ def check_bound(boundlist, remaining):
 
         return True
 
+    p[0] = None
     if p[8] is None:
-        p[0] = None
         return
 
     if check_bound(p[4].children, p[8]):
         id_, lineno = p[2][0]
         SYMBOL_TABLE.declare_array(id_, lineno, p[6], p[4], default_value=p[8])
 
-    p[0] = None
-
 
 def p_bound_list(p):
     """ bound_list : bound

src/zxbc/zxbparser.py

@@ -0,0 +1,4 @@
+REM These are not allowed either => or AT can be used, but not both at once
+
+dim test(0 to 3) as ubyte => {1,2,3,4} at $C000
+dim test2(0 to 3) as ubyte => {1,2,3,4} at $C000

tests/functional/dim_at_init_err.bas

@@ -193,6 +193,9 @@ db256.asm:4: warning: [W200] Value will be truncated
 db256.asm:6: warning: [W200] Value will be truncated
 >>> process_file('opt2_unused_var1.bas')
 opt2_unused_var1.bas:2: warning: Variable 'a' is never used
+>>> process_file('dim_at_init_err.bas')
+dim_at_init_err.bas:3: error: Syntax Error. Unexpected token 'AT' <AT>
+dim_at_init_err.bas:4: error: Syntax Error. Unexpected token 'AT' <AT>
 
 # Test warning silencing
 >>> process_file('mcleod3.bas', ['-S', '-q', '-O --expect-warnings=2'])