Merge remote-tracking branch 'origin/pull/124'

CHANGELOG.md

@@ -68,6 +68,8 @@ please take a look at related PRs and issues and see if the change affects you.
 - fix: #98 suppressed match in zero-or-more [#98]. Thanks @vpavlu for reporting
   the issue.
 
+- fix: empty comments in .peg files hid the next line, commented or not.
+
 [#125]: https://github.com/textX/Arpeggio/issues/125
 [#123]: https://github.com/textX/Arpeggio/discussions/123
 [#101]: https://github.com/textX/Arpeggio/issues/101

arpeggio/cleanpeg.py

@@ -58,7 +58,7 @@ def rule_name():        return _(r"[a-zA-Z_]([a-zA-Z_]|[0-9])*")
 def rule_crossref():    return rule_name
 def str_match():        return _(r'''(?s)('[^'\\]*(?:\\.[^'\\]*)*')|'''
                                  r'''("[^"\\]*(?:\\.[^"\\]*)*")''')
-def comment():          return "//", _(".*\n")
+def comment():          return _("//.*\n", multiline=False)
 
 
 class ParserPEG(ParserPEGOrig):

arpeggio/peg.py

@@ -67,8 +67,8 @@ def regex():            return _(r"""(r'[^'\\]*(?:\\.[^'\\]*)*')|"""
 def rule_name():        return _(r"[a-zA-Z_]([a-zA-Z_]|[0-9])*")
 def rule_crossref():    return rule_name
 def str_match():        return _(r'''(?s)('[^'\\]*(?:\\.[^'\\]*)*')|'''
-                                 r'''("[^"\\]*(?:\\.[^"\\]*)*")''')
-def comment():          return "//", _(".*\n")
+                                     r'''("[^"\\]*(?:\\.[^"\\]*)*")''')
+def comment():          return _("//.*\n", multiline=False)
 
 
 # Escape sequences supported in PEG literal string matches

arpeggio/tests/test_peg_parser.py

@@ -16,6 +16,7 @@
     factor <- ("+" / "-")?
               (number / "(" expression ")");
     // This is another comment
+    //
     term <- factor (( "*" / "/") factor)*;
     expression <- term (("+" / "-") term)*;
     calc <- expression+ EOF;