- Revision
- 1097
- Author
- rfscholte
- Date
- 2011-03-02 16:39:05 -0600 (Wed, 02 Mar 2011)
Log Message
Reformat several _expression_ + reference to JLS chapters
Modified Paths
Diff
Modified: trunk/qdox/src/grammar/parser.y (1096 => 1097)
--- trunk/qdox/src/grammar/parser.y 2011-03-02 22:25:34 UTC (rev 1096) +++ trunk/qdox/src/grammar/parser.y 2011-03-02 22:39:05 UTC (rev 1097) @@ -59,7 +59,7 @@ %type <type> InterfaceType %type <type> Wildcard %type <annoval> value _expression_ literal annotation arrayInitializer -%type <annoval> conditionalExpression conditionalOrExpression conditionalAndExpression inclusiveOrExpression exclusiveOrExpression andExpression +%type <annoval> ConditionalExpression ConditionalOrExpression ConditionalAndExpression InclusiveOrExpression ExclusiveOrExpression AndExpression %type <annoval> EqualityExpression RelationalExpression ShiftExpression AdditiveExpression MultiplicativeExpression %type <annoval> unaryExpression unaryExpressionNotPlusMinus primary %type <annoval> PostfixExpression CastExpression @@ -251,32 +251,30 @@ arrayInitializer ; _expression_: - conditionalExpression ; - -conditionalExpression: - conditionalOrExpression | - conditionalOrExpression QUERY _expression_ COLON _expression_ { $$ = new AnnotationQuery($1, $3, $5); }; + ConditionalExpression ; -conditionalOrExpression: - conditionalAndExpression | - conditionalOrExpression VERTLINE2 conditionalAndExpression { $$ = new AnnotationLogicalOr($1, $3); }; +//15.25 Conditional Operator ? : +ConditionalExpression: ConditionalOrExpression + | ConditionalOrExpression QUERY _expression_ COLON _expression_ { $$ = new AnnotationQuery($1, $3, $5); }; -conditionalAndExpression: - inclusiveOrExpression | - conditionalAndExpression AMPERSAND2 inclusiveOrExpression { $$ = new AnnotationLogicalAnd($1, $3); }; +//15.24 Conditional-Or Operator || +ConditionalOrExpression: ConditionalAndExpression + | ConditionalOrExpression VERTLINE2 ConditionalAndExpression { $$ = new AnnotationLogicalOr($1, $3); }; -inclusiveOrExpression: - exclusiveOrExpression | - inclusiveOrExpression VERTLINE exclusiveOrExpression { $$ = new AnnotationOr($1, $3); }; +// 15.23 Conditional-And Operator && +ConditionalAndExpression: InclusiveOrExpression + | ConditionalAndExpression AMPERSAND2 InclusiveOrExpression { $$ = new AnnotationLogicalAnd($1, $3); }; -exclusiveOrExpression: - andExpression | - exclusiveOrExpression CIRCUMFLEX andExpression { $$ = new AnnotationExclusiveOr($1, $3); }; +//15.22 Bitwise and Logical Operators +InclusiveOrExpression: ExclusiveOrExpression + | InclusiveOrExpression VERTLINE ExclusiveOrExpression { $$ = new AnnotationOr($1, $3); }; -andExpression: - EqualityExpression | - andExpression AMPERSAND EqualityExpression { $$ = new AnnotationAnd($1, $3); }; +ExclusiveOrExpression: AndExpression + | ExclusiveOrExpression CIRCUMFLEX AndExpression { $$ = new AnnotationExclusiveOr($1, $3); }; +AndExpression: EqualityExpression + | AndExpression AMPERSAND EqualityExpression { $$ = new AnnotationAnd($1, $3); }; + // 15.21 Equality Operators EqualityExpression: RelationalExpression | EqualityExpression EQUALS2 RelationalExpression { $$ = new AnnotationEquals($1, $3); }
To unsubscribe from this list please visit:
