Make syntax error call yyerror() rather than raising a Python exception

diff --git a/ndcode/piyacc/parse-gram.y b/ndcode/piyacc/parse-gram.y
index 87f1c97..d100820 100644 (file)
--- a/ndcode/piyacc/parse-gram.y
+++ b/ndcode/piyacc/parse-gram.y
@@ -712,10 +712,11 @@ def lloc_default(loc, stack, n):
 #  if strverscmp(version, '3.0.5') > 0:
 #    complain(loc, complaint, 'require bison %s, but have %s', version, '3.0.5')
 #    exit(63)
-#
-#def gram_error(loc, msg):
-#  complain(loc, complaint, '%s', msg)
-#
+
+# was gram_error(), due to use of %define api.prefix
+def yyerror(loc, msg):
+  state.complain(loc, state.complaint, msg)
+
 #def token_name(type):
 #  return yytname[YYTRANSLATE(type)]
 #

diff --git a/ndcode/piyacc/skel/skel_py.py b/ndcode/piyacc/skel/skel_py.py
index 3a263ab..ace03aa 100644 (file)
--- a/ndcode/piyacc/skel/skel_py.py
+++ b/ndcode/piyacc/skel/skel_py.py
@@ -92,7 +92,8 @@ def yyparse():
         bisect.bisect_right(yy_lr1dfa_states[state][0], yychar)
       ]
       if action == -1:
-        raise Exception('syntax error')
+        yyerror(yylloc, 'syntax error')
+        assert False # error recovery is not implemented yet
       if (action & 1) == 0:
         yystack.append((action >> 1, yylval, yylloc.copy()))
         #print('shift', yystack[-1][0])

diff --git a/ndcode/piyacc/skel/skel_py_element.py b/ndcode/piyacc/skel/skel_py_element.py
index 40726b2..d534337 100644 (file)
--- a/ndcode/piyacc/skel/skel_py_element.py
+++ b/ndcode/piyacc/skel/skel_py_element.py
@@ -105,7 +105,8 @@ def yyparse(factory, *args, **kwargs):
         bisect.bisect_right(yy_lr1dfa_states[state][0], yychar)
       ]
       if action == -1:
-        raise Exception('syntax error')
+        yyerror(yylloc, 'syntax error')
+        assert False # error recovery is not implemented yet
       if (action & 1) == 0:
         # push space then AST element contiguously onto yy_element_stack
         # even numbered elements are spaces, odd numbered elements are AST

diff --git a/skel_y_tab.py b/skel_y_tab.py
index 4f7d953..e33be3a 100644 (file)
--- a/skel_y_tab.py
+++ b/skel_y_tab.py
@@ -101,7 +101,8 @@ def yyparse(factory, *args, **kwargs):
         bisect.bisect_right(yy_lr1dfa_states[state][0], yychar)
       ]
       if action == -1:
-        raise Exception('syntax error')
+        yyerror(yylloc, 'syntax error')
+        assert False # error recovery is not implemented yet
       if (action & 1) == 0:
         yystack.append((state, yylval, yylloc.copy()))