/System/Library/Frameworks is an Apple-only path.

[cycript.git] / Cycript.l.in

diff --git a/Cycript.l.in b/Cycript.l.in
index 5915fc95272fb34a4d7f61fa74b6c9e641bb6cb1..c61c2fca3d6819ed7ae617137745a48943df271e 100644 (file)
--- a/Cycript.l.in
+++ b/Cycript.l.in
@@ -1,21 +1,21 @@
 /* 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/>.

 **/
 /* }}} */
 
 **/
 /* }}} */
 


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


@@ -155,6 +156,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 +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);


@@ -259,23 +263,29 @@ XMLName {XMLNameStart}{XMLNamePart}*
 
 @begin C
 "typedef"         L C I(identifier, Identifier("typedef"), tk::Typedef, hi::Meta);
 
 @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
 
 @end
 

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