From e26925cdf6edb7bb57c699f51ce30fea881ea92b Mon Sep 17 00:00:00 2001
From: grammarware <vadim@grammarware.net>
Date: Wed, 4 Feb 2009 18:48:04 +0000
Subject: [PATCH] new deyaccification rules

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@436 ab42f6e0-554d-0410-b580-99e487e6eeb2
---
 shared/prolog/xbgf1.pro                       | 84 ++++++++++++++++++-
 topics/java/lci/xbgf/deyaccify-doc2.xbgf      |  3 -
 topics/java/lci/xbgf/editDeclarations.xbgf    | 10 ---
 .../java/lci/xbgf/editExpressions-jls1.xbgf   |  3 -
 topics/java/lci/xbgf/editExpressions.xbgf     |  2 -
 topics/java/lci/xbgf/extendModifiers.xbgf     |  1 -
 topics/java/lci/xbgf/generalizeModifiers.xbgf |  7 --
 .../java/lci/xbgf/generalizeNames-doc1.xbgf   |  1 -
 topics/java/lci/xbgf/generalizeNames.xbgf     |  1 -
 topics/java/lci/xbgf/inlineStatements.xbgf    |  1 -
 topics/java/lci/xbgf/refactor-app1.xbgf       |  1 -
 topics/java/lci/xbgf/refactor-app3.xbgf       | 30 ++++++-
 .../java/lci/xbgf/refactorClasses-doc2.xbgf   |  3 -
 .../java/lci/xbgf/refactorClasses-doc3.xbgf   |  5 --
 .../lci/xbgf/refactorDeclarations-doc2.xbgf   |  4 -
 .../lci/xbgf/refactorDeclarations-doc3.xbgf   |  3 -
 topics/java/lci/xbgf/refactorEnums.xbgf       |  1 -
 .../lci/xbgf/refactorExpressions-doc3.xbgf    |  4 +-
 topics/java/lci/xbgf/refactorExpressions.xbgf |  1 -
 .../lci/xbgf/refactorInterfaces-doc2.xbgf     |  2 -
 .../lci/xbgf/refactorInterfaces-doc3.xbgf     |  6 +-
 .../lci/xbgf/refactorStatements-jls1.xbgf     |  6 --
 topics/java/lci/xbgf/refactorTypes-doc2.xbgf  |  1 -
 topics/java/lci/xbgf/refactorTypes-doc3.xbgf  |  2 -
 topics/java/lci/xbgf/refactorTypes-jls1.xbgf  |  1 -
 25 files changed, 115 insertions(+), 68 deletions(-)

diff --git a/shared/prolog/xbgf1.pro b/shared/prolog/xbgf1.pro
index 9ee48ac1..a5e0ea58 100644
--- a/shared/prolog/xbgf1.pro
+++ b/shared/prolog/xbgf1.pro
@@ -147,7 +147,89 @@ designate(P1,g(Rs,Ps1),g(Rs,Ps2))
 % Use EBNF-based regular expression operator instead of BNF encoding
 %
 
-deyaccify(N,g(Rs,Ps1),g(Rs,Ps2))
+deyaccify(N,g(Rs,Ps1),g(Rs,Ps3))
+ :-
+    splitN(Ps1,N,Ps2,Ps2a,Ps2b),
+    require(
+       ( length(Ps2, Len), Len > 1 ),
+       'Nonterminal ~q must be defined vertically for deyaccification to work.',
+       [N]),
+    Ps2 = [P1,P2],
+    require(
+      once(xbgf1:newdeyaccify_rules(N,P1,P2,P3)),
+      'Nonterminal ~q is not deyaccifiable: ~q and ~q',
+      [N,P1,P2]),
+    append(Ps2a,[P3|Ps2b],Ps3).
+
+% N: Nab|x -> N: x(ab)*
+newdeyaccify_rules(N,P1,P2,P3)
+ :-
+    P1 = p(As,N,','([n(N)|Xs1])),
+    P2 = p(As,N,Xs2),
+    normalizeG(','(Xs1),Xs3),
+    normalizeG(','([Xs2]),Xs4),
+   (
+        eqX(Xs3,Xs4),!,
+        P3 = p(As,N,+(','(Xs1)))
+    ;
+        P3 = p(As,N,','([Xs2,*(','(Xs1))]))
+    ).
+% N: abN|x -> N: (ab)*x
+newdeyaccify_rules(N,P1,P2,P3)
+ :-
+    P1 = p(As,N,','(Xs1)),
+    tailless(Xs1,[],Xs2),
+    tailof(Xs1,n(N)),
+    P2 = p(As,N,Xs3),
+    normalizeG(','(Xs2),Xs4),
+    normalizeG(','([Xs3]),Xs5),
+    (
+        eqX(Xs4,Xs5),!,
+        P3 = p(As,N,+(','(Xs2)))
+    ;
+        P3 = p(As,N,','([*(','(Xs2)),Xs3]))
+    ).
+%%%%%%
+% N: Nab|x -> N: x(ab)*
+newdeyaccify_rules(N,P1,P2,P3)
+ :-
+    P2 = p(As,N,','([n(N)|Xs1])),
+    P1 = p(As,N,Xs2),
+    normalizeG(','(Xs1),Xs3),
+    normalizeG(','([Xs2]),Xs4),
+    (
+        eqX(Xs3,Xs4),!,
+        P3 = p(As,N,+(','(Xs1)))
+    ;
+        P3 = p(As,N,','([Xs2,*(','(Xs1))]))
+    ).
+% N: abN|x -> N: (ab)*x
+newdeyaccify_rules(N,P1,P2,P3)
+ :-
+    P2 = p(As,N,','(Xs1)),
+    tailless(Xs1,[],Xs2),
+    tailof(Xs1,n(N)),
+    P1 = p(As,N,Xs3),
+    normalizeG(','(Xs2),Xs4),
+    normalizeG(','([Xs3]),Xs5),
+    (
+        eqX(Xs4,Xs5),!,
+        P3 = p(As,N,+(','(Xs2)))
+    ;
+        P3 = p(As,N,','([*(','(Xs2)),Xs3]))
+    ).
+
+% Needed -> prelude.pro
+% Not needed -> throw away
+tailof([X],X).
+tailof([_|T],X) :- tailof(T,X).
+tailless([_],L1,L1).
+tailless([H|T],L1,L3)
+ :-
+   concat([L1,[H]],L2),
+   tailless(T,L2,L3).
+
+olddeyaccify(N,g(Rs,Ps1),g(Rs,Ps2))
  :-
     splitN1(Ps1,N,P1,Ps2a,Ps2b),
     P1 = p(As,N,X1),    
