further renamings; editing project updated; fixed a tiny bug in dot; …

…fresh diagrams

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@377 ab42f6e0-554d-0410-b580-99e487e6eeb2

topics/convergence/lci/lci.py

@@ -222,9 +222,11 @@ def dumpgraph(df):
      colour = 'blue'
     else:
      colour = 'black'
-    label = node.split('_')
-    label = label[0]+("'"*(len(label)-1))
-    dot.write(node+' [label="'+label+'" color='+colour+'];')
+    # labels not needed anymore because nodes became points
+    #label = node.split('_')
+    #label = label[0]+("'"*(len(label)-1))
+    #dot.write(node+' [label="'+label+'" color='+colour+'];')
+    dot.write(node+' [color='+colour+'];\n')
  dot.write('}')
  dot.close()
  run = 'dot -Tpdf '+dot.name+' -o '+df+'_large.pdf'

topics/java/lci/java-lci.csproj

@@ -52,46 +52,49 @@
       <Link>xbgf.xsd</Link>
     </None>
     <None Include="java.lcf" />
-    <None Include="xbgf\addFeatures1to2.xbgf" />
-    <None Include="xbgf\addFeatures1to2doc.xbgf" />
-    <None Include="xbgf\addFeatures2to3.xbgf" />
-    <None Include="xbgf\addFeatures2to3doc.xbgf" />
-    <None Include="xbgf\breakSemantics2doc.xbgf" />
-    <None Include="xbgf\breakSemantics3doc.xbgf" />
-    <None Include="xbgf\cropFeatures1.xbgf" />
-    <None Include="xbgf\deyaccify2doc.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" />
-    <None Include="xbgf\fixErrors3.xbgf" />
-    <None Include="xbgf\fixErrors3doc.xbgf" />
-    <None Include="xbgf\inlineExpressions2doc.xbgf" />
-    <None Include="xbgf\inlineStatements2doc.xbgf" />
+    <None Include="xbgf\allowMethodBodyEmpty.xbgf" />
+    <None Include="xbgf\correct-app1.xbgf" />
+    <None Include="xbgf\correct-app2.xbgf" />
+    <None Include="xbgf\correct-app3.xbgf" />
+    <None Include="xbgf\correct-doc1.xbgf" />
+    <None Include="xbgf\correct-doc2.xbgf" />
+    <None Include="xbgf\correct-doc3.xbgf" />
+    <None Include="xbgf\deyaccify-doc2.xbgf" />
+    <None Include="xbgf\edit-doc1.xbgf" />
+    <None Include="xbgf\editDeclarations.xbgf" />
+    <None Include="xbgf\editExpressions-doc2.xbgf" />
+    <None Include="xbgf\editExpressions-doc3.xbgf" />
+    <None Include="xbgf\editExpressions.xbgf" />
+    <None Include="xbgf\extend-doc1.xbgf" />
+    <None Include="xbgf\extend-doc12.xbgf" />
+    <None Include="xbgf\extend-doc2.xbgf" />
+    <None Include="xbgf\extend-doc3.xbgf" />
+    <None Include="xbgf\extend-jls1.xbgf" />
+    <None Include="xbgf\extend-jls2.xbgf" />
+    <None Include="xbgf\extendModifiers.xbgf" />
+    <None Include="xbgf\generalizeLabels.xbgf" />
+    <None Include="xbgf\generalizeModifiers.xbgf" />
+    <None Include="xbgf\generalizeNames-doc1.xbgf" />
+    <None Include="xbgf\generalizeNames.xbgf" />
+    <None Include="xbgf\inlineStatements.xbgf" />
     <None Include="xbgf\prefer3.xbgf" />
     <None Include="xbgf\preferLALR.xbgf" />
     <None Include="xbgf\prepare1.xbgf" />
     <None Include="xbgf\prepare2.xbgf" />
     <None Include="xbgf\prepare3.xbgf" />
