Correct a stupid mistake (!= 0 without _assert()).

[cycript.git] / Cycript.l.in

diff --git a/Cycript.l.in b/Cycript.l.in
index cb422ccfca62add4cbcc7fa19f9221c74393da40..ab5d0b3882dbf02e8a208de2ad63a197005b554b 100644 (file)
--- a/Cycript.l.in
+++ b/Cycript.l.in
@@ -1,27 +1,34 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

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

 */
 
 */
 

-/* GNU 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 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
+ * 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
  * 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 General Public License
- * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+ * 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 */
 
 %{

+
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
+#pragma clang diagnostic ignored "-Wdeprecated-register"
+#endif
+

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


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


@@ -155,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 */


@@ -193,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);


@@ -257,21 +268,32 @@ XMLName {XMLNameStart}{XMLNamePart}*
 "@class"          L C F(tk::AtClass, hi::Meta);
 @end
 
 "@class"          L C F(tk::AtClass, hi::Meta);
 @end
 

-@begin ObjectiveC
+@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);
 "@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);
 "@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);
 
 "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);


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