Finished implementing strings.

diff --git a/Application.mm b/Application.mm
index 4dc765bde2a6a03b57402ae765cb3acaa7bd3f5a..1739471a9ac064393e7ad1194d9c3133828cf797 100644 (file)
--- a/Application.mm
+++ b/Application.mm
@@ -34,17 +34,27 @@ int main(int argc, const char *argv[]) {
         std::string command;
         std::vector<std::string> lines;
 
         std::string command;
         std::vector<std::string> lines;
 

+        bool extra(false);
+        const char *prompt("cy# ");
+

         if (setjmp(ctrlc_) != 0) {
             fputs("\n", fout);
             fflush(fout);
             goto restart;
         }
 
         if (setjmp(ctrlc_) != 0) {
             fputs("\n", fout);
             fflush(fout);
             goto restart;
         }
 

-        const char *prompt("cy# ");

       read:
         char *line(readline(prompt));
         if (line == NULL)
             break;
       read:
         char *line(readline(prompt));
         if (line == NULL)
             break;

+
+        if (!extra) {
+            extra = true;
+            if (line[0] == '\\') {
+                goto restart;
+            }
+        }
+

         lines.push_back(line);
         command += line;
         free(line);
         lines.push_back(line);
         command += line;
         free(line);

diff --git a/Cycript.l b/Cycript.l
index c711e8df163afc2160d70ed1ff377a14e67a3a74..13ae15e399f5526e5aff6eb9098979ec14baf374 100644 (file)
--- a/Cycript.l
+++ b/Cycript.l
@@ -24,6 +24,16 @@ typedef cy::parser::token tk;
     yylloc->columns(yyleng); \
 }
 
     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; \
 #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]+
 %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}

 
 %%
 
 
 %%
 


@@ -148,13 +158,45 @@ 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;
 
 
 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();
 
 \n yylloc->end.lines(); yylloc->step(); N
 
 [ \t] L
 <<EOF>> L yyterminate();

+. yyterminate();

 
 %%
 
 
 %%
 

diff --git a/Output.cpp b/Output.cpp
index 2b10d71c093c7600f9d6c0e4acf28838d1eb9bfc..edd262fdd819dc5b87f9b1a53128ce157e2a369c 100644 (file)
--- a/Output.cpp
+++ b/Output.cpp
@@ -294,7 +294,7 @@ void CYSelector::Output(std::ostream &out) const {
 
 void CYSource::Show(std::ostream &out) const {
     for (const CYSource *next(this); next != NULL; next = next->next_)
 
 void CYSource::Show(std::ostream &out) const {
     for (const CYSource *next(this); next != NULL; next = next->next_)

-        next->Output(out);
+        next->Output(out, false);

 }
 
 void CYSource::Output(std::ostream &out, bool block) const {
 }
 
 void CYSource::Output(std::ostream &out, bool block) const {