X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/cf19d1c1b69c77a7d91e93b25b2b0c2ca881b9be..142cb9e3c2eaba94e04b43f66178f5c4439bd1a8:/Cycript.l.in?ds=sidebyside diff --git a/Cycript.l.in b/Cycript.l.in index a3aed14..87a46af 100644 --- a/Cycript.l.in +++ b/Cycript.l.in @@ -1,20 +1,20 @@ /* 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 . **/ /* }}} */ @@ -33,7 +33,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); \ +@begin ObjectiveC yyextra->no_.AtImplementation = false; \ +@end yyextra->no_.Function = false; \ yyextra->no_.OpenBrace = false; \ yylval->highlight_ = highlight; \ @@ -41,7 +43,7 @@ typedef cy::parser::token tk; } 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; \ @@ -83,6 +85,12 @@ typedef cy::parser::token tk; 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'; @@ -147,12 +155,12 @@ XMLName {XMLNameStart}{XMLNamePart}* \/{RegularExpressionBody}\/{RegularExpressionFlags} L C I(literal, RegEx(Y), tk::RegularExpressionLiteral, hi::Constant); -\/\/[^\n]* L +\/\/[^\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); -\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\/ V(N) +\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\/ V(N) M @begin E4X "<>" L F(tk::LeftRight, hi::Structure); @@ -248,17 +256,24 @@ XMLName {XMLNameStart}{XMLNamePart}* @end @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); "@import" L C F(tk::AtImport, hi::Meta); "@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); +"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); + +"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); @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);