Updated Go code generator & libraries

Author: kevinlano

ASTBasicTerm.java

@@ -406,7 +406,9 @@ public Expression cexpressionToKM3(java.util.Map vartypes,
       { return new BasicExpression(65535); } 
       if ("ULONG_MAX".equals(value))
       { long mm = 1 + 2*(9223372036854775807L); 
-        return new BasicExpression(mm); 
+        Expression umax = new BasicExpression(mm);
+        umax.setBrackets(true); 
+        return umax;  
       } 
       if ("FLT_RADIX".equals(value))
       { return new BasicExpression(2); } 
@@ -452,6 +454,10 @@ public Expression cexpressionToKM3(java.util.Map vartypes,
       }
       if ("DBL_MIN_EXP".equals(value))
       { return new BasicExpression(-1021); } 
+      if ("EDOM".equals(value))
+      { return new BasicExpression(33); } 
+      if ("ERANGE".equals(value))
+      { return new BasicExpression(34); } 
 
 
 

ASTCompositeTerm.java

@@ -201,8 +201,8 @@ public String cgRules(CGSpec cgs, Vector rules)
       Vector vars = r.getVariables(); 
 
       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())
@@ -235,7 +235,7 @@ else if (tokens.size() == terms.size())
           if (tokens.size() > j+1)
           { nextTok = (String) tokens.get(j+1); } 
 
-          System.out.println(">> End token for _* is: " + nextTok); 
+          // System.out.println(">> End token for _* is: " + nextTok); 
           int remainingTokens = tokens.size() - (j+1); 
 
           boolean finished = false; 
@@ -254,26 +254,26 @@ else if (remainingTokens > remainingTerms)
             { rem.add(pterm); 
               k++;
             }  
-            System.out.println(">>> Terms for _* are: " + rem); 
+            // System.out.println(">>> Terms for _* are: " + rem); 
           } 
           eargs.add(rem); // corresponds to _* variable
         } 
         else if (vars.contains(tok))
         { // allocate terms(j) to tok
 
-          System.out.println(">> Matched variable " + tok + 
-                             " and term " + tm); 
+          // System.out.println(">> Matched variable " + tok + 
+          //                    " and term " + tm); 
           eargs.add(tm); 
           k++; 
         } 
         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 
-        { System.out.println("> " + tag + " rule " + r + " does not match " + this); 
-          System.out.println(tok + " /= " + tm.literalForm()); 
+        { // System.out.println("> " + tag + " rule " + r + " does not match " + this); 
+          // System.out.println(tok + " /= " + tm.literalForm()); 
           k++; 
           failed = true; // try next rule 
         } 
@@ -10759,13 +10759,12 @@ else if ("countTokens".equals(called))
           ASTTerm.setType(thisliteral,"int"); 
 
           if (arg.expression != null) 
-          { BasicExpression elems = 
-               BasicExpression.newBasicExpression(arg.expression, 
-"elements");
-            expression = new UnaryExpression("->size", elems);   
+          { expression = 
+               BasicExpression.newCallBasicExpression(
+                         "length", arg.expression);   
           }
 
-          return args + ".elements->size()"; 
+          return args + ".length()"; 
         } 
         else if ("get".equals(called) || "elementAt".equals(called)) 
         { ASTTerm callarg = (ASTTerm) callterms.get(2);
@@ -10787,6 +10786,15 @@ else if ("get".equals(called) || "elementAt".equals(called))
             }   
             return args + "->at(" + callp + ")"; 
           } 
+          else if ("OclIterator".equals(tt))
+          { if (arg.expression != null && 
+                callarg.expression != null) 
+            { expression = 
+                BasicExpression.newCallBasicExpression(
+                  "at", arg.expression, callarg.expression);
+            }   
+            return args + ".at(" + callp + ")"; 
+          } 
           else 
           { if (arg.expression != null && 
                 callarg.expression != null) 
@@ -11247,7 +11255,7 @@ else if ("addAll".equals(called) && arg.isCollection())
                   new AssignStatement(arg.expression, expression); 
               } 
 
-              return args + " := " + args + ".subrange(1, " + callp1 + ")->union(" + callp2 + ")->union(" + args + ".subrange(" + callp1 + "+1))"; 
+              return args + " := " + args + ".insertInto(" + callp1 + "+1, " + callp2 + ")"; 
             } 
             else 
             { if (arg.expression != null && 
@@ -14453,11 +14461,11 @@ else if (arg.isDate() &&
 
           if (arg.expression != null) 
           { expression = 
-              BasicExpression.newBasicExpression(
-                 arg.expression, "time"); 
+              BasicExpression.newCallBasicExpression(
+                 "getTime", arg.expression); 
           } 
 
-          return args + ".time"; 
+          return args + ".getTime()"; 
         } 
         else if (arg.isDate() && 
                  "setTimeInMillis".equals(called))

BSystemTypes.java

@@ -5562,8 +5562,8 @@ public static String generateTimeOp()
   }
 
   public static String generateTimeOpCPP()
-  { String res = "    static long getTime()\n" +
-    "    { return time(NULL); }\n\n";
+  { String res = "    static long long getTime()\n" +
+    "    { return 1000*time(NULL); }\n\n";
     res = res + "    static struct tm* getDate()\n" +
     "    { time_t t = time(NULL);\n" + 
     "      struct tm* res = localtime(&t);\n" + 

PreProcessModels.java

@@ -972,6 +972,80 @@ else if (operationExamples.size() > programOperationExamples.size())
 
   }
 
+  public static void parseExamples(String fname, Vector sexamples, Vector texamples)
+  { // reads file fname, each line is an example 
+    // stext tabs ttext
+    // sexamples will be the LHS texts, texamples the 
+    // RHS texts
+
+    try 
+    { File tfile = new File(fname);
+	  
+      if (tfile == null) { return; }
+	 
+      System.out.println(">>> Loading examples from " + fname);
+ 
+      BufferedReader br = null;
+      String s;
+      boolean eof = false;
+    
+      try
+      { br = new BufferedReader(new FileReader(tfile)); }
+      catch (FileNotFoundException fnfe)
+      { System.out.println("File not found: " + tfile.getName());
+        return; 
+      }
+  
+      int linecount = 0; 
+
+      while (!eof)
+      { try 
+        { s = br.readLine(); }
+        catch (IOException ioe)
+        { System.out.println("!! Reading " + tfile.getName() + " failed.");
+          return; 
+        }
+
+        if (s == null) 
+        { eof = true; 
+          break; 
+        }
+
+        s = s.trim();
+
+        if (s.length() == 0) 
+        { continue; } 
+
+        String progstring = ""; 
+        int tabindex = s.indexOf("\t"); 
+        if (tabindex >= 0) 
+        { progstring = s.substring(tabindex+1,s.length());
+          s = s.substring(0,tabindex);
+          tabindex = progstring.indexOf("\t");   
+          while (tabindex >= 0)
+          { progstring = progstring.substring(tabindex+1,progstring.length()); 
+            tabindex = progstring.indexOf("\t");   
+          }
+
+          System.out.println(">> Source text: " + s); 
+          sexamples.add(s); 
+          
+          System.out.println(">> Target text: " + progstring); 
+          texamples.add(progstring); 
+        }  
+    
+        linecount++;
+      } 
+
+      br.close(); 
+    } catch(Exception e)
+      { System.err.println(">>> Error processing " + fname); }
+
+    System.out.println(">> Source examples: " + sexamples); 
+    System.out.println(">> Target examples: " + texamples);
+  } 
+
+
   public static void main(String[] args)
   { PreProcessModels.preprocess(); }