better comment syntax

1 files changed, 13 insertions, 14 deletions

diff --git a/bootstrap/parse.c b/bootstrap/parse.c
index 8707709..75a3279 100644
--- a/bootstrap/parse.c
+++ b/bootstrap/parse.c
@@ -370,9 +370,20 @@ lex(struct parser *P) {
    } else if (c == '#') {
       char s[100];
 
-      if (readtilhsep(P, s, sizeof s, 0) < 0)
+      if (readtilhsep(P, s, sizeof s, 0) < 0) {
          fatal(P, P->tokspan, "invalid #keyword");
-      else if (!strcmp(s, "#")) {
+      } else if (!strcmp(s, "#") && chrpeek(P) == '{') {
+         chr(P);
+         int bal = 1;
+         while (bal != 0) {
+            switch (lex(P).t) {
+            case '{': ++bal; break;
+            case '}': --bal; break;
+            case TKeof: fatal(P, tok.span, "unterminated comment");
+            }
+         }
+         return lex(P);
+      } else if (!strcmp(s, "#")) {
          tok.t = '#';
       } else if (!strcmp(s, "#t") || !strcmp(s, "#f")) {
          tok.t = TKboolit;
@@ -394,18 +405,6 @@ lex(struct parser *P) {
          tok.t = '#FIL';
       } else if (!strcmp(s, "#LINE")) {
          tok.t = '#LIN';
-      } else if (!strcmp(s, "#!")) {
-         if (chr(P) != '{') fatal(P, P->tokspan, "expected '{' after '#!'");
-         int bal = 1;
-         while (bal != 0) {
-            switch (lex(P).t) {
-            case '{': ++bal; break;
-            case '}': --bal; break;
-            case TKeof: fatal(P, tok.span, "unterminated comment");
-            }
-         }
-         return lex(P);
-
       } else {
          fatal(P, P->tokspan, "invalid #keyword");
       }