Code generator files for Swift 4/5 and Java 8

cgSwift.cstl and cgJava8.cstl are the main CSTL files for code generating Swift and Java. Place these & auxiliary CSTL files in a subdirectory cg of your tool directory. The default CSTL file used should be named cg.cstl. Ocl.swift and Ocl.java are the OCL libraries assumed by these generators.

Author: kevinlano

Ocl.java

@@ -1,6 +1,8 @@
+package com.example.app6;
+
 
 /******************************
-* Copyright (c) 2003,2019 Kevin Lano
+* Copyright (c) 2003,2020 Kevin Lano
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License 2.0 which is available at
 * http://www.eclipse.org/legal/epl-2.0
@@ -178,7 +180,42 @@ public static <T> ArrayList<T> initialiseSequence(T ... args)
       { result.add(args[i]); } 
       return result; 
     } 
+	
+	public static <T> copySet(Collection<T> s)
+	{ HashSet<T> result = new HashSet<T>(); 
+      result.addAll(s); 
+	  return result; 
+	} 
+
+	public static <T> copySequence(Collection<T> s)
+	{ ArrayList<T> result = new ArrayList<T>(); 
+      result.addAll(s); 
+	  return result; 
+	} 
+
+    public static <T extends Comparable> T min(Collection<T> s)
+    { ArrayList<T> slist = new ArrayList<T>(); 
+	  slist.addAll(s); 
+	  T result = slist.get(0); 
+      for (int i = 1; i < slist.size(); i++) 
+      { T val = slist.get(i); 
+	    if (val.compareTo(result) < 0) 
+        { result = val; } 
+      } 
+      return result; 
+    } 
 
+    public static <T extends Comparable> T max(Collection<T> s)
+    { ArrayList<T> slist = new ArrayList<T>(); 
+	  slist.addAll(s); 
+	  T result = slist.get(0); 
+      for (int i = 1; i < slist.size(); i++) 
+      { T val = slist.get(i); 
+	    if (0 < val.compareTo(result)) 
+        { result = val; } 
+      } 
+      return result; 
+    } 
 
 
     public static <T> HashSet<T> addSet(HashSet<T> s, T x)
@@ -492,7 +529,7 @@ static <T> ArrayList<T> mergeSort(final ArrayList<T> a, java.util.Map<T,Comparab
   }
 
 
-  public static ArrayList<Integer> integerSubrange(int i, int j)
+  public static ArrayList<Integer> integerSubrange(int i, double j)
   { ArrayList<Integer> tmp = new ArrayList<Integer>(); 
     for (int k = i; k <= j; k++)
     { tmp.add(new Integer(k)); } 
@@ -906,5 +943,51 @@ public static <D,R> Map<D,R> addMap(Map<D,R> m, D key, R value)
   { m.put(key,value);
     return m;
   }
-  
+
+ public static ArrayList<String> tokeniseCSV(String line)
+ { StringBuffer buff = new StringBuffer();
+   int x = 0;
+   int len = line.length();
+   boolean instring = false;
+   ArrayList<String> res = new ArrayList<String>();
+   while (x < len)
+   { char chr = line.charAt(x);
+     x++;
+     if (chr == ',')
+     { if (instring) { buff.append(chr); }
+       else
+       { res.add(buff.toString().trim());
+         buff = new StringBuffer();
+       }
+     }
+     else if ('"' == chr)
+     { if (instring) { instring = false; }
+       else { instring = true; } 
+     }
+     else
+     { buff.append(chr); }
+   }
+   res.add(buff.toString().trim());
+   return res;
+ }
+
+ public static ArrayList<String> parseCSVtable(String rows)
+ { StringBuffer buff = new StringBuffer();
+   int x = 0;
+   int len = rows.length();
+   boolean instring = false;
+   ArrayList<String> res = new ArrayList<String>();
+   while (x < len)
+   { char chr = rows.charAt(x);
+     x++;
+     if (chr == '\n')
+     { res.add(buff.toString().trim());
+       buff = new StringBuffer();
+     }
+     else
+     { buff.append(chr); }
+   }
+   res.add(buff.toString().trim());
+   return res;
+ }  
 }

Ocl.swift

@@ -13,17 +13,6 @@ import Glibc
 
 class Ocl
 {
-  static func displayString(s: String) 
-  { print(s) } 
-
-  static func displayint(s: Int) 
-  { print(String(s)) } 
-
-  static func displaylong(s: Int) 
-  { print(String(s)) } 
-
-  static func displaydouble(s: Double) 
-  { print(String(s)) } 
 
   static func includingSet<T>(s : Set<T>, x : T) -> Set<T>
   { var result : Set<T> = Set<T>()
@@ -39,6 +28,18 @@ class Ocl
     return result
   }
 
+  static func copySet<T>(s : Set<T>) -> Set<T>
+  { var result : Set<T> = Set<T>()
+    result.formUnion(s)
+    return result
+  }
+
+  static func copySequence<T>(s : [T]) -> [T]
+  { var result : [T] = [T]()
+    result = result + s
+    return result
+  }
+
   static func prepend<T>(s : [T], x : T) -> [T]
   { var result : [T] = [T]()
     result = result + s
@@ -624,6 +625,17 @@ class Ocl
   return ""
 }
 
+ static func indexOf(str: String, ch: String) -> Int
+{ var count = 0
+  for index in str.indices
+  { let c : Character = str[index]
+    count = count + 1
+    if (String(c) == ch) 
+    { return count } 
+  } 
+  return 0
+}
+
  static func stringSubrange(str : String, st : Int, en : Int) -> String
   { var result : [Character] = [Character]()
     var count : Int = 0
@@ -696,6 +708,23 @@ class Ocl
     return String(rev)
   }
 
+   static func toLineSequence(str: String) -> [String]
+   { var result : [String] = [String]()
+     var buffer : String = ""
+	 
+     for index in str.indices
+     { let c : Character = str[index]
+       if "\n" == String(c)
+       { result.append(buffer) 
+	     buffer = String() 
+	   } 
+	   else 
+	   { buffer = buffer + String(c) }
+     } 	   
+	 result.append(buffer)
+     return result
+   }
+
   /* Only for Swift 5+ 
   static func before(str: String, sep: String) -> String
   { if let ind = str.firstIndex(of: sep)