From 3040e3c36d03bc19749dc221c37008a062621c25 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Hannu=20Niemist=C3=B6?= Date: Mon, 4 Dec 2017 16:40:09 +0200 Subject: [PATCH] Removed a clash between two nameOf functions refs #7662 Change-Id: I49845c132c6c2eb5d9e3ae1c34c9d0349a9f4144 --- .../scl/SCL/Reflection.scl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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_ -- 2.47.1