renaming really done; tagging done

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@380 ab42f6e0-554d-0410-b580-99e487e6eeb2
grammarware · Oct 28, 2008 · 6c02f15 · 6c02f15
1 parent 4445a08
commit 6c02f15
Show file tree

Hide file tree

Showing 42 changed files with 1,287 additions and 1,865 deletions.
diff --git a/shared/tools/xbgfi b/shared/tools/xbgfi
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# Get our hands on basedir
+LOCAL1=${PWD}
+cd `dirname $0`
+cd ../..
+SLPS=${PWD}
+cd ${LOCAL1}
+
+if [ $# -ne 1 ]; then
+    echo "This tool runs some metrics on a XBGF document"
+    echo "Usage: xbgfi <BGF-input>"
+    exit 1
+elif [ ! -r $1 ]; then
+    echo "Oops: $1 not found or not readable."
+    exit 1
+else
+    /bin/echo -n "Correcting: "
+    grep -c CORRECT $1
+    /bin/echo -n "Extending: "
+    grep -c EXTEND $1
+    /bin/echo -n "Refactoring: "
+    grep -c REFACTOR $1
+fi
diff --git a/topics/java/lci/java.lcf b/topics/java/lci/java.lcf
@@ -117,10 +117,11 @@
       <perform>generalizeNames</perform>
       <perform>deyaccify-doc2</perform>
       <perform>refactorTypes-doc2</perform>
-      <perform>refactorExpressions-doc2</perform>
+      <perform>refactorExpressions</perform>
       <perform>inlineStatements</perform>
       <perform>generalizeStatements</perform>
-      <perform>editExpressions-doc2</perform>
+      <perform>editExpressions</perform>
+      <perform>eliminate-doc2</perform>
       <perform>refactorClasses-doc2</perform>
       <perform>refactorInterfaces-doc2</perform>
       <perform>refactorDeclarations-doc2</perform>
@@ -148,7 +149,7 @@
       <perform>refactorTypes-doc3</perform>
       <perform>refactorExpressions-doc3</perform>
       <perform>inlineStatements</perform>
-      <perform>editExpressions-doc3</perform>
+      <perform>editExpressions</perform>
       <perform>refactorClasses-doc3</perform>
       <perform>refactorInterfaces-doc3</perform>
       <perform>refactorEnumDeclarations</perform>
@@ -165,8 +166,8 @@
       <perform>generalizeStatements</perform>
       <perform>refactorTypes-jls1</perform>
       <perform>editDeclarations</perform>
-      <perform>refactorExpressions-doc2</perform>
-      <perform>editExpressions</perform>
+      <perform>refactorExpressions</perform>
+      <perform>editExpressions-jls1</perform>
       <perform>extend-jls1</perform>
     </branch>
     <branch>

diff --git a/topics/java/lci/snapshot/architecture_large.pdf b/topics/java/lci/snapshot/architecture_large.pdf
diff --git a/topics/java/lci/snapshot/architecture_small.pdf b/topics/java/lci/snapshot/architecture_small.pdf
diff --git a/topics/java/lci/xbgf/deyaccify-doc2.xbgf b/topics/java/lci/xbgf/deyaccify-doc2.xbgf
@@ -1,7 +1,8 @@
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
-  <!--
+
+  <!-- ISSUE REFACTOR EBNF
    - Fail: SwitchBlockStatementGroups.
       - [], *(n(SwitchBlockStatementGroup))
      vs.
@@ -48,15 +49,15 @@
     </bgf:expression>
   </xbgf:massage>
 
-  <!--
+  <!--  ISSUE REFACTOR EBNF
    - Fail: Catches.
       - [], ,([n(CatchClause), *(n(CatchClause))])
      vs.
       - [], ;([n(CatchClause), ,([n(Catches), n(CatchClause)])])
   -->
   <xbgf:deyaccify>Catches</xbgf:deyaccify>
 
-  <!--
+  <!--  ISSUE REFACTOR EBNF
    - Fail: BlockStatements.
       - [], *(n(BlockStatement))
      vs.

diff --git a/topics/java/lci/xbgf/edit-doc1.xbgf b/topics/java/lci/xbgf/edit-doc1.xbgf
@@ -2,7 +2,34 @@
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
 
-  <!--
+  <!-- ISSUE EXTEND  -->
+  <xbgf:introduce>
+    <bgf:production>
+      <nonterminal>PackageOrTypeName</nonterminal>
+      <bgf:expression>
+        <choice>
+          <bgf:expression>
+            <nonterminal>Identifier</nonterminal>
+          </bgf:expression>
+          <bgf:expression>
+            <sequence>
+              <bgf:expression>
+                <nonterminal>PackageOrTypeName</nonterminal>
+              </bgf:expression>
+              <bgf:expression>
+                <terminal>.</terminal>
+              </bgf:expression>
+              <bgf:expression>
+                <nonterminal>Identifier</nonterminal>
+              </bgf:expression>
+            </sequence>
+          </bgf:expression>
+        </choice>
+      </bgf:expression>
+    </bgf:production>
+  </xbgf:introduce>
+
+  <!-- ISSUE REFACTOR EDITING
   Local substitution:
 
      - Fail: TypeImportOnDemandDeclaration.
@@ -22,7 +49,7 @@
     </in>
   </xbgf:replace>
 
-  <!--
+  <!-- ISSUE REFACTOR EDITING
   Local substitution:
      - Fail: TypeName.
       - [], ;([n(Identifier), ,([n(PackageName), t(.), n(Identifier)])])
@@ -41,7 +68,7 @@
     </in>
   </xbgf:replace>
 
-  <!--
+  <!-- ISSUE REFACTOR EDITING
   Local substitute + add + horizontal:
      - Fail: ClassInstanceCreationExpression.
       - [], ,([t(new), n(ClassType), t((), ?(n(ArgumentList)), t())])
@@ -151,32 +178,5 @@
     </bgf:production>
   </xbgf:add>
   <xbgf:horizontal>ClassInstanceCreationExpression</xbgf:horizontal>
-
-  <!-- last bits -->
-  <xbgf:define>
-    <bgf:production>
-      <nonterminal>PackageOrTypeName</nonterminal>
-      <bgf:expression>
-        <choice>
-          <bgf:expression>
-            <nonterminal>Identifier</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <sequence>
-              <bgf:expression>
-                <nonterminal>PackageOrTypeName</nonterminal>
-              </bgf:expression>
-              <bgf:expression>
-                <terminal>.</terminal>
-              </bgf:expression>
-              <bgf:expression>
-                <nonterminal>Identifier</nonterminal>
-              </bgf:expression>
-            </sequence>
-          </bgf:expression>
-        </choice>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:define>
-
+
 </xbgf:sequence>