Fix compilation bugs reported by zartan9

Merge pull request #11 from haroldo-ok/fix-zartan9-compilation

- Routine that moved variable declarations to the top of the function caused an error if there were no variables;
- Fixed a pair of compiler invocation errors that happened if the current project wasn't named test.

This fixes #10

blockly/apps/blocklyduino/blockly_helper.js

@@ -101,7 +101,7 @@ function compileAndRun() {
 		.then(async () => {
 			printToConsole('-----------------------');
 			printToConsole('Building and starting emulator...');	
-			await vn32x.execConsole(`cd "${path.resolve(buildScriptPath())}" && echo aaa | test-${platformToRun()}.bat`);
+			await vn32x.execConsole(`cd "${path.resolve(buildScriptPath())}" && echo aaa | ${project.current.name}-${platformToRun()}.bat`);
 		})
 		.catch(err => {
 			console.error(err);
@@ -359,7 +359,7 @@ const convertPortraits = async () => {
 }
 
 const generateBuildScripts = async () => {	
-	return execBuilder(` -projectFile projects/${project.current.name}/test.builder ` +
+	return execBuilder(` -projectFile projects/${project.current.name}/${project.current.name}.builder ` +
 		'-useGUI False -callEmu True');
 }
 

blockly/generators/arduino.js

@@ -268,7 +268,7 @@ Blockly.Arduino.scrub_ = function(block, code) {
 Blockly.Arduino.scrubLocalVars_ = function(code, indent) {  
   indent = indent || '';
   const varDeclarationRegex = /\n\s*int\s*(\w+\s*,\s*)*\s*\w+\s*;/g;
-  const vars = code.match(varDeclarationRegex).map(s => indent + (s || '').trim());  
+  const vars = (code.match(varDeclarationRegex) || []).map(s => indent + (s || '').trim());  
   const codeWithNoVars = code.replace(varDeclarationRegex, '');
   return vars.join('\n') + '\n\n' + codeWithNoVars;
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "BlocklyVN8bit",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Uses blockly to generate visual novels for 8bit-Unity",
   "main": "main.js",
   "scripts": {