Updates to CGBE and UML2C

Author: kevinlano

ASTBasicTerm.java

@@ -370,13 +370,22 @@ public Expression cexpressionToKM3(java.util.Map vartypes,
 
       if ("EOF".equals(value))
       { return new BasicExpression(-1); }
+
+
       if ("HUGE_VAL".equals(value))
       { Expression resx =
           new BasicExpression("Math_PINFINITY");
         resx.setType(new Type("double", null)); 
         return resx; 
       } 
 
+      if ("NAN".equals(value))
+      { Expression resx =
+          new BasicExpression("Math_NaN");
+        resx.setType(new Type("double", null)); 
+        return resx; 
+      } 
+
       if ("CHAR_BIT".equals(value))
       { return new BasicExpression(8); } 
       if ("CHAR_MAX".equals(value))

ASTCompositeTerm.java

@@ -6955,6 +6955,15 @@ else if ("toupper".equals(fname) && args.size() == 1)
       res.setType(new Type("int", null));  
       return res; 
     }
+    else if ("isnan".equals(fname) && 
+             args.size() == 1)
+    { Expression arg1 = (Expression) args.get(0); 
+          
+      UnaryExpression res = 
+        new UnaryExpression("->oclIsInvalid", arg1); 
+      res.setType(new Type("boolean", null)); 
+      return res; 
+    } 
     else if ("strcpy".equals(fname) && args.size() == 2)
     { Expression arg1 = (Expression) args.get(1);
       arg1.setType(new Type("String", null)); 

ASTTerm.java

@@ -75,7 +75,8 @@ public abstract class ASTTerm
     cqueryfunctions.add("isgraph"); 
     cqueryfunctions.add("isprint"); 
     cqueryfunctions.add("ispunct"); 
-    cqueryfunctions.add("isxdigit"); 
+    cqueryfunctions.add("isxdigit");
+    cqueryfunctions.add("isnan");  
     cqueryfunctions.add("calloc"); 
     cqueryfunctions.add("malloc"); 
     // cqueryfunctions.add("realloc"); 
@@ -1317,6 +1318,61 @@ public static boolean lowerNonSymbolArity(ASTTerm[] xs, ASTTerm[] ys)
       return false; 
     }
 
