Merge pull request #391 from boriel/bugfix/include

Fix wrong include name file

Author: boriel

api/symboltable.py

@@ -218,7 +218,8 @@ def check_is_declared(self, id_: str, lineno: int, classname='identifier',
 
         if result is None or not result.declared:
             if show_error:
-                syntax_error(lineno, 'Undeclared %s "%s"' % (classname, id_))
+                syntax_error(lineno, 'Undeclared %s "%s"' % (classname, id_),
+                             fname=(result.filename if result is not None else None))
             return False
         return True
 

tests/functional/include_error.bas

@@ -0,0 +1,3 @@
+REM should shouw the original (included) filename, not this one
+
+#include "llb.bas"

tests/functional/test_errmsg.txt

@@ -158,4 +158,6 @@ dim_at_label6.bas:3: error: Circular dependency between 'c' and 'b'
 dim_at_label7.bas:3: error: Circular dependency between 'b' and 'a'
 dim_at_label7.bas:3: error: Circular dependency between 'a' and 'c'
 dim_at_label7.bas:4: error: Circular dependency between 'c' and 'b'
+>>> process_file('include_error.bas')
+llb.bas:3: error: Undeclared function "f$"