Fix issue in 64-bit choose() reported by heardrwt.

[cycript.git] / Cycript.l.in

diff --git a/Cycript.l.in b/Cycript.l.in
index 17f0013ed315569abe33a9126f342c36d1c82d54..cbe4fe5c354229fd5ec569d676cea3fdc5003a7e 100644 (file)
--- a/Cycript.l.in
+++ b/Cycript.l.in
@@ -1,20 +1,20 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

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

 */
 
 */
 

-/* GNU Lesser General Public License, Version 3 {{{ */
+/* GNU 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 free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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.
+ * 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 General Public License for more details.

  *
  *

- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License

  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */
  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */


@@ -30,16 +30,20 @@ typedef cy::parser::token tk;
 
 #define YY_EXTRA_TYPE CYDriver *
 
 
 #define YY_EXTRA_TYPE CYDriver *
 

+// do /not/ fold token to the return: this is a macro and the ordering is dependent

 #define F(value, highlight) do { \
 #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; \

-    return value; \
+    return token; \

 } 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; \


@@ -81,6 +85,12 @@ typedef cy::parser::token tk;
     yylloc->columns(yyleng); \
 }
 
     yylloc->columns(yyleng); \
 }
 

+#define M { \
+    if (yyextra->commented_) { \
+        I(comment, Comment(Y), tk::Comment, hi::Comment); \
+    } \
+}
+

 int H(char c) {
     if (c >= '0' && c <= '9')
         return c - '0';
 int H(char c) {
     if (c >= '0' && c <= '9')
         return c - '0';


@@ -109,7 +119,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
 


@@ -145,12 +156,14 @@ 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
+#![^\n]* L M
+
+\/\/[^\n]* L M

 
        /* http://ostermiller.org/findcomment.html */
        /* XXX: unify these two rules using !? */
 \/\*!([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\/ V() C I(comment, Comment(Y), tk::Comment, hi::Comment);
 
        /* http://ostermiller.org/findcomment.html */
        /* XXX: unify these two rules using !? */
 \/\*!([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\/ V() C I(comment, Comment(Y), tk::Comment, hi::Comment);

-\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\/ V(N)
+\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\/ V(N) M

 
 @begin E4X
 <RegExp>"<>"      L F(tk::LeftRight, hi::Structure);
 
 @begin E4X
 <RegExp>"<>"      L F(tk::LeftRight, hi::Structure);


@@ -183,6 +196,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);


@@ -241,18 +255,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);
+@end
+

 @begin ObjectiveC
 @begin ObjectiveC

+"@encode"         L C F(tk::AtEncode, hi::Meta);

 "@end"            L C F(tk::AtEnd, hi::Meta);
 "@implementation" L C F(yyextra->no_.AtImplementation ? tk::AtImplementation_ : tk::AtImplementation, hi::Meta);
 "@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);
 "@selector"       L C F(tk::AtSelector, hi::Meta);

-"nil"             L C I(identifier, Identifier("nil"), tk::Identifier_, hi::Constant);
+
+"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::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
 
 @end
 

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

 "false"        L C I(false, False(), tk::False, hi::Constant);
 "null"         L C I(null, Null(), tk::Null, hi::Constant);
 "true"         L C I(true, True(), tk::True, hi::Constant);
 "false"        L C I(false, False(), tk::False, hi::Constant);
 "null"         L C I(null, Null(), tk::Null, hi::Constant);
 "true"         L C I(true, True(), tk::True, hi::Constant);