Updated C code generators

Author: kevinlano

ASTBasicTerm.java

@@ -60,6 +60,12 @@ public ASTTerm getTerm(int i)
     return null; 
   }
 
+  public Vector getTerms()
+  { Vector res = new Vector(); 
+    res.add(new ASTSymbolTerm(value));
+    return res; 
+  }  
+
   public void setValue(String v)
   { value = v; } 
 
@@ -97,6 +103,10 @@ public Vector tokenSequence()
     return res; 
   } 
 
+  public int termSize() 
+  { return 1; } 
+
+
   public String asTextModel(PrintWriter out)
   { String id = Identifier.nextIdentifier(tag); 
     out.println(id + " : " + tag);  

ASTCompositeTerm.java

@@ -200,6 +200,15 @@ public Vector tokenSequence()
     return res; 
   } 
 
+  public int termSize()
+  { int res = 0;  
+    for (int i = 0; i < terms.size(); i++) 
+    { ASTTerm t = (ASTTerm) terms.get(i); 
+      res = res + t.termSize(); 
+    } 
+    return res; 
+  } 
+
   public String asTextModel(PrintWriter out)
   { String id = Identifier.nextIdentifier(tag);
 
@@ -231,9 +240,12 @@ public String cgRules(CGSpec cgs, Vector rules)
       Vector tokens = r.lhsTokens; 
       Vector vars = r.getVariables(); 
 
+      java.util.HashMap matches = new java.util.HashMap(); 
+      // vars --> terms
+
       if (tokens.size() > terms.size())
-      { // System.out.println("> " + tag + " rule " + r + " does not match " + this);  
-        // System.out.println("!! Too many elements on rule LHS (" + tokens.size() + ") to match subterms: (" + terms.size() + ")"); 
+      { System.out.println("> " + tag + " rule " + r + " does not match " + this);  
+        System.out.println("!! Too many elements on rule LHS (" + tokens.size() + ") to match subterms: (" + terms.size() + ")"); 
         continue; 
       } 
       else if (vars.contains("_*") && terms.size() >= tokens.size())
@@ -292,14 +304,31 @@ else if (remainingTokens > remainingTerms)
         else if (vars.contains(tok))
         { // allocate terms(j) to tok
 
-          // System.out.println(">> Matched variable " + tok + 
-          //                    " and term " + tm); 
-          eargs.add(tm); 
-          k++; 
+          System.out.println(">> Matched variable " + tok + 
+                              " and term " + tm);
+
+          ASTTerm oldterm = (ASTTerm) matches.get(tok); 
+          if (oldterm == null)
+          { matches.put(tok,tm); 
+
+            eargs.add(tm); 
+            k++; 
+          } 
+          else if (oldterm.equals(tm)) 
+          { 
+            eargs.add(tm); 
+            k++; 
+          } 
+          else 
+          { System.err.println("!! Same variable " + tok + 
+                               " assigned different terms: " + 
+                               oldterm + " " + tm); 
+            failed = true; 
+          } 
         } 
         else if (tok.equals(tm.literalForm()))
-        { // System.out.println(">> Matched token " + tok + 
-          //                    " and term " + tm); 
+        { System.out.println(">> Matched token " + tok + 
+                              " and term " + tm); 
           k++; 
         } 
         else 
@@ -18391,7 +18420,18 @@ else if (restype != null)
       { ASTTerm mbody = (ASTTerm) terms.get(3);
 
         if (";".equals(mbody.literalForm()))
-        { return res + ";\n"; }  
+        { if (mtype.modelElement != null && 
+              mtype.modelElement instanceof Type) 
+          { Expression retval = 
+              ((Type) mtype.modelElement).getDefaultValueExpression();
+            Statement interfacestat = 
+              new ReturnStatement(retval); 
+            bf.setActivity(interfacestat);  
+            return res + "\n  activity: return " + retval + ";\n"; 
+          } 
+          return res + ";\n"; 
+        }
+  
         res = res + "\n  activity:\n"; 
 
         for (int i = 3; i < terms.size(); i++) 

ASTSymbolTerm.java

@@ -91,6 +91,9 @@ public Vector symbolTerms()
   public Vector nonSymbolTerms()
   { return new Vector(); } 
 
+  public Vector getTerms()
+  { return new Vector(); } 
+
   public ASTTerm removeOuterTag()
   { return null; }  
 
@@ -103,6 +106,9 @@ public Vector tokenSequence()
     return res; 
   } 
 
+  public int termSize() 
+  { return 1; } 
+
   public String asTextModel(PrintWriter out)
   { return "\"" + symbol + "\""; }