Optimize 0-arity foreign functions

mmhelloworld · mmhelloworld · commit b02d7d6bde02 · 2021-12-30T00:42:41.000-05:00
diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml
@@ -12,7 +12,7 @@ on:
 env:
   IDRIS2_PREVIOUS_VERSION: 0.2.2
   IDRIS2_PREVIOUS_VERSION_SUFFIX: '-SNAPSHOT'
-  IDRIS2_PREVIOUS_VERSION_TAG_SUFFIX: '-20210905'
+  IDRIS2_PREVIOUS_VERSION_TAG_SUFFIX: '-20210907'
   IDRIS2_TESTS_CG: jvm
   ACTIONS_ALLOW_UNSECURE_COMMANDS: true
 
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -8,7 +8,7 @@ on:
 env:
   IDRIS2_PREVIOUS_VERSION: 0.2.2
   IDRIS2_PREVIOUS_VERSION_SUFFIX: '-SNAPSHOT'
-  IDRIS2_PREVIOUS_VERSION_TAG_SUFFIX: '-20210905'
+  IDRIS2_PREVIOUS_VERSION_TAG_SUFFIX: '-20210907'
   IDRIS2_TESTS_CG: jvm
   ACTIONS_ALLOW_UNSECURE_COMMANDS: true
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,7 +8,7 @@ on:
 env:
   IDRIS2_PREVIOUS_VERSION: 0.2.2
   IDRIS2_PREVIOUS_VERSION_SUFFIX: '-SNAPSHOT'
-  IDRIS2_PREVIOUS_VERSION_TAG_SUFFIX: '-20210905'
+  IDRIS2_PREVIOUS_VERSION_TAG_SUFFIX: '-20210907'
   IDRIS2_TESTS_CG: jvm
   ACTIONS_ALLOW_UNSECURE_COMMANDS: true
 
diff --git a/idris-jvm-assembler/src/main/java/io/github/mmhelloworld/idrisjvm/assembler/AsmGlobalState.java b/idris-jvm-assembler/src/main/java/io/github/mmhelloworld/idrisjvm/assembler/AsmGlobalState.java
@@ -33,35 +33,35 @@ public AsmGlobalState(String programName) {
         assemblers = new ConcurrentHashMap<>();
     }
 
