some progress

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@343 ab42f6e0-554d-0410-b580-99e487e6eeb2
grammarware · Oct 14, 2008 · fd096ec · fd096ec
1 parent a621668
commit fd096ec
Show file tree

Hide file tree

Showing 9 changed files with 508 additions and 103 deletions.
diff --git a/topics/extraction/html2bgf/getpre.py b/topics/extraction/html2bgf/getpre.py
@@ -65,7 +65,7 @@ def processSection(text,tagN,cx,p):
     yes.append(pair[0])
     if pair[1]=='*':
      counter[pair[0]]=1000
-    if pair[1].find('+')>-1:
+    elif pair[1].find('+')>-1:
      counter[pair[0]]=len(pair[1])
      pattern[pair[0]]=pair[1]
     else:

diff --git a/topics/java/lci/Makefile b/topics/java/lci/Makefile
@@ -2,13 +2,8 @@ validator = ../../../shared/tools/checkxml
 
 build:
 
-diff2: test
-	gdt bgf/jls1app.prepare1.refactorStatements.refactorTypes.structure1.addFeatures1to2.cropFeatures1.bgf bgf/jls2.prepare2.bgf
-
 diff:
-	../../../shared/tools/xbgf xbgf/refactorClassDeclarations3.xbgf bgf/jls3doc.fixErrors3doc.unifyModifiers.unifyNames.deyaccify2doc.refactorTypes3.deyaccifyExpressions3.inlineStatements2doc.inlineExpressions2doc.bgf bgf/jls3doc.fixErrors3doc.unifyModifiers.unifyNames.deyaccify2doc.refactorTypes3.deyaccifyExpressions3.inlineStatements2doc.inlineExpressions2doc.refactorClassDeclarations3.bgf
-	../../../shared/tools/gdt bgf/jls3syntax.fixErrors3.prepare3.bgf bgf/jls3doc.fixErrors3doc.unifyModifiers.unifyNames.deyaccify2doc.refactorTypes3.deyaccifyExpressions3.inlineStatements2doc.inlineExpressions2doc.refactorClassDeclarations3.bgf
-
+	gdt bgf/jls3app.fixErrors3.prepare3.bgf bgf/jls3doc.fixErrors3doc.unifyModifiers.unifyNames.deyaccify2doc.refactorTypes3.deyaccifyExpressions3.inlineStatements2doc.inlineExpressions2doc.refactorClassDeclarations3.refactorEnumDeclarations.refactorInterfaceDeclarations3.breakSemantics3doc.bgf
 
 test:
 	python ../../convergence/lci/lci.py java.lcf architecture
