@# comments are becoming obsolescent. @# comments

can now be used. Within nested forms,
Lisp-compatible ; comments are suported.

* parser.l: Support @# and ; comments.

* txr.1: Documentation updated.

* txr.vim: Updated.

1 files changed, 7 insertions, 4 deletions

diff --git a/parser.l b/parser.l
index e7881a30..0ade291d 100644
--- a/parser.l
+++ b/parser.l
@@ -439,6 +439,9 @@ UONLY   {U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U}
                                   return TEXT;
                                 }
 
+<SPECIAL,NESTED>[;].*   {
+                          /* comment */
+                        }
 <SPECIAL,NESTED>{UANYN} {
                           yyerrprepf(lit("bad character in directive: '~a'"),
                                      string_utf8(yytext), nao);
@@ -536,14 +539,14 @@ UONLY   {U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U}
                   yy_push_state(SPECIAL);
                 }
 
-<INITIAL>^@#.*\n        {
+<INITIAL>^@[#;].*\n     {
                           /* eat whole line comment */
                           lineno++;
                         }
 
-<INITIAL>@#.*   {
-                   /* comment to end of line */
-                }
+<INITIAL>@[#;].*        {
+                          /* comment to end of line */
+                        }
 
 <STRLIT>\"      {
                   yy_pop_state();