@@ -774,7 +774,7 @@ FunctionItem FunctionItem():
774774
775775
776776
777- List<Column> PivotForColumn():
777+ /* List<Column> PivotForColumn():
778778{
779779 List<Column> columns = new ArrayList<Column>();
780780 Column column;
@@ -785,17 +785,20 @@ List<Column> PivotForColumn():
785785 columns.add(column);
786786 return columns;
787787 }
788- }
788+ }*/
789789
790790List<Column> PivotForColumns():
791791{
792792 List<Column> columns = new ArrayList<Column>();
793793 Column column;
794794}
795795{
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+ )
799802 { return columns; }
800803}
801804
@@ -858,9 +861,10 @@ Pivot Pivot():
858861}
859862{
860863 <K_PIVOT> "(" functionItems = PivotFunctionItems() <K_FOR>
861- ( forColumns = PivotForColumn() | forColumns = PivotForColumns() )
864+ forColumns = PivotForColumns()
862865 <K_IN> "("
863- (LOOKAHEAD(3) singleInItems = PivotSingleInItems() | multiInItems = PivotMultiInItems() )
866+ (LOOKAHEAD(3) singleInItems = PivotSingleInItems()
867+ | multiInItems = PivotMultiInItems() )
864868 ")"
865869 ")"
866870 {
@@ -883,7 +887,7 @@ PivotXml PivotXml():
883887}
884888{
885889 <K_PIVOT> <K_XML> "(" functionItems = PivotFunctionItems() <K_FOR>
886- ( forColumns = PivotForColumn() | forColumns = PivotForColumns() )
890+ forColumns = PivotForColumns()
887891 <K_IN> "("
888892 (
889893 <K_ANY> { retval.setInAny(true); } |
0 commit comments