Updated Go code generator & libraries

Author: kevinlano

BasicExpression.java

@@ -730,7 +730,8 @@ else if (objectRef != null)
 
     res.prestate = prestate;
     res.atTime = atTime;  
-    res.downcast = downcast; 
+    res.downcast = downcast;
+    res.isStatic = isStatic;  
     return res; 
   }
 
@@ -3227,7 +3228,8 @@ else if (objectRef.elementType != null && objectRef.elementType.isEntity())
       } 
     }
 
-    if ("newOclDate".equals(data))
+    if ("newOclDate".equals(data) ||
+        "newOclDate_Time".equals(data))
     { type = new Type("OclDate", null); 
       umlkind = UPDATEOP;
       isStatic = true;  
@@ -3296,7 +3298,7 @@ else if (createdClass.startsWith("OclIterator_String"))
                 new Attribute("ss", new Type("String", null), ModelElement.INTERNAL); 
             par1.formalParameter = fparss;
           }
-        }
+        } // and String_String
 
         return true;  
       }
@@ -3570,7 +3572,8 @@ else if (isCall(oref.data))
 
       if (staticent != null) 
       { objectRef.umlkind = Expression.CLASSID; 
-	  
+        // isStatic = true; 
+
         BehaviouralFeature bf = staticent.getStaticOperation(data,parameters); 
 
         if (bf != null) 
@@ -3614,8 +3617,8 @@ else if (staticent.hasDefinedAttribute(data))
 
             arrayType = type; 
             adjustTypeForArrayIndex(att); 
-            // System.out.println("*** Type of " + data + " is static ATTRIBUTE in entity " +
-            //                    staticent + " type is " + type + "(" + elementType + ") Modality = " + modality); 
+            System.out.println("*** Type of " + data + " is static ATTRIBUTE in entity " +
+                                staticent + " type is " + type + "(" + elementType + ") Modality = " + modality); 
             return res;
           } 
         } 
@@ -14119,14 +14122,36 @@ public String cg(CGSpec cgs)
     Vector eargs = new Vector(); 
     Vector textrules = new Vector(); 
 
