minor changes

663a7415 · romanb · d1cd35d3 · 663a7415 · 663a7415
Commit 663a7415 authored Jan 19, 2009 by romanb
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 6 deletions

Parser.php lib/Doctrine/ORM/Query/Parser.php +4 -5

query-language.txt query-language.txt +1 -1

No files found.
--- a/lib/Doctrine/ORM/Query/Parser.php
+++ b/lib/Doctrine/ORM/Query/Parser.php
@@ -957,11 +957,10 @@ class Doctrine_ORM_Query_Parser
    }
    /**
-     * SimpleConditionalExpression ::= ExistsExpression |
+     * SimpleConditionalExpression ::=
-     *          (SimpleStateFieldPathExpression (ComparisonExpression | BetweenExpression | LikeExpression |
+     *      ComparisonExpression | BetweenExpression | LikeExpression |
-     *           InExpression | NullComparisonExpression)) |
+     *      InExpression | NullComparisonExpression | ExistsExpression |
-     *          (CollectionValuedPathExpression EmptyCollectionComparisonExpression) |
+     *      EmptyCollectionComparisonExpression | CollectionMemberExpression
-     *          (EntityExpression CollectionMemberExpression)
     */
    private function _SimpleConditionalExpression()
    {

--- a/query-language.txt
+++ b/query-language.txt
@@ -200,7 +200,7 @@ NamedParameter      ::= ":" string
 */
 ArithmeticExpression       ::= SimpleArithmeticExpression | "(" Subselect ")"
 SimpleArithmeticExpression ::= ArithmeticTerm {("+" | "-") ArithmeticTerm}*
-ArithmeticTerm             ::= ArithmeticFactor {("*" |"/") ArithmeticFactor}*
+ArithmeticTerm             ::= ArithmeticFactor {("*" | "/") ArithmeticFactor}*
 ArithmeticFactor           ::= [("+" | "-")] ArithmeticPrimary
 ArithmeticPrimary          ::= StateFieldPathExpression | Literal | "(" SimpleArithmeticExpression ")" | Function | AggregateExpression