+    public static Vector targetBrackets(ASTTerm[] xs, ASTTerm[] ys)
+    { // Is each ys[i].terms starts with same symbol and 
+      // ends with another or same symbol? Return these symbols 
+      Vector res = new Vector(); 
+      String startSymbol = null; 
+      String endSymbol = null; 
+      
+      if (ys.length > 1 && xs.length == ys.length)
+      { for (int i = 0; i < xs.length; i++)
+        { ASTTerm xx = xs[i]; 
+          ASTTerm yy = ys[i]; 
+
+          if (xx == null || yy == null)
+          { return null; } 
+
+          int n = xx.arity(); 
+          int m = yy.arity(); 
+        
+          if (m < 2) 
+          { return null; } 
+
+          // ASTTerm s0 = xx.getTerm(0); 
+          // ASTTerm sn = xx.getTerm(n-1); 
+
+          ASTTerm t0 = yy.getTerm(0); 
+          ASTTerm tn = yy.getTerm(m-1); 
+
+          if (t0 instanceof ASTSymbolTerm && 
+              tn instanceof ASTSymbolTerm)
+          { if (startSymbol == null) 
+            { startSymbol = t0.literalForm(); } 
+            else if (startSymbol.equals(t0.literalForm())) { } 
+            else 
+            { return null; } // not consistent start symbols
+
+            if (endSymbol == null) 
+            { endSymbol = tn.literalForm(); } 
+            else if (endSymbol.equals(tn.literalForm())) { } 
+            else 
+            { return null; } // not consistent end symbols
+          } 
+          else 
+          { return null; } 
+          // Should also be different to s0, sn
+        } 
+        
+        if (startSymbol != null && endSymbol != null)
+        { res.add(startSymbol); 
+          res.add(endSymbol); 
+          return res; 
+        } 
+      } 
+      return null; 
+    }
+
 
 /* 
     public static boolean embeddedTrees(ASTTerm[] xs, ASTTerm[] ys, ModelSpecification mod)

BasicExpression.java

@@ -780,8 +780,14 @@ public static void updateVariableType(Expression lhs, Expression rhs)
   { if (lhs instanceof BasicExpression)
     { BasicExpression be = (BasicExpression) lhs; 
       if (be.variable != null)
-      { Type elemType = rhs.getElementType(); 
+      { Type elemType = rhs.getElementType();
+
+        System.out.println(">>> RHS element type: " + elemType); 
+ 
         Type oldElemType = be.variable.getElementType(); 
+
+        System.out.println(">>> old element type: " + oldElemType); 
+
         be.variable.setElementType( 
           Type.refineType(oldElemType,elemType));
         System.out.println(">> From " + lhs + " := " + rhs + " deduced element type " + be.variable.getElementType() + " for " + be.data);
@@ -2091,7 +2097,7 @@ public String toAST()
     { res = res + " ( "; 
 
       if (parameters.size() > 0)
-      { res = res + "(ParameterArgument "; } 
+      { res = res + " (ParameterArguments "; } 
 
       for (int i = 0; i < parameters.size(); i++)
       { res = res + ((Expression) parameters.get(i)).toAST(); 
@@ -2102,7 +2108,7 @@ public String toAST()
       if (parameters.size() > 0)
       { res = res + " ) "; } 
 
-      res = res + " )"; 
+      res = res + " ) "; 
     }
 
     if (arrayIndex != null)
@@ -2255,7 +2261,7 @@ else if (type != null && type.elementType != null)
       out.println(res + ".elementType = " + tet); 
     } 
     else 
-    { System.err.println("Warning!: no element type for " + this); 
+    { System.err.println("!!! Warning!: no element type for " + this); 
       out.println(res + ".elementType = " + tname); 
     } 
 
@@ -3126,6 +3132,8 @@ public boolean typeCheck(final Vector types, final Vector entities,
         "OclDate".equals(data) || "OclAny".equals(data) || 
         "OclType".equals(data) || "OclFile".equals(data) || 
         "OclRandom".equals(data) ||
+        "OclAttribute".equals(data) || 
+        "OclOperation".equals(data) || 
         Type.isOclExceptionType(data) ||  
         "OclProcess".equals(data) || 
         "OclProcessGroup".equals(data))
@@ -3239,6 +3247,7 @@ else if (objectRef.elementType != null && objectRef.elementType.isEntity())
     { type = new Type("OclDate", null); 
       umlkind = UPDATEOP;
       isStatic = true;  
+      entity = (Entity) ModelElement.lookupByName("OclDate",entities);  
       multiplicity = ModelElement.ONE; 
       // set the formal parameters
       if (parameters != null && parameters.size() > 0) 
@@ -3332,16 +3341,21 @@ else if (createdClass.startsWith("OclIterator_String"))
       { type = new Type("long", null);
         umlkind = ATTRIBUTE; 
         multiplicity = ModelElement.ONE; 
- 
+        entity = (Entity) ModelElement.lookupByName("OclDate",entities);  
+
         return true;
       }  
     } 
 
     if ("getSystemTime".equals(data) && "OclDate".equals(objectRef + "")) 
     { type = new Type("long", null);
       umlkind = QUERY;
-      isStatic = true;  
+      isStatic = true;
+      entity = (Entity) ModelElement.lookupByName("OclDate",entities);  
+  
       multiplicity = ModelElement.ONE; 
+      entity = 
+       (Entity) ModelElement.lookupByName("OclDate",entities);  
 
       return true;
     } 
@@ -3352,7 +3366,8 @@ else if (createdClass.startsWith("OclIterator_String"))
           objectRef.type.getName().equals("OclDate")) 
       { umlkind = QUERY; 
         multiplicity = ModelElement.ONE; 
-        type = new Type("long", null); 
+        type = new Type("long", null);
+        entity = (Entity) ModelElement.lookupByName("OclDate",entities);  
         return true;
       }  
     } 
@@ -3364,6 +3379,8 @@ else if (createdClass.startsWith("OclIterator_String"))
       { type = new Type("void", null); 
         umlkind = UPDATEOP; 
         multiplicity = ModelElement.ONE; 
+        entity = 
+          (Entity) ModelElement.lookupByName("OclDate",entities);
         // set the formal parameters
         if (parameters != null && parameters.size() > 0) 
         { Expression par1 = (Expression) parameters.get(0); 
@@ -3383,7 +3400,8 @@ else if (createdClass.startsWith("OclIterator_String"))
           objectRef.type.getName().equals("OclDate")) 
       { type = new Type("boolean", null); 
         umlkind = QUERY; 
-        multiplicity = ModelElement.ONE; 
+        multiplicity = ModelElement.ONE;
+        entity = (Entity) ModelElement.lookupByName("OclDate",entities); 
         // set the formal parameters
         if (parameters != null && parameters.size() > 0) 
         { Expression par1 = (Expression) parameters.get(0); 
@@ -3403,7 +3421,9 @@ else if (createdClass.startsWith("OclIterator_String"))
           objectRef.type.getName().equals("OclDate")) 
       { type = new Type("boolean", null); 
         umlkind = QUERY; 
-        multiplicity = ModelElement.ONE; 
+        multiplicity = ModelElement.ONE;
+        entity = 
+          (Entity) ModelElement.lookupByName("OclDate",entities); 
         if (parameters != null && parameters.size() > 0) 
         { Expression par1 = (Expression) parameters.get(0); 
           Attribute fpar1 = new Attribute("d", 
@@ -3851,8 +3871,10 @@ else if (data.equals("size") || data.equals("floor") || data.equals("count") ||
       { type = new Type("int",null); 
         elementType = type; 
       }
-      else if (data.equals("sort") || data.equals("characters") ||
-               data.equals("sortedBy") || data.equals("asSequence") ||
+      else if (data.equals("sort") || 
+               data.equals("characters") ||
+               data.equals("sortedBy") || 
+               data.equals("asSequence") ||
                data.equals("allInstances"))
       { type = new Type("Sequence",null); 
         elementType = objectRef.elementType; 
@@ -3910,6 +3932,7 @@ else if (data.equals("reverse") ||
                data.equals("tail") || 
                data.equals("front") || 
                data.equals("insertAt") || 
+               data.equals("insertInto") || 
                data.equals("setAt"))  
       { type = objectRef.getType(); // Sequence or String
         elementType = objectRef.elementType; 
@@ -4507,7 +4530,8 @@ else if (resType == null || resType.typeMultiplicity() == ModelElement.ONE)
   private void adjustTypeForArrayIndex()
   { // if there is an arrayIndex, make type = elementType, etc
 
-    if (arrayIndex != null && "String".equals(type + ""))
+    if (arrayIndex != null && type != null && 
+        "String".equals(type.getName()))
     { elementType = new Type("String", null); 
       multiplicity = ModelElement.ONE; 
     } 

BehaviouralFeature.java

@@ -3099,7 +3099,7 @@ public String toAST()
     res = res + getName() + tpars + " ( ";
 
     if (parameters != null && parameters.size() > 0)
-    { res = res + "(OclParameterList "; 
+    { res = res + " (OclParameterList "; 
       for (int i = 0; i < parameters.size(); i++)
       { Attribute par = (Attribute) parameters.get(i);
         String pnme = par.toASTParameter();

BinaryExpression.java

@@ -3445,13 +3445,15 @@ else if (type.getElementType() != null)
       { elementType = left.getElementType(); } 
     }  
     else if ("->at".equals(operator))
-    { if ("String".equals(left.type + ""))
+    { if (left.type != null && "String".equals(left.type.getName()))
       { type = new Type("String", null); 
         elementType = type; 
       }  
       else 
       { type = left.elementType;
-        if (type != null) 
+        if (type != null && "String".equals(type.getName()))
+        { elementType = type; } 
+        else if (type != null)  
         { elementType = type.getElementType(); } 
         else 
         { Attribute leftvar = (Attribute) ModelElement.lookupByName(left + "", env); 

Compiler2.java

@@ -4805,12 +4805,17 @@ public static String isKeywordOrPart(String st, String[] mess)
 
 
       if ("String".startsWith(st)) 
-      { mess[0] = "String type. Empty string is \"\"\nOperators include:  s->size()  s1 + s2  s1->indexOf(s2)  s->at(index)  s->display()  s->tail()  s->first()\ns.subrange(i,j)  s.subrange(i)  s->isMatch(pattern)  s->allMatches(patt)  s->trim()\n"; 
+      { mess[0] = "String type String. Empty string is \"\"\n" + 
+          "Operators include:  s->size()  s1 + s2  s1->indexOf(s2)  s->at(index)\n" + 
+          "s->display()  s->tail()  s->first()\n" + 
+          "s.subrange(i,j)  s.subrange(i)  s.setAt(i,ch)\n" + 
+          "s->isMatch(pattern)  s->allMatches(patt)  s->trim()\n"; 
         return "String"; 
       }
 
       if ("int".startsWith(st)) 
-      { mess[0] = "32-bit integer type, from -(2->pow(31)) to 2->pow(31)-1\n" + 
+      { mess[0] = "32-bit integer type int,\n" + 
+          "ranges from -(2->pow(31)) to 2->pow(31)-1\n" + 
           "Operators include: x mod y  x div y\n" + 
           "and usual arithmetic operators * / - + < <= > >= = /= etc"; 
         return "int"; 
@@ -5084,7 +5089,8 @@ public static String isKeywordOrPart(String st, String[] mess)
 
 
     if ("long".startsWith(st)) 
-    { mess[0] = "64-bit integer type, from -(2->pow(63)) to (2->pow(63)-1)\n" +  
+    { mess[0] = "64-bit integer type long,\n" + 
+          "ranges from -(2->pow(63)) to (2->pow(63)-1)\n" +  
           "Operators include: x mod y  x div y\n" + 
           "and usual arithmetic operators * / - + < <= > >= = /= etc"; 
 
@@ -5093,7 +5099,9 @@ public static String isKeywordOrPart(String st, String[] mess)
 
 
     if ("boolean".startsWith(st)) 
-    { mess[0] = "Boolean-values type, values are true and false\nOperators include:  b1 & b2  b1 or b2  not(b)  b1 => b2"; 
+    { mess[0] = "Boolean-values type boolean,\n" + 
+                "values are true and false\n" + 
+                "Operators include:  b1 & b2  b1 or b2  not(b)  b1 => b2"; 
       return "boolean"; 
     } 
 

Entity.java

@@ -8518,12 +8518,12 @@ else if (interfaces.size() > 0)
     if (Entity.isEmptyClass(this)) 
     { res = res + " " + nme + " { "; } 
     else 
-    { res = res + " " + nme + " (OclClassContents { "; }
+    { res = res + " " + nme + " { (OclClassContents "; }
 
-    for (int i = 0; i < stereotypes.size(); i++) 
-    { String stereo = (String) stereotypes.get(i); 
-      res = res + "  stereotype " + stereo + " ; "; 
-    }
+    // for (int i = 0; i < stereotypes.size(); i++) 
+    // { String stereo = (String) stereotypes.get(i); 
+    //   res = res + "  stereotype " + stereo + " ; "; 
+    // }
 
     for (int i = 0; i < invariants.size(); i++) 
     { Constraint con = (Constraint) invariants.get(i);
@@ -8553,10 +8553,10 @@ else if (interfaces.size() > 0)
     if (Entity.isEmptyClass(this)) 
     { res = res + " } )"; }  
     else 
-    { res = res + " } ) )"; }
+    { res = res + " ) } )"; }
 
     return res;    
-  } // and operations
+  } 
 
 
   public String stereotypesKM3() 

KM3Editor.java

@@ -100,9 +100,9 @@ public KM3Editor(UCDArea parent, Vector ents, Vector ucs)
         }
 
         JScrollPane scrollPane = new JScrollPane(textPane);
-        scrollPane.setPreferredSize(new Dimension(100, 300));
+        scrollPane.setPreferredSize(new Dimension(150, 300));
 
-        messageArea = new JTextArea(20, 35);
+        messageArea = new JTextArea(15, 45);
         messageArea.setEditable(false);
         JScrollPane scrollPaneForLog = new JScrollPane(messageArea);