Changeset 388

Timestamp:

02/17/10 04:06:32 (2 years ago)

Author:

walter

Message:

add !in operator

Files:

• trunk/src/parse.c (modified) (6 diffs)

trunk/src/parse.c

@@ -202 +202 @@
-        {
-            case TOKlparen:
-
+    {
-            nextToken();
-            check(TOKlparen, "mixin");
@@ -210 +210 @@
-            s = new CompileDeclaration(loc, e);
-            break;
-
+
-            case TOKtemplate:
-            // mixin template
@@ -4948 +4948 @@
-        id = token.ident;
-        nextToken();
-peekNext() != TOKis
+(save = peekNext()) != TOKis && save != TOKin
-        {   // identifier!(template-argument-list)
-        TemplateInstance *tempinst;
@@ -5683 +5683 @@
-            case TOKnot:
-            tk = peek(tk);
-)    // !is
+ || tk->value == TOKin)  // !is or !in
-                break;
-            case TOKdot:
@@ -5873 +5873 @@
-        continue;
-
+        case TOKnot:        // could be !in
+printf("test1\n");
+        if (peekNext() == TOKin)
+        {
+printf("test2\n");
+            nextToken();
+            nextToken();
+            e2 = parseShiftExp();
+            e = new InExp(loc, e, e2);
+            e = new NotExp(loc, e);
+            continue;
+        }
+        break;
+
-        case TOKin:
-        nextToken();
@@ -5966 +5980 @@
-        // Attempt to identify '!is'
-        t = peek(&token);
+        if (t->value == TOKin)
+        {
+        nextToken();
+        nextToken();
+        e2 = parseShiftExp();
+        e = new InExp(loc, e, e2);
+        e = new NotExp(loc, e);
+        break;
+        }
-        if (t->value != TOKis)
-        break;