Core of implementation of TIP#201 ('in' and 'ni' operators)

1 files changed, 32 insertions, 6 deletions

diff --git a/generic/tclParseExpr.c b/generic/tclParseExpr.c
index 266466c..2a1c151 100644
--- a/generic/tclParseExpr.c
+++ b/generic/tclParseExpr.c
@@ -13,7 +13,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclParseExpr.c,v 1.22 2004/10/04 13:56:37 dkf Exp $
+ * RCS: @(#) $Id: tclParseExpr.c,v 1.23 2004/10/08 15:39:55 dkf Exp $
  */
 
 #include "tclInt.h"
@@ -134,6 +134,13 @@ typedef struct ParseInfo {
 #define EXPON		36
 
 /*
+ * List containment operators
+ */
+
+#define IN_LIST		37
+#define NOT_IN_LIST	38
+
+/*
  * Mapping from lexemes to strings; used for debugging messages. These
  * entries must match the order and number of the lexeme definitions above.
  */
@@ -144,7 +151,7 @@ static char *lexemeStrings[] = {
     "*", "/", "%", "+", "-",
     "<<", ">>", "<", ">", "<=", ">=", "==", "!=",
     "&", "^", "|", "&&", "||", "?", ":",
-    "!", "~", "eq", "ne", "**"
+    "!", "~", "eq", "ne", "**", "in", "ni"
 };
 
 /*
@@ -747,8 +754,8 @@ ParseEqualityExpr(infoPtr)
     }
 
     lexeme = infoPtr->lexeme;
-    while ((lexeme == EQUAL) || (lexeme == NEQ)
-	    || (lexeme == STREQ) || (lexeme == STRNEQ)) {
+    while (lexeme == EQUAL || lexeme == NEQ || lexeme == NOT_IN_LIST ||
+	    lexeme == IN_LIST || lexeme == STREQ || lexeme == STRNEQ) {
 	operator = infoPtr->start;
 	code = GetLexeme(infoPtr); /* skip over ==, !=, 'eq' or 'ne'  */
 	if (code != TCL_OK) {
@@ -1857,7 +1864,7 @@ GetLexeme(infoPtr)
 
 	case 'e':
 	    if ((src[1] == 'q') && ((infoPtr->lastChar - src) > 1) &&
-		(infoPtr->lastChar-src==2 || !isalpha(UCHAR(src[2])))) {
+		    (infoPtr->lastChar-src==2 || !isalpha(UCHAR(src[2])))) {
 		infoPtr->lexeme = STREQ;
 		infoPtr->size = 2;
 		infoPtr->next = src+2;
@@ -1869,12 +1876,31 @@ GetLexeme(infoPtr)
 
 	case 'n':
 	    if ((src[1] == 'e') && ((infoPtr->lastChar - src) > 1) &&
-		(infoPtr->lastChar-src==2 || !isalpha(UCHAR(src[2])))) {
+		    (infoPtr->lastChar-src==2 || !isalpha(UCHAR(src[2])))) {
 		infoPtr->lexeme = STRNEQ;
 		infoPtr->size = 2;
 		infoPtr->next = src+2;
 		parsePtr->term = infoPtr->next;
 		return TCL_OK;
+	    } else if ((src[1] == 'i') && ((infoPtr->lastChar - src) > 1) &&
+		    (infoPtr->lastChar-src==2 || !isalpha(UCHAR(src[2])))) {
+		infoPtr->lexeme = NOT_IN_LIST;
+		infoPtr->size = 2;
+		infoPtr->next = src+2;
+		parsePtr->term = infoPtr->next;
+		return TCL_OK;
+	    } else {
+		goto checkFuncName;
+	    }
+
+	case 'i':
+	    if ((src[1] == 'n') && ((infoPtr->lastChar - src) > 1) &&
+		    (infoPtr->lastChar-src==2 || !isalpha(UCHAR(src[2])))) {
+		infoPtr->lexeme = IN_LIST;
+		infoPtr->size = 2;
+		infoPtr->next = src+2;
+		parsePtr->term = infoPtr->next;
+		return TCL_OK;
 	    } else {
 		goto checkFuncName;
 	    }