X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/5befe15eb839184507218ab3feb9e375edf335c3..930aa21ba5c097f9ee6ebfc418c321de0729e076:/Cycript.l

diff --git a/Cycript.l b/Cycript.l
index c711e8d..43c9285 100644
--- a/Cycript.l
+++ b/Cycript.l
@@ -24,6 +24,16 @@ typedef cy::parser::token tk;
     yylloc->columns(yyleng); \
 }
 
+int H(char c) {
+    if (c >= '0' && c <= '9')
+        return c - '0';
+    if (c >= 'a' && c <= 'f')
+        return c - 'a' + 10;
+    if (c >= 'A' && c <= 'F')
+        return c - 'A' + 10;
+    return -1;
+}
+
 #define YY_INPUT(data, value, size) { \
     if (yyextra->size_ == 0) \
         value = YY_NULL; \
@@ -48,7 +58,7 @@ typedef cy::parser::token tk;
 %option reentrant
 
 Exponent [eE][+-]?[0-9]+
-Escape   \\['"\\bfnrtv]|\\0|\\x[0-9a-fA-F]{2}|\\u[0-9a-fA-F]{4}
+Escape   \\[\\'"bfnrtv]|\\0|\\x[0-9a-fA-F]{2}|\\u[0-9a-fA-F]{4}
 
 %%
 
@@ -109,36 +119,70 @@ Escape   \\['"\\bfnrtv]|\\0|\\x[0-9a-fA-F]{2}|\\u[0-9a-fA-F]{4}
 "["    L C return tk::OpenBracket;
 "]"    L C return tk::CloseBracket;
 
-"@selector"  L C return tk::AtSelector;
-
-"break"      L R yylval->word_ = new CYWord("break"); return tk::Break;
-"case"       L C yylval->word_ = new CYWord("case"); return tk::Case;
-"catch"      L C yylval->word_ = new CYWord("catch"); return tk::Catch;
-"continue"   L R yylval->word_ = new CYWord("continue"); return tk::Continue;
-"default"    L C yylval->word_ = new CYWord("default"); return tk::Default;
-"delete"     L C yylval->word_ = new CYWord("delete"); return tk::Delete;
-"do"         L C yylval->word_ = new CYWord("do"); return tk::Do;
-"else"       L C yylval->word_ = new CYWord("else"); return tk::Else;
-"false"      L C yylval->false_ = new CYFalse(); return tk::False;
-"finally"    L C yylval->word_ = new CYWord("finally"); return tk::Finally;
-"for"        L C yylval->word_ = new CYWord("for"); return tk::For;
-"function"   L C yylval->word_ = new CYWord("function"); return tk::Function;
-"if"         L C yylval->word_ = new CYWord("if"); return tk::If;
-"in"         L C yylval->word_ = new CYWord("in"); return tk::In;
-"instanceof" L C yylval->word_ = new CYWord("instanceof"); return tk::InstanceOf;
-"new"        L C yylval->word_ = new CYWord("new"); return tk::New;
-"null"       L C yylval->null_ = new CYNull(); return tk::Null;
-"return"     L R yylval->word_ = new CYWord("return"); return tk::Return;
-"switch"     L C yylval->word_ = new CYWord("switch"); return tk::Switch;
-"this"       L C yylval->this_ = new CYThis(); return tk::This;
-"throw"      L R yylval->word_ = new CYWord("throw"); return tk::Throw;
-"true"       L C yylval->true_ = new CYTrue(); return tk::True;
-"try"        L C yylval->word_ = new CYWord("try"); return tk::Try;
-"typeof"     L C yylval->word_ = new CYWord("typeof"); return tk::TypeOf;
-"var"        L C yylval->word_ = new CYWord("var"); return tk::Var;
-"void"       L C yylval->word_ = new CYWord("void"); return tk::Void;
-"while"      L C yylval->word_ = new CYWord("while"); return tk::While;
-"with"       L C yylval->word_ = new CYWord("with"); return tk::With;
+"@class"       L C return tk::AtClass;
+"@end"         L C return tk::AtEnd;
+"@selector"    L C return tk::AtSelector;
+
+"break"        L R yylval->word_ = new CYWord("break"); return tk::Break;
+"case"         L C yylval->word_ = new CYWord("case"); return tk::Case;
+"catch"        L C yylval->word_ = new CYWord("catch"); return tk::Catch;
+"continue"     L R yylval->word_ = new CYWord("continue"); return tk::Continue;
+"default"      L C yylval->word_ = new CYWord("default"); return tk::Default;
+"delete"       L C yylval->word_ = new CYWord("delete"); return tk::Delete;
+"do"           L C yylval->word_ = new CYWord("do"); return tk::Do;
+"else"         L C yylval->word_ = new CYWord("else"); return tk::Else;
+"false"        L C yylval->false_ = new CYFalse(); return tk::False;
+"finally"      L C yylval->word_ = new CYWord("finally"); return tk::Finally;
+"for"          L C yylval->word_ = new CYWord("for"); return tk::For;
+"function"     L C yylval->word_ = new CYWord("function"); return tk::Function;
+"if"           L C yylval->word_ = new CYWord("if"); return tk::If;
+"in"           L C yylval->word_ = new CYWord("in"); return tk::In;
+"instanceof"   L C yylval->word_ = new CYWord("instanceof"); return tk::InstanceOf;
+"new"          L C yylval->word_ = new CYWord("new"); return tk::New;
+"null"         L C yylval->null_ = new CYNull(); return tk::Null;
+"return"       L R yylval->word_ = new CYWord("return"); return tk::Return;
+"switch"       L C yylval->word_ = new CYWord("switch"); return tk::Switch;
+"this"         L C yylval->this_ = new CYThis(); return tk::This;
+"throw"        L R yylval->word_ = new CYWord("throw"); return tk::Throw;
+"true"         L C yylval->true_ = new CYTrue(); return tk::True;
+"try"          L C yylval->word_ = new CYWord("try"); return tk::Try;
+"typeof"       L C yylval->word_ = new CYWord("typeof"); return tk::TypeOf;
+"var"          L C yylval->word_ = new CYWord("var"); return tk::Var;
+"void"         L C yylval->word_ = new CYWord("void"); return tk::Void;
+"while"        L C yylval->word_ = new CYWord("while"); return tk::While;
+"with"         L C yylval->word_ = new CYWord("with"); return tk::With;
+
+"abstract"     L C yylval->word_ = new CYWord("abstract"); return tk::Abstract;
+"boolean"      L C yylval->word_ = new CYWord("boolean"); return tk::Boolean;
+"byte"         L C yylval->word_ = new CYWord("byte"); return tk::Byte;
+"char"         L C yylval->word_ = new CYWord("char"); return tk::Char;
+"class"        L C yylval->word_ = new CYWord("class"); return tk::Class;
+"const"        L C yylval->word_ = new CYWord("const"); return tk::Const;
+"debugger"     L C yylval->word_ = new CYWord("debugger"); return tk::Debugger;
+"double"       L C yylval->word_ = new CYWord("double"); return tk::Double;
+"enum"         L C yylval->word_ = new CYWord("enum"); return tk::Enum;
+"export"       L C yylval->word_ = new CYWord("export"); return tk::Export;
+"extends"      L C yylval->word_ = new CYWord("extends"); return tk::Extends;
+"final"        L C yylval->word_ = new CYWord("final"); return tk::Final;
+"float"        L C yylval->word_ = new CYWord("float"); return tk::Float;
+"goto"         L C yylval->word_ = new CYWord("goto"); return tk::Goto;
+"implements"   L C yylval->word_ = new CYWord("implements"); return tk::Implements;
+"import"       L C yylval->word_ = new CYWord("import"); return tk::Import;
+"int"          L C yylval->word_ = new CYWord("int"); return tk::Int;
+"interface"    L C yylval->word_ = new CYWord("interface"); return tk::Interface;
+"long"         L C yylval->word_ = new CYWord("long"); return tk::Long;
+"native"       L C yylval->word_ = new CYWord("native"); return tk::Native;
+"package"      L C yylval->word_ = new CYWord("package"); return tk::Package;
+"private"      L C yylval->word_ = new CYWord("private"); return tk::Private;
+"protected"    L C yylval->word_ = new CYWord("protected"); return tk::Protected;
+"public"       L C yylval->word_ = new CYWord("public"); return tk::Public;
+"short"        L C yylval->word_ = new CYWord("short"); return tk::Short;
+"static"       L C yylval->word_ = new CYWord("static"); return tk::Static;
+"super"        L C yylval->word_ = new CYWord("super"); return tk::Super;
+"synchronized" L C yylval->word_ = new CYWord("synchronized"); return tk::Synchronized;
+"throws"       L C yylval->word_ = new CYWord("throws"); return tk::Throws;
+"transient"    L C yylval->word_ = new CYWord("transient"); return tk::Transient;
+"volatile"     L C yylval->word_ = new CYWord("volatile"); return tk::Volatile;
 
 [a-zA-Z$_][a-zA-Z$_0-9]* yylval->identifier_ = new CYIdentifier(apr_pstrmemdup(yyextra->pool_, yytext, yyleng)); L C return tk::Identifier;
 
@@ -148,14 +192,53 @@ Escape   \\['"\\bfnrtv]|\\0|\\x[0-9a-fA-F]{2}|\\u[0-9a-fA-F]{4}
 
 0[bB][0-1]+ L C yylval->number_ = new CYNumber(strtoull(yytext + 2, NULL, 2)); return tk::NumericLiteral;
 
-\"([^"\\\n]|{Escape})*\" L C return tk::StringLiteral;
-'([^'\\\n]|{Escape})*' L C return tk::StringLiteral;
+\"([^"\\\n]|{Escape})*\"|'([^'\\\n]|{Escape})*' L C {
+    char *value(reinterpret_cast<char *>(apr_palloc(yyextra->pool_, yyleng)));
+    char *local(value);
+
+    for (int i(1); i != yyleng - 1; ++i) {
+        char next(yytext[i]);
+
+        if (yytext[i] == '\\')
+            switch (next = yytext[++i]) {
+                case '\\': next = '\\'; break;
+                case '\'': next = '\''; break;
+                case '"': next = '"'; break;
+                case 'b': next = '\b'; break;
+                case 'f': next = '\f'; break;
+                case 'n': next = '\n'; break;
+                case 'r': next = '\r'; break;
+                case 't': next = '\t'; break;
+                case 'v': next = '\v'; break;
+                case '0': next = '\0'; break;
+
+                case 'x':
+                    next = H(yytext[i + 1]) << 4 | H(yytext[i + 2]);
+                    i += 2;
+                break;
+            }
+
+        *local++ = next;
+    }
+
+    *local = '\0';
+    yylval->string_ = new CYString(value, local - value);
+    return tk::StringLiteral;
+}
 
 \n yylloc->end.lines(); yylloc->step(); N
 
 [ \t] L
 <<EOF>> L yyterminate();
 
+. {
+    CYDriver::Error error;
+    error.location_ = *yylloc;
+    error.message_ = "syntax error, unknown token";
+    yyextra->errors_.push_back(error);
+    yyterminate();
+}
+
 %%
 
 void CYDriver::ScannerInit() {