@@ -20,12 +15,12 @@ check:
 	ls -1  bgf/*.bgf  | xargs -n1 ${validator} bgf
 
 debug:
-	../../../shared/tools/html2bgf ../jls1/syntax.kw ../jls1/syntax.html 1.bnf -bnf >/dev/null
-	../../../shared/tools/html2bgf ../jls1/collect.kw ../jls1/collected.html q.bnf -bnf >/dev/null
-	../../../shared/tools/html2bgf ../jls2/syntax.html 2.bnf -bnf >/dev/null
-	../../../shared/tools/html2bgf ../jls2/collect.kw ../jls2/collected.html w.bnf -bnf >/dev/null
-	../../../shared/tools/html2bgf ../jls3/syntax.html 3.bnf -bnf >/dev/null
-	../../../shared/tools/html2bgf ../jls3/collect.kw ../jls3/collected.html e.bnf -bnf >/dev/null
+	../../../shared/tools/html2bgf ../jls1/syntax.kw ../jls1/app.html 1.bnf -bnf >/dev/null
+	../../../shared/tools/html2bgf ../jls1/collect.kw ../jls1/doc.html q.bnf -bnf >/dev/null
+	../../../shared/tools/html2bgf ../jls2/app.html 2.bnf -bnf >/dev/null
+	../../../shared/tools/html2bgf ../jls2/collect.kw ../jls2/doc.html w.bnf -bnf >/dev/null
+	../../../shared/tools/html2bgf ../jls3/app.html 3.bnf -bnf >/dev/null
+	../../../shared/tools/html2bgf ../jls3/collect.kw ../jls3/doc.html e.bnf -bnf >/dev/null
 clean:
 	rm -f *~
 	rm -f bgf/*

diff --git a/topics/java/lci/java-lci.csproj b/topics/java/lci/java-lci.csproj
@@ -48,12 +48,6 @@
     <None Include="..\..\..\shared\xsd\lcf.xsd">
       <Link>lcf.xsd</Link>
     </None>
-    <None Include="..\..\..\shared\xsd\ldf.xsd">
-      <Link>ldf.xsd</Link>
-    </None>
-    <None Include="..\..\..\shared\xsd\ldx.xsd">
-      <Link>ldx.xsd</Link>
-    </None>
     <None Include="..\..\..\shared\xsd\xbgf.xsd">
       <Link>xbgf.xsd</Link>
     </None>
@@ -65,7 +59,10 @@
     <None Include="xbgf\breakSemantics2doc.xbgf" />
     <None Include="xbgf\cropFeatures1.xbgf" />
     <None Include="xbgf\deyaccify2doc.xbgf" />
+    <None Include="xbgf\deyaccifyExpressions.xbgf" />
     <None Include="xbgf\enhanceModifiers.xbgf" />
+    <None Include="xbgf\expandOps.xbgf" />
+    <None Include="xbgf\fixErrors1.xbgf" />
     <None Include="xbgf\fixErrors1doc.xbgf" />
     <None Include="xbgf\fixErrors2.xbgf" />
     <None Include="xbgf\fixErrors2doc.xbgf" />
@@ -77,10 +74,13 @@
     <None Include="xbgf\prepare1.xbgf" />
     <None Include="xbgf\prepare2.xbgf" />
     <None Include="xbgf\prepare3.xbgf" />
-    <None Include="xbgf\refactorDeclarations2doc.xbgf" />
+    <None Include="xbgf\refactorClassDeclarations.xbgf" />
+    <None Include="xbgf\refactorInterfaceDeclarations.xbgf" />
     <None Include="xbgf\refactorStatements.xbgf" />
     <None Include="xbgf\refactorTypes.xbgf" />
     <None Include="xbgf\restructure1doc.xbgf" />
     <None Include="xbgf\structure1.xbgf" />
+    <None Include="xbgf\unifyModifiers.xbgf" />
+    <None Include="xbgf\unifyNames.xbgf" />
   </ItemGroup>
 </Project>
diff --git a/topics/java/lci/xbgf/deyaccifyExpressions3.xbgf b/topics/java/lci/xbgf/deyaccifyExpressions3.xbgf
@@ -113,6 +113,79 @@
      "(" ReferenceType ")" UnaryExpressionNotPlusMinus
 
   -->
+
+  <!-- [Dims] vs BracketsOpt-->
+  <xbgf:extract>
+    <bgf:production>
+      <nonterminal>B</nonterminal>
+      <bgf:expression>
+        <sequence>
+          <bgf:expression>
+            <terminal>[</terminal>
+          </bgf:expression>
+          <bgf:expression>
+            <terminal>]</terminal>
+          </bgf:expression>
+        </sequence>
+      </bgf:expression>
+    </bgf:production>
+  </xbgf:extract>
+  <xbgf:deyaccify>Dims</xbgf:deyaccify>
+  <xbgf:extract>
+    <bgf:production>
+      <nonterminal>BracketsOpt</nonterminal>
+      <bgf:expression>
+        <optional>
+          <bgf:expression>
+            <nonterminal>Dims</nonterminal>
+          </bgf:expression>
+        </optional>
+      </bgf:expression>
+    </bgf:production>
+  </xbgf:extract>
+  <xbgf:unfold>
+    <nonterminal>Dims</nonterminal>
+    <in>
+      <nonterminal>BracketsOpt</nonterminal>
+    </in>
+  </xbgf:unfold>
+  <xbgf:inline>B</xbgf:inline>
+  <xbgf:massage>
+    <bgf:expression>
+      <optional>
+        <bgf:expression>
+          <plus>
+            <bgf:expression>
+              <sequence>
+                <bgf:expression>
+                  <terminal>[</terminal>
+                </bgf:expression>
+                <bgf:expression>
+                  <terminal>]</terminal>
+                </bgf:expression>
+              </sequence>
+            </bgf:expression>
+          </plus>
+        </bgf:expression>
+      </optional>
+    </bgf:expression>
+    <bgf:expression>
+      <star>
+        <bgf:expression>
+          <sequence>
+            <bgf:expression>
+              <terminal>[</terminal>
+            </bgf:expression>
+            <bgf:expression>
+              <terminal>]</terminal>
+            </bgf:expression>
+          </sequence>
+        </bgf:expression>
+      </star>
+    </bgf:expression>
+  </xbgf:massage>
+
+  <!-- This all needs to be completely redone and rename -->
 
   <!-- Complicated surgery on CastExpression - kind of fold mod new type system
 
@@ -165,11 +238,7 @@ vs
             <nonterminal>BasicType</nonterminal>
           </bgf:expression>
           <bgf:expression>
-            <optional>
-              <bgf:expression>
-                <nonterminal>Dims</nonterminal>
-              </bgf:expression>
-            </optional>
+                <nonterminal>BracketsOpt</nonterminal>
           </bgf:expression>
           <bgf:expression>
             <terminal>)</terminal>

diff --git a/topics/java/lci/xbgf/fixErrors3.xbgf b/topics/java/lci/xbgf/fixErrors3.xbgf
@@ -6,7 +6,17 @@
   <xbgf:reroot>
     <root>CompilationUnit</root>
   </xbgf:reroot>
-
+
+  <!--
+  There's no such thing as TypeName
+
+Annotation:
+        </em><code>@</code><em> TypeName [<code>(</code> [Identifier <code>=</code>] ElementValue<code>)</code>]
+  -->
+  <xbgf:unite>
+    <add>TypeName</add>
+    <to>QualifiedIdentifier</to>
+  </xbgf:unite>
   <!--
   The extractor can't tell if {} are terminals or BNF
 

diff --git a/topics/java/lci/xbgf/prepare3.xbgf b/topics/java/lci/xbgf/prepare3.xbgf
@@ -89,5 +89,26 @@
       </plus>
     </bgf:expression>
   </xbgf:massage>
+
+  <!-- This stuff was used in JLS1 and JLS2 -->
+  <xbgf:extract>
+    <bgf:production>
+      <nonterminal>BracketsOpt</nonterminal>
+      <bgf:expression>
+        <star>
+          <bgf:expression>
+            <sequence>
+              <bgf:expression>
+                <terminal>[</terminal>
+              </bgf:expression>
+              <bgf:expression>
+                <terminal>]</terminal>
+              </bgf:expression>
+            </sequence>
+          </bgf:expression>
+        </star>
+      </bgf:expression>
+    </bgf:production>
+  </xbgf:extract>
 
 </xbgf:sequence>