@@ -774,7 +774,7 @@ FunctionItem FunctionItem():
774
774
775
775
776
776
777
- List<Column> PivotForColumn():
777
+ /* List<Column> PivotForColumn():
778
778
{
779
779
List<Column> columns = new ArrayList<Column>();
780
780
Column column;
@@ -785,17 +785,20 @@ List<Column> PivotForColumn():
785
785
columns.add(column);
786
786
return columns;
787
787
}
788
- }
788
+ }*/
789
789
790
790
List<Column> PivotForColumns():
791
791
{
792
792
List<Column> columns = new ArrayList<Column>();
793
793
Column column;
794
794
}
795
795
{
796
- "(" column = Column() { columns.add(column); }
797
- ("," column = Column() { columns.add(column); } )*
798
- ")"
796
+ (
797
+ ("(" column = Column() { columns.add(column); }
798
+ ("," column = Column() { columns.add(column); } )*
799
+ ")")
800
+ | column = Column() { columns.add(column); }
801
+ )
799
802
{ return columns; }
800
803
}
801
804
@@ -858,9 +861,10 @@ Pivot Pivot():
858
861
}
859
862
{
860
863
<K_PIVOT> "(" functionItems = PivotFunctionItems() <K_FOR>
861
- ( forColumns = PivotForColumn() | forColumns = PivotForColumns() )
864
+ forColumns = PivotForColumns()
862
865
<K_IN> "("
863
- (LOOKAHEAD(3) singleInItems = PivotSingleInItems() | multiInItems = PivotMultiInItems() )
866
+ (LOOKAHEAD(3) singleInItems = PivotSingleInItems()
867
+ | multiInItems = PivotMultiInItems() )
864
868
")"
865
869
")"
866
870
{
@@ -883,7 +887,7 @@ PivotXml PivotXml():
883
887
}
884
888
{
885
889
<K_PIVOT> <K_XML> "(" functionItems = PivotFunctionItems() <K_FOR>
886
- ( forColumns = PivotForColumn() | forColumns = PivotForColumns() )
890
+ forColumns = PivotForColumns()
887
891
<K_IN> "("
888
892
(
889
893
<K_ANY> { retval.setInAny(true); } |
0 commit comments