diff --git a/topics/java/lci/xbgf/deyaccify-doc2.xbgf b/topics/java/lci/xbgf/deyaccify-doc2.xbgf
index ea0210a1..02dd8b51 100644
--- a/topics/java/lci/xbgf/deyaccify-doc2.xbgf
+++ b/topics/java/lci/xbgf/deyaccify-doc2.xbgf
@@ -8,7 +8,6 @@
      vs.
       - [], ;([n(SwitchBlockStatementGroup), ,([n(SwitchBlockStatementGroups), n(SwitchBlockStatementGroup)])])
   -->
-  <xbgf:horizontal>SwitchBlockStatementGroups</xbgf:horizontal>
   <xbgf:deyaccify>SwitchBlockStatementGroups</xbgf:deyaccify>
   <xbgf:extract>
     <bgf:production>
@@ -56,7 +55,6 @@
      vs.
       - [], ;([n(CatchClause), ,([n(Catches), n(CatchClause)])])
   -->
-  <xbgf:horizontal>Catches</xbgf:horizontal>
   <xbgf:deyaccify>Catches</xbgf:deyaccify>
 
   <!-- 
@@ -65,7 +63,6 @@
      vs.
       - [], ;([n(BlockStatement), ,([n(BlockStatements), n(BlockStatement)])])
   -->
-  <xbgf:horizontal>BlockStatements</xbgf:horizontal>
   <xbgf:deyaccify>BlockStatements</xbgf:deyaccify>
 
 </xbgf:sequence>
diff --git a/topics/java/lci/xbgf/editDeclarations.xbgf b/topics/java/lci/xbgf/editDeclarations.xbgf
index e6f03541..656a52d0 100644
--- a/topics/java/lci/xbgf/editDeclarations.xbgf
+++ b/topics/java/lci/xbgf/editDeclarations.xbgf
@@ -65,7 +65,6 @@
  with
    p([], 'ExtendsInterfaces', ;([','([t(extends), n('InterfaceType')]), ','([n('ExtendsInterfaces'), t((',')), n('InterfaceType')])]))
  -->
-  <xbgf:horizontal>ExtendsInterfaces</xbgf:horizontal>
   <xbgf:deyaccify>ExtendsInterfaces</xbgf:deyaccify>
   <xbgf:fold>
     <nonterminal>TypeList</nonterminal>
@@ -234,7 +233,6 @@
   with
     p([], 'SwitchLabels', ;([n('SwitchLabel'), ','([n('SwitchLabels'), n('SwitchLabel')])])),
   -->
-  <xbgf:horizontal>SwitchLabels</xbgf:horizontal>
   <xbgf:deyaccify>SwitchLabels</xbgf:deyaccify>
   
   <!-- 
@@ -358,7 +356,6 @@
      vs.
       - [], ,([t({), ?(,([n(VariableInitializer), *(,([t((,)), n(VariableInitializer)])), ?(t((,)))])), t(})])
   -->
-  <xbgf:horizontal>VariableInitializers</xbgf:horizontal>
   <xbgf:deyaccify>VariableInitializers</xbgf:deyaccify>
   <xbgf:inline>VariableInitializers</xbgf:inline>
   
@@ -368,7 +365,6 @@
      vs.
       - [], ,([t({), *(n(ClassBodyDeclaration)), t(})])
   -->
-  <xbgf:horizontal>ClassBodyDeclarations</xbgf:horizontal>
   <xbgf:deyaccify>ClassBodyDeclarations</xbgf:deyaccify>
   <xbgf:inline>ClassBodyDeclarations</xbgf:inline>
   <xbgf:massage>
@@ -398,7 +394,6 @@
      vs.
       - [], ,([t({), *(n(InterfaceBodyDeclaration)), t(})])
   -->
-  <xbgf:horizontal>InterfaceMemberDeclarations</xbgf:horizontal>
   <xbgf:deyaccify>InterfaceMemberDeclarations</xbgf:deyaccify>
   <xbgf:inline>InterfaceMemberDeclarations</xbgf:inline>
   <xbgf:massage>
@@ -434,9 +429,7 @@
      vs.
       - [], ,([?(,([t(package), n(QualifiedIdentifier), t((;))])), *(n(ImportDeclaration)), *(n(TypeDeclaration))])
   -->
-  <xbgf:horizontal>ImportDeclarations</xbgf:horizontal>
   <xbgf:deyaccify>ImportDeclarations</xbgf:deyaccify>
-  <xbgf:horizontal>TypeDeclarations</xbgf:horizontal>
   <xbgf:deyaccify>TypeDeclarations</xbgf:deyaccify>
   <xbgf:inline>ImportDeclarations</xbgf:inline>
   <xbgf:inline>TypeDeclarations</xbgf:inline>
@@ -512,7 +505,6 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:extract>
-  <xbgf:horizontal>Modifiers</xbgf:horizontal>
   <xbgf:deyaccify>Modifiers</xbgf:deyaccify>
   <xbgf:inline>Modifiers</xbgf:inline>
   <xbgf:massage>
@@ -768,7 +760,6 @@
       <nonterminal>InterfaceMemberDecl</nonterminal>
     </in>
   </xbgf:unfold>
-  <xbgf:horizontal>MethodDeclarator</xbgf:horizontal>
   <xbgf:deyaccify>MethodDeclarator</xbgf:deyaccify>
   <xbgf:inline>MethodDeclarator</xbgf:inline>
   
@@ -1127,7 +1118,6 @@
      vs.
       - [], ,([n(FormalParameters), n(BracketsOpt), ?(,([t(throws), n(QualifiedIdentifierList)])), t((;))])
   -->
-  <xbgf:horizontal>FormalParameterList</xbgf:horizontal>
   <xbgf:deyaccify>FormalParameterList</xbgf:deyaccify>
   <xbgf:extract>
     <bgf:production>
diff --git a/topics/java/lci/xbgf/editExpressions-jls1.xbgf b/topics/java/lci/xbgf/editExpressions-jls1.xbgf
index bec0095b..715145fe 100644
--- a/topics/java/lci/xbgf/editExpressions-jls1.xbgf
+++ b/topics/java/lci/xbgf/editExpressions-jls1.xbgf
@@ -14,10 +14,8 @@
   <xbgf:horizontal>PrimaryNoNewArray</xbgf:horizontal>
   <xbgf:inline>PrimaryNoNewArray</xbgf:inline>
 
-  <xbgf:horizontal>Dims</xbgf:horizontal>
   <xbgf:deyaccify>Dims</xbgf:deyaccify>
   <xbgf:inline>Dims</xbgf:inline>
-  <xbgf:horizontal>DimExprs</xbgf:horizontal>
   <xbgf:deyaccify>DimExprs</xbgf:deyaccify>
   <xbgf:inline>DimExprs</xbgf:inline>
   <xbgf:inline>DimExpr</xbgf:inline>
@@ -86,7 +84,6 @@
      vs.
        - [], ,([t(new), n(QualifiedIdentifier), n(Arguments)])
  -->
-  <xbgf:horizontal>ArgumentList</xbgf:horizontal>
   <xbgf:deyaccify>ArgumentList</xbgf:deyaccify>
   <xbgf:inline>ArgumentList</xbgf:inline>
   <xbgf:fold>
diff --git a/topics/java/lci/xbgf/editExpressions.xbgf b/topics/java/lci/xbgf/editExpressions.xbgf
index c8a3bc59..66f1df77 100644
--- a/topics/java/lci/xbgf/editExpressions.xbgf
+++ b/topics/java/lci/xbgf/editExpressions.xbgf
@@ -261,7 +261,6 @@
      vs.
       - [], ;([n(StatementExpressionList), ,([?(t(final)), n(Type), n(VariableDeclarators)])])
   -->
-  <xbgf:horizontal>StatementExpressionList</xbgf:horizontal>
   <xbgf:deyaccify>StatementExpressionList</xbgf:deyaccify>
   <xbgf:extract>
     <bgf:production>
@@ -292,7 +291,6 @@
      vs.
       - [], ,([t({), ?(n(VariableInitializers)), ?(t((,))), t(})])
   -->
