From fc96e230a50e0236e77adf6c3223e0a548aac69e Mon Sep 17 00:00:00 2001 From: grammarware Date: Mon, 22 Feb 2010 16:17:26 +0000 Subject: [PATCH] deyaccify, eliminate, horizontal: concrete syntax cleaned up git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@776 ab42f6e0-554d-0410-b580-99e487e6eeb2 --- shared/prolog/readXbgf.pro | 10 ++-- shared/xsd/xbgf.xsd | 23 +++++++-- topics/fl/lci/fl-lci.csproj | 48 ++++++++++++++++++- topics/fl/lci/fl-lci.sln | 4 +- topics/fl/lci/xbgf/trim-jaxb.xbgf | 8 +++- topics/fl/lci/xbgf/trim-om.xbgf | 4 +- topics/fl/lci/xbgf/trim-xsd.xbgf | 4 +- topics/java/lci/xbgf/correct-impl1.xbgf | 2 +- topics/java/lci/xbgf/correct-impl2.xbgf | 6 +-- topics/java/lci/xbgf/correct-read1.xbgf | 4 +- topics/java/lci/xbgf/correct-read2.xbgf | 2 +- topics/java/lci/xbgf/correct-read3.xbgf | 2 +- .../lci/xbgf/deyaccifyModifiers-read2.xbgf | 14 +++--- topics/java/lci/xbgf/deyaccifyStatements.xbgf | 6 +-- topics/java/lci/xbgf/edit-read1.xbgf | 6 +-- topics/java/lci/xbgf/edit-read2.xbgf | 6 +-- topics/java/lci/xbgf/edit-read3.xbgf | 10 ++-- topics/java/lci/xbgf/editDeclarations.xbgf | 36 +++++++------- .../java/lci/xbgf/editExpressions-jls1.xbgf | 18 +++---- .../java/lci/xbgf/editExpressions-read2.xbgf | 18 +++---- .../java/lci/xbgf/editExpressions-read3.xbgf | 22 ++++----- topics/java/lci/xbgf/eliminate-read2.xbgf | 6 +-- topics/java/lci/xbgf/extend-read12.xbgf | 6 +-- .../lci/xbgf/extendClassDeclarations.xbgf | 2 +- topics/java/lci/xbgf/extendExpressions.xbgf | 6 +-- .../lci/xbgf/extendInterfaceDeclarations.xbgf | 4 +- topics/java/lci/xbgf/extendModifiers.xbgf | 2 +- topics/java/lci/xbgf/generalize-impl3.xbgf | 2 +- .../lci/xbgf/generalizeModifiers-read3.xbgf | 16 +++---- .../java/lci/xbgf/generalizeNames-read1.xbgf | 2 +- topics/java/lci/xbgf/generalizeNames.xbgf | 2 +- topics/java/lci/xbgf/inlineForStatement.xbgf | 2 +- topics/java/lci/xbgf/inlineStatements.xbgf | 14 +++--- topics/java/lci/xbgf/refactor-impl1.xbgf | 2 +- topics/java/lci/xbgf/refactor-impl2.xbgf | 6 +-- topics/java/lci/xbgf/refactor-impl3.xbgf | 8 ++-- topics/java/lci/xbgf/refactor-read1.xbgf | 8 ++-- .../java/lci/xbgf/refactorClasses-read2.xbgf | 18 +++---- .../java/lci/xbgf/refactorClasses-read3.xbgf | 12 ++--- .../lci/xbgf/refactorDeclarations-read2.xbgf | 12 ++--- .../lci/xbgf/refactorDeclarations-read3.xbgf | 14 +++--- topics/java/lci/xbgf/refactorEnums.xbgf | 2 +- topics/java/lci/xbgf/refactorExpressions.xbgf | 8 ++-- .../lci/xbgf/refactorInterfaces-read2.xbgf | 6 +-- .../lci/xbgf/refactorInterfaces-read3.xbgf | 16 +++---- .../lci/xbgf/refactorMinorMismatches.xbgf | 4 +- .../java/lci/xbgf/refactorPackageNames.xbgf | 4 +- .../lci/xbgf/refactorStatements-jls1.xbgf | 28 +++++------ .../lci/xbgf/refactorStatements-read3.xbgf | 6 +-- topics/java/lci/xbgf/refactorTypes-jls1.xbgf | 10 ++-- topics/java/lci/xbgf/refactorTypes-read2.xbgf | 10 ++-- topics/java/lci/xbgf/refactorTypes-read3.xbgf | 18 +++---- topics/java/lci/xbgf/relaxClasses-read3.xbgf | 10 ++-- .../java/lci/xbgf/relaxExpressions-read3.xbgf | 18 +++---- 54 files changed, 304 insertions(+), 233 deletions(-) diff --git a/shared/prolog/readXbgf.pro b/shared/prolog/readXbgf.pro index 4762bc1f..53ec75ee 100644 --- a/shared/prolog/readXbgf.pro +++ b/shared/prolog/readXbgf.pro @@ -64,7 +64,8 @@ xml2xbgf(T,unlabel(L)) xml2xbgf(T,deyaccify(N)) :- self(name(xbgf:deyaccify),T), - content(T,N). + child(name(nonterminal),T,T1), + content(T1,N). xml2xbgf(T,abstractize(P2)) :- @@ -116,7 +117,8 @@ xml2xbgf(T,dump) xml2xbgf(T,eliminate(N)) :- self(name(xbgf:eliminate),T), - content(T,N). + child(name(nonterminal),T,T1), + content(T1,N). xml2xbgf(T,G) :- @@ -149,8 +151,10 @@ xml2xbgf(T,G) xml2xbgf(T,horizontal(N)) :- self(name(xbgf:horizontal),T), - content(T,N). + child(name(nonterminal),T,T1), + content(T1,N). +% Unused / undocumented / deprecated ? xml2xbgf(T,id) :- self(name(xbgf:id),T). diff --git a/shared/xsd/xbgf.xsd b/shared/xsd/xbgf.xsd index cd2205b1..3bc89c39 100644 --- a/shared/xsd/xbgf.xsd +++ b/shared/xsd/xbgf.xsd @@ -439,7 +439,7 @@ - + Deyaccification is a widely used term that means converting recursive @@ -461,6 +461,11 @@ Both left- and right-recursive forms can be factored with this transformation. + + + + + @@ -493,7 +498,7 @@ - + An unused definition (at most used within the definition itself) @@ -504,6 +509,11 @@ a production of a vertical definition) is to be removed. + + + + + @@ -592,13 +602,18 @@ - + Turn a definition based on multiple productions into a top choice-based one. - The action is a reverse of vertical. + The action is a reverse of vertical. + + + + + diff --git a/topics/fl/lci/fl-lci.csproj b/topics/fl/lci/fl-lci.csproj index 435939a3..b1fe1dd8 100644 --- a/topics/fl/lci/fl-lci.csproj +++ b/topics/fl/lci/fl-lci.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,8 +10,29 @@ Properties fl_lci fl-lci - v3.5 + v4.0 512 + + + + + 3.5 + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + true @@ -54,6 +75,7 @@ xbgf.xsd + @@ -85,4 +107,26 @@ + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + true + + + False + Microsoft Visual Basic PowerPacks 10.0 + true + + + False + Windows Installer 3.1 + true + + \ No newline at end of file diff --git a/topics/fl/lci/fl-lci.sln b/topics/fl/lci/fl-lci.sln index e24fbbc6..6037678d 100644 --- a/topics/fl/lci/fl-lci.sln +++ b/topics/fl/lci/fl-lci.sln @@ -1,6 +1,6 @@  -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C# Express 2008 +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "fl-lci", "fl-lci.csproj", "{9DF685A6-6572-47F9-8DE3-1E827BFDB62F}" EndProject Global diff --git a/topics/fl/lci/xbgf/trim-jaxb.xbgf b/topics/fl/lci/xbgf/trim-jaxb.xbgf index 6bc9e5b0..29c3ffd3 100644 --- a/topics/fl/lci/xbgf/trim-jaxb.xbgf +++ b/topics/fl/lci/xbgf/trim-jaxb.xbgf @@ -1,6 +1,10 @@ - ObjectFactory - package-info + + ObjectFactory + + + package-info + EQUAL diff --git a/topics/fl/lci/xbgf/trim-om.xbgf b/topics/fl/lci/xbgf/trim-om.xbgf index abe317d1..1192d44b 100644 --- a/topics/fl/lci/xbgf/trim-om.xbgf +++ b/topics/fl/lci/xbgf/trim-om.xbgf @@ -1,3 +1,5 @@ - Visitor + + Visitor + diff --git a/topics/fl/lci/xbgf/trim-xsd.xbgf b/topics/fl/lci/xbgf/trim-xsd.xbgf index f9acf539..f0e439d3 100644 --- a/topics/fl/lci/xbgf/trim-xsd.xbgf +++ b/topics/fl/lci/xbgf/trim-xsd.xbgf @@ -1,5 +1,7 @@ - Fragment + + Fragment + diff --git a/topics/java/lci/xbgf/correct-impl1.xbgf b/topics/java/lci/xbgf/correct-impl1.xbgf index d631cc5a..f55b8da4 100644 --- a/topics/java/lci/xbgf/correct-impl1.xbgf +++ b/topics/java/lci/xbgf/correct-impl1.xbgf @@ -9,6 +9,6 @@ - Goal + Goal \ No newline at end of file diff --git a/topics/java/lci/xbgf/correct-impl2.xbgf b/topics/java/lci/xbgf/correct-impl2.xbgf index 53dafd05..49cb0b19 100644 --- a/topics/java/lci/xbgf/correct-impl2.xbgf +++ b/topics/java/lci/xbgf/correct-impl2.xbgf @@ -205,11 +205,11 @@ - ArgumentsOpt + ArgumentsOpt - VoidMethodDeclaratorRest + VoidMethodDeclaratorRest - VariableDeclaratorsRest + VariableDeclaratorsRest diff --git a/topics/java/lci/xbgf/correct-read1.xbgf b/topics/java/lci/xbgf/correct-read1.xbgf index bea776f8..0178cbe4 100644 --- a/topics/java/lci/xbgf/correct-read1.xbgf +++ b/topics/java/lci/xbgf/correct-read1.xbgf @@ -16,7 +16,7 @@ vs. - [], ;([n(ConstantModifier), ,([n(ConstantModifiers), n(ConstantModifer)])]) --> - ConstantModifiers + ConstantModifiers ConstantModifiers @@ -103,7 +103,7 @@ ,([t((), n(ReferenceType), t()), n(UnaryExpressionNotPlusMinus)]), ,([t((), n(PrimitiveType), ?(n(Dims)), t()), n(UnaryExpression)])]) --> - CastExpression + CastExpression diff --git a/topics/java/lci/xbgf/correct-read2.xbgf b/topics/java/lci/xbgf/correct-read2.xbgf index c1fdc247..b2106d62 100644 --- a/topics/java/lci/xbgf/correct-read2.xbgf +++ b/topics/java/lci/xbgf/correct-read2.xbgf @@ -85,7 +85,7 @@ ','([t('('), n('ReferenceType'), t(')'), n('UnaryExpressionNotPlusMinus')]), ','([t('('), n('PrimitiveType'), ?(n('Dims')), t(')'), n('UnaryExpression')])])), --> - CastExpression + CastExpression diff --git a/topics/java/lci/xbgf/correct-read3.xbgf b/topics/java/lci/xbgf/correct-read3.xbgf index 3a87a016..bce15913 100644 --- a/topics/java/lci/xbgf/correct-read3.xbgf +++ b/topics/java/lci/xbgf/correct-read3.xbgf @@ -150,7 +150,7 @@ ','([t('('), n('ReferenceType'), t(')'), n('UnaryExpressionNotPlusMinus')]), ','([t('('), n('PrimitiveType'), ?(n('Dims')), t(')'), n('UnaryExpression')])])), --> - CastExpression + CastExpression diff --git a/topics/java/lci/xbgf/deyaccifyModifiers-read2.xbgf b/topics/java/lci/xbgf/deyaccifyModifiers-read2.xbgf index 0df44fe8..7bbd84f8 100644 --- a/topics/java/lci/xbgf/deyaccifyModifiers-read2.xbgf +++ b/topics/java/lci/xbgf/deyaccifyModifiers-read2.xbgf @@ -4,13 +4,13 @@ xmlns:xbgf="http://planet-sl.org/xbgf"> - Modifiers - AbstractMethodModifiers - InterfaceModifiers - MethodModifiers - FieldModifiers - ConstructorModifiers - ConstantModifiers + Modifiers + AbstractMethodModifiers + InterfaceModifiers + MethodModifiers + FieldModifiers + ConstructorModifiers + ConstantModifiers Modifiers diff --git a/topics/java/lci/xbgf/deyaccifyStatements.xbgf b/topics/java/lci/xbgf/deyaccifyStatements.xbgf index 52f0aee1..595824c3 100644 --- a/topics/java/lci/xbgf/deyaccifyStatements.xbgf +++ b/topics/java/lci/xbgf/deyaccifyStatements.xbgf @@ -9,7 +9,7 @@ vs. - [], ;([n(SwitchBlockStatementGroup), ,([n(SwitchBlockStatementGroups), n(SwitchBlockStatementGroup)])]) --> - SwitchBlockStatementGroups + SwitchBlockStatementGroups SwitchBlockStatementGroups @@ -50,7 +50,7 @@ vs. - [], ;([n(CatchClause), ,([n(Catches), n(CatchClause)])]) --> - Catches + Catches - BlockStatements + BlockStatements \ No newline at end of file diff --git a/topics/java/lci/xbgf/edit-read1.xbgf b/topics/java/lci/xbgf/edit-read1.xbgf index 2393c954..94f6d6d4 100644 --- a/topics/java/lci/xbgf/edit-read1.xbgf +++ b/topics/java/lci/xbgf/edit-read1.xbgf @@ -37,8 +37,8 @@ vs. - [], ,([t(import), n(PackageOrTypeName), t(.), t(*), t((;))]) --> - PackageName - PackageOrTypeName + PackageName + PackageOrTypeName PackageName @@ -198,7 +198,7 @@ - ClassInstanceCreationExpression + ClassInstanceCreationExpression diff --git a/topics/java/lci/xbgf/edit-read2.xbgf b/topics/java/lci/xbgf/edit-read2.xbgf index bd24e281..b3d03add 100644 --- a/topics/java/lci/xbgf/edit-read2.xbgf +++ b/topics/java/lci/xbgf/edit-read2.xbgf @@ -16,8 +16,8 @@ ConstructorBody MethodBody - ExplicitConstructorInvocation - ArgumentList + ExplicitConstructorInvocation + ArgumentList - FormalParameterList - LastFormalParameter - NonWildTypeArguments - ReferenceTypeList - TypeDeclSpecifier + FormalParameterList + LastFormalParameter + NonWildTypeArguments + ReferenceTypeList + TypeDeclSpecifier \ No newline at end of file diff --git a/topics/java/lci/xbgf/editDeclarations.xbgf b/topics/java/lci/xbgf/editDeclarations.xbgf index f846541b..a9232ff4 100644 --- a/topics/java/lci/xbgf/editDeclarations.xbgf +++ b/topics/java/lci/xbgf/editDeclarations.xbgf @@ -265,7 +265,7 @@ with p([], 'ExtendsInterfaces', ;([','([t(extends), n('InterfaceType')]), ','([n('ExtendsInterfaces'), t((',')), n('InterfaceType')])])) --> - ExtendsInterfaces + ExtendsInterfaces TypeList @@ -374,7 +374,7 @@ vs. - [], ,([n(ModifiersOpt), ;([n(ClassDeclaration), n(InterfaceDeclaration)])]) --> - TypeDeclaration + TypeDeclaration ClassOrInterfaceDeclaration @@ -467,7 +467,7 @@ with p([], 'SwitchLabels', ;([n('SwitchLabel'), ','([n('SwitchLabels'), n('SwitchLabel')])])), --> - SwitchLabels + SwitchLabels SingleTypeImportDeclaration TypeImportOnDemandDeclaration - ImportDeclaration + ImportDeclaration @@ -590,7 +590,7 @@ vs. - [], ,([t({), ?(,([n(VariableInitializer), *(,([t((,)), n(VariableInitializer)])), ?(t((,)))])), t(})]) --> - VariableInitializers + VariableInitializers VariableInitializers - ClassBodyDeclarations + ClassBodyDeclarations ClassBodyDeclarations @@ -628,7 +628,7 @@ vs. - [], ,([t({), *(n(InterfaceBodyDeclaration)), t(})]) --> - InterfaceMemberDeclarations + InterfaceMemberDeclarations InterfaceMemberDeclarations @@ -657,8 +657,8 @@ vs. - [], ,([?(,([t(package), n(QualifiedIdentifier), t((;))])), *(n(ImportDeclaration)), *(n(TypeDeclaration))]) --> - ImportDeclarations - TypeDeclarations + ImportDeclarations + TypeDeclarations ImportDeclarations TypeDeclarations PackageDeclaration @@ -712,7 +712,7 @@ ConstantDeclaration FieldDeclaration AbstractMethodDeclaration - MethodHeader + MethodHeader MethodHeader - InterfaceBodyDeclaration + InterfaceBodyDeclaration InterfaceBodyDeclaration @@ -980,7 +980,7 @@ InterfaceMemberDecl - MethodDeclarator + MethodDeclarator MethodDeclarator @@ -1344,7 +1344,7 @@ vs. - [], ,([n(FormalParameters), n(BracketsOpt), ?(,([t(throws), n(QualifiedIdentifierList)])), t((;))]) --> - FormalParameterList + FormalParameterList FormalParameters @@ -1471,7 +1471,7 @@ - ArrayInitializer + ArrayInitializer @@ -1790,7 +1790,7 @@ vs. - [], ;([t((;)), ,([?(t(static)), n(Block)]), ,([n(ModifiersOpt), n(MethodOrFieldDecl)]), ,([n(ModifiersOpt), t(void), n(Identifier), n(MethodDeclaratorRest)]), ,([n(ModifiersOpt), n(Identifier), n(ConstructorDeclaratorRest)]), ,([n(ModifiersOpt), n(ClassOrInterfaceDeclaration)])]) --> - ClassMemberDeclaration + ClassMemberDeclaration ClassMemberDeclaration StaticInitializer ConstructorDeclaration @@ -1962,7 +1962,7 @@ Block: - ExplicitConstructorInvocation + ExplicitConstructorInvocation Block @@ -2123,7 +2123,7 @@ Block: - [], ,([n(ModifiersOpt), n(Type), n(Identifier), n(VariableDeclaratorRest)]) --> - ClassBodyDeclaration + ClassBodyDeclaration diff --git a/topics/java/lci/xbgf/editExpressions-jls1.xbgf b/topics/java/lci/xbgf/editExpressions-jls1.xbgf index f7eceb75..f6fbabf7 100644 --- a/topics/java/lci/xbgf/editExpressions-jls1.xbgf +++ b/topics/java/lci/xbgf/editExpressions-jls1.xbgf @@ -10,14 +10,14 @@ vs. - [], ;([,([t((), n(Expression), t())]), ,([t(this), ?(n(Arguments))]), ,([t(super), n(SuperSuffix)]), n(Literal), ,([t(new), n(Creator)]), ,([n(QualifiedIdentifier), ?(n(IdentifierSuffix))]), ,([n(BasicType), n(BracketsOpt), t(.), t(class)]), ,([t(void), t(.), t(class)])]) --> - ArrayCreationExpression + ArrayCreationExpression ArrayCreationExpression - PrimaryNoNewArray + PrimaryNoNewArray PrimaryNoNewArray - Dims + Dims Dims - DimExprs + DimExprs DimExprs DimExpr @@ -65,14 +65,14 @@ ClassInstanceCreationExpression - FieldAccess + FieldAccess FieldAccess - MethodInvocation + MethodInvocation MethodInvocation - Primary + Primary - ArgumentList + ArgumentList ArgumentList Arguments @@ -218,7 +218,7 @@ - ArrayAccess + ArrayAccess - PrimaryNoNewArray + PrimaryNoNewArray PrimaryNoNewArray - FieldAccess + FieldAccess FieldAccess @@ -173,10 +173,10 @@ - ArrayCreationExpression - DimExprs - DimExpr - Dims + ArrayCreationExpression + DimExprs + DimExpr + Dims ArrayCreatorRest @@ -288,7 +288,7 @@ vs. - [], ;([n(StatementExpressionList), ,([?(t(final)), n(Type), n(VariableDeclarators)])]) --> - StatementExpressionList + StatementExpressionList MoreStatementExpressions @@ -318,7 +318,7 @@ vs. - [], ,([t({), ?(n(VariableInitializers)), ?(t((,))), t(})]) --> - VariableInitializers + VariableInitializers VariableInitializers @@ -475,7 +475,7 @@ - IdentifierSuffix + IdentifierSuffix diff --git a/topics/java/lci/xbgf/editExpressions-read3.xbgf b/topics/java/lci/xbgf/editExpressions-read3.xbgf index 2a76d052..790835c7 100644 --- a/topics/java/lci/xbgf/editExpressions-read3.xbgf +++ b/topics/java/lci/xbgf/editExpressions-read3.xbgf @@ -36,9 +36,9 @@ vs. - [], ;([n(PrimaryNoNewArray), n(ArrayCreationExpression)]) --> - PrimaryNoNewArray + PrimaryNoNewArray PrimaryNoNewArray - FieldAccess + FieldAccess FieldAccess Primary @@ -171,10 +171,10 @@ - ArrayCreationExpression - DimExprs - DimExpr - Dims + ArrayCreationExpression + DimExprs + DimExpr + Dims ArrayCreatorRest @@ -369,7 +369,7 @@ vs. - [], ;([n(StatementExpressionList), ,([?(t(final)), n(Type), n(VariableDeclarators)])]) --> - StatementExpressionList + StatementExpressionList Expressions @@ -399,7 +399,7 @@ vs. - [], ,([t({), ?(n(VariableInitializers)), ?(t((,))), t(})]) --> - VariableInitializers + VariableInitializers VariableInitializers @@ -723,7 +723,7 @@ - MethodInvocation + MethodInvocation @@ -735,7 +735,7 @@ - ClassInstanceCreationExpression + ClassInstanceCreationExpression diff --git a/topics/java/lci/xbgf/eliminate-read2.xbgf b/topics/java/lci/xbgf/eliminate-read2.xbgf index 228c03da..8befdede 100644 --- a/topics/java/lci/xbgf/eliminate-read2.xbgf +++ b/topics/java/lci/xbgf/eliminate-read2.xbgf @@ -3,8 +3,8 @@ xmlns:bgf="http://planet-sl.org/bgf" xmlns:xbgf="http://planet-sl.org/xbgf"> - ArrayAccess - MethodInvocation - ClassInstanceCreationExpression + ArrayAccess + MethodInvocation + ClassInstanceCreationExpression \ No newline at end of file diff --git a/topics/java/lci/xbgf/extend-read12.xbgf b/topics/java/lci/xbgf/extend-read12.xbgf index 582670d3..4c36afa2 100644 --- a/topics/java/lci/xbgf/extend-read12.xbgf +++ b/topics/java/lci/xbgf/extend-read12.xbgf @@ -1255,7 +1255,7 @@ - [], ,([n(Identifier), t((), ?(n(FormalParameterList)), t())]) --> - FormalParameters + FormalParameters FormalParameters @@ -1525,8 +1525,8 @@ - ClassOrInterfaceType - SurgeryOnTypeName + ClassOrInterfaceType + SurgeryOnTypeName ClassOrInterfaceType diff --git a/topics/java/lci/xbgf/extendClassDeclarations.xbgf b/topics/java/lci/xbgf/extendClassDeclarations.xbgf index 9e567026..afa66daf 100644 --- a/topics/java/lci/xbgf/extendClassDeclarations.xbgf +++ b/topics/java/lci/xbgf/extendClassDeclarations.xbgf @@ -351,7 +351,7 @@ vs. - [], ,([n(ModifiersOpt), n(MemberDecl)]) --> - ClassBodyDeclaration + ClassBodyDeclaration ClassBodyDeclaration diff --git a/topics/java/lci/xbgf/extendExpressions.xbgf b/topics/java/lci/xbgf/extendExpressions.xbgf index 7716a452..0570dde3 100644 --- a/topics/java/lci/xbgf/extendExpressions.xbgf +++ b/topics/java/lci/xbgf/extendExpressions.xbgf @@ -254,7 +254,7 @@ CreatedName: - [], ,([t((), ;([n(Expression), n(Type)]), t()), n(Expression3)]) - [], ,([n(PrefixOp), n(Expression3)]) --> - Expression3 + Expression3 @@ -443,7 +443,7 @@ CreatedName: - Selector + Selector @@ -492,7 +492,7 @@ CreatedName: Expression3 - Expression3 + Expression3 diff --git a/topics/java/lci/xbgf/extendInterfaceDeclarations.xbgf b/topics/java/lci/xbgf/extendInterfaceDeclarations.xbgf index 8b12196f..9c6cd598 100644 --- a/topics/java/lci/xbgf/extendInterfaceDeclarations.xbgf +++ b/topics/java/lci/xbgf/extendInterfaceDeclarations.xbgf @@ -404,11 +404,11 @@ - [], ,([n(ModifiersOpt), n(Type), n(Identifier), t((), ?(n(FormalParameterDecls)), t()), n(BracketsOpt), ?(,([t(throws), n(QualifiedIdentifierList)])), t((;))]) - [], ,([n(ModifiersOpt), n(Type), n(Identifier), n(ConstantDeclaratorRest), *(,([t((,)), n(ConstantDeclarator)])), t((;))]) --> - InterfaceMemberDecl + InterfaceMemberDecl InterfaceMemberDecl InterfaceMethodOrFieldDecl VoidInterfaceMethodDeclaratorRest - InterfaceMethodOrFieldRest + InterfaceMethodOrFieldRest InterfaceMethodOrFieldRest InterfaceMethodDeclaratorRest ConstantDeclaratorsRest diff --git a/topics/java/lci/xbgf/extendModifiers.xbgf b/topics/java/lci/xbgf/extendModifiers.xbgf index be7376cb..e0f0036a 100644 --- a/topics/java/lci/xbgf/extendModifiers.xbgf +++ b/topics/java/lci/xbgf/extendModifiers.xbgf @@ -218,7 +218,7 @@ vs. - [], ;([n(ConstantModifier), ,([n(ConstantModifier), n(ConstantModifers)])]) --> - ConstantModifiers + ConstantModifiers ConstantModifiers diff --git a/topics/java/lci/xbgf/generalize-impl3.xbgf b/topics/java/lci/xbgf/generalize-impl3.xbgf index 860643ab..ed1b4aef 100644 --- a/topics/java/lci/xbgf/generalize-impl3.xbgf +++ b/topics/java/lci/xbgf/generalize-impl3.xbgf @@ -36,7 +36,7 @@ Later should be a massage (AB|AB?)->AB? - Expression1 + Expression1 Expression1 diff --git a/topics/java/lci/xbgf/generalizeModifiers-read3.xbgf b/topics/java/lci/xbgf/generalizeModifiers-read3.xbgf index 8c271e5c..dad6c0d8 100644 --- a/topics/java/lci/xbgf/generalizeModifiers-read3.xbgf +++ b/topics/java/lci/xbgf/generalizeModifiers-read3.xbgf @@ -56,13 +56,13 @@ --> - Modifiers - AbstractMethodModifiers - InterfaceModifiers - MethodModifiers - FieldModifiers - ConstructorModifiers - ConstantModifiers + Modifiers + AbstractMethodModifiers + InterfaceModifiers + MethodModifiers + FieldModifiers + ConstructorModifiers + ConstantModifiers @@ -98,7 +98,7 @@ - Modifiers + Modifiers AbstractMethodModifiers InterfaceModifiers MethodModifiers diff --git a/topics/java/lci/xbgf/generalizeNames-read1.xbgf b/topics/java/lci/xbgf/generalizeNames-read1.xbgf index c8f1f539..be18ecbf 100644 --- a/topics/java/lci/xbgf/generalizeNames-read1.xbgf +++ b/topics/java/lci/xbgf/generalizeNames-read1.xbgf @@ -52,6 +52,6 @@ vs Name - Name + Name \ No newline at end of file diff --git a/topics/java/lci/xbgf/generalizeNames.xbgf b/topics/java/lci/xbgf/generalizeNames.xbgf index bbe90e38..5b75f444 100644 --- a/topics/java/lci/xbgf/generalizeNames.xbgf +++ b/topics/java/lci/xbgf/generalizeNames.xbgf @@ -62,6 +62,6 @@ vs QualifiedIdentifier - QualifiedIdentifier + QualifiedIdentifier \ No newline at end of file diff --git a/topics/java/lci/xbgf/inlineForStatement.xbgf b/topics/java/lci/xbgf/inlineForStatement.xbgf index 33d0f587..5c1f822f 100644 --- a/topics/java/lci/xbgf/inlineForStatement.xbgf +++ b/topics/java/lci/xbgf/inlineForStatement.xbgf @@ -4,6 +4,6 @@ xmlns:xbgf="http://planet-sl.org/xbgf"> - ForStatement + ForStatement \ No newline at end of file diff --git a/topics/java/lci/xbgf/inlineStatements.xbgf b/topics/java/lci/xbgf/inlineStatements.xbgf index 3850a6b3..eca1d1ac 100644 --- a/topics/java/lci/xbgf/inlineStatements.xbgf +++ b/topics/java/lci/xbgf/inlineStatements.xbgf @@ -24,13 +24,13 @@ vs. - [], ;([n(StatementWithoutTrailingSubstatement), n(LabeledStatement), n(IfThenStatement), n(IfThenElseStatement), n(WhileStatement), n(ForStatement)]) --> - StatementWithoutTrailingSubstatement + StatementWithoutTrailingSubstatement StatementWithoutTrailingSubstatement LabeledStatement IfThenElseStatement WhileStatement ForStatement - TryStatement + TryStatement TryStatement ThrowStatement SynchronizedStatement @@ -139,10 +139,10 @@ StatementNoShortIf - WhileStatementNoShortIf - IfThenElseStatementNoShortIf - ForStatementNoShortIf - LabeledStatementNoShortIf + WhileStatementNoShortIf + IfThenElseStatementNoShortIf + ForStatementNoShortIf + LabeledStatementNoShortIf SimpleName QualifiedName - Name + Name \ No newline at end of file diff --git a/topics/java/lci/xbgf/refactor-impl2.xbgf b/topics/java/lci/xbgf/refactor-impl2.xbgf index 4003ad90..10a7acf8 100644 --- a/topics/java/lci/xbgf/refactor-impl2.xbgf +++ b/topics/java/lci/xbgf/refactor-impl2.xbgf @@ -44,9 +44,9 @@ - PrefixOp + PrefixOp PrefixOp - PostfixOp + PostfixOp PostfixOp Expression3 @@ -103,7 +103,7 @@ - MemberDecl + MemberDecl MemberDecl - InterfaceMemberDecl + InterfaceMemberDecl InterfaceMemberDecl InterfaceMethodOrFieldDecl - InterfaceMethodOrFieldRest + InterfaceMethodOrFieldRest InterfaceMethodOrFieldRest InterfaceGenericMethodDecl InterfaceMethodDeclaratorRest diff --git a/topics/java/lci/xbgf/refactor-read1.xbgf b/topics/java/lci/xbgf/refactor-read1.xbgf index 7d6b7fa3..d686da72 100644 --- a/topics/java/lci/xbgf/refactor-read1.xbgf +++ b/topics/java/lci/xbgf/refactor-read1.xbgf @@ -19,7 +19,7 @@ NB: The following two folds are virtually chain transformations, but performed for an existing definition. --> - ClassOrInterfaceType + ClassOrInterfaceType @@ -70,7 +70,7 @@ AbstractMethodDeclaration - ResultType + ResultType ResultType MethodHeader @@ -177,7 +177,7 @@ - [], ;([,([n(PrimitiveType), t([), t(])]), ,([n(Name), t([), t(])]), ,([n(ArrayType), t([), t(])])]) --> - Type + Type Type @@ -189,7 +189,7 @@ - ReferenceType + ReferenceType ReferenceType diff --git a/topics/java/lci/xbgf/refactorClasses-read2.xbgf b/topics/java/lci/xbgf/refactorClasses-read2.xbgf index c6d05e7a..06463a62 100644 --- a/topics/java/lci/xbgf/refactorClasses-read2.xbgf +++ b/topics/java/lci/xbgf/refactorClasses-read2.xbgf @@ -71,11 +71,11 @@ vs. - [], ;([n(ClassDeclaration), n(InterfaceDeclaration), t((;))]) --> - TypeDeclaration - ClassBodyDeclaration - ClassMemberDeclaration + TypeDeclaration + ClassBodyDeclaration + ClassMemberDeclaration - InterfaceBodyDeclaration + InterfaceBodyDeclaration ClassOrInterfaceDeclaration @@ -151,7 +151,7 @@ vs. - [], ,([t({), ?(n(ClassBodyDeclarations)), t(})]) --> - ClassBodyDeclarations + ClassBodyDeclarations ClassBodyDeclarations @@ -246,7 +246,7 @@ ConstructorDeclaration MethodDeclaration ConstructorDeclarator - ResultType + ResultType ResultType MethodHeader @@ -330,7 +330,7 @@ - FormalParameterList + FormalParameterList FormalParameterList @@ -363,7 +363,7 @@ ','([n('ModifiersOpt'), t(void), n('Identifier'), n('FormalParameters'), ?(','([t(throws), n('TypeList')])), n('MethodBody')])), --> - MethodDeclarator + MethodDeclarator BracketsOpt @@ -485,7 +485,7 @@ - FieldDeclaration + FieldDeclaration \ No newline at end of file diff --git a/topics/java/lci/xbgf/refactorClasses-read3.xbgf b/topics/java/lci/xbgf/refactorClasses-read3.xbgf index 5f510d47..d7435c1c 100644 --- a/topics/java/lci/xbgf/refactorClasses-read3.xbgf +++ b/topics/java/lci/xbgf/refactorClasses-read3.xbgf @@ -75,7 +75,7 @@ vs. - [], ;([n(ClassDeclaration), n(InterfaceDeclaration), t((;))]) --> - TypeDeclaration + TypeDeclaration ClassOrInterfaceDeclaration @@ -104,7 +104,7 @@ vs. - [], ,([t({), ?(n(ClassBodyDeclarations)), t(})]) --> - ClassBodyDeclarations + ClassBodyDeclarations ClassBodyDeclarations @@ -227,7 +227,7 @@ - ClassMemberDeclaration + ClassMemberDeclaration InstanceInitializer StaticInitializer - ClassBodyDeclaration + ClassBodyDeclaration @@ -445,7 +445,7 @@ Identifier "(" [ FormalParameterList ] ")" MethodDeclarator "[" "]" --> - MethodDeclarator + MethodDeclarator MethodDeclarator - VariableDeclaratorId - VariableDeclarator + VariableDeclaratorId + VariableDeclarator @@ -137,7 +137,7 @@ - [], ,([?(n(PackageDeclaration)), ?(n(ImportDeclarations)), ?(n(TypeDeclarations))]) --> PackageDeclaration - ImportDeclarations + ImportDeclarations ImportDeclarations @@ -159,7 +159,7 @@ - TypeDeclarations + TypeDeclarations TypeDeclarations @@ -198,7 +198,7 @@ - [], ;([,([t(import), n(QualifiedIdentifier), t((;))]), ,([t(import), n(QualifiedIdentifier), t(.), t(*), t((;))])]) --> - ImportDeclaration + ImportDeclaration diff --git a/topics/java/lci/xbgf/refactorDeclarations-read3.xbgf b/topics/java/lci/xbgf/refactorDeclarations-read3.xbgf index e31fbe4e..148357bb 100644 --- a/topics/java/lci/xbgf/refactorDeclarations-read3.xbgf +++ b/topics/java/lci/xbgf/refactorDeclarations-read3.xbgf @@ -3,7 +3,7 @@ xmlns:bgf="http://planet-sl.org/bgf" xmlns:xbgf="http://planet-sl.org/xbgf"> - VariableDeclarators + VariableDeclarators - VariableDeclarator + VariableDeclarator @@ -134,7 +134,7 @@ - [], ,([?(n(PackageDeclaration)), ?(n(ImportDeclarations)), ?(n(TypeDeclarations))]) --> PackageDeclaration - ImportDeclarations + ImportDeclarations ImportDeclarations @@ -156,7 +156,7 @@ - TypeDeclarations + TypeDeclarations TypeDeclarations @@ -195,7 +195,7 @@ - [], ;([,([t(import), n(QualifiedIdentifier), t((;))]), ,([t(import), n(QualifiedIdentifier), t(.), t(*), t((;))])]) --> - ImportDeclaration + ImportDeclaration @@ -376,7 +376,7 @@ ImportDeclaration - ImportDeclaration + ImportDeclaration @@ -840,7 +840,7 @@ AnnotationTypeElementRest: AnnotationTypeElementDeclaration - AnnotationTypeElementDeclaration + AnnotationTypeElementDeclaration diff --git a/topics/java/lci/xbgf/refactorEnums.xbgf b/topics/java/lci/xbgf/refactorEnums.xbgf index 57fafd78..5342c9e2 100644 --- a/topics/java/lci/xbgf/refactorEnums.xbgf +++ b/topics/java/lci/xbgf/refactorEnums.xbgf @@ -24,7 +24,7 @@ vs. - [], ,([t((), ?(n(ArgumentList)), t())]) --> - ArgumentList + ArgumentList ArgumentList PreIncrementExpression PreDecrementExpression - UnaryExpressionNotPlusMinus + UnaryExpressionNotPlusMinus UnaryExpressionNotPlusMinus Expression3 @@ -193,7 +193,7 @@ vs - PostfixExpression + PostfixExpression @@ -735,7 +735,7 @@ vs ExclusiveOrExpression InclusiveOrExpression - ConditionalAndExpression + ConditionalAndExpression @@ -759,7 +759,7 @@ vs - ConditionalExpression + ConditionalExpression diff --git a/topics/java/lci/xbgf/refactorInterfaces-read2.xbgf b/topics/java/lci/xbgf/refactorInterfaces-read2.xbgf index bf0b1773..b0db4250 100644 --- a/topics/java/lci/xbgf/refactorInterfaces-read2.xbgf +++ b/topics/java/lci/xbgf/refactorInterfaces-read2.xbgf @@ -105,7 +105,7 @@ - ExtendsInterfaces + ExtendsInterfaces TypeList @@ -120,7 +120,7 @@ vs. - [], ,([t({), ?(n(InterfaceMemberDeclarations)), t(})]) --> - InterfaceMemberDeclarations + InterfaceMemberDeclarations InterfaceMemberDeclarations @@ -311,7 +311,7 @@ ClassOrInterfaceDeclaration --> - InterfaceBodyDeclaration + InterfaceBodyDeclaration diff --git a/topics/java/lci/xbgf/refactorInterfaces-read3.xbgf b/topics/java/lci/xbgf/refactorInterfaces-read3.xbgf index 3ba8b913..ef33946a 100644 --- a/topics/java/lci/xbgf/refactorInterfaces-read3.xbgf +++ b/topics/java/lci/xbgf/refactorInterfaces-read3.xbgf @@ -111,7 +111,7 @@ - ExtendsInterfaces + ExtendsInterfaces TypeList @@ -170,7 +170,7 @@ vs. - [], ,([t({), ?(n(InterfaceMemberDeclarations)), t(})]) --> - InterfaceMemberDeclarations + InterfaceMemberDeclarations InterfaceMemberDeclarations @@ -261,7 +261,7 @@ vs. - [], ;([n(Annotation), ,([n(Annotations), n(Annotation)])]) --> - Annotations + Annotations - ElementValues + ElementValues @@ -734,7 +734,7 @@ - ElementValues + ElementValues @@ -839,7 +839,7 @@ InterfaceBodyDeclaration - InterfaceBodyDeclaration--> + InterfaceBodyDeclaration--> diff --git a/topics/java/lci/xbgf/refactorMinorMismatches.xbgf b/topics/java/lci/xbgf/refactorMinorMismatches.xbgf index 95981073..48a2bf09 100644 --- a/topics/java/lci/xbgf/refactorMinorMismatches.xbgf +++ b/topics/java/lci/xbgf/refactorMinorMismatches.xbgf @@ -11,7 +11,7 @@ - [], ,([t(try), n(Block), n(Catches)]) --> - Statement + Statement @@ -103,7 +103,7 @@ - [], ,([n(ModifiersOpt), n(MethodOrFieldDecl)]) --> - ClassBodyDeclaration + ClassBodyDeclaration diff --git a/topics/java/lci/xbgf/refactorPackageNames.xbgf b/topics/java/lci/xbgf/refactorPackageNames.xbgf index 468ff4f1..4c6eb113 100644 --- a/topics/java/lci/xbgf/refactorPackageNames.xbgf +++ b/topics/java/lci/xbgf/refactorPackageNames.xbgf @@ -3,7 +3,7 @@ xmlns:bgf="http://planet-sl.org/bgf" xmlns:xbgf="http://planet-sl.org/xbgf"> - PackageName - PackageOrTypeName + PackageName + PackageOrTypeName \ No newline at end of file diff --git a/topics/java/lci/xbgf/refactorStatements-jls1.xbgf b/topics/java/lci/xbgf/refactorStatements-jls1.xbgf index a6d38e14..a024e14c 100644 --- a/topics/java/lci/xbgf/refactorStatements-jls1.xbgf +++ b/topics/java/lci/xbgf/refactorStatements-jls1.xbgf @@ -35,7 +35,7 @@ vs. - [], *(n(SwitchBlockStatementGroup)) --> - SwitchBlockStatementGroups + SwitchBlockStatementGroups SwitchBlockStatementGroups @@ -130,7 +130,7 @@ IfThenStatement IfThenElseStatement LabeledStatement - StatementWithoutTrailingSubstatement + StatementWithoutTrailingSubstatement StatementWithoutTrailingSubstatement EmptyStatement SwitchStatement @@ -140,7 +140,7 @@ ReturnStatement SynchronizedStatement ThrowStatement - TryStatement + TryStatement TryStatement Finally @@ -164,7 +164,7 @@ Statement - Statement + Statement @@ -277,10 +277,10 @@ StatementNoShortIf - ForStatementNoShortIf - WhileStatementNoShortIf - LabeledStatementNoShortIf - IfThenElseStatementNoShortIf + ForStatementNoShortIf + WhileStatementNoShortIf + LabeledStatementNoShortIf + IfThenElseStatementNoShortIf - BlockStatements + BlockStatements BlockStatements @@ -394,7 +394,7 @@ vs p([], 'MoreStatementExpressions', *(','([t((',')), n('StatementExpression')]))), --> - StatementExpressionList + StatementExpressionList MoreStatementExpressions @@ -457,7 +457,7 @@ vs. - [], +n(CatchClause) --> - Catches + Catches - VariableDeclarators + VariableDeclarators - VariableDeclaratorId + VariableDeclaratorId BracketsOpt @@ -503,7 +503,7 @@ with p([], 'VariableDeclaratorRest', ','([n('BracketsOpt'), ?(','([t(=), n('VariableInitializer')]))])), --> - VariableDeclarator + VariableDeclarator diff --git a/topics/java/lci/xbgf/refactorStatements-read3.xbgf b/topics/java/lci/xbgf/refactorStatements-read3.xbgf index 0d597e99..419dd8f2 100644 --- a/topics/java/lci/xbgf/refactorStatements-read3.xbgf +++ b/topics/java/lci/xbgf/refactorStatements-read3.xbgf @@ -3,7 +3,7 @@ xmlns:bgf="http://planet-sl.org/bgf" xmlns:xbgf="http://planet-sl.org/xbgf"> - AssertStatement + AssertStatement AssertStatement BasicForStatement EnhancedForStatement @@ -16,7 +16,7 @@ ;([,([t(assert), n(Expression), t((;))]), ,([t(assert), n(Expression), t(:), n(Expression), t((;))])]), --> - Statement + Statement @@ -450,7 +450,7 @@ vs. - [], ,([n(VariableModifiers), n(Type), n(VariableDeclarators), t((;))]) --> - VariableModifiers + VariableModifiers VariableModifiers diff --git a/topics/java/lci/xbgf/refactorTypes-jls1.xbgf b/topics/java/lci/xbgf/refactorTypes-jls1.xbgf index 52cb5856..752fc808 100644 --- a/topics/java/lci/xbgf/refactorTypes-jls1.xbgf +++ b/topics/java/lci/xbgf/refactorTypes-jls1.xbgf @@ -9,11 +9,11 @@ - IntegralType + IntegralType IntegralType - FloatingPointType + FloatingPointType FloatingPointType - NumericType + NumericType NumericType BasicType @@ -30,7 +30,7 @@ - ArrayType + ArrayType ReferenceType ClassOrInterfaceType diff --git a/topics/java/lci/xbgf/refactorTypes-read2.xbgf b/topics/java/lci/xbgf/refactorTypes-read2.xbgf index 2f523025..e1337354 100644 --- a/topics/java/lci/xbgf/refactorTypes-read2.xbgf +++ b/topics/java/lci/xbgf/refactorTypes-read2.xbgf @@ -72,11 +72,11 @@ - IntegralType + IntegralType IntegralType - FloatingPointType + FloatingPointType FloatingPointType - NumericType + NumericType NumericType BasicType @@ -93,7 +93,7 @@ - ArrayType + ArrayType ReferenceType diff --git a/topics/java/lci/xbgf/refactorTypes-read3.xbgf b/topics/java/lci/xbgf/refactorTypes-read3.xbgf index 058b78c3..0c711a5b 100644 --- a/topics/java/lci/xbgf/refactorTypes-read3.xbgf +++ b/topics/java/lci/xbgf/refactorTypes-read3.xbgf @@ -75,11 +75,11 @@ --> - IntegralType + IntegralType IntegralType - FloatingPointType + FloatingPointType FloatingPointType - NumericType + NumericType NumericType @@ -390,7 +390,7 @@ InterfaceType ClassType - TypeList + TypeList @@ -439,7 +439,7 @@ p([], 'Type', ','([n('Identifier'), ?(n('TypeArguments')), *(','([t('.'), n('Identifier'), ?(n('TypeArguments'))])), n('BracketsOpt')])), p([], 'Type', n('BasicType')), --> - TypeDeclSpecifier + TypeDeclSpecifier BracketsOpt @@ -498,7 +498,7 @@ Bound: Type ( ( "&" Type ))* --> - AdditionalBoundList + AdditionalBoundList AdditionalBoundList @@ -794,7 +794,7 @@ TypeArgument: "?" ( ( "extends" | "super" ) Type )? --> - ActualTypeArgumentList + ActualTypeArgumentList TypeDeclSpecifier @@ -992,7 +992,7 @@ TypeArgument: - WildcardBounds + WildcardBounds WildcardBounds Wildcard diff --git a/topics/java/lci/xbgf/relaxClasses-read3.xbgf b/topics/java/lci/xbgf/relaxClasses-read3.xbgf index c8687995..d49704cc 100644 --- a/topics/java/lci/xbgf/relaxClasses-read3.xbgf +++ b/topics/java/lci/xbgf/relaxClasses-read3.xbgf @@ -174,7 +174,7 @@ - ResultType + ResultType ResultType @@ -187,7 +187,7 @@ vs. - [], ;([n(Identifier), ,([n(VariableDeclaratorId), t([), t(])])]) --> - VariableDeclaratorId + VariableDeclaratorId @@ -394,7 +394,7 @@ - [], ,([*(n(Modifier)), n(ClassDeclaration)]) - [], ,([*(n(Modifier)), n(GenericMethodOrConstructorDecl)]) --> - ClassBodyDeclaration + ClassBodyDeclaration @@ -650,7 +650,7 @@ Block: - ExplicitConstructorInvocation + ExplicitConstructorInvocation Block @@ -683,7 +683,7 @@ Block: vs. - [], ,([t(<), n(TypeParameterList), t(>)]) --> - TypeParameterList + TypeParameterList TypeParameterList diff --git a/topics/java/lci/xbgf/relaxExpressions-read3.xbgf b/topics/java/lci/xbgf/relaxExpressions-read3.xbgf index e40e483a..910d87be 100644 --- a/topics/java/lci/xbgf/relaxExpressions-read3.xbgf +++ b/topics/java/lci/xbgf/relaxExpressions-read3.xbgf @@ -163,7 +163,7 @@ MultiplicativeExpression Expression2 - Expression2 + Expression2 @@ -181,7 +181,7 @@ - Expression3 + Expression3 @@ -787,7 +787,7 @@ vs. - [], ,([n(Expression1), ?(,([n(AssignmentOperator), n(Expression1)]))]) --> - AssignmentExpression + AssignmentExpression AssignmentExpression @@ -801,7 +801,7 @@ vs. - [], ,([n(Expression2), ?(n(Expression1Rest))]) --> - Expression1 + Expression1 @@ -930,7 +930,7 @@ PreIncrementExpression PreDecrementExpression - UnaryExpressionNotPlusMinus + UnaryExpressionNotPlusMinus UnaryExpressionNotPlusMinus PostIncrementExpression PostDecrementExpression - PostfixExpression + PostfixExpression @@ -1226,7 +1226,7 @@ PostfixExpression - PostfixExpression + PostfixExpression TMP @@ -1260,7 +1260,7 @@ Assignment - Assignment + Assignment @@ -1656,7 +1656,7 @@ Assignment - LeftHandSide + LeftHandSide