Merge adapter into callback, removing indirection.

[cycript.git] / Cycript.l.in

diff --git a/Cycript.l.in b/Cycript.l.in
index c61c2fca3d6819ed7ae617137745a48943df271e..4878a2550792ba493054a73fce362de830582e84 100644 (file)
--- a/Cycript.l.in
+++ b/Cycript.l.in
@@ -1,5 +1,5 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

- * Copyright (C) 2009-2014  Jay Freeman (saurik)
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)

 */
 
 /* GNU Affero General Public License, Version 3 {{{ */
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */


@@ -22,7 +22,14 @@
 /* XXX: supposedly I will be screwed on very very long multi-line comments and need to replace these with a manual lexer. http://websrv.cs.fsu.edu/~engelen/courses/COP5621/Pr2.pdf */
 
 %{
 /* XXX: supposedly I will be screwed on very very long multi-line comments and need to replace these with a manual lexer. http://websrv.cs.fsu.edu/~engelen/courses/COP5621/Pr2.pdf */
 
 %{

-#define YYLTYPE cy::location
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
+#pragma clang diagnostic ignored "-Wdeprecated-register"
+#endif
+
+#define YYLTYPE CYLocation

 #include "Cycript.tab.hh"
 typedef cy::parser::token tk;
 
 #include "Cycript.tab.hh"
 typedef cy::parser::token tk;
 


@@ -73,16 +80,16 @@ typedef cy::parser::token tk;
             left = yyleng - (nl - yytext) - 1; \
             nl = reinterpret_cast<const char *>(memchr(nl + 1, '\n', left)); \
         } while (nl != NULL); \
             left = yyleng - (nl - yytext) - 1; \
             nl = reinterpret_cast<const char *>(memchr(nl + 1, '\n', left)); \
         } while (nl != NULL); \

+        yylloc->step(); \

         yylloc->end.lines(lines); \
         yylloc->end.columns(left); \
         yylloc->end.lines(lines); \
         yylloc->end.columns(left); \

-        yylloc->step(); \

         more \
     } else L \
 }
 
 #define L { \
     yylloc->step(); \
         more \
     } else L \
 }
 
 #define L { \
     yylloc->step(); \

-    yylloc->columns(yyleng); \
+    yylloc->end.columns(yyleng); \

 }
 
 #define M { \
 }
 
 #define M { \


@@ -265,6 +272,7 @@ XMLName {XMLNameStart}{XMLNamePart}*
 "typedef"         L C I(identifier, Identifier("typedef"), tk::Typedef, hi::Meta);
 "unsigned"        L C I(identifier, Identifier("unsigned"), tk::Unsigned, hi::Type);
 "signed"          L C I(identifier, Identifier("signed"), tk::Signed, hi::Type);
 "typedef"         L C I(identifier, Identifier("typedef"), tk::Typedef, hi::Meta);
 "unsigned"        L C I(identifier, Identifier("unsigned"), tk::Unsigned, hi::Type);
 "signed"          L C I(identifier, Identifier("signed"), tk::Signed, hi::Type);

+"extern"          L C I(identifier, Identifier("extern"), tk::Extern, hi::Type);

 @end
 
 @begin C
 @end
 
 @begin C


@@ -410,7 +418,7 @@ XMLName {XMLNameStart}{XMLNamePart}*
     I(string, String(value, local - value), tk::StringLiteral, hi::Constant);
 }
 
     I(string, String(value, local - value), tk::StringLiteral, hi::Constant);
 }
 

-\r?\n|\r|\xe2\x80[\xa8\xa9] yylloc->end.lines(); yylloc->step(); N
+\r?\n|\r|\xe2\x80[\xa8\xa9] yylloc->step(); yylloc->end.lines(); N

 
 [ \t] L
 
 
 [ \t] L
 


@@ -491,3 +499,7 @@ void CYDriver::PushCondition(Condition condition) {
 void CYDriver::PopCondition() {
     yy_pop_state(scanner_);
 }
 void CYDriver::PopCondition() {
     yy_pop_state(scanner_);
 }

+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif