Refact method syntax_error to error

It's a more convenient name since not only syntax errors
are reported with this method, sino semantic and general ones.

Author: boriel

api/check.py

@@ -14,7 +14,7 @@
 from .constants import CLASS
 from .constants import SCOPE
 import api.errmsg
-from .errmsg import syntax_error
+from .errmsg import error
 
 
 __all__ = ['check_type',
@@ -52,11 +52,11 @@ def check_type(lineno, type_list, arg):
         return True
 
     if len(type_list) == 1:
-        syntax_error(lineno, "Wrong expression type '%s'. Expected '%s'" %
-                     (arg.type_, type_list[0]))
+        error(lineno, "Wrong expression type '%s'. Expected '%s'" %
+              (arg.type_, type_list[0]))
     else:
-        syntax_error(lineno, "Wrong expression type '%s'. Expected one of '%s'"
-                     % (arg.type_, tuple(type_list)))
+        error(lineno, "Wrong expression type '%s'. Expected one of '%s'"
+              % (arg.type_, tuple(type_list)))
 
     return False
 
@@ -100,13 +100,13 @@ def check_call_arguments(lineno, id_, args):
 
     if len(args) != len(entry.params):
         c = 's' if len(entry.params) != 1 else ''
-        syntax_error(lineno, "Function '%s' takes %i parameter%s, not %i" %
-                     (id_, len(entry.params), c, len(args)))
+        error(lineno, "Function '%s' takes %i parameter%s, not %i" %
+              (id_, len(entry.params), c, len(args)))
         return False
 
     for arg, param in zip(args, entry.params):
         if arg.class_ in (CLASS.var, CLASS.array) and param.class_ != arg.class_:
-            syntax_error(lineno, "Invalid argument '{}'".format(arg.value))
+            error(lineno, "Invalid argument '{}'".format(arg.value))
             return None
 
         if not arg.typecast(param.type_):
@@ -115,11 +115,11 @@ def check_call_arguments(lineno, id_, args):
         if param.byref:
             from symbols.var import SymbolVAR
             if not isinstance(arg.value, SymbolVAR):
-                syntax_error(lineno, "Expected a variable name, not an expression (parameter By Reference)")
+                error(lineno, "Expected a variable name, not an expression (parameter By Reference)")
                 return False
 
             if arg.class_ not in (CLASS.var, CLASS.array):
-                syntax_error(lineno, "Expected a variable or array name (parameter By Reference)")
+                error(lineno, "Expected a variable or array name (parameter By Reference)")
                 return False
 
             arg.byref = True
@@ -128,7 +128,7 @@ def check_call_arguments(lineno, id_, args):
             arg.value.add_required_symbol(param)
 
     if entry.forwarded:  # The function / sub was DECLARED but not implemented
-        syntax_error(lineno, "%s '%s' declared but not implemented" % (CLASS.to_string(entry.class_), entry.name))
+        error(lineno, "%s '%s' declared but not implemented" % (CLASS.to_string(entry.class_), entry.name))
         return False
 
     return True
@@ -172,8 +172,8 @@ def check_pending_labels(ast):
 
         tmp = global_.SYMBOL_TABLE.get_entry(node.name)
         if tmp is None or tmp.class_ is CLASS.unknown:
-            syntax_error(node.lineno, 'Undeclared identifier "%s"'
-                         % node.name)
+            error(node.lineno, 'Undeclared identifier "%s"'
+                  % node.name)
         else:
             assert tmp.class_ == CLASS.label
             node.to_label(node)
@@ -194,7 +194,7 @@ def check_and_make_label(lbl, lineno):
         if lbl == int(lbl):
             id_ = str(int(lbl))
         else:
-            syntax_error(lineno, 'Line numbers must be integers.')
+            error(lineno, 'Line numbers must be integers.')
             return None
     else:
         id_ = lbl

api/errmsg.py

@@ -14,7 +14,7 @@
 from .config import OPTIONS
 
 # Exports only these functions. Others
-__all__ = ['syntax_error', 'warning']
+__all__ = ['error', 'warning']
 
 
 def msg_output(msg):
@@ -31,7 +31,7 @@ def info(msg):
     OPTIONS.stderr.value.write("info: %s\n" % msg)
 
 
-def syntax_error(lineno, msg, fname=None):
+def error(lineno, msg, fname=None):
     """ Generic syntax error routine
     """
     if fname is None:
@@ -40,7 +40,7 @@ def syntax_error(lineno, msg, fname=None):
     if global_.has_errors > OPTIONS.max_syntax_errors.value:
         msg = 'Too many errors. Giving up!'
 
-    msg = "%s:%i: %s" % (fname, lineno, msg)
+    msg = "%s:%i: error: %s" % (fname, lineno, msg)
     msg_output(msg)
 
     if global_.has_errors > OPTIONS.max_syntax_errors.value:
@@ -108,96 +108,96 @@ def warning_not_used(lineno, id_, kind='Variable'):
 #               numeric expression.
 # ----------------------------------------
 def syntax_error_expected_string(lineno, _type):
-    syntax_error(lineno, "Expected a 'string' type expression, got '%s' instead" % _type)
+    error(lineno, "Expected a 'string' type expression, got '%s' instead" % _type)
 
 
 # ----------------------------------------
 # Syntax error: FOR variable should be X
 #               instead of Y
 # ----------------------------------------
 def syntax_error_wrong_for_var(lineno, x, y):
-    syntax_error(lineno, "FOR variable should be '%s' instead of '%s'" %
-                 (x, y))
+    error(lineno, "FOR variable should be '%s' instead of '%s'" %
+          (x, y))
 
 
 # ----------------------------------------
 # Syntax error: Initializer expression is
 #               not constant
 # ----------------------------------------
 def syntax_error_not_constant(lineno):
-    syntax_error(lineno, "Initializer expression is not constant.")
+    error(lineno, "Initializer expression is not constant.")
 
 
 # ----------------------------------------
 # Syntax error: Id is neither an array nor
 #               a function
 # ----------------------------------------
 def syntax_error_not_array_nor_func(lineno, varname):
-    syntax_error(lineno, "'%s' is neither an array nor a function." % varname)
+    error(lineno, "'%s' is neither an array nor a function." % varname)
 
 
 # ----------------------------------------
 # Syntax error: Id is neither an array nor
 #               a function
 # ----------------------------------------
 def syntax_error_not_an_array(lineno, varname):
-    syntax_error(lineno, "'%s' is not an array (or has not been declared yet)" % varname)
+    error(lineno, "'%s' is not an array (or has not been declared yet)" % varname)
 
 
 # ----------------------------------------
 # Syntax error: function redefinition type
 #               mismatch
 # ----------------------------------------
 def syntax_error_func_type_mismatch(lineno, entry):
-    syntax_error(lineno, "Function '%s' (previously declared at %i) type mismatch" % (entry.name, entry.lineno))
+    error(lineno, "Function '%s' (previously declared at %i) type mismatch" % (entry.name, entry.lineno))
 
 
 # ----------------------------------------
 # Syntax error: function redefinition parm.
 #               mismatch
 # ----------------------------------------
 def syntax_error_parameter_mismatch(lineno, entry):
-    syntax_error(lineno, "Function '%s' (previously declared at %i) parameter mismatch" % (entry.name, entry.lineno))
+    error(lineno, "Function '%s' (previously declared at %i) parameter mismatch" % (entry.name, entry.lineno))
 
 
 # ----------------------------------------
 # Syntax error: can't convert value to the
 #               given type.
 # ----------------------------------------
 def syntax_error_cant_convert_to_type(lineno, expr_str, type_):
-    syntax_error(lineno, "Cant convert '%s' to type %s" % (expr_str, type_))
+    error(lineno, "Cant convert '%s' to type %s" % (expr_str, type_))
 
 
 # ----------------------------------------
 # Syntax error: is a SUB not a FUNCTION
 # ----------------------------------------
 def syntax_error_is_a_sub_not_a_func(lineno, name):
-    syntax_error(lineno, "'%s' is SUBROUTINE not a FUNCTION" % name)
+    error(lineno, "'%s' is SUBROUTINE not a FUNCTION" % name)
 
 
 # ----------------------------------------
 # Syntax error: strict mode: missing type declaration
 # ----------------------------------------
 def syntax_error_undeclared_type(lineno: int, id_: str):
-    syntax_error(lineno, "strict mode: missing type declaration for '%s'" % id_)
+    error(lineno, "strict mode: missing type declaration for '%s'" % id_)
 
 
 # ----------------------------------------
 #  Cannot assign a value to 'var'. It's not a variable
 # ----------------------------------------
 def syntax_error_cannot_assign_not_a_var(lineno, id_):
-    syntax_error(lineno, "Cannot assign a value to '%s'. It's not a variable" % id_)
+    error(lineno, "Cannot assign a value to '%s'. It's not a variable" % id_)
 
 
 # ----------------------------------------
 #  Cannot assign a value to 'var'. It's not a variable
 # ----------------------------------------
 def syntax_error_address_must_be_constant(lineno):
-    syntax_error(lineno, 'Address must be a numeric constant expression')
+    error(lineno, 'Address must be a numeric constant expression')
 
 
 # ----------------------------------------
 #  Cannot pass an array by value
 # ----------------------------------------
 def syntax_error_cannot_pass_array_by_value(lineno, id_):
-    syntax_error(lineno, "Array parameter '%s' must be passed ByRef" % id_)
+    error(lineno, "Array parameter '%s' must be passed ByRef" % id_)

api/symboltable.py

@@ -19,7 +19,7 @@
 from . import global_
 from .config import OPTIONS
 
-from .errmsg import syntax_error
+from .errmsg import error as syntax_error
 from .errmsg import warning_implicit_type
 from .errmsg import warning_not_used
 from .errmsg import syntax_error_func_type_mismatch

api/utils.py

@@ -42,7 +42,7 @@ def read_txt_file(fname):
             pass
 
     global_.FILENAME = fname
-    errmsg.syntax_error(1, 'Invalid file encoding. Use one of: %s' % ', '.join(encodings))
+    errmsg.error(1, 'Invalid file encoding. Use one of: %s' % ', '.join(encodings))
     return ''
 
 

arch/zx48k/translator.py

@@ -14,7 +14,7 @@
 import api.check as check
 
 from api.debug import __DEBUG__
-from api.errmsg import syntax_error
+from api.errmsg import error
 from api.config import OPTIONS
 from api.global_ import optemps
 from api.errors import InvalidLoopError
@@ -959,7 +959,7 @@ def default_value(cls, type_, expr):  # TODO: This function must be moved to api
 
         if isinstance(expr, (symbols.CONST, symbols.VAR)):  # a constant expression like @label + 1
             if type_ in (cls.TYPE(TYPE.float_), cls.TYPE(TYPE.string)):
-                syntax_error(expr.lineno, "Can't convert non-numeric value to {0} at compile time".format(type_.name))
+                error(expr.lineno, "Can't convert non-numeric value to {0} at compile time".format(type_.name))
                 return ['<ERROR>']
 
             val = Translator.traverse_const(expr)

libzxbasm/asmlex.py

@@ -14,7 +14,7 @@
 import ply.lex as lex
 import sys
 from api.config import OPTIONS
-from api.errmsg import syntax_error
+from api.errmsg import error
 
 _tokens = ('STRING', 'NEWLINE', 'CO',
            'ID', 'COMMA', 'PLUS', 'MINUS', 'LP', 'RP', 'LPP', 'RPP', 'MUL', 'DIV', 'POW', 'MOD',
@@ -422,7 +422,7 @@ def t_INITIAL_preproc_ERROR(self, t):
 
     def t_INITIAL_preproc_error(self, t):
         # error handling rule
-        syntax_error(t.lexer.lineno, "illegal character '%s'" % t.value[0])
+        error(t.lexer.lineno, "illegal character '%s'" % t.value[0])
 
     def __init__(self):
         """ Creates a new GLOBAL lexer instance

libzxbasm/asmparse.py

@@ -22,7 +22,7 @@
 from ast_.tree import NotAnAstError
 from api.debug import __DEBUG__
 from api.config import OPTIONS
-from api.errmsg import syntax_error as error
+from api.errmsg import error as error
 from api.errmsg import warning
 from api import global_ as gl
 import api.utils

libzxbc/zxblex.py

@@ -13,7 +13,7 @@
 from ply import lex
 from .keywords import KEYWORDS as reserved
 import api
-from api.errmsg import syntax_error
+from api.errmsg import error
 
 
 ASM = ''  # Set to asm block when commenting
@@ -249,7 +249,7 @@ def t_MACROS(t):
         t.type = t.value
         return t
 
-    syntax_error(t.lexer.lineno, "unknown macro '%s'" % t.value)
+    error(t.lexer.lineno, "unknown macro '%s'" % t.value)
 
 
 def t_ADDRESSOF(t):
@@ -618,13 +618,13 @@ def t_INITIAL_bin_NEWLINE(t):
 
 def t_INITIAL_bin_string_asm_preproc_comment_ERROR(t):
     r'.'
-    syntax_error(t.lineno, "ignoring illegal character '%s'" % t.value[0])
+    error(t.lineno, "ignoring illegal character '%s'" % t.value[0])
     return t
 
 
 # error handling rule
 def t_INITIAL_bin_string_asm_preproc_comment_error(t):
-    syntax_error(t.lineno, "illegal character '%s'" % t.value[0])
+    error(t.lineno, "illegal character '%s'" % t.value[0])
 
 
 # --------- END OF Token rules ---------