Merge pull request #56 from Priw8/master

& and | operators, escaping quotes/backslashes, other small things
thpatch · May 22, 2019 · 609f733 · 609f733
2 parents 19b04b1 + 0784031
commit 609f733
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 8 deletions.
diff --git a/thecl/ecsparse.y b/thecl/ecsparse.y
@@ -222,6 +222,8 @@ void set_time(parser_state_t* state, int new_time);
 %token AND "&&"
 %token OR "||"
 %token XOR "^"
+%token B_OR "|"
+%token B_AND "&"
 %token DEC "--"
 %token NEG "-"
 %token NEGI "$-"
@@ -255,7 +257,7 @@ void set_time(parser_state_t* state, int new_time);
 %type <integer> Cast_Target
 %type <integer> Cast_Target2
 
-%nonassoc ADD ADDI ADDF SUBTRACT SUBTRACTI SUBTRACTF MULTIPLY MULTIPLYI MULTIPLYF DIVIDE DIVIDEI DIVIDEF EQUAL EQUALI EQUALF INEQUAL INEQUALI INEQUALF LT LTI LTF LTEQ LTEQI LTEQF GT GTI GTF GTEQ GTEQI GTEQF MODULO OR AND XOR
+%nonassoc ADD ADDI ADDF SUBTRACT SUBTRACTI SUBTRACTF MULTIPLY MULTIPLYI MULTIPLYF DIVIDE DIVIDEI DIVIDEF EQUAL EQUALI EQUALF INEQUAL INEQUALI INEQUALF LT LTI LTF LTEQ LTEQI LTEQF GT GTI GTF GTEQ GTEQI GTEQF MODULO OR AND XOR B_OR B_AND
 %left NOT NEG NEGI NEGF SIN COS SQRT
 %right DEC
 
@@ -806,6 +808,8 @@ Expression:
     | Expression "||"  Expression { $$ = EXPR_12(OR,                   $1, $3); }
     | Expression "&&"  Expression { $$ = EXPR_12(AND,                  $1, $3); }
     | Expression "^"   Expression { $$ = EXPR_12(XOR,                  $1, $3); }
+    | Expression "|" Expression   { $$ = EXPR_12(B_OR,                 $1, $3); }
+    | Expression "&" Expression   { $$ = EXPR_12(B_AND,                $1, $3); }
     | Address "--"                { $$ = EXPR_1A(DEC,                  $1); }
     | "-" Expression              { $$ = EXPR_1B(NEGI,      NEGF,      $2); }
     | "sin" Expression            { $$ = EXPR_11(SIN,                  $2); }

diff --git a/thecl/ecsscan.l b/thecl/ecsscan.l
@@ -60,7 +60,7 @@
             result = 1; \
         } \
     }
-%x COMMENT CSTRING STRING
+%x COMMENT CSTRING STRING ESCAPE_CHAR
 %%
 ","        return COMMA;
 ":"        return COLON;
@@ -105,6 +105,8 @@
 "||"       return OR;
 "&&"       return AND;
 "^"        return XOR;
+"|"        return B_OR;
+"&"        return B_AND;
 "--"       return DEC;
 "-"        return NEG;
 "sin"      return SIN;
@@ -150,10 +152,13 @@ ins_[0-9]+ {
     BEGIN(STRING);
     yylval.string = strdup("");
 }
-<STRING>[^\"\n]+ {
+<STRING>[^\"\n\\]+ {
     yylval.string = realloc(yylval.string, strlen(yylval.string) + yyleng + 1);
     strcat(yylval.string, yytext);
 }
+<STRING>\\ {
+    BEGIN(ESCAPE_CHAR);
+}
 <STRING>\n {
     free(yylval.string);
     yyerror(NULL, "unterminated string");
@@ -164,6 +169,18 @@ ins_[0-9]+ {
     BEGIN(INITIAL);
     return TEXT;
 }
+<ESCAPE_CHAR>[\"\\] {
+    yylval.string = realloc(yylval.string, strlen(yylval.string) + yyleng + 1);
+    strcat(yylval.string, yytext);
+    BEGIN(STRING);
+}
+<ESCAPE_CHAR>[^\"\\] {
+    char buf[256];
+    snprintf(buf, 256, "invalid character escape: %s", yytext);
+    yyerror(NULL, buf);
+    BEGIN(INITIAL);
+    yyterminate();
+}
 
 "/*"               BEGIN(COMMENT);
 <COMMENT>[^*]*     |

diff --git a/thecl/expr.c b/thecl/expr.c
@@ -101,6 +101,8 @@ th10_expressions[] = {
     { OR,         73, 'S', NULL, 2, "SS", "s1 || s0" },
     { AND,        74, 'S', NULL, 2, "SS", "s1 && s0" },
     { XOR,        75, 'S', NULL, 2, "SS", "s1 ^ s0" },
+    { B_OR,       76, 'S', NULL, 2, "SS", "s1 | s0" },
+    { B_AND,      77, 'S', NULL, 2, "SS", "s1 & s0" },
     { DEC,        78, 'S',  "S", 0, NULL, "p0--" },
     { SIN,        79, 'f', NULL, 1, "f", "sin(s0)" },
     { COS,        80, 'f', NULL, 1, "f", "cos(s0)" },

diff --git a/thecl/thecl06.c b/thecl/thecl06.c
@@ -124,7 +124,7 @@ th06_param_to_text(
         for (size_t z = 0; z < zlen; ++z) {
             if (!param->value.val.z[z])
                 break;
-            if (param->value.val.z[z] == '"')
+            if (param->value.val.z[z] == '"' || param->value.val.z[z] == '\\')
                 *temp++ = '\\';
             *temp++ = param->value.val.z[z];
         }

diff --git a/thecl/thecl10.c b/thecl/thecl10.c
@@ -137,7 +137,7 @@ th10_param_to_text(
         for (size_t z = 0; z < zlen; ++z) {
             if (!param->value.val.z[z])
                 break;
-            if (param->value.val.z[z] == '"')
+            if (param->value.val.z[z] == '"' || param->value.val.z[z] == '\\')
                 *temp++ = '\\';
             *temp++ = param->value.val.z[z];
         }
@@ -761,9 +761,9 @@ static const id_format_pair_t th13_fmts[] = {
     { 405, "SSff" },
     { 406, "ff" },
     { 407, "SSff" },
-    { 408, "ffSS" },
+    { 408, "ffff" },
     { 409, "SSfff" },
-    { 410, "ffSS" },
+    { 410, "ffff" },
     { 411, "SSfff" },
     { 412, "SSf" },
     { 413, "SSf" },
@@ -783,7 +783,7 @@ static const id_format_pair_t th13_fmts[] = {
     { 427, "" },
     { 428, "ff" },
     { 429, "SSff" },
-    { 430, "SS" },
+    { 430, "ff" },
     { 431, "SSff" },
     { 432, "S" },
     { 433, "S" },