-    public void addFunction(String name, Object value) {
+    public synchronized void addFunction(String name, Object value) {
         functions.put(name, value);
     }
 
-    public Object getFunction(String name) {
+    public synchronized Object getFunction(String name) {
         return functions.get(name);
     }
 
-    public void addUntypedFunction(String name) {
+    public synchronized void addUntypedFunction(String name) {
         untypedFunctions.add(name);
     }
 
-    public boolean isUntypedFunction(String name) {
+    public synchronized boolean isUntypedFunction(String name) {
         return untypedFunctions.contains(name);
     }
 
-    public Assembler getAssembler(String name) {
+    public synchronized Assembler getAssembler(String name) {
         return assemblers.computeIfAbsent(name, key -> new Assembler());
     }
 
     public String getProgramName() {
         return programName;
     }
 
-    public boolean hasConstructor(String name) {
+    public synchronized boolean hasConstructor(String name) {
         return constructors.contains(name);
     }
 
-    public void addConstructor(String name) {
+    public synchronized void addConstructor(String name) {
         constructors.add(name);
     }
 
diff --git a/idris-jvm-assembler/src/main/java/io/github/mmhelloworld/idrisjvm/assembler/IdrisName.java b/idris-jvm-assembler/src/main/java/io/github/mmhelloworld/idrisjvm/assembler/IdrisName.java
@@ -99,10 +99,10 @@ private static List<String> addModulePrefix(String programName, List<String> nam
         if (size > 1) {
             List<String> packageNameParts = nameParts.subList(1, size - 1);
             LinkedList<String> prefixedPackagedNames = packageNameParts.stream()
-                .map(packageName -> "M$" + packageName)
+                .map(packageName -> "M_" + packageName)
                 .collect(toCollection(LinkedList::new));
             String rootPackage = nameParts.get(0);
-            prefixedPackagedNames.add(0, rootPackage.equals(programName) ? rootPackage : "M$" + rootPackage);
+            prefixedPackagedNames.add(0, rootPackage.equals(programName) ? rootPackage : "M_" + rootPackage);
             String className = nameParts.get(size - 1);
             prefixedPackagedNames.add(className);
             return prefixedPackagedNames;
diff --git a/idris-jvm-assembler/src/test/java/io/github/mmhelloworld/idrisjvm/jvmassembler/IdrisNameTest.java b/idris-jvm-assembler/src/test/java/io/github/mmhelloworld/idrisjvm/jvmassembler/IdrisNameTest.java
@@ -30,17 +30,17 @@ void getConstructorClassName(String idrisConstructorName, String transformedCons
 
     static Stream<Arguments> getFunctionName() {
         return Stream.of(
-            arguments("Data/List", "take", IdrisList.fromIterable(asList("M$Data/List","take"))),
+            arguments("Data/List", "take", IdrisList.fromIterable(asList("M_Data/List","take"))),
             arguments("Main", "bar", IdrisList.fromIterable(asList("main/Main","bar"))),
             arguments("Foo", "bar", IdrisList.fromIterable(asList("main/Foo","bar"))),
-            arguments("Main/Foo", "bar", IdrisList.fromIterable(asList("M$Main/Foo","bar"))),
-            arguments("Main/Foo/Bar/Baz", "bar", IdrisList.fromIterable(asList("M$Main/M$Foo/M$Bar/Baz","bar"))));
+            arguments("Main/Foo", "bar", IdrisList.fromIterable(asList("M_Main/Foo","bar"))),
+            arguments("Main/Foo/Bar/Baz", "bar", IdrisList.fromIterable(asList("M_Main/M_Foo/M_Bar/Baz","bar"))));
     }
 
     static Stream<Arguments> getConstructorClassName() {
         return Stream.of(
-            arguments("Data/List/Take", "M$Data/M$List/Take"),
-            arguments("Prelude/Foo", "M$Prelude/Foo"),
+            arguments("Data/List/Take", "M_Data/M_List/Take"),
+            arguments("Prelude/Foo", "M_Prelude/Foo"),
             arguments("Prelude", "main/Prelude")
         );
     }
diff --git a/idris-jvm-compiler/pom.xml b/idris-jvm-compiler/pom.xml
@@ -189,7 +189,7 @@
                             <repositoryName>exec/idris2_app</repositoryName>
                             <repositoryLayout>flat</repositoryLayout>
                             <assembleDirectory>${project.parent.basedir}/build</assembleDirectory>
-                            <extraJvmArguments>-Xss36m -Xms2g -Xmx3g</extraJvmArguments>
+                            <extraJvmArguments>-Xss36m -Xms3g -Xmx3g</extraJvmArguments>
                             <programs>
                                 <program>
                                     <mainClass>idris2.Main</mainClass>
diff --git a/idris-jvm-runtime/src/main/java/io/github/mmhelloworld/idrisjvm/runtime/IdrisSystem.java b/idris-jvm-runtime/src/main/java/io/github/mmhelloworld/idrisjvm/runtime/IdrisSystem.java
@@ -29,12 +29,12 @@ public final class IdrisSystem {
 
         // To conform to support/chez/support.ss
         String osNameProperty = getOsNameProperty();
-        if (osNameProperty.startsWith("windows")) {
-            OS_NAME = "windows";
-        } else if (osNameProperty.startsWith("mac")) {
+        if (osNameProperty.contains("mac") || osNameProperty.contains("darwin")) {
             OS_NAME = "darwin";
-        } else if (Stream.of("linux", "aix", "solaris", "sunos", "freebsd", "openbsd", "netbsd")
-            .anyMatch(osNameProperty::startsWith)) {
+        } else if (osNameProperty.contains("win")) {
+            OS_NAME = "windows";
+        } else if (Stream.of("nix", "nux", "aix", "solaris", "sunos", "freebsd", "openbsd", "netbsd")
+            .anyMatch(osNameProperty::contains)) {
             OS_NAME = "unix";
         } else {
             OS_NAME = "unknown";
diff --git a/libs/base/System.idr b/libs/base/System.idr
@@ -121,7 +121,7 @@ system cmd = primIO (prim__system cmd)
 
 %foreign support "idris2_time"
          "javascript:lambda:() => Math.floor(new Date().getTime() / 1000)"
-         "jvm:time(int),io/github/mmhelloworld/idrisjvm/runtime/IdrisSystem"
+         "jvm:time(java/lang/Object int),io/github/mmhelloworld/idrisjvm/runtime/IdrisSystem"
 prim__time : PrimIO Int
 
 ||| Return the number of seconds since epoch.
diff --git a/libs/base/System/Clock.idr b/libs/base/System/Clock.idr
@@ -98,47 +98,47 @@ isClockMandatory _      = Mandatory
 
 %foreign "scheme:blodwen-clock-time-monotonic"
          "RefC:clockTimeMonotonic"
-         "jvm:getMonotonicClock(io/github/mmhelloworld/idrisjvm/runtime/IdrisClock),io/github/mmhelloworld/idrisjvm/runtime/Clocks"
+         "jvm:getMonotonicClock(java/lang/Object io/github/mmhelloworld/idrisjvm/runtime/IdrisClock),io/github/mmhelloworld/idrisjvm/runtime/Clocks"
 prim__clockTimeMonotonic : PrimIO OSClock
 
 clockTimeMonotonic : IO OSClock
 clockTimeMonotonic = fromPrim prim__clockTimeMonotonic
 
 %foreign "scheme:blodwen-clock-time-utc"
          "RefC:clockTimeUtc"
-         "jvm:getUtcClock(io/github/mmhelloworld/idrisjvm/runtime/IdrisClock),io/github/mmhelloworld/idrisjvm/runtime/Clocks"
+         "jvm:getUtcClock(java/lang/Object io/github/mmhelloworld/idrisjvm/runtime/IdrisClock),io/github/mmhelloworld/idrisjvm/runtime/Clocks"
 prim__clockTimeUtc : PrimIO OSClock
 
 clockTimeUtc : IO OSClock
 clockTimeUtc = fromPrim prim__clockTimeUtc
 
 %foreign "scheme:blodwen-clock-time-process"
          "RefC:clockTimeProcess"
-         "jvm:getProcessClock(io/github/mmhelloworld/idrisjvm/runtime/IdrisClock),io/github/mmhelloworld/idrisjvm/runtime/Clocks"
+         "jvm:getProcessClock(java/lang/Object io/github/mmhelloworld/idrisjvm/runtime/IdrisClock),io/github/mmhelloworld/idrisjvm/runtime/Clocks"
 prim__clockTimeProcess : PrimIO OSClock
 
 clockTimeProcess : IO OSClock
 clockTimeProcess = fromPrim prim__clockTimeProcess
 
 %foreign "scheme:blodwen-clock-time-thread"
          "RefC:clockTimeThread"
-         "jvm:getThreadClock(io/github/mmhelloworld/idrisjvm/runtime/IdrisClock),io/github/mmhelloworld/idrisjvm/runtime/Clocks"
+         "jvm:getThreadClock(java/lang/Object io/github/mmhelloworld/idrisjvm/runtime/IdrisClock),io/github/mmhelloworld/idrisjvm/runtime/Clocks"
 prim__clockTimeThread : PrimIO OSClock
 
 clockTimeThread : IO OSClock
 clockTimeThread = fromPrim prim__clockTimeThread
 
 %foreign "scheme:blodwen-clock-time-gccpu"
          "RefC:clockTimeGcCpu"
-         "jvm:getGcCpuClock(io/github/mmhelloworld/idrisjvm/runtime/IdrisClock),io/github/mmhelloworld/idrisjvm/runtime/Clocks"
+         "jvm:getGcCpuClock(java/lang/Object io/github/mmhelloworld/idrisjvm/runtime/IdrisClock),io/github/mmhelloworld/idrisjvm/runtime/Clocks"
 prim__clockTimeGcCpu : PrimIO OSClock
 
 clockTimeGcCpu : IO OSClock
 clockTimeGcCpu = fromPrim prim__clockTimeGcCpu
 
 %foreign "scheme:blodwen-clock-time-gcreal"
          "RefC:clockTimeGcReal"
-         "jvm:getGcRealClock(io/github/mmhelloworld/idrisjvm/runtime/IdrisClock),io/github/mmhelloworld/idrisjvm/runtime/Clocks"
+         "jvm:getGcRealClock(java/lang/Object io/github/mmhelloworld/idrisjvm/runtime/IdrisClock),io/github/mmhelloworld/idrisjvm/runtime/Clocks"
 prim__clockTimeGcReal : PrimIO OSClock
 
 clockTimeGcReal : IO OSClock
diff --git a/libs/contrib/System/Random.idr b/libs/contrib/System/Random.idr
@@ -35,7 +35,7 @@ Random Int where
      in map (+ lo) $ liftIO $ randomInt range
 
 %foreign "scheme:blodwen-random"
-         "jvm:nextDouble(double),io/github/mmhelloworld/idrisjvm/runtime/Random"
+         "jvm:nextDouble(java/lang/Object double),io/github/mmhelloworld/idrisjvm/runtime/Random"
 prim__randomDouble : PrimIO Double
 
 randomDouble : IO Double
diff --git a/libs/network/Network/FFI.idr b/libs/network/Network/FFI.idr
@@ -77,7 +77,7 @@ prim__idrnet_sockaddr_port : (sockfd : SocketDescriptor) -> PrimIO Int
 
 %foreign
   "C:idrnet_create_sockaddr, libidris2_support, idris_net.h"
-  jvm idrisSocketClass "createSocketAddress"
+  jvm' idrisSocketClass "createSocketAddress" "java/lang/Object" "java/lang/Object"
 export
 prim__idrnet_create_sockaddr : PrimIO AnyPtr
 
@@ -202,7 +202,7 @@ prim__idrnet_geteagain : PrimIO Int
 
 %foreign
   "C:idrnet_errno, libidris2_support, idris_net.h"
-  jvm runtimeClass "getErrorNumber"
+  jvm' runtimeClass "getErrorNumber" "java/lang/Object" "int"
 export
 prim__idrnet_errno : PrimIO Int
 
diff --git a/libs/network/Network/Socket/Data.idr b/libs/network/Network/Socket/Data.idr
@@ -65,6 +65,7 @@ EAGAIN =
 
 -- repeat without export to avoid dependency cycles
 %foreign "C:idrnet_errno, libidris2_support, idris_net.h"
+         jvm' runtimeClass "getErrorNumber" "java/lang/Object" "int"
 prim__idrnet_errno : PrimIO Int
 
 %foreign "C:isNull, libidris2_support, idris_support.h"
diff --git a/libs/prelude/Prelude/IO.idr b/libs/prelude/Prelude/IO.idr
@@ -79,12 +79,12 @@ prim__getString : Ptr String -> String
          "jvm:putChar(char void),io/github/mmhelloworld/idrisjvm/runtime/Console"
 prim__putChar : Char -> (1 x : %World) -> IORes ()
 %foreign "C:getchar,libc 6"
-         "jvm:getChar(char),io/github/mmhelloworld/idrisjvm/runtime/Console"
+         "jvm:getChar(java/lang/Object char),io/github/mmhelloworld/idrisjvm/runtime/Console"
 %extern prim__getChar : (1 x : %World) -> IORes Char
 
 %foreign "C:idris2_getStr, libidris2_support, idris_support.h"
          "node:support:getStr,support_system_file"
-         "jvm:getString,io/github/mmhelloworld/idrisjvm/runtime/Console"
+         "jvm:getString(java/lang/Object java/lang/String),io/github/mmhelloworld/idrisjvm/runtime/Console"
 prim__getStr : PrimIO String
 
 %foreign "C:idris2_putStr, libidris2_support, idris_support.h"
diff --git a/src/Compiler/Jvm/Asm.idr b/src/Compiler/Jvm/Asm.idr
@@ -107,7 +107,7 @@ namespace JList
     JList : Type -> Type
     JList a = JListNative
 
-    %foreign "jvm:<init>(java/util/ArrayList),java/util/ArrayList"
+    %foreign "jvm:<init>(java/lang/Object java/util/ArrayList),java/util/ArrayList"
     prim_newArrayList : PrimIO JListNative
 
     %foreign jvm' "java/util/List" ".add" "i:java/util/List int java/lang/Object" "void"
@@ -206,7 +206,7 @@ namespace Map
   Map : Type -> Type -> Type
   Map k v = JMap
 
-  %foreign "jvm:<init>(java/util/TreeMap),java/util/TreeMap"
+  %foreign "jvm:<init>(java/lang/Object java/util/TreeMap),java/util/TreeMap"
   prim_newTreeMap : PrimIO JMap
 
   export
@@ -755,11 +755,6 @@ Applicative Asm where
               Bind a (\a' =>
               Pure (f' a')))
 
-public export
-%foreign
-    "jvm:<init>(io/github/mmhelloworld/idrisjvm/assembler/Assembler),io/github/mmhelloworld/idrisjvm/assembler/Assembler"
-newAssembler : PrimIO Assembler
-
 public export
 newAsmState : HasIO io => AsmGlobalState -> Assembler -> io AsmState
 newAsmState globalState assembler = do
@@ -1516,7 +1511,7 @@ debugFunction = unsafePerformIO $ getEnv "IDRIS_JVM_DEBUG_FUNCTION"
 namespace LocalDateTime
     data LocalDateTime : Type where [external]
 
-    %foreign "jvm:now(java/time/LocalDateTime),java/time/LocalDateTime"
+    %foreign "jvm:now(java/lang/Object java/time/LocalDateTime),java/time/LocalDateTime"
     prim_now : PrimIO LocalDateTime
 
     %foreign jvm' "java/time/LocalDateTime" ".toString" "java/time/LocalDateTime" "String"
@@ -1528,7 +1523,7 @@ namespace LocalDateTime
         now <- primIO prim_now
         primIO $ prim_toString now
 
-%foreign "jvm:getCurrentThreadName(java/lang/String),io/github/mmhelloworld/idrisjvm/runtime/Runtime"
+%foreign "jvm:getCurrentThreadName(java/lang/Object java/lang/String),io/github/mmhelloworld/idrisjvm/runtime/Runtime"
 prim_getCurrentThreadName : PrimIO String
 
 export
diff --git a/src/Compiler/Jvm/Codegen.idr b/src/Compiler/Jvm/Codegen.idr
@@ -264,15 +264,8 @@ mutual
                         loadVar types ty ty targetVariableIndex
                         storeVar ty ty argIndex
 
-    assembleExpr isTailCall returnType (NmApp _ (NmRef _ idrisName) []) = do
-        let jname = jvmName idrisName
-        let functionName = getIdrisFunctionName !getProgramName (className jname) (methodName jname)
-        Field GetStatic (className functionName) (methodName functionName)
-            "Lio/github/mmhelloworld/idrisjvm/runtime/MemoizedDelayed;"
-        InvokeMethod InvokeVirtual "io/github/mmhelloworld/idrisjvm/runtime/MemoizedDelayed" "evaluate"
-            "()Ljava/lang/Object;" False
-        asmCast inferredObjectType returnType
-        when isTailCall $ asmReturn returnType
+    assembleExpr isTailCall returnType (NmApp _ (NmRef _ idrisName) []) =
+        assembleNmAppNilArity isTailCall returnType idrisName
     assembleExpr isTailCall returnType (NmApp _ (NmRef _ idrisName) args) = do
         -- Not a tail call, unwrap possible trampoline thunks
         let jname = jvmName idrisName
@@ -282,14 +275,17 @@ mutual
                 addUntypedFunction jname
                 Pure $ MkInferredFunctionType inferredObjectType $ replicate (length args) inferredObjectType
         let paramTypes = parameterTypes functionType
-        let argsWithTypes = List.zip args paramTypes
-        traverse assembleParameter argsWithTypes
-        let methodReturnType = InferredFunctionType.returnType functionType
-        let methodDescriptor = getMethodDescriptor $ MkInferredFunctionType methodReturnType paramTypes
-        let functionName = getIdrisFunctionName !getProgramName (className jname) (methodName jname)
-        InvokeMethod InvokeStatic (className functionName) (methodName functionName) methodDescriptor False
-        asmCast methodReturnType returnType
-        when isTailCall $ asmReturn returnType
+        if paramTypes == []
+            then assembleNmAppNilArity isTailCall returnType idrisName
+            else do
+                let argsWithTypes = List.zip args paramTypes
+                traverse assembleParameter argsWithTypes
+                let methodReturnType = InferredFunctionType.returnType functionType
+                let methodDescriptor = getMethodDescriptor $ MkInferredFunctionType methodReturnType paramTypes
+                let functionName = getIdrisFunctionName !getProgramName (className jname) (methodName jname)
+                InvokeMethod InvokeStatic (className functionName) (methodName functionName) methodDescriptor False
+                asmCast methodReturnType returnType
+                when isTailCall $ asmReturn returnType
 
     assembleExpr isTailCall returnType (NmApp _ lambdaVariable [arg]) = do
         assembleExpr False inferredLambdaType lambdaVariable
@@ -417,6 +413,17 @@ mutual
         when isTailCall $ asmReturn returnType
     assembleExpr _ _ expr = Throw (getFC expr) $ "Cannot compile " ++ show expr ++ " yet"
 
+    assembleNmAppNilArity : (isTailCall : Bool) -> InferredType -> Name -> Asm ()
+    assembleNmAppNilArity isTailCall returnType idrisName = do
+        let jname = jvmName idrisName
+        let functionName = getIdrisFunctionName !getProgramName (className jname) (methodName jname)
+        Field GetStatic (className functionName) (methodName functionName)
+            "Lio/github/mmhelloworld/idrisjvm/runtime/MemoizedDelayed;"
+        InvokeMethod InvokeVirtual "io/github/mmhelloworld/idrisjvm/runtime/MemoizedDelayed" "evaluate"
+            "()Ljava/lang/Object;" False
+        asmCast inferredObjectType returnType
+        when isTailCall $ asmReturn returnType
+
     unsignedIntToBigInteger : InferredType -> NamedCExp -> Asm ()
     unsignedIntToBigInteger returnType expr = do
         assembleExpr False IInt expr
@@ -1421,10 +1428,6 @@ mutual
     jvmExtPrim fc _ prim args = Throw fc $ "Unsupported external function " ++ show prim ++ "(" ++
         (show $ showNamedCExp 0 <$> args) ++ ")"
 
-isDelayedExpr : NamedCExp -> Bool
-isDelayedExpr (NmDelay _ _) = True
-isDelayedExpr _ = False
-
 assembleDefinition : Name -> FC -> Asm ()
 assembleDefinition idrisName fc = do
     let jname = jvmName idrisName
@@ -1453,7 +1456,7 @@ assembleDefinition idrisName fc = do
     debug $ showNamedCExp 0 optimizedExpr
     let fileName = fst $ getSourceLocationFromFc fc
     let descriptor = getMethodDescriptor functionType
-    let isField = arity == 0 && isDelayedExpr optimizedExpr
+    let isField = arity == 0
     let classInitOrMethodName = if isField then "<clinit>" else methodName
     when isField $ do
         CreateField [Public, Static, Final] fileName declaringClassName methodName
@@ -1479,7 +1482,7 @@ assembleDefinition idrisName fc = do
             MaxStackAndLocal (-1) (-1)
             MethodCodeEnd
         else do
-            withScope $ assembleExpr False methodReturnType optimizedExpr
+            withScope $ assembleExpr False delayedType optimizedExpr
             Field PutStatic declaringClassName methodName "Lio/github/mmhelloworld/idrisjvm/runtime/MemoizedDelayed;"
 
 createMainMethod : String -> Jname -> Asm ()
diff --git a/src/Compiler/Jvm/Foreign.idr b/src/Compiler/Jvm/Foreign.idr
diff --git a/src/Compiler/Jvm/MockAsm.idr b/src/Compiler/Jvm/MockAsm.idr
diff --git a/tests/jvm/concurrency001/Futures.idr b/tests/jvm/concurrency001/Futures.idr

Original file line number	Diff line number	Diff line change
`@@ -33,35 +33,35 @@ public AsmGlobalState(String programName) {`
`33`	`33`	`assemblers = new ConcurrentHashMap<>();`
`34`	`34`	`}`
`35`	`35`
`36`		`- public void addFunction(String name, Object value) {`
	`36`	`+ public synchronized void addFunction(String name, Object value) {`
`37`	`37`	`functions.put(name, value);`
`38`	`38`	`}`
`39`	`39`
`40`		`- public Object getFunction(String name) {`
	`40`	`+ public synchronized Object getFunction(String name) {`
`41`	`41`	`return functions.get(name);`
`42`	`42`	`}`
`43`	`43`
`44`		`- public void addUntypedFunction(String name) {`
	`44`	`+ public synchronized void addUntypedFunction(String name) {`
`45`	`45`	`untypedFunctions.add(name);`
`46`	`46`	`}`
`47`	`47`
`48`		`- public boolean isUntypedFunction(String name) {`
	`48`	`+ public synchronized boolean isUntypedFunction(String name) {`
`49`	`49`	`return untypedFunctions.contains(name);`
`50`	`50`	`}`
`51`	`51`
`52`		`- public Assembler getAssembler(String name) {`
	`52`	`+ public synchronized Assembler getAssembler(String name) {`
`53`	`53`	`return assemblers.computeIfAbsent(name, key -> new Assembler());`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public String getProgramName() {`
`57`	`57`	`return programName;`
`58`	`58`	`}`
`59`	`59`
`60`		`- public boolean hasConstructor(String name) {`
	`60`	`+ public synchronized boolean hasConstructor(String name) {`
`61`	`61`	`return constructors.contains(name);`
`62`	`62`	`}`
`63`	`63`
`64`		`- public void addConstructor(String name) {`
	`64`	`+ public synchronized void addConstructor(String name) {`
`65`	`65`	`constructors.add(name);`
`66`	`66`	`}`
`67`	`67`