OpenJ9 compatibility for SCL compiler's naming of ontology modules

[simantics/platform.git] / bundles / org.simantics.scl.compiler / src / org / simantics / scl / compiler / internal / codegen / utils / JavaNamingPolicy.java

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/codegen/utils/JavaNamingPolicy.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/codegen/utils/JavaNamingPolicy.java
index 009eec2e24468fa015422bbc3ba1db8dd3818057..7e9780d4a78f12eddbc61aca29ba269f111ab33c 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/codegen/utils/JavaNamingPolicy.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/codegen/utils/JavaNamingPolicy.java
@@ -34,11 +34,11 @@ public class JavaNamingPolicy {
                 b.append('_').append((int)c).append('_');
         }
         //System.out.println("m2c " + moduleName + " -> " + b.toString());
-        return b.toString().replace("..", "._.");
+        return b.toString().replace("..", "._.").replace("//", "/_/");
     }
     
     public static String classNameToModuleName(String className) {
-       className = className.replace("._.", "..");
+        className = className.replace("/_/", "//").replace("._.", "..");
         StringBuilder b = new StringBuilder(className.length());
         int length = className.length();
         for(int i=0;i<length;++i) {
@@ -71,6 +71,10 @@ public class JavaNamingPolicy {
         return NameMangling.mangle(name);
     }
 
+    public String getFreshClosureClassNameSuffix() {
+        return "$" + (++closureCount);
+    }
+    
     public String getFreshClosureClassName() {
         return moduleClassName + "$" + (++closureCount);
     }