[ExpressionLanguage] added support for regexes

fabpot · fabpot · commit 3a4178164059 · 2013-09-19T12:59:10.000+02:00
diff --git a/src/Symfony/Component/ExpressionLanguage/Lexer.php b/src/Symfony/Component/ExpressionLanguage/Lexer.php
@@ -101,7 +101,7 @@ private function getOperatorRegex()
     {
         $operators = array(
             'not', '!', '-', '+',
-            'or', '||', '&&', 'and', '|', '^', '&', '==', '===', '!=', '!==', '<', '>', '>=', '<=', 'not in', 'in', '..', '+', '-', '~', '*', '/', '%', '**',
+            'or', '||', '&&', 'and', '|', '^', '&', '==', '===', '!=', '!==', '<', '>', '>=', '<=', 'not in', 'in', '..', '+', '-', '~', '*', '/', '%', '=~', '!~', '**',
         );
 
         $operators = array_combine($operators, array_map('strlen', $operators));
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php b/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php
@@ -38,6 +38,18 @@ public function compile(Compiler $compiler)
     {
         $operator = $this->attributes['operator'];
 
+        if ('=~' == $operator || '!~' == $operator) {
+            $compiler
+                ->raw(('!~' == $operator ? '!' : '').'preg_match(')
+                ->compile($this->nodes['right'])
+                ->raw(', ')
+                ->compile($this->nodes['left'])
+                ->raw(')')
+            ;
+
+            return;
+        }
+
         if (isset($this->functions[$operator])) {
             $compiler
                 ->raw(sprintf('%s(', $this->functions[$operator]))
@@ -124,6 +136,10 @@ public function evaluate($functions, $values)
                 return $left / $right;
             case '%':
                 return $left % $right;
+            case '=~':
+                return preg_match($right, $left);
+            case '!~':
+                return !preg_match($right, $left);
         }
     }
 }
diff --git a/src/Symfony/Component/ExpressionLanguage/Parser.php b/src/Symfony/Component/ExpressionLanguage/Parser.php
@@ -67,6 +67,8 @@ public function __construct(array $functions)
             '*'      => array('precedence' => 60,  'associativity' => Parser::OPERATOR_LEFT),
             '/'      => array('precedence' => 60,  'associativity' => Parser::OPERATOR_LEFT),
             '%'      => array('precedence' => 60,  'associativity' => Parser::OPERATOR_LEFT),
+            '=~'     => array('precedence' => 70,  'associativity' => Parser::OPERATOR_LEFT),
+            '!~'     => array('precedence' => 70,  'associativity' => Parser::OPERATOR_LEFT),
             '**'     => array('precedence' => 200, 'associativity' => Parser::OPERATOR_RIGHT),
         );
     }
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/BinaryNodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/BinaryNodeTest.php
@@ -61,6 +61,9 @@ public function getEvaluateData()
             array(false, new BinaryNode('not in', new ConstantNode('a'), $array)),
 
             array(array(1, 2, 3), new BinaryNode('..', new ConstantNode(1), new ConstantNode(3))),
+
+            array(1, new BinaryNode('=~', new ConstantNode('abc'), new ConstantNode('/^[a-z]+$/'))),
+            array(false, new BinaryNode('!~', new ConstantNode('abc'), new ConstantNode('/^[a-z]+$/'))),
         );
     }
 
@@ -108,6 +111,9 @@ public function getCompileData()
             array('!in_array("a", array(0 => "a", 1 => "b"))', new BinaryNode('not in', new ConstantNode('a'), $array)),
 
             array('range(1, 3)', new BinaryNode('..', new ConstantNode(1), new ConstantNode(3))),
+
+            array('preg_match("/^[a-z]+/i\$/", "abc")', new BinaryNode('=~', new ConstantNode('abc'), new ConstantNode('/^[a-z]+/i$/'))),
+            array('!preg_match("/^[a-z]+\$/", "abc")', new BinaryNode('!~', new ConstantNode('abc'), new ConstantNode('/^[a-z]+$/'))),
         );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ private function getOperatorRegex()`
`101`	`101`	`{`
`102`	`102`	`$operators = array(`
`103`	`103`	`'not', '!', '-', '+',`
`104`		`- 'or', '\|\|', '&&', 'and', '\|', '^', '&', '==', '===', '!=', '!==', '<', '>', '>=', '<=', 'not in', 'in', '..', '+', '-', '~', '', '/', '%', '*',`
	`104`	`+ 'or', '\|\|', '&&', 'and', '\|', '^', '&', '==', '===', '!=', '!==', '<', '>', '>=', '<=', 'not in', 'in', '..', '+', '-', '~', '', '/', '%', '=~', '!~', '*',`
`105`	`105`	`);`
`106`	`106`
`107`	`107`	`$operators = array_combine($operators, array_map('strlen', $operators));`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,8 @@ public function __construct(array $functions)`
`67`	`67`	`'*' => array('precedence' => 60, 'associativity' => Parser::OPERATOR_LEFT),`
`68`	`68`	`'/' => array('precedence' => 60, 'associativity' => Parser::OPERATOR_LEFT),`
`69`	`69`	`'%' => array('precedence' => 60, 'associativity' => Parser::OPERATOR_LEFT),`
	`70`	`+ '=~' => array('precedence' => 70, 'associativity' => Parser::OPERATOR_LEFT),`
	`71`	`+ '!~' => array('precedence' => 70, 'associativity' => Parser::OPERATOR_LEFT),`
`70`	`72`	`'**' => array('precedence' => 200, 'associativity' => Parser::OPERATOR_RIGHT),`
`71`	`73`	`);`
`72`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,9 @@ public function getEvaluateData()`
`61`	`61`	`array(false, new BinaryNode('not in', new ConstantNode('a'), $array)),`
`62`	`62`
`63`	`63`	`array(array(1, 2, 3), new BinaryNode('..', new ConstantNode(1), new ConstantNode(3))),`
	`64`	`+`
	`65`	`+ array(1, new BinaryNode('=~', new ConstantNode('abc'), new ConstantNode('/^[a-z]+$/'))),`
	`66`	`+ array(false, new BinaryNode('!~', new ConstantNode('abc'), new ConstantNode('/^[a-z]+$/'))),`
`64`	`67`	`);`
`65`	`68`	`}`
`66`	`69`
`@@ -108,6 +111,9 @@ public function getCompileData()`
`108`	`111`	`array('!in_array("a", array(0 => "a", 1 => "b"))', new BinaryNode('not in', new ConstantNode('a'), $array)),`
`109`	`112`
`110`	`113`	`array('range(1, 3)', new BinaryNode('..', new ConstantNode(1), new ConstantNode(3))),`
	`114`	`+`
	`115`	`+ array('preg_match("/^[a-z]+/i\$/", "abc")', new BinaryNode('=~', new ConstantNode('abc'), new ConstantNode('/^[a-z]+/i$/'))),`
	`116`	`+ array('!preg_match("/^[a-z]+\$/", "abc")', new BinaryNode('!~', new ConstantNode('abc'), new ConstantNode('/^[a-z]+$/'))),`
`111`	`117`	`);`
`112`	`118`	`}`
`113`	`119`	`}`