-    <None Include="xbgf\refactorClassDeclarations.xbgf" />
-    <None Include="xbgf\refactorClassDeclarations3.xbgf" />
+    <None Include="xbgf\refactorClasses-doc2.xbgf" />
+    <None Include="xbgf\refactorClasses-doc3.xbgf" />
+    <None Include="xbgf\refactorDeclarations-doc2.xbgf" />
+    <None Include="xbgf\refactorDeclarations-doc3.xbgf" />
     <None Include="xbgf\refactorEnumDeclarations.xbgf" />
-    <None Include="xbgf\refactorInterfaceDeclarations.xbgf" />
-    <None Include="xbgf\refactorInterfaceDeclarations3.xbgf" />
-    <None Include="xbgf\refactorMiscDeclarations.xbgf" />
+    <None Include="xbgf\refactorExpressions-doc2.xbgf" />
+    <None Include="xbgf\refactorExpressions-doc3.xbgf" />
+    <None Include="xbgf\refactorInterfaces-doc2.xbgf" />
+    <None Include="xbgf\refactorInterfaces-doc3.xbgf" />
+    <None Include="xbgf\refactorOps.xbgf" />
     <None Include="xbgf\refactorStatements.xbgf" />
-    <None Include="xbgf\refactorTypes.xbgf" />
-    <None Include="xbgf\refactorTypes1.xbgf" />
-    <None Include="xbgf\refactorTypes3.xbgf" />
-    <None Include="xbgf\restructure1doc.xbgf" />
-    <None Include="xbgf\unifyModifiers.xbgf" />
-    <None Include="xbgf\unifyNames.xbgf" />
-    <None Include="xbgf\unifyNames1.xbgf" />
-    <None Include="xbgf\unlayerExpressions.xbgf" />
-    <None Include="xbgf\unlayerExpressions3.xbgf" />
-    <None Include="xbgf\upgradeDeclarations1to2.xbgf" />
-    <None Include="xbgf\upgradeExpressions.xbgf" />
+    <None Include="xbgf\refactorTypes-doc2.xbgf" />
+    <None Include="xbgf\refactorTypes-doc3.xbgf" />
+    <None Include="xbgf\refactorTypes-jls1.xbgf" />
   </ItemGroup>
 </Project>

topics/java/lci/java.lcf

@@ -108,7 +108,7 @@
       <perform>correct-app2</perform>
       <perform>prepare2</perform>
       <perform>refactorOps</perform>
-      <perform>allowMultipleLabels</perform>
+      <perform>generalizeLabels</perform>
       <perform>allowMethodBodyEmpty</perform>
     </branch>
     <branch>
@@ -118,8 +118,8 @@
       <perform>generalizeNames</perform>
       <perform>deyaccify-doc2</perform>
       <perform>refactorTypes-doc2</perform>
-      <perform>unlayerExpressions</perform>
-      <perform>inlineStatements2doc</perform>
+      <perform>refactorExpressions-doc2</perform>
+      <perform>inlineStatements</perform>
       <perform>editExpressions-doc2</perform>
       <perform>refactorClasses-doc2</perform>
       <perform>refactorInterfaces-doc2</perform>
@@ -135,7 +135,7 @@
       <input>app3</input>
       <perform>correct-app3</perform>
       <perform>prepare3</perform>
-      <perform>allowMultipleLabels</perform>
+      <perform>generalizeLabels</perform>
       <perform>allowMethodBodyEmpty</perform>
     </branch>
     <branch>
@@ -145,8 +145,8 @@
       <perform>generalizeNames</perform>
       <perform>deyaccify-doc2</perform>
       <perform>refactorTypes-doc3</perform>
-      <perform>unlayerExpressions3</perform>
-      <perform>inlineStatements2doc</perform>
+      <perform>refactorExpressions-doc3</perform>
+      <perform>inlineStatements</perform>
       <perform>editExpressions-doc3</perform>
       <perform>refactorClasses-doc3</perform>
       <perform>refactorInterfaces-doc3</perform>
@@ -163,7 +163,7 @@
       <perform>refactorStatements</perform>
       <perform>refactorTypes-jls1</perform>
       <perform>editDeclarations</perform>
-      <perform>unlayerExpressions</perform>
+      <perform>refactorExpressions-doc2</perform>
       <perform>editExpressions</perform>
       <perform>extend-jls1</perform>
     </branch>