Corrected C Sharp code generator

Author: kevinlano

BasicExpression.java

@@ -8592,7 +8592,7 @@ public String queryFormCSharp(java.util.Map env, boolean local)
     if (data.startsWith("new"))
     { String createdClass = data.substring(3); 
       if ("OclDate".equals(createdClass))
-      { return "DateTime.Now"; }
+      { return "OclDate.newOclDate()"; }
       if (Type.isExceptionType(createdClass))
       { String csharpClass = 
           (String) Type.exceptions2csharp.get(createdClass); 
@@ -8630,7 +8630,7 @@ public String queryFormCSharp(java.util.Map env, boolean local)
             " = DateTimeOffset.FromUnixTimeMilliseconds(" + par1qf + ").DateTime;";
         } 
       }  
-    } */ 
+    } 
 
     if ("dateAfter".equals(data) && objectRef != null) 
     { if (objectRef.type != null && 
@@ -8658,7 +8658,6 @@ public String queryFormCSharp(java.util.Map env, boolean local)
       }  
     } 
 
-/* 
     if (data.startsWith("create") && objectRef == null) 
     { String entname = data.substring(6);
       System.out.println(">>> Creation operation for " + entname); 
@@ -10394,7 +10393,7 @@ public String updateFormCSharp(java.util.Map env, boolean local)
     }  
 
     // Update form: 
-    if ("setTime".equals(data) && objectRef != null) 
+   /* if ("setTime".equals(data) && objectRef != null) 
     { if (objectRef.type != null && 
           objectRef.type.getName().equals("OclDate")) 
       { if (parameters != null && parameters.size() > 0) 
@@ -10406,7 +10405,7 @@ public String updateFormCSharp(java.util.Map env, boolean local)
             " = DateTimeOffset.FromUnixTimeMilliseconds(" + par1qf + ").DateTime;";
         } 
       }  
-    } 
+    } */  
 
     if (data.startsWith("create") && objectRef == null) 
     { String entname = data.substring(6);

Type.java

@@ -3252,7 +3252,7 @@ public String getCSharp()
     { return alias.getCSharp(); } 
 
     if (nme.equals("OclDate"))
-    { return "DateTime"; } 
+    { return "OclDate"; } 
     if (nme.equals("OclAny"))
     { return "object"; } 
     if (nme.equals("OclType"))

UnaryExpression.java

@@ -4921,12 +4921,14 @@ else if (Type.isMapType(argument.type))
       return "Math." + data1 + "(" + pre + ")"; 
     }  // upper case
 
-    if (operator.equals("->floor") || operator.equals("->ceil") ||
+    if (operator.equals("->floor") ||
         operator.equals("->round"))  
       // But exp, floor can be applied to sets/sequences. ceil not sqr? 
     { String data1 = (data.charAt(0) + "").toUpperCase() + data.substring(1,data.length()); 
       return "((int) Math." + data1 + "(" + pre + "))"; 
     }  // could be long for double arguments 
+    else if (operator.equals("->ceil"))
+    { return "((int) Math.Ceiling(" + pre + "))"; } 
     else if (data.equals("toUpperCase") || data.equals("toUpper")) 
     { return pre + ".ToUpper()"; } 
     else if (data.equals("toLowerCase") || data.equals("toLower"))