-  <xbgf:horizontal>VariableInitializers</xbgf:horizontal>
   <xbgf:deyaccify>VariableInitializers</xbgf:deyaccify>
   <xbgf:inline>VariableInitializers</xbgf:inline>
 
diff --git a/topics/java/lci/xbgf/extendModifiers.xbgf b/topics/java/lci/xbgf/extendModifiers.xbgf
index ccc14f4d..465827b8 100644
--- a/topics/java/lci/xbgf/extendModifiers.xbgf
+++ b/topics/java/lci/xbgf/extendModifiers.xbgf
@@ -215,7 +215,6 @@
      vs.
       - [], ;([n(ConstantModifier), ,([n(ConstantModifier), n(ConstantModifers)])])
   -->
-  <xbgf:horizontal>ConstantModifiers</xbgf:horizontal>
   <xbgf:deyaccify>ConstantModifiers</xbgf:deyaccify>
   <xbgf:yaccify>
     <bgf:production>
diff --git a/topics/java/lci/xbgf/generalizeModifiers.xbgf b/topics/java/lci/xbgf/generalizeModifiers.xbgf
index f617f122..12f84ee3 100644
--- a/topics/java/lci/xbgf/generalizeModifiers.xbgf
+++ b/topics/java/lci/xbgf/generalizeModifiers.xbgf
@@ -55,19 +55,12 @@
   -->
 
   <!-- First the deyaccification -->
-  <xbgf:horizontal>AbstractMethodModifiers</xbgf:horizontal>
   <xbgf:deyaccify>AbstractMethodModifiers</xbgf:deyaccify>
-  <xbgf:horizontal>InterfaceModifiers</xbgf:horizontal>
   <xbgf:deyaccify>InterfaceModifiers</xbgf:deyaccify>
-  <xbgf:horizontal>MethodModifiers</xbgf:horizontal>
   <xbgf:deyaccify>MethodModifiers</xbgf:deyaccify>
-  <xbgf:horizontal>FieldModifiers</xbgf:horizontal>
   <xbgf:deyaccify>FieldModifiers</xbgf:deyaccify>
-  <xbgf:horizontal>ConstructorModifiers</xbgf:horizontal>
   <xbgf:deyaccify>ConstructorModifiers</xbgf:deyaccify>
-  <xbgf:horizontal>ClassModifiers</xbgf:horizontal>
   <xbgf:deyaccify>ClassModifiers</xbgf:deyaccify>
-  <xbgf:horizontal>ConstantModifiers</xbgf:horizontal>
   <xbgf:deyaccify>ConstantModifiers</xbgf:deyaccify>
 
   <!-- ISSUE PERMISSIVENESS
diff --git a/topics/java/lci/xbgf/generalizeNames-doc1.xbgf b/topics/java/lci/xbgf/generalizeNames-doc1.xbgf
index fb5df0ca..1626bb38 100644
--- a/topics/java/lci/xbgf/generalizeNames-doc1.xbgf
+++ b/topics/java/lci/xbgf/generalizeNames-doc1.xbgf
@@ -52,7 +52,6 @@ vs
     <add>ExpressionName</add>
     <to>QualifiedIdentifier</to>
   </xbgf:unite>
-  <xbgf:horizontal>QualifiedIdentifier</xbgf:horizontal>
   <xbgf:deyaccify>QualifiedIdentifier</xbgf:deyaccify>
 
   <!-- use another name -->
diff --git a/topics/java/lci/xbgf/generalizeNames.xbgf b/topics/java/lci/xbgf/generalizeNames.xbgf
index 1634a9aa..aa173bab 100644
--- a/topics/java/lci/xbgf/generalizeNames.xbgf
+++ b/topics/java/lci/xbgf/generalizeNames.xbgf
@@ -61,7 +61,6 @@ vs
     <to>QualifiedIdentifier</to>
   </xbgf:unite>
 
-  <xbgf:horizontal>QualifiedIdentifier</xbgf:horizontal>
   <xbgf:deyaccify>QualifiedIdentifier</xbgf:deyaccify>
   
 </xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/inlineStatements.xbgf b/topics/java/lci/xbgf/inlineStatements.xbgf
index 46996e59..b86aecf9 100644
--- a/topics/java/lci/xbgf/inlineStatements.xbgf
+++ b/topics/java/lci/xbgf/inlineStatements.xbgf
@@ -170,7 +170,6 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:project>
-  <xbgf:horizontal>SwitchLabels</xbgf:horizontal>
   <xbgf:deyaccify>SwitchLabels</xbgf:deyaccify>
   <xbgf:inline>SwitchStatement</xbgf:inline>
 
diff --git a/topics/java/lci/xbgf/refactor-app1.xbgf b/topics/java/lci/xbgf/refactor-app1.xbgf
index 14169bb5..0e4ad507 100644
--- a/topics/java/lci/xbgf/refactor-app1.xbgf
+++ b/topics/java/lci/xbgf/refactor-app1.xbgf
@@ -10,7 +10,6 @@
   -->
   <xbgf:inline>SimpleName</xbgf:inline>
   <xbgf:inline>QualifiedName</xbgf:inline>
-  <xbgf:horizontal>Name</xbgf:horizontal>
   <xbgf:deyaccify>Name</xbgf:deyaccify>
 
 </xbgf:sequence>
diff --git a/topics/java/lci/xbgf/refactor-app3.xbgf b/topics/java/lci/xbgf/refactor-app3.xbgf
index 27e97ca8..33115366 100644
--- a/topics/java/lci/xbgf/refactor-app3.xbgf
+++ b/topics/java/lci/xbgf/refactor-app3.xbgf
@@ -7,9 +7,35 @@
       - [], ,([n(Annotation), ?(n(Annotations))])
      vs.
       - [], ;([n(Annotation), ,([n(Annotations), n(Annotation)])])
-      
-  Later this should become just deyaccify
   -->
+  <xbgf:massage>
+    <bgf:expression>
+      <optional>
+        <bgf:expression>
+          <nonterminal>Annotations</nonterminal>
+        </bgf:expression>
+      </optional>
+    </bgf:expression>
+    <bgf:expression>
+      <choice>
+        <bgf:expression>
+          <nonterminal>Annotations</nonterminal>
+        </bgf:expression>
+        <bgf:expression>
+          <epsilon/>
+        </bgf:expression>
+      </choice>
+    </bgf:expression>
+    <in>
+      <nonterminal>Annotations</nonterminal>
+    </in>
+  </xbgf:massage>
+  <xbgf:distribute>
+    <nonterminal>Annotations</nonterminal>
+  </xbgf:distribute>
+  <xbgf:vertical>
+    <nonterminal>Annotations</nonterminal>
+  </xbgf:vertical>
   <xbgf:deyaccify>Annotations</xbgf:deyaccify>
 
   <!-- 
diff --git a/topics/java/lci/xbgf/refactorClasses-doc2.xbgf b/topics/java/lci/xbgf/refactorClasses-doc2.xbgf
index 768afbf8..d23b96e5 100644
--- a/topics/java/lci/xbgf/refactorClasses-doc2.xbgf
+++ b/topics/java/lci/xbgf/refactorClasses-doc2.xbgf
@@ -134,7 +134,6 @@
      vs.
       - [], ,([t({), ?(n(ClassBodyDeclarations)), t(})])
   -->
-  <xbgf:horizontal>ClassBodyDeclarations</xbgf:horizontal>
   <xbgf:deyaccify>ClassBodyDeclarations</xbgf:deyaccify>
   <xbgf:inline>ClassBodyDeclarations</xbgf:inline>
   <xbgf:massage>
@@ -296,7 +295,6 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:extract>
-  <xbgf:horizontal>FormalParameterList</xbgf:horizontal>
   <xbgf:deyaccify>FormalParameterList</xbgf:deyaccify>
   <xbgf:inline>FormalParameterList</xbgf:inline>
   <xbgf:extract>
@@ -330,7 +328,6 @@
    ','([n('ModifiersOpt'), t(void), n('Identifier'), n('FormalParameters'), ?(','([t(throws), n('TypeList')])), n('MethodBody')])),
 
   -->
-  <xbgf:horizontal>MethodDeclarator</xbgf:horizontal>
   <xbgf:deyaccify>MethodDeclarator</xbgf:deyaccify>
   <xbgf:fold>
     <nonterminal>BracketsOpt</nonterminal>
diff --git a/topics/java/lci/xbgf/refactorClasses-doc3.xbgf b/topics/java/lci/xbgf/refactorClasses-doc3.xbgf
index 789129c0..0cadcfc0 100644
--- a/topics/java/lci/xbgf/refactorClasses-doc3.xbgf
+++ b/topics/java/lci/xbgf/refactorClasses-doc3.xbgf
@@ -103,7 +103,6 @@
      vs.
       - [], ,([t({), ?(n(ClassBodyDeclarations)), t(})])
   -->
-  <xbgf:horizontal>ClassBodyDeclarations</xbgf:horizontal>
   <xbgf:deyaccify>ClassBodyDeclarations</xbgf:deyaccify>
   <xbgf:inline>ClassBodyDeclarations</xbgf:inline>
   <xbgf:massage>
@@ -427,7 +426,6 @@
      Identifier "(" [ FormalParameterList ] ")"
      MethodDeclarator "[" "]"
   -->
-  <xbgf:horizontal>MethodDeclarator</xbgf:horizontal>
   <xbgf:deyaccify>MethodDeclarator</xbgf:deyaccify>
   <xbgf:inline>MethodDeclarator</xbgf:inline>
 
@@ -692,7 +690,6 @@
      vs.
       - [], ;([n(Identifier), ,([n(VariableDeclaratorId), t([), t(])])])
    -->
-  <xbgf:horizontal>VariableDeclaratorId</xbgf:horizontal>
   <xbgf:deyaccify>VariableDeclaratorId</xbgf:deyaccify>
 
   <!--  
@@ -1088,7 +1085,6 @@
      vs.
       - [], ,([t(<), n(TypeParameterList), t(>)])
   -->
-  <xbgf:horizontal>TypeParameterList</xbgf:horizontal>
   <xbgf:deyaccify>TypeParameterList</xbgf:deyaccify>
   <xbgf:inline>TypeParameterList</xbgf:inline>
 
@@ -1109,7 +1105,6 @@
   AdditionalBound is defined as:
      "&amp;" InterfaceType
   -->
-  <xbgf:horizontal>AdditionalBoundList</xbgf:horizontal>
   <xbgf:deyaccify>AdditionalBoundList</xbgf:deyaccify>
   <xbgf:inline>AdditionalBoundList</xbgf:inline>
   <xbgf:massage>
diff --git a/topics/java/lci/xbgf/refactorDeclarations-doc2.xbgf b/topics/java/lci/xbgf/refactorDeclarations-doc2.xbgf
index 116d72d5..caf9558c 100644
--- a/topics/java/lci/xbgf/refactorDeclarations-doc2.xbgf
+++ b/topics/java/lci/xbgf/refactorDeclarations-doc2.xbgf
@@ -2,7 +2,6 @@
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
 
-  <xbgf:horizontal>VariableDeclarators</xbgf:horizontal>
   <xbgf:deyaccify>VariableDeclarators</xbgf:deyaccify>
   
   <!-- 
@@ -11,7 +10,6 @@
      vs.
       - [], ;([n(VariableDeclaratorId), ,([n(VariableDeclaratorId), t(=), n(VariableInitializer)])])
   -->
-  <xbgf:horizontal>VariableDeclaratorId</xbgf:horizontal>
   <xbgf:deyaccify>VariableDeclaratorId</xbgf:deyaccify>
   <xbgf:horizontal>VariableDeclarator</xbgf:horizontal>
   <xbgf:factor>
@@ -138,7 +136,6 @@
       - [], ,([?(n(PackageDeclaration)), ?(n(ImportDeclarations)), ?(n(TypeDeclarations))])
   -->
   <xbgf:inline>PackageDeclaration</xbgf:inline>
-  <xbgf:horizontal>ImportDeclarations</xbgf:horizontal>
   <xbgf:deyaccify>ImportDeclarations</xbgf:deyaccify>
   <xbgf:inline>ImportDeclarations</xbgf:inline>
   <xbgf:massage>
@@ -161,7 +158,6 @@
       </star>
     </bgf:expression>
   </xbgf:massage>
-  <xbgf:horizontal>TypeDeclarations</xbgf:horizontal>
   <xbgf:deyaccify>TypeDeclarations</xbgf:deyaccify>
   <xbgf:inline>TypeDeclarations</xbgf:inline>
   <xbgf:massage>
diff --git a/topics/java/lci/xbgf/refactorDeclarations-doc3.xbgf b/topics/java/lci/xbgf/refactorDeclarations-doc3.xbgf
index 117087dc..532deedf 100644
--- a/topics/java/lci/xbgf/refactorDeclarations-doc3.xbgf
+++ b/topics/java/lci/xbgf/refactorDeclarations-doc3.xbgf
@@ -2,7 +2,6 @@
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
 
-  <xbgf:horizontal>VariableDeclarators</xbgf:horizontal>
   <xbgf:deyaccify>VariableDeclarators</xbgf:deyaccify>
   
   <!-- 
@@ -134,7 +133,6 @@
       - [], ,([?(n(PackageDeclaration)), ?(n(ImportDeclarations)), ?(n(TypeDeclarations))])
   -->
   <xbgf:inline>PackageDeclaration</xbgf:inline>
-  <xbgf:horizontal>ImportDeclarations</xbgf:horizontal>
   <xbgf:deyaccify>ImportDeclarations</xbgf:deyaccify>
   <xbgf:inline>ImportDeclarations</xbgf:inline>
   <xbgf:massage>
@@ -157,7 +155,6 @@
       </star>
     </bgf:expression>
   </xbgf:massage>
-  <xbgf:horizontal>TypeDeclarations</xbgf:horizontal>
   <xbgf:deyaccify>TypeDeclarations</xbgf:deyaccify>
   <xbgf:inline>TypeDeclarations</xbgf:inline>
   <xbgf:massage>
diff --git a/topics/java/lci/xbgf/refactorEnums.xbgf b/topics/java/lci/xbgf/refactorEnums.xbgf
index e8723d92..091e5bc9 100644
--- a/topics/java/lci/xbgf/refactorEnums.xbgf
+++ b/topics/java/lci/xbgf/refactorEnums.xbgf
@@ -23,7 +23,6 @@
      vs.
       - [], ,([t((), ?(n(ArgumentList)), t())])
   -->
-  <xbgf:horizontal>ArgumentList</xbgf:horizontal>
   <xbgf:deyaccify>ArgumentList</xbgf:deyaccify>
   <xbgf:unfold>
     <nonterminal>ArgumentList</nonterminal>
diff --git a/topics/java/lci/xbgf/refactorExpressions-doc3.xbgf b/topics/java/lci/xbgf/refactorExpressions-doc3.xbgf
index 81e3f587..f733279a 100644
--- a/topics/java/lci/xbgf/refactorExpressions-doc3.xbgf
+++ b/topics/java/lci/xbgf/refactorExpressions-doc3.xbgf
@@ -130,7 +130,6 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:extract>
-  <xbgf:horizontal>Dims</xbgf:horizontal>
   <xbgf:deyaccify>Dims</xbgf:deyaccify>
   <xbgf:extract>
     <bgf:production>
@@ -1291,6 +1290,9 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:extract>
+  <xbgf:vertical>
+    <nonterminal>PostfixExpression</nonterminal>
+  </xbgf:vertical>
   <xbgf:deyaccify>PostfixExpression</xbgf:deyaccify>
   <xbgf:inline>TMP</xbgf:inline>
 
diff --git a/topics/java/lci/xbgf/refactorExpressions.xbgf b/topics/java/lci/xbgf/refactorExpressions.xbgf
index 431ced0d..fbcda439 100644
--- a/topics/java/lci/xbgf/refactorExpressions.xbgf
+++ b/topics/java/lci/xbgf/refactorExpressions.xbgf
@@ -192,7 +192,6 @@ vs
       </bgf:expression>
     </bgf:production>
   </xbgf:remove>
-  <xbgf:horizontal>PostfixExpression</xbgf:horizontal>
   <xbgf:deyaccify>PostfixExpression</xbgf:deyaccify>
   <!-- BREFACTOR -->
   <xbgf:inject>
diff --git a/topics/java/lci/xbgf/refactorInterfaces-doc2.xbgf b/topics/java/lci/xbgf/refactorInterfaces-doc2.xbgf
index 030e369a..b4ddc5b3 100644
--- a/topics/java/lci/xbgf/refactorInterfaces-doc2.xbgf
+++ b/topics/java/lci/xbgf/refactorInterfaces-doc2.xbgf
@@ -86,7 +86,6 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:project>
-  <xbgf:horizontal>ExtendsInterfaces</xbgf:horizontal>
   <xbgf:deyaccify>ExtendsInterfaces</xbgf:deyaccify>
   <xbgf:fold>
     <nonterminal>TypeList</nonterminal>
@@ -102,7 +101,6 @@
      vs.
       - [], ,([t({), ?(n(InterfaceMemberDeclarations)), t(})])
   -->
-  <xbgf:horizontal>InterfaceMemberDeclarations</xbgf:horizontal>
   <xbgf:deyaccify>InterfaceMemberDeclarations</xbgf:deyaccify>
   <xbgf:inline>InterfaceMemberDeclarations</xbgf:inline>
   <xbgf:rename>
diff --git a/topics/java/lci/xbgf/refactorInterfaces-doc3.xbgf b/topics/java/lci/xbgf/refactorInterfaces-doc3.xbgf
index 3fd1b5bd..ec0c8ed0 100644
--- a/topics/java/lci/xbgf/refactorInterfaces-doc3.xbgf
+++ b/topics/java/lci/xbgf/refactorInterfaces-doc3.xbgf
@@ -92,7 +92,6 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:project>
-  <xbgf:horizontal>ExtendsInterfaces</xbgf:horizontal>
   <xbgf:deyaccify>ExtendsInterfaces</xbgf:deyaccify>
   <xbgf:fold>
     <nonterminal>TypeList</nonterminal>
@@ -147,7 +146,6 @@
      vs.
       - [], ,([t({), ?(n(InterfaceMemberDeclarations)), t(})])
   -->
-  <xbgf:horizontal>InterfaceMemberDeclarations</xbgf:horizontal>
   <xbgf:deyaccify>InterfaceMemberDeclarations</xbgf:deyaccify>
   <xbgf:inline>InterfaceMemberDeclarations</xbgf:inline>
   <xbgf:rename>
@@ -252,7 +250,6 @@
      vs.
       - [], ;([n(Annotation), ,([n(Annotations), n(Annotation)])])
   -->
-  <xbgf:horizontal>Annotations</xbgf:horizontal>
   <xbgf:deyaccify>Annotations</xbgf:deyaccify>
 
   <!-- BREFACTOR 
@@ -629,9 +626,8 @@
      vs.
       - [], ;([n('ElementValue'), ,([n('ElementValues'), t((',')), n('ElementValue')])])
   -->
-  <xbgf:horizontal>ElementValues</xbgf:horizontal>
   <xbgf:deyaccify>ElementValues</xbgf:deyaccify>
-  <!-- can be yaccify after yaccify2 test case works -->
+  <!-- TODO: can be yaccify after yaccify2 test case works -->
   <!-- BREFACTOR -->
   <xbgf:redefine>
     <bgf:production>
