Merge adapter into callback, removing indirection.

[cycript.git] / Cycript.l.in

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

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

 */
 
 */
 

-/* GNU Lesser General Public License, Version 3 {{{ */
+/* GNU Affero General Public License, Version 3 {{{ */

 /*
 /*

- * Cycript is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * Cycript is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 **/
 /* }}} */
 
 /* 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;
 


@@ -33,7 +40,9 @@ typedef cy::parser::token tk;
 // do /not/ fold token to the return: this is a macro and the ordering is dependent
 #define F(value, highlight) do { \
     int token(value); \
 // do /not/ fold token to the return: this is a macro and the ordering is dependent
 #define F(value, highlight) do { \
     int token(value); \

+@begin ObjectiveC

     yyextra->no_.AtImplementation = false; \
     yyextra->no_.AtImplementation = false; \

+@end

     yyextra->no_.Function = false; \
     yyextra->no_.OpenBrace = false; \
     yylval->highlight_ = highlight; \
     yyextra->no_.Function = false; \
     yyextra->no_.OpenBrace = false; \
     yylval->highlight_ = highlight; \


@@ -41,7 +50,7 @@ typedef cy::parser::token tk;
 } while (false)
 
 #define A new($pool)
 } while (false)
 
 #define A new($pool)

-#define Y apr_pstrmemdup($pool, yytext, yyleng)
+#define Y $pool.strmemdup(yytext, yyleng)

 
 #define I(type, Type, value, highlight) do { \
     yylval->type ## _ = A CY ## Type; \
 
 #define I(type, Type, value, highlight) do { \
     yylval->type ## _ = A CY ## Type; \


@@ -71,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 { \


@@ -117,7 +126,8 @@ int H(char c) {
 %option noyywrap
 %option yylineno
 %option nounput
 %option noyywrap
 %option yylineno
 %option nounput

-%option interactive
+%option batch
+%option never-interactive

 %option reentrant
 %option stack
 
 %option reentrant
 %option stack
 


@@ -153,6 +163,8 @@ XMLName {XMLNameStart}{XMLNamePart}*
 
 <RegExp>\/{RegularExpressionBody}\/{RegularExpressionFlags} L C I(literal, RegEx(Y), tk::RegularExpressionLiteral, hi::Constant);
 
 
 <RegExp>\/{RegularExpressionBody}\/{RegularExpressionFlags} L C I(literal, RegEx(Y), tk::RegularExpressionLiteral, hi::Constant);
 

+#![^\n]* L M
+

 \/\/[^\n]* L M
 
        /* http://ostermiller.org/findcomment.html */
 \/\/[^\n]* L M
 
        /* http://ostermiller.org/findcomment.html */


@@ -191,6 +203,7 @@ XMLName {XMLNameStart}{XMLNamePart}*
 
 @begin E4X ObjectiveC
 "@"    L C F(tk::At, hi::Operator);
 
 @begin E4X ObjectiveC
 "@"    L C F(tk::At, hi::Operator);

+"#"    L C F(tk::Pound, hi::Operator);

 @end
 
 "&"    L C F(tk::Ampersand, hi::Operator);
 @end
 
 "&"    L C F(tk::Ampersand, hi::Operator);


@@ -249,20 +262,38 @@ XMLName {XMLNameStart}{XMLNamePart}*
 "["    L C F(tk::OpenBracket, hi::Structure);
 "]"    L C F(tk::CloseBracket, hi::Structure);
 
 "["    L C F(tk::OpenBracket, hi::Structure);
 "]"    L C F(tk::CloseBracket, hi::Structure);
 

+"@error"          L C F(tk::AtError, hi::Error);
+

 @begin Java
 "@class"          L C F(tk::AtClass, hi::Meta);
 @end
 
 @begin Java
 "@class"          L C F(tk::AtClass, hi::Meta);
 @end
 

+@begin C
+"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
+"@encode"         L C F(tk::AtEncode, hi::Meta);
+@end
+

 @begin ObjectiveC
 "@end"            L C F(tk::AtEnd, hi::Meta);
 "@implementation" L C F(yyextra->no_.AtImplementation ? tk::AtImplementation_ : tk::AtImplementation, hi::Meta);
 @begin ObjectiveC
 "@end"            L C F(tk::AtEnd, hi::Meta);
 "@implementation" L C F(yyextra->no_.AtImplementation ? tk::AtImplementation_ : tk::AtImplementation, hi::Meta);

-"@import"         L C F(tk::AtImport, hi::Meta);
+"@import"         L C F(tk::AtImport, hi::Special);

 "@selector"       L C F(tk::AtSelector, hi::Meta);
 
 "NULL"         L C I(identifier, Identifier("NULL"), tk::Identifier_, hi::Constant);
 "nil"          L C I(identifier, Identifier("nil"), tk::Identifier_, hi::Constant);
 "@selector"       L C F(tk::AtSelector, hi::Meta);
 
 "NULL"         L C I(identifier, Identifier("NULL"), tk::Identifier_, hi::Constant);
 "nil"          L C I(identifier, Identifier("nil"), tk::Identifier_, hi::Constant);

-"YES"          L C I(identifier, Identifier("YES"), tk::Identifier_, hi::Constant);
-"NO"           L C I(identifier, Identifier("NO"), tk::Identifier_, hi::Constant);
+"YES"          L C I(identifier, Identifier("YES"), tk::Yes, hi::Constant);
+"NO"           L C I(identifier, Identifier("NO"), tk::No, hi::Constant);
+
+"bool"         L C I(identifier, Identifier("bool"), tk::Identifier_, hi::Type);
+"BOOL"         L C I(identifier, Identifier("BOOL"), tk::Identifier_, hi::Type);
+"id"           L C I(identifier, Identifier("id"), tk::Identifier_, hi::Type);
+"SEL"          L C I(identifier, Identifier("SEL"), tk::Identifier_, hi::Type);

 @end
 
 "undefined"    L C I(identifier, Identifier("undefined"), tk::Identifier_, hi::Operator);
 @end
 
 "undefined"    L C I(identifier, Identifier("undefined"), tk::Identifier_, hi::Operator);


@@ -387,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
 


@@ -468,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