Due to a conflict in Windows, we rename the IN token as IN_OP.

diff --git a/lib/expr/excc.c b/lib/expr/excc.c
index 409f3b193d6071aeab9d954ac8a48ad13654e539..2fbbbdeaa4ff05228c955f5fc789f814c73a46db 100644 (file)
--- a/lib/expr/excc.c
+++ b/lib/expr/excc.c
@@ -264,7 +264,7 @@ static void gen(Excc_t * cc, register Exnode_t * expr)
        }
        sfprintf(cc->ccdisc->text, ")");
        return;
-    case IN:
+    case IN_OP:
         gen(cc, expr->data.variable.index);
        sfprintf(cc->ccdisc->text, " in %s", expr->data.variable.symbol->name);
        return;

diff --git a/lib/expr/exdata.c b/lib/expr/exdata.c
index dbf1a4664cc9888ef9b5896702c3d38a5a1ceac8..ff6c941445856370b09c8640a1c54905c022bde0 100644 (file)
--- a/lib/expr/exdata.c
+++ b/lib/expr/exdata.c
@@ -49,7 +49,7 @@ Exid_t exbuiltin[] = {
     EX_ID("float", DECLARE, FLOATING, FLOATING, 0),
     EX_ID("gsub", GSUB, GSUB, STRING, 0),
     EX_ID("if", IF, IF, 0, 0),
-    EX_ID("in", IN, IN, 0, 0),
+    EX_ID("in", IN_OP, IN_OP, 0, 0),
     EX_ID("int", DECLARE, INTEGER, INTEGER, 0),
     EX_ID("long", DECLARE, INTEGER, INTEGER, 0),
     EX_ID("print", PRINT, PRINT, INTEGER, 0),

diff --git a/lib/expr/exeval.c b/lib/expr/exeval.c
index 6f18203e51fd912ae266389ffaa991c686fd4041..f0f1b71ea005e7e3c1901b029bef886fd319a087 100644 (file)
--- a/lib/expr/exeval.c
+++ b/lib/expr/exeval.c
@@ -1208,7 +1208,7 @@ static Extype_t eval(Expr_t * ex, register Exnode_t * expr, void *env)
     case '#':
        v.integer = dtsize ((Dt_t*)expr->data.variable.symbol->local.pointer);
        return v;
-    case IN:
+    case IN_OP:
        v.integer = evaldyn (ex, expr, env, 0);
        return v;
     case UNSET:

diff --git a/lib/expr/exgram.h b/lib/expr/exgram.h
index ea97eeeed1475cc452d31c84768176180d00921e..24d82d90b0a73c299d27ccb033ae2b1fbdf11943 100644 (file)
--- a/lib/expr/exgram.h
+++ b/lib/expr/exgram.h
@@ -110,7 +110,7 @@ extern "C" {
                x->data.variable.symbol->local.pointer = 0;
            }
            break;
-       case IN:
+       case IN_OP:
        case UNSET:
            if (x->data.variable.index)
                exfreenode(p, x->data.variable.index);

diff --git a/lib/expr/exparse.y b/lib/expr/exparse.y
index 77ce460611284ad6f2e3697c359212ab096bd2e1..ded73eb6e8877391bd4e8d7c62ead8b25e112b06 100644 (file)
--- a/lib/expr/exparse.y
+++ b/lib/expr/exparse.y
@@ -136,7 +136,7 @@
 %binary        <op>    EQ      NE
 %binary        <op>    '<'     '>'     LE      GE
 %left  <op>    LS      RS
-%left  <op>    '+'     '-'     IN
+%left  <op>    '+'     '-'     IN_OP
 %left  <op>    '*'     '/'     '%'
 %right <op>    '!'     '~'     '#'     UNARY
 %right <op>    INC     DEC
@@ -939,14 +939,14 @@ expr              :       '(' expr ')'
                        $$ = exnewnode(expr.program, $2, 0, $1->type, $1, NiL);
                        $$->subop = POS;
                }
-               |       expr IN DYNAMIC
+               |       expr IN_OP DYNAMIC
                {
                        if ($3->local.pointer == 0)
                                exerror("cannot apply IN to non-array %s", $3->name);
                        if (($3->index_type > 0) && ($1->type != $3->index_type))
                            exerror("%s indices must have type %s, not %s", 
                                $3->name, extypename(expr.program, $3->index_type),extypename(expr.program, $1->type));
-                       $$ = exnewnode(expr.program, IN, 0, INTEGER, NiL, NiL);
+                       $$ = exnewnode(expr.program, IN_OP, 0, INTEGER, NiL, NiL);
                        $$->data.variable.symbol = $3;
                        $$->data.variable.index = $1;
                }

diff --git a/lib/expr/extoken.c b/lib/expr/extoken.c
index e115ec5b79243b10bde3ed3a68cea49af57f9535..14439207fc0a397e304b0c27738024c7cfdb82f9 100644 (file)
--- a/lib/expr/extoken.c
+++ b/lib/expr/extoken.c
@@ -183,7 +183,7 @@ static void trace(Expr_t * ex, int lev, char *op, int c)
     case IF:
        s = " if";
        break;
-    case IN:
+    case IN_OP:
        s = " in";
        break;
     case PRAGMA: