Merged issue MapServer#5490 fix into a 7.2-based branch.

sdlime · Nov 7, 2018 · be54ab8 · be54ab8
2 parents 8765e13 + c44fc6a
commit be54ab8
Show file tree

Hide file tree

Showing 16 changed files with 498 additions and 606 deletions.
diff --git a/maplexer.c b/maplexer.c
@@ -2754,7 +2754,7 @@ YY_RULE_SETUP
 case 21:
 YY_RULE_SETUP
 #line 188 "maplexer.l"
-{ MS_LEXER_RETURN_TOKEN(IN); }
+{ MS_LEXER_RETURN_TOKEN(MS_TOKEN_COMPARISON_IN); /* was IN */ }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP

diff --git a/maplexer.l b/maplexer.l
@@ -185,7 +185,7 @@ char path[MS_MAXPATHLEN];
 <EXPRESSION_STRING>=\*                         { MS_LEXER_RETURN_TOKEN(MS_TOKEN_COMPARISON_IEQ); }
 <EXPRESSION_STRING>~\*                         { MS_LEXER_RETURN_TOKEN(MS_TOKEN_COMPARISON_IRE); }
 
-<EXPRESSION_STRING>in                          { MS_LEXER_RETURN_TOKEN(IN); }
+<EXPRESSION_STRING>in                          { MS_LEXER_RETURN_TOKEN(MS_TOKEN_COMPARISON_IN); /* was IN */ }
 
 <EXPRESSION_STRING>area                        { MS_LEXER_RETURN_TOKEN(MS_TOKEN_FUNCTION_AREA); }
 <EXPRESSION_STRING>length                      { MS_LEXER_RETURN_TOKEN(MS_TOKEN_FUNCTION_LENGTH); }