+    if (("displayString".equals(data) || 
+         "displayint".equals(data) ||
+         "displaylong".equals(data) ||
+         "displaydouble".equals(data) ||
+         "displayboolean".equals(data) || 
+         "displaySequence".equals(data) ||
+         "displaySet".equals(data) ||
+         "displayMap".equals(data)) && 
+        parameters != null &&
+        parameters.size() == 1)
+    { Expression par1 = (Expression) parameters.get(0); 
+      args.add(par1.cg(cgs)); 
+      eargs.add(par1); 
+      CGRule r = cgs.matchedBasicExpressionRule(this,etext,textrules); 
+      if (r != null) 
+      { System.out.println(">> Matched rule: " + r + " to: " + etext + " with arguments= " + args); 
+       String res = r.applyRule(args,eargs,cgs);
+       return res;
+     }  
+   }
+
+
     if (umlkind == FUNCTION) 
     { // process as the corresponding unary or binary expression
       if ("allInstances".equals(data))
-	 { args.add(objectRef + ""); 
-	   eargs.add(objectRef); 
-	   CGRule r = cgs.matchedBasicExpressionRule(this,etext,textrules); 
-	   if (r != null) 
-	   { // System.out.println(">> Matched rule: " + r + " to: " + etext + " with arguments= " + args); 
+      { args.add(objectRef + ""); 
+        eargs.add(objectRef); 
+        CGRule r = cgs.matchedBasicExpressionRule(this,etext,textrules); 
+        if (r != null) 
+        { // System.out.println(">> Matched rule: " + r + " to: " + etext + " with arguments= " + args); 
          String res = r.applyRule(args,eargs,cgs);
          return res;
        }  
@@ -14244,7 +14269,13 @@ else if (objectRef != null)
           { parg = parg + ","; } 
           // need special processig for parameters
         } */ 
-        dataexp.parameters = null; 
+        dataexp.parameters = null;
+
+        System.out.println(dataexp + " is static: " + dataexp.isStatic); 
+        String dexcg = dataexp.cg(cgs); 
+        System.out.println(dexcg); 
+        System.out.println(); 
+ 
         args.add(dataexp.cg(cgs));
         args.add(pars); 
         eargs.add(dataexp);

BehaviouralFeature.java

@@ -808,11 +808,19 @@ public Statement extendBehaviour()
   public String cg(CGSpec cgs)
   { String etext = this + "";
     Vector args = new Vector();
-    args.add(getParameterisedName());
+    args.add(getName());
     Vector eargs = new Vector();
     eargs.add(this);
-    String pars = "";
 
+    String typePar = ""; 
+    if (typeParameters != null && typeParameters.size() > 0) 
+    { Type tp = (Type) typeParameters.get(0); 
+      typePar = tp.getName(); 
+      args.add(typePar); 
+      eargs.add(tp); 
+    } 
+
+    String pars = "";
     if (parameters == null) {} 
     else if (parameters.size() == 0) {} 
     else 
@@ -879,7 +887,7 @@ else if (parameters.size() == 0) {}
 
     CGRule r = cgs.matchedOperationRule(this,etext);
     if (r != null)
-    { // System.out.println(">>> Matched operation rule: " + r + " with args " + args); 
+    { System.out.println(">>> Matched operation rule: " + r + " with args " + args); 
       return r.applyRule(args,eargs,cgs); 
     }
     System.out.println("!!! No matching rule for operation " + getName()); 

BinaryExpression.java

@@ -3910,6 +3910,13 @@ else if (operator.equals("->restrict"))
       { type = new Type("Map", null); } 
     } 
 
+    if (operator.equals("->append") ||
+        operator.equals("->prepend") || 
+		operator.equals("^"))
+    { if (type == null) 
+      { type = new Type("Sequence", null); } 
+    } 
+
     Type etleft = left.getElementType(); 
     Type etright = right.getElementType(); 
     Type maxtype = etleft; 
@@ -3933,22 +3940,26 @@ else if (operator.equals("->including") ||
     { Type newleftET = Type.refineType(etleft,right.getType()); 
       System.out.println(">> Deduced element type of " + this + " = " + newleftET); 
       elementType = newleftET; 
+	  if (type == null)
+	  { type = new Type("Sequence", null); }
       type.setElementType(newleftET); 
     } 
     else if (operator.equals("->union") || 
              operator.equals("^"))
     { Type newleftET = Type.refineType(etleft,etright); 
       System.out.println(">> Deduced element type of " + this + " = " + newleftET); 
       elementType = newleftET; 
-      type.setElementType(newleftET); 
+	  if (type != null)
+      { type.setElementType(newleftET); } 
     } 
     else if (etleft != null) // if classes, take closest common super
     { elementType = maxtype;
-      type.setElementType(elementType); 
+      if (type != null) 
+	  { type.setElementType(elementType); }  
       if (etright == null)
       { right.setElementType(etleft); } 
     } // should be the same
-    else if (etright != null) 
+    else if (etright != null && type != null) 
     { elementType = maxtype; 
       type.setElementType(elementType); 
       left.setElementType(etright); 

CGCondition.java

@@ -143,7 +143,7 @@ else if (m instanceof ASTTerm &&
           else 
           { return false; } 
 
-          System.out.println(">>> Condition " + cond + " is satisfied by " + m); 
+          System.out.println("||| Condition " + cond + " is satisfied by " + m); 
         } 
       } 
     } 
@@ -161,14 +161,19 @@ public boolean stereotypeConditionSatisfied(ModelElement m, Vector entities)
   } 
 
   public boolean conditionSatisfied(Type t, Vector entities)
-  { System.out.println(">> Checking type condition " + t + " " + stereotype); 
+  { System.out.println("||| Checking type condition " + t + " " + stereotype); 
     System.out.println(); 
 
     if ("string".equals(stereotype.toLowerCase()) && t.isStringType())
     { return positive; }
 
     if ("class".equals(stereotype.toLowerCase()) && t.isEntityType(entities))
-    { System.out.println(">> Condition class satisfied for " + t); 
+    { System.out.println("||| Condition class satisfied for " + t); 
+      return positive; 
+    }
+
+    if ("interface".equals(stereotype.toLowerCase()) && t.isInterfaceType(entities))
+    { System.out.println("||| Condition interface satisfied for " + t); 
       return positive; 
     }
 
@@ -213,10 +218,16 @@ public boolean conditionSatisfied(Type t, Vector entities)
     { return positive; }
 
     if ("class".equals(stereotype.toLowerCase()) && !(t.isEntityType(entities)))
-    { System.out.println(t + " is not a class"); 
+    { System.out.println("||| " + t + " is not a class"); 
+      return !positive; 
+    }
+
+    if ("interface".equals(stereotype.toLowerCase()) && !(t.isInterfaceType(entities)))
+    { System.out.println("||| " + t + " is not an interface"); 
       return !positive; 
     }
 
+
     if ("void".equals(stereotype.toLowerCase()) && t != null && !t.isVoidType())
     { return !positive; }
 
@@ -258,6 +269,8 @@ public boolean conditionSatisfied(Type t, Vector entities)
 
   public boolean conditionSatisfied(Attribute a, Vector entities)
   { if ("primary".equals(stereotype.toLowerCase()) && a.isPrimaryAttribute())
+    { return positive; }
+    if ("static".equals(stereotype.toLowerCase()) && a.isStatic())
     { return positive; }
     if (a.hasStereotype(stereotype))
     { return positive; }
@@ -299,7 +312,7 @@ public boolean conditionSatisfied(Expression e, Vector entities)
     String tname = ""; 
 
     if (t == null) 
-    { System.err.println("!! ERROR: null type in: " + e); 
+    { System.err.println("!! WARNING: null type in: " + e); 
       // return false; 
     } 
     else 
@@ -465,6 +478,12 @@ else if ("StringRef".equals(stereotype))
       else 
       { return !(tname.equals("Ref") && etname.equals("String")); } 
     } 
+    else if ("static".equals(stereotype))
+    { if (positive) 
+      { return e.isStatic(); }
+      else 
+      { return !(e.isStatic()); } 
+    } 
     else if (edata.equals(stereotype))
     { return positive; } 
     else // _i is T   T is int, double, long, etc, or a enumeration or class name 

CGRule.java

@@ -595,6 +595,12 @@ else if ("type".equals(mffeat) &&
           String repl = t.cg(cgs); 
           res = replaceByMetafeatureValue(res,mf,repl);
         }
+        else if ("name".equals(mffeat) && 
+                 obj instanceof Expression)
+        { Expression e = (Expression) obj; 
+          String repl = e + ""; 
+          res = replaceByMetafeatureValue(res,mf,repl);
+        }
         else if ("type".equals(mffeat) && 
                  obj instanceof Attribute)
         { Attribute att = (Attribute) obj;