Improved refactorings

Author: kevinlano

ASTTerm.java

@@ -4768,12 +4768,18 @@ public static Vector powersOf(
     } 
 
     String v = var.literalForm(); 
+    String elit = expr.literalForm(); 
 
-    if (v.equals(expr.literalForm()))
+    if (v.equals(elit))
     { res.add(1); 
       return res; 
     } 
 
+    if ((v + "^{2}").equals(elit))
+    { res.add(2); 
+      return res; 
+    } 
+
     if (expr instanceof ASTCompositeTerm)
     { // (factorExpression _1 * _2), etc
 
@@ -5563,6 +5569,20 @@ public static String constantTerms(
         return "0"; 
       }  
 
+      if ("factor2Expression".equals(ct.tag))
+      { if (subterms.size() == 4 && 
+            "^{".equals(subterms.get(1) + ""))
+        { // expr^{power}
+          ASTTerm tt = (ASTTerm) subterms.get(0); 
+          ASTTerm power = (ASTTerm) subterms.get(2); 
+          String powlit = power.literalForm(); 
+
+          String coef1 = ASTTerm.constantTerms(vars, tt); 
+          if ("0".equals(coef1))
+          { return "0"; } 
+          return "(" + coef1 + ")^{" + powlit + "}"; 
+        } 
+      }           
 
       if ("factorExpression".equals(ct.tag))
       { if (subterms.size() == 2)

Association.java

@@ -33,6 +33,8 @@ public class Association extends ModelElement
   private Vector constraints = new Vector(); // those that involve this association
   private Attribute qualifier = null; // non-null for qualified associations
   private boolean instanceScope = true; 
+
+  private Expression initialExpression = null; 
 
   public Association(Entity e1, Entity e2, int c1,
                      int c2, String r1, String r2)
@@ -121,6 +123,9 @@ else if ("1".equals(c2))
     role2 = r2;
   }
 
+  public void setInitialExpression(Expression init)
+  { initialExpression = init; } 
+
   public void setType(Type t) { } 
 
   public void addParameter(Attribute att) 

CGRule.java

@@ -598,10 +598,10 @@ public static String applyMetafeature(String mffeat,
                                         CGSpec cgs, Vector entities)
   { System.out.println(">***> Applying " + mffeat + " to ASTTerm " + term); 
     System.out.println(); 
-    JOptionPane.showMessageDialog(null, 
+    /* JOptionPane.showMessageDialog(null, 
       "Trying to compute: " + mffeat + " of: " + term + 
               " in: " + ASTTerm.metafeatures,   "",
-              JOptionPane.INFORMATION_MESSAGE);
+              JOptionPane.INFORMATION_MESSAGE); */ 
 
 
     ASTTerm obj = term; 

Compiler2.java

@@ -8032,6 +8032,15 @@ else if ("Sequence".equals(res.e2name) &&
       res.card2 = ModelElement.MANY; 
       res.stereotypes.add("ordered"); 
     }
+    else if (":=".equals(rlex))
+    { Expression init = 
+              parse_expression(0,reached+1,en-1,entities,types); 
+      if (init != null) 
+      { res.setInitialExpression(init); 
+        System.out.println(">>> Reference " + res.role2 + ". Initial expression = " + init); 
+      }
+    } 
+          
     return res; 
   } 
 

PreAssociation.java

@@ -1,7 +1,7 @@
 import java.util.Vector;
 
 /******************************
-* Copyright (c) 2003,2019 Kevin Lano
+* Copyright (c) 2003-2023 Kevin Lano
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License 2.0 which is available at
 * http://www.eclipse.org/legal/epl-2.0
@@ -19,6 +19,7 @@ public class PreAssociation
   int ys, ye;
   String role2;
   String role1;
+  Expression initialExpression; 
   Vector stereotypes; 
   Vector wpoints; 
 
@@ -46,6 +47,9 @@ public PreAssociation(String e1n, String e2n, int c1,
     wpoints = wps; 
   }
 
+  public void setInitialExpression(Expression expr)
+  { initialExpression = expr; } 
+
   public boolean isDualTo(PreAssociation pinv)
   { if (pinv.role1 != null && pinv.role1.equals(role2) && 
         role1 != null && role1.equals(pinv.role2) && 

UCDArea.java

@@ -7317,16 +7317,18 @@ public void addEntity(Entity srcent, Entity trgent, int xx)
   private void reconstructAssociation(String ename1,
                  String ename2, int xs, int ys, int xe,
                  int ye, int c1, int c2, String role2,
-                 String role1, Vector stereotypes, Vector wpoints)
+                 String role1, Vector stereotypes, Vector wpoints, Expression initExpr)
   { Entity e1 =
       (Entity) ModelElement.lookupByName(ename1,entities);
     Entity e2 =
       (Entity) ModelElement.lookupByName(ename2,entities);
+
     if (e1 == null || e2 == null)
     { System.out.println("!! Error in data, no entities " +
                          e1 + " " + e2);
       return;
     }
+
     if ("null".equals(role1))
     { role1 = null; }
 
@@ -7369,6 +7371,7 @@ else if (stereotypes.contains("qualified"))
       ast.unsetQualifier(); 
       ast.setQualifier(qatt);   
     }          
+
     if (stereotypes.contains("associationClass"))
     { int acind = stereotypes.indexOf("associationClass"); 
       if (acind + 1 < stereotypes.size())
@@ -7387,9 +7390,13 @@ else if (stereotypes.contains("qualified"))
           } 
         } 
       } 
+
       System.out.println(">> Reconstructed association class: " + acent + " " + sline); 
     }             
 
+    if (initExpr != null) 
+    { ast.setInitialExpression(initExpr); } 
+
     associations.add(ast);
     e1.addAssociation(ast);
     if (role1 != null && role1.length() > 0)
@@ -15892,7 +15899,7 @@ else if (s.equals("Activity:"))
         (PreAssociation) preassociations.get(i);
       reconstructAssociation(p.e1name,p.e2name,p.xs,p.ys,
                              p.xe,p.ye,p.card1,p.card2,
-                             p.role2,p.role1,p.stereotypes, p.wpoints);
+                             p.role2,p.role1,p.stereotypes, p.wpoints, p.initialExpression);
     }
 
     for (int j = 0; j < preentities.size(); j++)
@@ -16143,7 +16150,7 @@ else if (s.equals("Activity:"))
         (PreAssociation) preassociations.get(i);
       reconstructAssociation(p.e1name,p.e2name,p.xs,p.ys,
                              p.xe,p.ye,p.card1,p.card2,
-                             p.role2,p.role1,p.stereotypes, p.wpoints);
+                             p.role2,p.role1,p.stereotypes, p.wpoints, p.initialExpression);
     }
 
     for (int j = 0; j < preentities.size(); j++)
@@ -17849,7 +17856,7 @@ private void loadKM3FromText(String xmlstring)
         reconstructAssociation(pa.e1name,pa.e2name,xs,ys,
                     xe,ye,pa.card1,pa.card2,
                     pa.role2, pa.role1, pa.stereotypes, 
-                    new Vector());
+                    new Vector(), pa.initialExpression);
       } 
     } 
 
@@ -18019,7 +18026,7 @@ else if (oldtype instanceof Type)
 
           reconstructAssociation(pa.e1name,pa.e2name,xs,ys,
                              xe,ye,pa.card1,pa.card2,
-                             pa.role2, pa.role1, pa.stereotypes, new Vector());
+                             pa.role2, pa.role1, pa.stereotypes, new Vector(), pa.initialExpression);
         } 
       } 
     } 

UmlTool.java

@@ -363,6 +363,13 @@ public UmlTool()
       "Creates UML/OCL from AST produced by Antlr Python parser, in output/ast.txt");
     fileMenu.add(fromPython);
 
+    JMenuItem fromPascal = 
+      new JMenuItem("From Pascal AST",openIcon);
+    fromPascal.addActionListener(this);
+    fromPascal.setToolTipText(
+      "Creates UML/OCL from AST produced by Antlr pascal parser, in output/ast.txt");
+    fileMenu.add(fromPascal);
+
     JMenuItem fromSQL = 
       new JMenuItem("From SQL AST",openIcon);
     fromSQL.addActionListener(this);
@@ -1773,6 +1780,10 @@ else if (label.equals("From Python AST"))
       { ucdArea.loadFromPython();
         saved = true; 
       }
+      else if (label.equals("From Pascal AST")) 
+      { ucdArea.loadFromPascal();
+        saved = true; 
+      }
       else if (label.equals("From SQL AST")) 
       { ucdArea.loadFromSQL();
         saved = true;