From: Hannu Niemistö <hannu.niemisto@semantum.fi>
Date: Mon, 4 Dec 2017 14:40:09 +0000 (+0200)
Subject: Removed a clash between two nameOf functions
X-Git-Tag: v1.31.0~8
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=refs%2Fchanges%2F86%2F1286%2F2

Removed a clash between two nameOf functions

refs #7662

Change-Id: I49845c132c6c2eb5d9e3ae1c34c9d0349a9f4144
---

diff --git a/bundles/org.simantics.scl.compiler/scl/SCL/Reflection.scl b/bundles/org.simantics.scl.compiler/scl/SCL/Reflection.scl
index e32401d50..6b2fd0bcd 100644
--- a/bundles/org.simantics.scl.compiler/scl/SCL/Reflection.scl
+++ b/bundles/org.simantics.scl.compiler/scl/SCL/Reflection.scl
@@ -1,6 +1,6 @@
 module {
     export = [possibleUnsafeSclValueByName, unsafeSclValueByName, sclModuleNames, moduleByName,
-              moduleOf, nameOf, createName, valueNamesOf]
+              moduleOfName, nameOfName, createName, valueNamesOf]
 }
 
 include "SCL/ReflectionJava"
@@ -37,18 +37,18 @@ importJava "org.simantics.scl.compiler.common.names.Name" where
     data Name
     
     @JavaName module
-    moduleOf_ :: Name -> String
+    moduleOfName_ :: Name -> String
     @JavaName name
-    nameOf_ :: Name -> String
+    nameOfName_ :: Name -> String
     
     @JavaName create
     createName_ :: String -> String -> Name
 
 instance Show Name where
-    sb <+ n = sb << moduleOf n << "/" << nameOf n
+    sb <+ n = sb << moduleOfName n << "/" << nameOfName n
     
-moduleOf = moduleOf_
-nameOf = nameOf_
+moduleOfName = moduleOfName_
+nameOfName = nameOfName_
 createName = createName_
 valueNamesOf = valueNamesOf_