Fix tests: "infix modifier required" and "operator modifier required" errors

libraries/tools/idl2k/src/main/kotlin/gen.kt

@@ -182,8 +182,19 @@ fun generateUnions(ifaces: List<GenerateTraitOrClass>, typedefs: Iterable<Typede
 
     val typedefsMarkersMap = typedefsToBeGenerated.groupBy { it.name }.mapValues { mapUnionType(it.value.first().value).copy(name = it.key) }
 
-    val typeNamesToUnions = anonymousUnionTypes.toList().flatMap { unionType -> unionType.memberTypes.filterIsInstance<SimpleType>().map { unionMember -> unionMember.type to unionType.name } }.toMultiMap() merge
-            typedefsToBeGenerated.flatMap { typedef -> typedef.value.memberTypes.filterIsInstance<SimpleType>().map { unionMember -> unionMember.type to typedef.name } }.toMultiMap()
+    val typeNamesToUnions = anonymousUnionTypes
+            .toList()
+            .flatMap { unionType ->
+                unionType.memberTypes
+                        .filterIsInstance<SimpleType>()
+                        .map { unionMember -> unionMember.type to unionType.name }
+            }.toMultiMap()
+            .merge(typedefsToBeGenerated
+                    .flatMap { typedef ->
+                        typedef.value.memberTypes
+                                .filterIsInstance<SimpleType>()
+                                .map { unionMember -> unionMember.type to typedef.name }
+                    }.toMultiMap())
 
     return GenerateUnionTypes(
             typeNamesToUnionsMap = typeNamesToUnions,

libraries/tools/idl2k/src/main/kotlin/main.kt

@@ -19,7 +19,7 @@ fun main(args: Array<String>) {
         Repository(
                 interfaces = acc.interfaces.mergeReduce(fileRepository.interfaces, ::merge),
                 typeDefs = acc.typeDefs + fileRepository.typeDefs,
-                externals = acc.externals merge fileRepository.externals,
+                externals = acc.externals.merge(fileRepository.externals),
                 enums = acc.enums + fileRepository.enums
         )
     }