Finished first pass on Runtime, fixed ESLint errors.

Author: MitMaro

package.json

@@ -22,7 +22,7 @@
     "eslint-config-mitmaro": "^2.0.0",
     "eslint-plugin-strict-newline": "^1.0.0",
     "istanbul": "^0.4.4",
-    "mocha": "^2.5.3"
+    "mocha": "^3.0.0"
   },
   "dependencies": {
     "async": "^2.0.1"

src/Parser.js

@@ -139,6 +139,7 @@ class Parser {
 	generateAST() {
 		this.sources = [];
 		const ast = this.generateRootNode();
+
 		this.getExpectedToken(TOKEN_STRUCTURE_EOF);
 		ast.sources = this.sources;
 		return ast;

src/Runner.js src/Runtime.jssrc/Runner.js renamed to src/Runtime.js

@@ -8,21 +8,22 @@ const Parser = require('./Parser');
 const Lexer = require('./Lexer');
 
 // credit: http://stackoverflow.com/a/3886106/124861
-function isFloat(n){
+function isFloat(n) {
 	return Number(n) === n && n % 1 !== 0;
 }
 
 function floatEqual(a, b, epsilon = Number.EPSILON) {
-		if (a === b) {
-			return true;
-		}
+	if (a === b) {
+		return true;
+	}
 
-		if (isNaN(a) || isNaN(b) || !isFinite(a) || !isFinite(b)) {
-			return false;
-		}
+	if (isNaN(a) || isNaN(b) || !isFinite(a) || !isFinite(b)) {
+		return false;
+	}
+
+	const diff = Math.abs(a - b);
 
-		const diff = Math.abs(a - b);
-		return diff < epsilon ? true : diff <= Math.max(Math.abs(a), Math.abs(b)) * epsilon;
+	return diff < epsilon ? true : diff <= Math.max(Math.abs(a), Math.abs(b)) * epsilon;
 }
 
 const {
@@ -66,6 +67,7 @@ class Runner {
 
 		for (const value of sources) {
 			const path = value.type === PARSER_TYPE_VARIABLE ? this.getValueFromVariable(value.name) : value.value;
+
 			tasks[path] = fs.readFile.bind(fs, path);
 		}
 
@@ -96,10 +98,17 @@ class Runner {
 	}
 
 	invokeInclude(statement) {
+		let path;
 
-		if ()
-
-		this.invoke(ast);
+		if (statement.value.type === PARSER_TYPE_VARIABLE) {
+			path = this.getValueFromVariable(statement.value.name);
+		}
+		else {
+			path = statement.value.value;
+		}
+		if (this.astCache[path]) {
+			this.invokeStatements(this.astCache[path].statements);
+		}
 	}
 
 	invokeBranch(statement) {
@@ -108,6 +117,8 @@ class Runner {
 				return this.invokeStatements(branch.consequent.statements);
 			}
 		}
+		// no branch executed
+		return null;
 	}
 
 	evaluateExpression(expression) {
@@ -123,6 +134,7 @@ class Runner {
 		else if (expression.type === PARSER_TYPE_VARIABLE) {
 			return this.getValueFromVariable(expression.name);
 		}
+		throw new RuntimeError(`Unknown expression type: ${expression.type}`);
 	}
 
 	evaluateBinaryExpression(expression) {
@@ -176,7 +188,7 @@ class Runner {
 		if (isFloat(leftValue) && isFloat(rightValue)) {
 			return floatEqual(leftValue, rightValue);
 		}
-
+		// eslint-disable-next-line eqeqeq
 		return strict ? leftValue === rightValue : leftValue == rightValue;
 	}
 
@@ -189,7 +201,7 @@ class Runner {
 	}
 
 	getValueFromVariable(name) {
-		if (!name in this.input) {
+		if (!(name in this.input)) {
 			throw new RuntimeError(`Unset variable: ${name}`);
 		}
 		return this.input[name];

test/Parser/Parser.generate.spec.js

@@ -36,7 +36,7 @@ describe('Parser.generate', function() {
 			nb.include(nb.value('foo'))
 		];
 
-		expect(result.sources).to.deep.equal([nb.value('foo')]);
+		expect(result.sources).to.deep.equal([ nb.value('foo') ]);
 		expect(result.statements).to.deep.equal(expected);
 	});
 
@@ -46,14 +46,14 @@ describe('Parser.generate', function() {
 			nb.include(nb.variable('foo'))
 		];
 
-		expect(result.sources).to.deep.equal([nb.variable('foo')]);
+		expect(result.sources).to.deep.equal([ nb.variable('foo') ]);
 		expect(result.statements).to.deep.equal(expected);
 	});
 
 	it('should set sources from inside if blocks', function() {
 		const result = getParserResult('{{if bar}}{{include baz}}{{fi}}');
 
-		expect(result.sources).to.deep.equal([nb.variable('baz')]);
+		expect(result.sources).to.deep.equal([ nb.variable('baz') ]);
 	});
 
 	it('should parse with basic if statement', function() {