Merged in bugfix/array_error (pull request #174)

bugfix: fix crash on wrong array definition

Approved-by: Jose Rodriguez <[email protected]>

Author: boriel

tests/functional/array_err.bas

@@ -0,0 +1,3 @@
+
+dim test(10,1) as ubyte => {{0,0,0,0,0,0,0,0,0,0,0}}
+

tests/functional/test_errmsg.txt

@@ -136,4 +136,6 @@ bad_sigil.bas:2: warning: Parameter 'y' is never used
 >>> process_file('params_implicit.bas')
 params_implicit.bas:2: warning: Using default implicit type 'float' for 'y'
 params_implicit.bas:2: warning: Parameter 'y' is never used
+>>> process_file('array_err.bas')
+array_err.bas:2: Mismatched vector size. Expected 11 elements, got 1.
 

zxbparser.py

@@ -732,19 +732,20 @@ def p_arr_decl_initialized(p):
     def check_bound(boundlist, remaining):
         """ Checks if constant vector bounds matches the array one
         """
+        lineno = p.lineno(8)
         if not boundlist:  # Returns on empty list
             if not isinstance(remaining, list):
                 return True  # It's OK :-)
 
-            syntax_error(p.lineno(9), 'Unexpected extra vector dimensions. It should be %i' % len(remaining))
+            syntax_error(lineno, 'Unexpected extra vector dimensions. It should be %i' % len(remaining))
 
         if not isinstance(remaining, list):
-            syntax_error(p.lineno(9), 'Mismatched vector size. Missing %i extra dimension(s)' % len(boundlist))
+            syntax_error(lineno, 'Mismatched vector size. Missing %i extra dimension(s)' % len(boundlist))
             return False
 
         if len(remaining) != boundlist[0].count:
-            syntax_error(p.lineno(9), 'Mismatched vector size. Expected %i elements, got %i.' % (boundlist[0].count,
-                                                                                                 len(remaining)))
+            syntax_error(lineno, 'Mismatched vector size. Expected %i elements, got %i.' % (boundlist[0].count,
+                                                                                            len(remaining)))
             return False  # It's wrong. :-(
 
         for row in remaining: