A decisive change: now the output of the HTML->BGF extractor (for JLS…

… test case) is by default vertical, and the transformation sequences need to perform horizontal explicitly when necessary. git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@430 ab42f6e0-554d-0410-b580-99e487e6eeb2
grammarware · Feb 2, 2009 · 89353f6 · 89353f6
1 parent b27697e
commit 89353f6
Show file tree

Hide file tree

Showing 41 changed files with 849 additions and 676 deletions.
diff --git a/topics/extraction/html2bgf/html2bgf.py b/topics/extraction/html2bgf/html2bgf.py
@@ -9,8 +9,6 @@
 pp_outer = pp_mode
 verbose = False
 totalerrors = 0
-# pp_mode == MODE_ITALIC
-# pp_mode == MODE_FIXED
 
 pessimistic = [False,0,0]
 prods = {}
@@ -111,6 +109,9 @@ def serialiseExpression(seq):
 def serialiseX(name,choices):
  return '<bgf:production><nonterminal>'+name+'</nonterminal>'+traverse(choices)+'</bgf:production>'
 
+def serialiseY(name,choice):
+ return '<bgf:production><nonterminal>'+name+'</nonterminal>'+serialiseExpression(choice)+'</bgf:production>'
+
 def traverse(c):
  if len(c)==1:
   return serialiseExpression(c[0])
@@ -460,6 +461,15 @@ def printGrammar(fn):
  ext.write('</bgf:grammar>')
  ext.close()
 
+def printGrammarVertical(fn):
+ ext = open(fn,'w')
+ ext.write('<bgf:grammar xmlns:bgf="http://planet-sl.org/bgf">')
+ for nt in prods.keys():
+  for vertprod in prods[nt]:
+   ext.write(serialiseY(nt,vertprod))
+ ext.write('</bgf:grammar>')
+ ext.close()
+
 def breakWords(nt,s):
  # transforms terminals like "aaa.bbb" to "aaa" "." "bbb"
  word = s[1:-1]
@@ -799,7 +809,7 @@ def fixBracketPair(nt,arr,left,right):
   preprocessCorrect()
   killDuplicates()
   print 'Writing the extracted grammar...'
-  printGrammar(sys.argv[2])
+  printGrammarVertical(sys.argv[2])
   if pessimistic[2]:
    print 'Total of',pessimistic[2]+pessimistic[1],'problems encountered and coped with.'
  else:

diff --git a/topics/java/lci/xbgf/correct-app2.xbgf b/topics/java/lci/xbgf/correct-app2.xbgf
@@ -43,9 +43,6 @@
 
   <!-- ISSUE CORRECT SPECERROR
   let's complete some of the statements with a trailing semicolon-->
-  <xbgf:vertical>
-    <nonterminal>Statement</nonterminal>
-  </xbgf:vertical>
   <xbgf:designate>
     <bgf:production>
       <label>ContinueStatement</label>
@@ -142,7 +139,6 @@
   <xbgf:strip>
     <label>BreakStatement</label>
   </xbgf:strip>
-  <xbgf:horizontal>Statement</xbgf:horizontal>
 
   <!-- ISSUE CORRECT SPECERROR
   Expression is referenced as Expr:

diff --git a/topics/java/lci/xbgf/correct-doc1.xbgf b/topics/java/lci/xbgf/correct-doc1.xbgf
@@ -15,6 +15,7 @@
      vs.
       - [], ;([n(ConstantModifier), ,([n(ConstantModifiers), n(ConstantModifer)])])
   -->
+  <xbgf:horizontal>ConstantModifiers</xbgf:horizontal>
   <xbgf:chain>
     <bgf:production>
       <nonterminal>ConstantModifiers</nonterminal>
@@ -23,6 +24,9 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:chain>
+  <xbgf:vertical>
+    <nonterminal>ConstantModifier</nonterminal>
+  </xbgf:vertical>
   <xbgf:add>
     <bgf:production>
       <nonterminal>ConstantModifiers</nonterminal>
@@ -38,7 +42,6 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:add>
-  <xbgf:horizontal>ConstantModifiers</xbgf:horizontal>
 
   <!-- ISSUE CORRECT SPECERROR
   The authors fix an old problem here. (fixed partially
@@ -93,6 +96,7 @@
                ,([t((), n(ReferenceType), t()), n(UnaryExpressionNotPlusMinus)]),
                ,([t((), n(PrimitiveType), ?(n(Dims)), t()), n(UnaryExpression)])])
   -->
+  <xbgf:horizontal>CastExpression</xbgf:horizontal>
   <xbgf:factor>
     <bgf:expression>
       <choice>
@@ -215,4 +219,8 @@
       </optional>
     </bgf:expression>
   </xbgf:massage>
+  <xbgf:vertical>
+    <nonterminal>CastExpression</nonterminal>
+  </xbgf:vertical>
+
 </xbgf:sequence>
diff --git a/topics/java/lci/xbgf/correct-doc2.xbgf b/topics/java/lci/xbgf/correct-doc2.xbgf
@@ -55,6 +55,9 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:define>
+  <xbgf:vertical>
+    <nonterminal>ClassName</nonterminal>
+  </xbgf:vertical>
 
   <!-- ISSUE CORRECT SPECERROR
    - Fail: ConstructorDeclarator.
@@ -77,6 +80,7 @@
      ','([t('('), n('ReferenceType'), t(')'), n('UnaryExpressionNotPlusMinus')]),
      ','([t('('), n('PrimitiveType'), ?(n('Dims')), t(')'), n('UnaryExpression')])])),
   -->
+  <xbgf:horizontal>CastExpression</xbgf:horizontal>
   <xbgf:factor>
     <bgf:expression>
       <choice>
@@ -199,5 +203,8 @@
       </optional>
     </bgf:expression>
   </xbgf:massage>
+  <xbgf:vertical>
+    <nonterminal>CastExpression</nonterminal>
+  </xbgf:vertical>
 
 </xbgf:sequence>
diff --git a/topics/java/lci/xbgf/correct-doc3.xbgf b/topics/java/lci/xbgf/correct-doc3.xbgf
@@ -74,6 +74,9 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:define>
+  <xbgf:vertical>
+    <nonterminal>TypeParameterList</nonterminal>
+  </xbgf:vertical>
 
   <!--ISSUE CORRECT SPECERROR
    - Fail: ConstructorDeclarator.
@@ -116,6 +119,9 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:define>
+  <xbgf:vertical>
+    <nonterminal>ClassName</nonterminal>
+  </xbgf:vertical>
 
   <!-- ISSUE CORRECT SPECERROR
   "Expression1" and "Expression2" define different "Expression"s in AssertStatement actually -->
@@ -136,6 +142,7 @@
      ','([t('('), n('ReferenceType'), t(')'), n('UnaryExpressionNotPlusMinus')]),
      ','([t('('), n('PrimitiveType'), ?(n('Dims')), t(')'), n('UnaryExpression')])])),
   -->
+  <xbgf:horizontal>CastExpression</xbgf:horizontal>
   <xbgf:factor>
     <bgf:expression>
       <choice>
@@ -258,6 +265,9 @@
       </optional>
     </bgf:expression>
   </xbgf:massage>
+  <xbgf:vertical>
+    <nonterminal>CastExpression</nonterminal>
+  </xbgf:vertical>
 
   <!-- ISSUE CORRECT SPECERROR
   A mess due to duplicate definitions:
@@ -270,9 +280,6 @@
               ,([n(TypeName), t(.), n(Identifier)]),
               ,([n(PackageOrTypeName), t(.), n(Identifier)])])
   -->
-  <xbgf:vertical>
-    <nonterminal>TypeName</nonterminal>
-  </xbgf:vertical>
   <xbgf:remove>
     <bgf:production>
       <nonterminal>TypeName</nonterminal>
@@ -291,6 +298,5 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:remove>
-  <xbgf:horizontal>TypeName</xbgf:horizontal>
 
 </xbgf:sequence>
diff --git a/topics/java/lci/xbgf/deyaccify-doc2.xbgf b/topics/java/lci/xbgf/deyaccify-doc2.xbgf
@@ -8,6 +8,7 @@
      vs.
       - [], ;([n(SwitchBlockStatementGroup), ,([n(SwitchBlockStatementGroups), n(SwitchBlockStatementGroup)])])
   -->
+  <xbgf:horizontal>SwitchBlockStatementGroups</xbgf:horizontal>
   <xbgf:deyaccify>SwitchBlockStatementGroups</xbgf:deyaccify>
   <xbgf:extract>
     <bgf:production>
@@ -55,14 +56,16 @@
      vs.
       - [], ;([n(CatchClause), ,([n(Catches), n(CatchClause)])])
   -->
+  <xbgf:horizontal>Catches</xbgf:horizontal>
   <xbgf:deyaccify>Catches</xbgf:deyaccify>
 
-  <!-- 
+  <!-- 
    - Fail: BlockStatements.
       - [], *(n(BlockStatement))
      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/edit-doc1.xbgf b/topics/java/lci/xbgf/edit-doc1.xbgf
@@ -28,6 +28,9 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:introduce>
+  <xbgf:vertical>
+    <nonterminal>PackageOrTypeName</nonterminal>
+  </xbgf:vertical>
 
   <!--
   Local substitution:
@@ -270,5 +273,8 @@
       </optional>
     </bgf:expression>
   </xbgf:massage>
+  <xbgf:vertical>
+    <nonterminal>ClassInstanceCreationExpression</nonterminal>
+  </xbgf:vertical>
 
 </xbgf:sequence>
diff --git a/topics/java/lci/xbgf/edit-doc2.xbgf b/topics/java/lci/xbgf/edit-doc2.xbgf
@@ -2,8 +2,6 @@
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
 
-  <xbgf:horizontal>Primary</xbgf:horizontal>
-
  <!-- GENERALITY?
   ConstructorBody is defined as:
      { [ ExplicitConstructorInvocation ] [ BlockStatements ] }