Merge remote-tracking branch 'origin/master'

parser.y

@@ -65,6 +65,7 @@ struct lexer_param;
 %token SETDEFINEDOR "//="
 %token LESSEQ "<="
 %token GREATEREQ ">="
+%token CONTAINS "contains"
 
 %token QQSTRING_START
 %token <literal> QQSTRING_TEXT
@@ -80,7 +81,7 @@ struct lexer_param;
 %nonassoc '=' SETPIPE SETPLUS SETMINUS SETMULT SETDIV SETDEFINEDOR
 %left OR
 %left AND
-%nonassoc NEQ EQ '<' '>' LESSEQ GREATEREQ
+%nonassoc NEQ EQ '<' '>' LESSEQ GREATEREQ CONTAINS
 %left '+' '-'
 %left '*' '/'
 
@@ -149,6 +150,7 @@ static block gen_binop(block a, block b, int op) {
   case '>': funcname = "_greater"; break;
   case LESSEQ: funcname = "_lesseq"; break;
   case GREATEREQ: funcname = "_greatereq"; break;
+  case CONTAINS: funcname = "_contains"; break;
   }
   assert(funcname);
 
@@ -293,6 +295,10 @@ Exp ">=" Exp {
   $$ = gen_binop($1, $3, GREATEREQ);
 } |
 
+Exp "contains" Exp {
+  $$ = gen_binop($1, $3, CONTAINS);
+} |
+
 Term { 
   $$ = $1; 
 }