small fix in JS event.toString + NotEqual

TelluIoT · Apr 12, 2021 · cc6c850 · cc6c850
1 parent bf2dd98
commit cc6c850
Show file tree

Hide file tree

Showing 3 changed files with 349 additions and 342 deletions.
diff --git a/compilers/framework/src/main/java/org/thingml/compilers/utils/OpaqueThingMLCompiler.java b/compilers/framework/src/main/java/org/thingml/compilers/utils/OpaqueThingMLCompiler.java
@@ -98,11 +98,10 @@ public boolean compile(Configuration cfg, Logger log, String... options) {
 		//Saving the complete model, e.g. to get all required inputs if there is a problem in the compiler
 		ThingMLModel flatModel = ThingMLHelpers.flattenModel(ThingMLHelpers.findContainingModel(cfg));
 		try {
-		saveAsThingML(flatModel, new File(ctx.getOutputDirectory(), cfg.getName() + "_merged.thingml").getAbsolutePath());
+			saveAsThingML(flatModel, new File(ctx.getOutputDirectory(), cfg.getName() + "_merged.thingml").getAbsolutePath());
 		} catch (Exception e) {
-			e.printStackTrace();
+			System.err.println("Could not save merged ThingML file!");
 		}
-		//saveAsXMI(flatModel, new File(ctx.getOutputDirectory(), cfg.getName() + "_merged.xmi").getAbsolutePath());
 
 		//Run validation
 		log.info("Checking configuration...");

diff --git a/compilers/javascript/src/main/java/org/thingml/compilers/javascript/JSCompiler.java b/compilers/javascript/src/main/java/org/thingml/compilers/javascript/JSCompiler.java
@@ -84,15 +84,15 @@ protected void generateEvents(Configuration cfg) {
 			for(Parameter p : m.getParameters()) {
 				events.append("    this." + p.getName() + " = params[" + m.getParameters().indexOf(p) + "];\n");
 				if (m.getParameters().indexOf(p) > 0)
-					params.append(" + ', ' + ");
-				params.append("this." + p.getName());
+					params.append(", ");
+				params.append("' + this." + p.getName() + " + '");
 			}
 			events.append("  }\n\n");
 			events.append("  " + className + ".prototype.is = function (type) {\n");
 			events.append("    return this.type === type;\n");
 			events.append("  };\n\n");
 			events.append("  " + className + ".prototype.toString = function () {\n");
-			events.append("    return 'event ' + this.type + '?' + this.port + '(' + " + params + " + ')';\n");
+			events.append("    return 'event ' + this.type + '?' + this.port + '(" + params + ")';\n");
 			events.append("  };\n\n");
 			events.append("  return " + className + ";\n");
 			events.append("}());\n");