Merge pull request #752 from braddr/cleanup-backend2

Change lexer to support # as a token, preserving #line's original behavior
dlang · Feb 21, 2012 · 2cb061a · 2cb061a
2 parents 027fdbc + 0bdc831
commit 2cb061a
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 10 deletions.
diff --git a/src/lexer.c b/src/lexer.c
@@ -1224,9 +1224,21 @@ void Lexer::scan(Token *t)
 #undef DOUBLE
 
             case '#':
+            {
                 p++;
-                pragma();
-                continue;
+                Token *n = peek(&token);
+                if (n->value == TOKidentifier && n->ident == Id::line)
+                {
+                    nextToken();
+                    poundLine();
+                    continue;
+                }
+                else
+                {
+                    t->value = TOKpound;
+                    return;
+                }
+            }
 
             default:
             {   unsigned c = *p;
@@ -2562,22 +2574,17 @@ __body
 }
 
 /*********************************************
- * Do pragma.
- * Currently, the only pragma supported is:
+ * parse:
  *      #line linnum [filespec]
  */
 
-void Lexer::pragma()
+void Lexer::poundLine()
 {
     Token tok;
     int linnum;
     char *filespec = NULL;
     Loc loc = this->loc;
 
-    scan(&tok);
-    if (tok.value != TOKidentifier || tok.ident != Id::line)
-        goto Lerr;
-
     scan(&tok);
     if (tok.value == TOKint32v || tok.value == TOKint64v)
     {   linnum = tok.uns64value - 1;
@@ -3160,6 +3167,7 @@ void Lexer::initKeywords()
     Token::tochars[TOKpow]              = "^^";
     Token::tochars[TOKpowass]           = "^^=";
     Token::tochars[TOKgoesto]           = "=>";
+    Token::tochars[TOKpound]            = "#";
 #endif
 
      // For debugging

diff --git a/src/lexer.h b/src/lexer.h
@@ -170,6 +170,7 @@ enum TOK
         TOKpowass,
         TOKgoesto,
         TOKvector,
+        TOKpound,
 #endif
 
         TOKMAX
@@ -305,7 +306,7 @@ struct Lexer
     void error(const char *format, ...);
     void error(Loc loc, const char *format, ...);
     void verror(Loc loc, const char *format, va_list ap);
-    void pragma();
+    void poundLine();
     unsigned decodeUTF();
     void getDocComment(Token *t, unsigned lineComment);
 

diff --git a/test/compilable/line.d b/test/compilable/line.d
@@ -0,0 +1,21 @@
+module line;
+
+static assert(__LINE__ == 3);
+
+int #line 10
+x;
+
+static assert(__LINE__ == 12);
+static assert(__FILE__ == "compilable/line.d");
+
+#line 100 "newfile.d"
+
+static assert(__LINE__ == 101);
+static assert(__FILE__ == "newfile.d");
+
+# line 200
+
+static assert(__LINE__ == 201);
+static assert(__FILE__ == "newfile.d");
+
+