diff -r d8379f5d5a1d -r 7797936ba34c src/Scanner.cpp
--- a/src/Scanner.cpp	Sun Jul 29 18:19:12 2012 -0700
+++ b/src/Scanner.cpp	Sun Jul 29 19:24:55 2012 -0700
@@ -369,10 +369,12 @@
         if (!literal_.append(c))
             return TOK_ERROR;
     }
-
+    
     if (!literal_.append('\0'))
         return TOK_ERROR;
 
+    if (!strcmp(literal(), "_"))
+        return TOK_UNDERSCORE;
     if (!strcmp(literal(),  "new"))
         return TOK_NEW;
     if (!strcmp(literal(),  "for"))