Updated C code generator

Author: kevinlano

ASTTerm.java

@@ -794,7 +794,7 @@ public static TypeMatching createNewFunctionalMapping(String name, ASTTerm[] str
 
     // If an identity mapping, return _1 |-->_1
 
-    // A "default" case _1 |--> v is included where v is the 
+    // A "default" case _* |--> v is included where v is the 
     // most frequent target of different source values. 
 
     Type str = new Type("String", null); 
@@ -834,13 +834,13 @@ public static TypeMatching createNewFunctionalMapping(String name, ASTTerm[] str
       }     
     } 
 
-    System.out.println(">> Default mapping is _1 |-->" + defaultValue); 
+    System.out.println(">> Default mapping is _* |-->" + defaultValue); 
 
 
     tm.setStringValues(sattvalues,tattvalues);
 
     if (defaultValue != null) 
-    { tm.addDefaultMapping("_1", defaultValue); } 
+    { tm.addDefaultMapping("_*", defaultValue); } 
 
     return tm; 
   } 

CGCondition.java

@@ -507,7 +507,9 @@ public boolean conditionSatisfied(Statement e, Vector entities)
   } // and for other kinds of statement also 
 
   public boolean conditionSatisfied(ASTTerm a, Vector entities)
-  { if (a instanceof ASTCompositeTerm)
+  { String alit = a.literalForm(); 
+
+    if (a instanceof ASTCompositeTerm)
     { ASTCompositeTerm ac = (ASTCompositeTerm) a; 
 
       if (ac.tag.equalsIgnoreCase(stereotype))
@@ -534,6 +536,13 @@ else if (a instanceof ASTSymbolTerm)
       return positive; 
     } 
 
+    if ("Class".equals(stereotype))
+    { if (Type.isOclEntityType(alit,entities)) 
+      { return positive; } 
+      else 
+      { return !positive; } 
+    }  
+
     if ("updatesObject".equals(stereotype))
     { if (a.updatesObject(null))
       { return positive; } 

Compiler2.java

@@ -3767,6 +3767,10 @@ public ASTTerm parseGeneralAST(String xstring)
 
   public ASTTerm parseGeneralAST(int st, int en)
   { ASTTerm res = null; 
+  
+    if (lexicals == null || lexicals.size() == 0) 
+	{ return res; }
+	
     String lex = lexicals.get(st) + ""; 
 
     if (st == en) 
@@ -9121,6 +9125,13 @@ public static void main(String[] args)
     // Statement stat = c.parseStatement(); 
     // System.out.println(stat); 
 
+    Compiler2 comp = new Compiler2();  
+    Vector vv = new Vector(); 
+    comp.nospacelexicalanalysis("x <>= y"); 
+    Expression tt = comp.parseExpression(vv,vv); 
+        
+    System.out.println(tt); 
+
     // c = new Compiler2(); 
 
     // c.nospacelexicalanalysis("i < v->size() & i < w->size()"); 

ConditionalExpression.java

@@ -579,9 +579,9 @@ public String toString()
   } 
 
   public String toAST()
-  { String res = "(ConditionalExpression if " + test.toAST() + " then " + ifExp.toAST() + " else " + elseExp.toAST() + " endif )"; 
-    if (needsBracket) 
-    { res = "(BracketedExpression ( " + res + " ) )"; } 
+  { String res = "(OclConditionalExpression if " + test.toAST() + " then " + ifExp.toAST() + " else " + elseExp.toAST() + " endif )"; 
+    // if (needsBracket) 
+    // { res = "(BracketedExpression ( " + res + " ) )"; } 
     return res; 
   } 
 

Expression.java

@@ -1564,12 +1564,13 @@ public static boolean isOclBinaryInfix(Expression expr)
       String op = ue.getOperator(); 
       if ("+".equals(op) || "-".equals(op) || 
           "*".equals(op) || "&".equals(op) || 
-          "^".equals(op) || 
+          "^".equals(op) || "<>=".equals(op) || 
           "/".equals(op) || "div".equals(op) || 
           "mod".equals(op) || "and".equals(op) || 
           "or".equals(op) || "xor".equals(op) || 
           "<".equals(op) || "<=".equals(op) || 
           "=".equals(op) || "/=".equals(op) ||
+          "=>".equals(op) || 
           ">".equals(op) || ">=".equals(op))
       { return true; } 
       if (op.startsWith("->"))

SetExpression.java

@@ -215,7 +215,7 @@ else if (ordered)
   }
 
   public String toAST()
-  { String res = "(OclSetExpression ";
+  { String res = "(OclCollectionExpression ";
 
     if (type != null && "Ref".equals(type.getName()))
     { res = "Ref { "; } 
@@ -231,7 +231,7 @@ else if (ordered)
       return res; 
     } 
 
-    res = res + " (ElementList "; 
+    res = res + " (OclElementList "; 
 
     for (int i = 0; i < elements.size(); i++)
     { Expression elem = (Expression) elements.get(i); 

Type.java

@@ -159,13 +159,21 @@ public boolean isEntityType(Vector ents)
     Entity ex = (Entity) ModelElement.lookupByName(name, ents);
     if (ex != null) 
     { return true; } 
-    if ("OclType".equals(name) || "OclAny".equals(name) ||
-        "OclProcess".equals(name) ||  
-        "OclFile".equals(name) || "OclRandom".equals(name))
+    if (isOclClassifierType(name))
     { return true; } 
     return false; 
  } 
 
+  public static boolean isOclEntityType(String tname, Vector ents) 
+  { Entity ex = (Entity) ModelElement.lookupByName(tname, ents);
+    if (ex != null) 
+    { return true; } 
+    if (isOclClassifierType(tname))
+    { return true; } 
+    return false; 
+ } 
+
+
   public boolean isInterfaceType(Vector ents) 
   { if (entity != null && entity.isInterface())
     { return true; } 
@@ -2074,9 +2082,19 @@ public static boolean isClassifierType(Type e)
   { if (e == null) 
     { return false; } 
     String estr = e + ""; 
+    return isOclClassifierType(estr); 
+  } 
+
+  public static boolean isOclClassifierType(String estr)
+  {
     if ("String".equals(estr) || "OclDate".equals(estr) ||
         "OclAny".equals(estr) || "OclType".equals(estr) || 
-        "OclProcess".equals(estr) || "OclFile".equals(estr) ||
+        "OclAttribute".equals(estr) || 
+        "OclOperation".equals(estr) ||
+        "OclProcess".equals(estr) || 
+        "OclProcessGroup".equals(estr) || 
+        isExceptionType(estr) ||
+        "OclFile".equals(estr) ||
         "OclRandom".equals(estr))
     { return true; } 
     return false; 

UCDArea.java

@@ -12765,7 +12765,7 @@ public void testCSTLwithASTS()
         if (xx == null) 
         { System.err.println("!!ERROR: Invalid text for general AST at line " + noflines + ":"); 
           System.err.println(c.lexicals); 
-          return; 
+          // return; 
         }
         else 
         { res.add(xx); }