diff --git a/jdk.js b/jdk.js index 3830b33..8f65d64 100755 --- a/jdk.js +++ b/jdk.js @@ -215,11 +215,11 @@ if (lambdaRegex.test(in0)) { in0 = in0.replace(lambdaRegex, (match, in1) => { in1.replaceAll('\n', '\\n'); - return 'new Runnable("' + in1 + '")'; + return 'new Runnable("' + in1 + '")'; }); } in0 = in0.replaceAll('\n', '\\n'); - return 'new Runnable("' + in0 + '")'; + return 'new Runnable("' + in0 + '")'; }); // convert string .length() method @@ -234,7 +234,7 @@ // log(trans); // TODO fix this by adding real support for lambda - trans = trans.replace(/new\s*Runnable\('(.*)'\)/, (match, p1) => { + trans = trans.replace(/new\s*Runnable\('([^]*)'\)/gm, (match, p1) => { return '() => {' + p1.replaceAll('\\n', '\n') + '}'; }); diff --git a/package.json b/package.json index 7d9b713..d389b05 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "java2js", - "version": "1.1.1", + "version": "1.1.2", "description": "Converts Java to JavaScript with support for p5.js and QuintOS.", "main": "jdk.js", "scripts": {