branch: externals/parser-generator commit e157091adf3a39526141ff5b27c3fcc0f9597df3 Author: Christian Johansson <christ...@cvj.se> Commit: Christian Johansson <christ...@cvj.se>
Fixed error signaling in invalid LR-parser and generated LR-parser --- parser-generator-lr-export.el | 8 ++------ parser-generator-lr.el | 6 +----- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/parser-generator-lr-export.el b/parser-generator-lr-export.el index 761c3fd..73d3e43 100644 --- a/parser-generator-lr-export.el +++ b/parser-generator-lr-export.el @@ -575,13 +575,10 @@ (insert " (error - (format \"Invalid syntax! Expected one of %s found %s at %s\" - possible-look-aheads - look-ahead") +") (insert (format " - %s-lex-analyzer--index) possible-look-aheads look-ahead %s-lex-analyzer--index)) @@ -630,7 +627,6 @@ (setq goto-index (1+ goto-index)))" namespace namespace - namespace namespace)) (insert " @@ -868,7 +864,7 @@ output translation translation-symbol-table-list - history)))))") + history)))))\n") ;; Parse (insert diff --git a/parser-generator-lr.el b/parser-generator-lr.el index 74e628a..cad6f5b 100644 --- a/parser-generator-lr.el +++ b/parser-generator-lr.el @@ -1840,11 +1840,7 @@ ;; transfer to an error recovery routine). (error - (format - "Invalid syntax! Expected one of %S found %S at position %S" - possible-look-aheads - look-ahead - parser-generator-lex-analyzer--index) + "Invalid syntax! Expected one of %S found %S at position %S" possible-look-aheads look-ahead parser-generator-lex-analyzer--index))