composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°7985 Remove OQL grammar ambiguity leading to scary warnings when generating the parser (4 parsing conflicts)

Browse Source
This commit is contained in:
Romain Quetiez
2024-11-21 10:29:45 +01:00
parent 0d8a20c35e
commit ce68e270c3
2 changed files with 465 additions and 483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

934
core/oql/oql-parser.php
View File

File diff suppressed because it is too large Load Diff

14
core/oql/oql-parser.y
View File

@@ -71,28 +71,24 @@ class_list(A) ::= class_list(L) COMA class_name(X). {
where_statement(A) ::= WHERE condition(C). { A = C;}
where_statement(A) ::= . { A = null;}
join_statement(A) ::= join_item(J) join_statement(S). {
join_statement(A) ::= join_statement(S) JOIN join_item(J). {
// insert the join statement on top of the existing list
array_unshift(S, J);
array_push(S, J);
// and return the updated array
A = S;
}
join_statement(A) ::= join_item(J). {
A = Array(J);
}
join_statement(A) ::= . { A = null;}
join_statement(A) ::= . { A = [];}
join_item(A) ::= JOIN class_name(X) AS_ALIAS class_name(Y) ON join_condition(C).
join_item(A) ::= class_name(X) AS_ALIAS class_name(Y) ON join_condition(C).
{
// create an array with one single item
A = new OqlJoinSpec(X, Y, C);
}
join_item(A) ::= JOIN class_name(X) ON join_condition(C).
join_item(A) ::= class_name(X) ON join_condition(C).
{
// create an array with one single item
A = new OqlJoinSpec(X, X, C);
}
join_condition(A) ::= field_id(X) EQ field_id(Y). { A = new BinaryOqlExpression(X, '=', Y); }
join_condition(A) ::= field_id(X) BELOW field_id(Y). { A = new BinaryOqlExpression(X, 'BELOW', Y); }
join_condition(A) ::= field_id(X) BELOW_STRICT field_id(Y). { A = new BinaryOqlExpression(X, 'BELOW_STRICT', Y); }