hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 06:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve jison script, run the update parser

Browse Source
This commit is contained in:
Damien Alexandre
2014-09-22 16:58:50 +02:00
parent 4a051e4e42
commit 1b8ae26c64
5 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Alchemy/Phrasea/SearchEngine/Elastic/QueryParser.php
View File

@@ -446,12 +446,14 @@ class QueryParser
switch ($yystate) {
case 1:
return $thisS;
break;
case 2:
// $thisS = sprintf('(%s DEF_OP %s)', $s[$o-1]->text, $s[$o]->text);
$thisS = new AST\AndExpression($s[$o-1]->text, $s[$o]->text);
@@ -459,40 +461,48 @@ case 2:
break;
case 4:
$thisS = new AST\AndExpression($s[$o-2]->text, $s[$o]->text);
break;
case 5:
$thisS = new AST\OrExpression($s[$o-2]->text, $s[$o]->text);
break;
case 6:
$thisS = new AST\InExpression($s[$o]->text, $s[$o-2]->text);
break;
case 7:
$thisS = $s[$o-1];
break;
case 10:
$thisS = new AST\KeywordNode($s[$o]->text);
break;
case 11:
$thisS = new AST\PrefixNode($s[$o-1]->text);
break;
case 12:
$thisS = new AST\TextNode($s[$o]->text);
break;
case 13:
$thisS = new AST\QuotedTextNode($s[$o]->text);
break;
@@ -811,7 +821,7 @@ break;
}
}
}
if ( isset($match) && $match ) {
if ( $match ) {
$matchCount = strlen($match[0]);
$lineCount = preg_match("/(?:\r\n?|\n).*/", $match[0], $lines);
$line = ($lines ? $lines[$lineCount - 1] : false);
@@ -897,7 +907,6 @@ break;
function LexerPerformAction($avoidingNameCollisions, $YY_START = null)
{
;
switch($avoidingNameCollisions) {
case 0:/* skip whitespace */
@@ -1120,4 +1129,4 @@ class ParserRange
$this->x = $x;
$this->y = $y;
}
}
}