diff --git a/topics/java/lci/xbgf/refactorStatements-jls1.xbgf b/topics/java/lci/xbgf/refactorStatements-jls1.xbgf
index 79af6f73..4920c6da 100644
--- a/topics/java/lci/xbgf/refactorStatements-jls1.xbgf
+++ b/topics/java/lci/xbgf/refactorStatements-jls1.xbgf
@@ -34,7 +34,6 @@
      vs.
       - [], *(n(SwitchBlockStatementGroup))
   -->
-  <xbgf:horizontal>SwitchBlockStatementGroups</xbgf:horizontal>
   <xbgf:deyaccify>SwitchBlockStatementGroups</xbgf:deyaccify>
   <xbgf:inline>SwitchBlockStatementGroups</xbgf:inline>
   <xbgf:massage>
@@ -280,7 +279,6 @@
       - [], ,([t({), n(BlockStatements), t(})])
    ...
   -->
-  <xbgf:horizontal>BlockStatements</xbgf:horizontal>
   <xbgf:deyaccify>BlockStatements</xbgf:deyaccify>
   <xbgf:inline>BlockStatements</xbgf:inline>
   <xbgf:massage>
@@ -386,7 +384,6 @@
    vs
     p([], 'MoreStatementExpressions', *(','([t((',')), n('StatementExpression')]))),
   -->
-  <xbgf:horizontal>StatementExpressionList</xbgf:horizontal>
   <xbgf:deyaccify>StatementExpressionList</xbgf:deyaccify>
   <xbgf:extract>
     <bgf:production>
@@ -446,7 +443,6 @@
      vs.
       - [], +n(CatchClause)
   -->
-  <xbgf:horizontal>Catches</xbgf:horizontal>
   <xbgf:deyaccify>Catches</xbgf:deyaccify>
 
   <!-- 
@@ -455,7 +451,6 @@
      vs.
       - [], ,([n(VariableDeclarator), *(,([t((,)), n(VariableDeclarator)]))])
   -->
-  <xbgf:horizontal>VariableDeclarators</xbgf:horizontal>
   <xbgf:deyaccify>VariableDeclarators</xbgf:deyaccify>
 
   <!-- 
@@ -464,7 +459,6 @@
      vs.
       - [], ,([n(Identifier), n(BracketsOpt)])
   -->
-  <xbgf:horizontal>VariableDeclaratorId</xbgf:horizontal>
   <xbgf:deyaccify>VariableDeclaratorId</xbgf:deyaccify>
   <xbgf:extract>
     <bgf:production>
diff --git a/topics/java/lci/xbgf/refactorTypes-doc2.xbgf b/topics/java/lci/xbgf/refactorTypes-doc2.xbgf
index 3aaaa835..edadb7b5 100644
--- a/topics/java/lci/xbgf/refactorTypes-doc2.xbgf
+++ b/topics/java/lci/xbgf/refactorTypes-doc2.xbgf
@@ -154,7 +154,6 @@
       <to>TypeList</to>
     </nonterminal>
   </xbgf:rename>
-  <xbgf:horizontal>TypeList</xbgf:horizontal>
   <xbgf:deyaccify>TypeList</xbgf:deyaccify>
   
   <!-- BREFACTOR 
diff --git a/topics/java/lci/xbgf/refactorTypes-doc3.xbgf b/topics/java/lci/xbgf/refactorTypes-doc3.xbgf
index e928e763..f3676ddb 100644
--- a/topics/java/lci/xbgf/refactorTypes-doc3.xbgf
+++ b/topics/java/lci/xbgf/refactorTypes-doc3.xbgf
@@ -142,7 +142,6 @@
       <to>TypeList</to>
     </nonterminal>
   </xbgf:rename>
-  <xbgf:horizontal>TypeList</xbgf:horizontal>
   <xbgf:deyaccify>TypeList</xbgf:deyaccify>
 
   <!-- BREFACTOR 
@@ -197,7 +196,6 @@
   p([], 'Type', ','([n('Identifier'), ?(n('TypeArguments')), *(','([t('.'), n('Identifier'), ?(n('TypeArguments'))])), n('BracketsOpt')])),
   p([], 'Type', n('BasicType')),
   -->
-  <xbgf:horizontal>TypeDeclSpecifier</xbgf:horizontal>
   <xbgf:deyaccify>TypeDeclSpecifier</xbgf:deyaccify>
   
   <!-- BREFACTOR 
diff --git a/topics/java/lci/xbgf/refactorTypes-jls1.xbgf b/topics/java/lci/xbgf/refactorTypes-jls1.xbgf
index 4ee17cbc..a14a6e4a 100644
--- a/topics/java/lci/xbgf/refactorTypes-jls1.xbgf
+++ b/topics/java/lci/xbgf/refactorTypes-jls1.xbgf
@@ -91,7 +91,6 @@
       <to>TypeList</to>
     </nonterminal>
   </xbgf:rename>
-  <xbgf:horizontal>TypeList</xbgf:horizontal>
   <xbgf:deyaccify>TypeList</xbgf:deyaccify>
   
   <!-- BREFACTOR -->