Updated Go translator

Author: kevinlano

ASTBasicTerm.java

@@ -26,6 +26,9 @@ public void setTag(String t)
   public String getTag()
   { return tag; } 
 
+  public String tagFunction()
+  { return tag; } 
+
   public boolean hasTag(String tagx) 
   { return tagx.equals(tag); } 
 

ASTCompositeTerm.java

@@ -62,6 +62,27 @@ public boolean hasSingleTerm()
 
   public int arity()
   { return terms.size(); } 
+
+  public String tagFunction()
+  { String res = ""; 
+    for (int i = 0; i < terms.size(); i++)
+    { ASTTerm trm = (ASTTerm) terms.get(i); 
+      if (trm instanceof ASTSymbolTerm) 
+      { if ("".equals(res))
+        { res = tag + "~"; }
+        else 
+        { res = res + "$" + tag + "~"; }
+      }  
+      else 
+      { String tstring = tag + "_" + trm.tagFunction(); 
+        if ("".equals(res))
+        { res = tstring; }
+        else 
+        { res = res + "$" + tstring; } 
+      } 
+    } 
+    return res; 
+  }  
 
   public int nonSymbolArity()
   { int res = 0; 

ASTSymbolTerm.java

@@ -19,6 +19,9 @@ public ASTSymbolTerm(String s)
   public String getTag()
   { return symbol; } 
 
+  public String tagFunction()
+  { return "~"; } 
+
   public boolean hasTag(String tagx) 
   { return false; } 
 

ASTTerm.java

@@ -112,6 +112,8 @@ public abstract class ASTTerm
 
   public abstract String literalForm();
 
+  public abstract String tagFunction(); 
+
   public void addStereotype(String str) 
   { String lit = literalForm(); 
     Vector stereotypes = 
@@ -1578,7 +1580,9 @@ public static Vector generateASTExamples(Vector javaASTs)
 
   public static void entitiesFromASTs(Vector asts, String suff, Vector es)
   { // For each tag t, create entity t+suff. Add subclass for 
-    // each different arity of t terms. 
+    // each different arity of t terms.
+    // Nesting: (t (t1 x) (t2 y)) becomes
+    // t_t1$t_t2, etc.  
 
     Type treeType = new Type("OclAny", null); 
 
@@ -1625,6 +1629,56 @@ public static void entitiesFromASTs(Vector asts, String suff, Vector es)
     } 
   } 
 
+  public static void deepEntitiesFromASTs(Vector asts, String suff, Vector es)
+  { // For each different term t, create entity t' + suff.
+    // Nesting: (t (t1 x) (t2 y)) entity has name
+    // t_t1$t_t2, etc.  
+
+    Type treeType = new Type("OclAny", null); 
+
+    for (int i = 0; i < asts.size(); i++) 
+    { ASTTerm t = (ASTTerm) asts.get(i); 
+      String tg = t.tagFunction() + suff; 
+      String tgsup = t.getTag() + suff; 
+      int n = t.arity(); 
+      if (n > 0) 
+      { Entity sup = (Entity) ModelElement.lookupByName(tgsup,es); 
+        if (sup == null) 
+        { sup = new Entity(tgsup);
+
+          System.out.println("Created entity: "  + sup); 
+ 
+          if (suff.equals(""))
+          { sup.addStereotype("source"); } 
+          else 
+          { sup.addStereotype("target"); } 
+           
+          sup.setAbstract(true); 
+          Attribute astatt = 
+            new Attribute("ast", treeType, ModelElement.INTERNAL); 
+          sup.addAttribute(astatt); 
+          es.add(sup); 
+        } 
+
+        Entity ee = (Entity) ModelElement.lookupByName(tg,es); 
+        if (ee == null) 
+        { ee = new Entity(tg);
+
+          System.out.println("Created entity: "  + tg); 
+ 
+          if (suff.equals(""))
+          { ee.addStereotype("source"); } 
+          else 
+          { ee.addStereotype("target"); } 
+           
+          ee.setSuperclass(sup); 
+          sup.addSubclass(ee); 
+          es.add(ee); 
+        } 
+      } 
+    } 
+  } 
+
   public static Vector entityMatchingsFromASTs(Vector sasts, 
                          Vector tasts, Vector es)
   { // For corresponding s, t create entity matching
@@ -1640,7 +1694,7 @@ public static Vector entityMatchingsFromASTs(Vector sasts,
       int m = t.arity(); 
 
       if (n > 0 && m > 0) 
-      { String sentname = s.getTag() + "_" + n; 
+      { String sentname = s.tagFunction(); // Assume it is deep 
         Entity sent = 
           (Entity) ModelElement.lookupByName(sentname,es); 
         String tentname = t.getTag() + "$T_" + m; 
@@ -1676,7 +1730,7 @@ public static void modelSpecificationFromASTs(Vector sasts,
       int m = t.arity(); 
 
       if (n > 0 && m > 0) 
-      { String sentname = s.getTag() + "_" + n; 
+      { String sentname = s.tagFunction(); 
         String tentname = t.getTag() + "$T_" + m; 
         String sinst = sentname.toLowerCase() + "_" + i; 
         String tinst = tentname.toLowerCase() + "_" + i; 
@@ -1745,6 +1799,24 @@ public static void main(String[] args)
     // System.out.println(t.isInteger()); 
     // System.out.println(t.isBoolean());
 
+    ASTBasicTerm tt1 = new ASTBasicTerm("t1", "aa"); 
+    ASTBasicTerm tt2 = new ASTBasicTerm("t2", "bb");
+    ASTSymbolTerm tts = new ASTSymbolTerm("&"); 
+ 
+
+    Vector vect = new Vector(); 
+    vect.add(tt1); 
+    vect.add(tts); 
+    vect.add(tt2); 
+    
+    ASTCompositeTerm ttc = 
+       new ASTCompositeTerm("ct", vect); 
+
+    System.out.println(ttc.tagFunction()); 
+  }
+} 
+
+  /* 
     Vector consts = 
       randomBasicASTTermsForTag("Const", 1, 50);
     Vector ops = new Vector(); 
@@ -1944,8 +2016,9 @@ public static void main(String[] args)
     catch (Exception _fex) 
     { System.err.println("! No file: output/asts.txt"); }  
 
-  } 
-} 
+  } */ 
+
+
 
 /* tree2tree dataset format: */ 
 

BasicExpression.java

@@ -1055,6 +1055,12 @@ public Expression getParameter(int i)
     return null; 
   } 
 
+  public int arity() 
+  { if (parameters == null) 
+    { return 0; } 
+    return parameters.size(); 
+  } 
+
   public String getData()
   { return data; } 
 

CGSpec.java

@@ -103,6 +103,8 @@ public void addCategoryRule(String category, CGRule r)
   { Vector rules = (Vector) categoryRules.get(category); 
     if (rules == null) 
     { rules = new Vector(); } 
+    if (rules.contains(r)) 
+    { return; } 
     rules.add(r); 
     categoryRules.put(category,rules); 
   } 
@@ -546,16 +548,16 @@ public void displayText(String str, PrintWriter out)
     for (int i = 0; i < n; i++) 
     { char x = str.charAt(i); 
 
-      // if (x == '"' && !instring) 
-      // { instring = true; } 
-      // else if (x == '"' && instring) 
-      // { instring = false; } 
+      if (x == '"' && !instring) 
+      { instring = true; } 
+      else if (x == '"' && instring) 
+      { instring = false; } 
 
-      if (x == '\n')
+      if (x == '\n' && !instring)
       { out.println(res); 
         res = new StringBuffer(); 
       } 
-      else if (i < n-1 && x == '\\' && str.charAt(i+1) == 'n')
+      else if (i < n-1 && x == '\\' && str.charAt(i+1) == 'n' && !instring)
       { out.println(res); 
         res = new StringBuffer(); 
         i++; 

Compiler2.java

@@ -4670,14 +4670,20 @@ public static String isKeywordOrPart(String st, String[] mess)
 
     if ("operation".startsWith(st)) 
     { mess[0] = "Operation declaration:\noperation name(parameters) : Type\n" + 
-                "pre: expression\npost: expression\nactivity: statement;"; 
+                "pre: expression\npost: expression\nactivity: statement;\n\n" + 
+                "Or with a generic type parameter name T:\n" + 
+                "operation name<T>(parameters) : Type\n" + 
+                "pre: expression\npost: expression\nactivity: statement;\n"; 
       return "operation"; 
     } 
 
     if ("query".startsWith(st)) 
     { mess[0] = "Query operation declaration, returning a result value:\n" + 
                 "query name(parameters) : Type\n" + 
-                "pre: expression\npost: expression\nactivity: statement;"; 
+                "pre: expression\npost: expression\nactivity: statement;\n\n" + 
+                "Or with a generic type parameter name T:\n" + 
+                "query name<T>(parameters) : Type\n" + 
+                "pre: expression\npost: expression\nactivity: statement;\n";; 
       return "query"; 
     }
 
@@ -4784,7 +4790,8 @@ public static String isKeywordOrPart(String st, String[] mess)
       } 
 
       if ("static".startsWith(st)) 
-      { mess[0] = "static feature, ie., of class scope"; 
+      { mess[0] = "static attribute or operation, ie., of class scope. Eg:\n" + "static attribute nobjs : int;\n" + 
+              "static query pi() : double\npre: true post: result = 3.14159265\n"; 
         return "static"; 
       } 
 

EntityMatching.java

@@ -37,8 +37,21 @@ public class EntityMatching implements SystemTypes
   public EntityMatching(Entity asrc, Entity atrg)
   { src = asrc; 
     trg = atrg; 
-    srcname = src.getName(); 
-    trgname = trg.getName(); 
+
+    if (src == null) 
+    { System.err.println("!!! Null source in entity match to " + trg); 
+      return; 
+    }
+
+    if (trg == null) 
+    { System.err.println("!!! Null target in entity match from " + src); 
+      return; 
+    }
+
+    if (src != null) 
+    { srcname = src.getName(); } 
+    if (trg != null)  
+    { trgname = trg.getName(); }  
     realsrc = asrc; 
     realtrg = atrg; 
   } 
@@ -1116,8 +1129,20 @@ public String getName()
 
   public String toString()
   { String res = ""; 
+    String sname = ""; 
+    if (realsrc == null) 
+    { sname = ""; } 
+    else 
+    { sname = realsrc.getName(); } 
+
+    String tname = ""; 
+    if (realtrg == null) 
+    { tname = ""; } 
+    else 
+    { tname = realtrg.getName(); } 
+    
     if (condition == null) 
-    { res = realsrc.getName() + " |--> " + realtrg.getName(); } 
+    { res = sname + " |--> " + tname; } 
     else 
     { res = "{ " + condition + " } " + 
             realsrc.getName() + " |--> " + realtrg.getName(); 
@@ -1131,6 +1156,7 @@ public String toString()
     { AttributeMatching am = (AttributeMatching) attributeMappings.get(i); 
       res = res + "    " + am + "\n"; 
     } 
+
     return res; 
   } 
 

Expression.java

@@ -171,6 +171,9 @@ public static String getCInputType(Type t)
   public int getUMLKind()
   { return umlkind; } 
 
+  public int arity()
+  { return 0; } 
+
   public static boolean isComparator(String opx)
   { return comparitors.contains(opx); }