Implement if/else/elsif

Merge pull request #31 from haroldo-ok/conditionals

README.md

@@ -8,6 +8,8 @@ The syntax of the scripts is somewhat based on ChoiceScript, but it is not exact
 
 *Please note that this is an early work and progress, and it is not as stable or user-friendly as it is planned to become.*
 
+
+
 ## Commands implemented so far
 
 ### `font`
@@ -47,13 +49,16 @@ Creates a local variable. `temp` variables are only visible inside the scene fil
 
 Changes the current value of an existing variable.
 
+### `if`/`elseif`/`else`
+
+Allows a certain block of code to only be executed on a given condition.
+
+
+
 ## Planned commands
 
 The tool accepts those commands, but, at the moment, they don't do anything.
 
-### `if`/`elseif`/`else`
-Will allow a certain block of code to only be executed on a given condition.
-
 ### `label`
 Will allow to mark a place where the `goto` command can jump to.
 

examples/test/project/startup.choice

@@ -8,13 +8,24 @@
 * set intVar, 3
 * set localInt, intVar + 3
 
+* create playingMusic, false
+
 * choice
-	# Play some music
+	* if playingMusic
+		# Stop the music
+			* stop music, sound
+			OK, music is stopped.
+			* set playingMusic, false
+	* elseif FALSE
+		This should not appear
+		This should not play
 		* music "Actraiser - Fillmore.vgm"
-		OK, playing Fillmore, from Actraiser.
-	# Stop the music
-		* stop music, sound
-		OK, music is stopped.
+	* else
+		# Play some music
+			* music "Actraiser - Fillmore.vgm"
+			OK, playing Fillmore, from Actraiser.
+			* set playingMusic, true
+
 	# Play a voice
 		* sound "ready.wav"
 		OK, playing a digital voice.

examples/test/src/vn_engine.c

@@ -63,7 +63,7 @@ void VN_init() {
 	XGM_setLoopNumber(-1);
 	XGM_setForceDelayDMA(TRUE);
 
-	VDP_drawText("choice4genesis v0.1.0", 18, 27);
+	VDP_drawText("choice4genesis v0.2.0", 18, 27);
 }
 
 

generator/generator.js

@@ -80,6 +80,8 @@ const indent = (...params) =>
 		o.flat ? o.flat() : 
 		`// Unknown value of type ${typeof o}: ${o}`)
 	.flat()
+	.map(o => o.split ? o.split('\n') : o)
+	.flat()
 	.map(s => '\t' + s)
 	.join('\n');
 
@@ -228,6 +230,38 @@ const COMMAND_GENERATORS = {
 		}
 
 		return `${existingVar.value.internalVar} = ${newValue.code};`;
+	},
+
+	'if': (entity, context) => {		
+		const condition = getExpression(entity, entity.params.positional.condition, context, 'Condition') || {};
+		const generatedBody = generateFromBody(entity.body, context);
+
+		return [
+			`if (${condition.code}) {`,
+			indent(generatedBody),
+			'}'
+		].join('\n');
+	},	
+
+	'elseif': (entity, context) => {		
+		const condition = getExpression(entity, entity.params.positional.condition, context, 'Condition') || {};
+		const generatedBody = generateFromBody(entity.body, context);
+
+		return [
+			`else if (${condition.code}) {`,
+			indent(generatedBody),
+			'}'
+		].join('\n');
+	},
+
+	'else': (entity, context) => {		
+		const generatedBody = generateFromBody(entity.body, context);
+
+		return [
+			'else {',
+			indent(generatedBody),
+			'}'
+		].join('\n');
 	}
 };
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "choice4genesis",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "A ChoiceScript clone that generates SGDK-compatible C source for the Sega Genesis ",
   "main": "index.js",
   "scripts": {

parser/syntax-full.js

@@ -99,9 +99,6 @@ const checkSiblingCommands = (body, errors) => checkSiblings(checkOnlyAfter(body
 
 
 const completeCommands = (body, errors) => {
-	if (!body.map) {
-		console.log({ body });
-	}
 	const completedCommands = body.map(element => {
 		if (element.type !== 'command') {
 			return element;
@@ -139,6 +136,7 @@ const parse = source => {
 
 	const completedErrors = [...(errors || [])];
 	const completedBody = completeCommands(body, completedErrors);
+	debugger;
 
 	return { 
 		type,