X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/153c6dec5130531c908f623f585cf1aa32172cee..79492f212da2fcaa4ce44d00fc08530e1630d05b:/Cycript.l.in
diff --git a/Cycript.l.in b/Cycript.l.in
index 5472417..ab5d0b3 100644
--- a/Cycript.l.in
+++ b/Cycript.l.in
@@ -1,27 +1,34 @@
/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2012 Jay Freeman (saurik)
+ * Copyright (C) 2009-2014 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 .
+ * 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 .
**/
/* }}} */
/* 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;
@@ -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); \
+@begin ObjectiveC
yyextra->no_.AtImplementation = false; \
+@end
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)
-#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 +92,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';
@@ -111,7 +126,8 @@ int H(char c) {
%option noyywrap
%option yylineno
%option nounput
-%option interactive
+%option batch
+%option never-interactive
%option reentrant
%option stack
@@ -147,12 +163,14 @@ XMLName {XMLNameStart}{XMLNamePart}*
\/{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);
-\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\/ V(N)
+\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\/ V(N) M
@begin E4X
"<>" L F(tk::LeftRight, hi::Structure);
@@ -185,6 +203,7 @@ XMLName {XMLNameStart}{XMLNamePart}*
@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);
@@ -243,18 +262,42 @@ XMLName {XMLNameStart}{XMLNamePart}*
"[" 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 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);
-"@import" L C F(tk::AtImport, hi::Meta);
+"@import" L C F(tk::AtImport, hi::Special);
"@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
+"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);
@@ -456,3 +499,7 @@ void CYDriver::PushCondition(Condition condition) {
void CYDriver::PopCondition() {
yy_pop_state(scanner_);
}
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif