X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/aa8f2b2cad24825ef2a2c82e65db1554bbf426e2..12e37ba3b9b322dd5b0483b45008e78e12aaa670:/Cycript.l.in?ds=inline
diff --git a/Cycript.l.in b/Cycript.l.in
index 77a4d27..85db0e8 100644
--- a/Cycript.l.in
+++ b/Cycript.l.in
@@ -1,28 +1,35 @@
/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2013 Jay Freeman (saurik)
+ * Copyright (C) 2009-2015 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
- * 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 .
+ * 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 */
%{
-#define YYLTYPE cy::location
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
+#pragma clang diagnostic ignored "-Wdeprecated-register"
+#endif
+
+#define YYLTYPE CYLocation
#include "Cycript.tab.hh"
typedef cy::parser::token tk;
@@ -73,16 +80,16 @@ typedef cy::parser::token tk;
left = yyleng - (nl - yytext) - 1; \
nl = reinterpret_cast(memchr(nl + 1, '\n', left)); \
} while (nl != NULL); \
+ yylloc->step(); \
yylloc->end.lines(lines); \
yylloc->end.columns(left); \
- yylloc->step(); \
more \
} else L \
}
#define L { \
yylloc->step(); \
- yylloc->columns(yyleng); \
+ yylloc->end.columns(yyleng); \
}
#define M { \
@@ -91,6 +98,14 @@ typedef cy::parser::token tk;
} \
}
+#define E(message) { \
+ CYDriver::Error error; \
+ error.location_ = *yylloc; \
+ error.message_ = "syntax error, " message; \
+ yyextra->errors_.push_back(error); \
+ yyterminate(); \
+}
+
int H(char c) {
if (c >= '0' && c <= '9')
return c - '0';
@@ -116,14 +131,23 @@ int H(char c) {
%option prefix="cy"
%option bison-bridge
%option bison-locations
+%option nodefault
%option noyywrap
-%option yylineno
+%option noyylineno
%option nounput
-%option interactive
+%option nounistd
+%option 8bit
+%option backup
+%option batch
+%option never-interactive
+%option pointer
%option reentrant
%option stack
-Exponent [eE][+-]?[0-9]+
+%option full
+%option ecs
+%option align
+
Escape \\[\\'"bfnrtv]|\\0|\\x[0-9a-fA-F]{2}|\\u[0-9a-fA-F]{4}|\\\n
IdentifierStart [a-zA-Z$_]
@@ -154,6 +178,9 @@ XMLName {XMLNameStart}{XMLNamePart}*
%%
\/{RegularExpressionBody}\/{RegularExpressionFlags} L C I(literal, RegEx(Y), tk::RegularExpressionLiteral, hi::Constant);
+\/{RegularExpressionBody}?\\? L E("unterminated regex")
+
+#![^\n]* L M
\/\/[^\n]* L M
@@ -161,6 +188,7 @@ XMLName {XMLNameStart}{XMLNamePart}*
/* 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) M
+\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\** V() E("invalid comment")
@begin E4X
"<>" L F(tk::LeftRight, hi::Structure);
@@ -185,6 +213,7 @@ XMLName {XMLNameStart}{XMLNamePart}*
@end
"..." L C F(tk::PeriodPeriodPeriod, hi::Meta);
+".." L E("invalid operator")
@begin E4X
"::" L C F(tk::ColonColon, hi::Operator);
@@ -193,6 +222,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);
@@ -259,13 +289,19 @@ XMLName {XMLNameStart}{XMLNamePart}*
@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 ObjectiveC
+@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);
"NULL" L C I(identifier, Identifier("NULL"), tk::Identifier_, hi::Constant);
@@ -361,12 +397,15 @@ XMLName {XMLNameStart}{XMLNamePart}*
{IdentifierStart}{IdentifierPart}* L C I(identifier, Identifier(Y), tk::Identifier_, hi::Identifier);
-(\.[0-9]+|(0|[1-9][0-9]*)(\.[0-9]*)?){Exponent}? L C I(number, Number(strtod(yytext, NULL)), tk::NumericLiteral, hi::Constant);
0[xX][0-9a-fA-F]+ L C I(number, Number(strtoull(yytext + 2, NULL, 16)), tk::NumericLiteral, hi::Constant);
0[0-7]+ L C I(number, Number(strtoull(yytext + 1, NULL, 8)), tk::NumericLiteral, hi::Constant);
0[bB][0-1]+ L C I(number, Number(strtoull(yytext + 2, NULL, 2)), tk::NumericLiteral, hi::Constant);
+(\.[0-9]+|(0|[1-9][0-9]*)(\.[0-9]*)?)([eE][+-]?[0-9]+)? L C I(number, Number(strtod(yytext, NULL)), tk::NumericLiteral, hi::Constant);
+(\.[0-9]+|(0|[1-9][0-9]*)(\.[0-9]*)?)[eE][+-]?{IdentifierPart}* L E("invalid exponent")
+(\.?[0-9]|(0|[1-9][0-9]*)\.){IdentifierPart}* L E("invalid number")
+
\"([^"\\\n]|{Escape})*\"|'([^'\\\n]|{Escape})*' L C {
char *value(A char[yyleng]);
char *local(value);
@@ -401,19 +440,15 @@ XMLName {XMLNameStart}{XMLNamePart}*
I(string, String(value, local - value), tk::StringLiteral, hi::Constant);
}
-\r?\n|\r|\xe2\x80[\xa8\xa9] yylloc->end.lines(); yylloc->step(); N
+(\"([^"\\\n]|{Escape})*|'([^'\\\n]|{Escape})*)(\\(x.{0,2}|u.{0,4})?)? L E("invalid escape")
+
+\r?\n|\r|\xe2\x80[\xa8\xa9] yylloc->step(); yylloc->end.lines(); N
[ \t] L
<> if (yyextra->auto_) { yyextra->auto_ = false; F(tk::AutoComplete, hi::Nothing); } L yyterminate();
-. L {
- CYDriver::Error error;
- error.location_ = *yylloc;
- error.message_ = "syntax error, unknown token";
- yyextra->errors_.push_back(error);
- yyterminate();
-}
+@{IdentifierPart}+|\xe2.|. L E("unknown token")
%%
@@ -482,3 +517,7 @@ void CYDriver::PushCondition(Condition condition) {
void CYDriver::PopCondition() {
yy_pop_state(scanner_);
}
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif