Merge branch 'master' of https://github.com/coder13/Meta

Author: Caleb Hoover

bin/check

@@ -5,8 +5,10 @@ var yargs = require('yargs')
     .describe('v', 'Verbose flag. Will print all statements. Default is false.')
     .describe('r', 'Recrusive flag. Will recursively check required files. Default is false.')
     .describe('j', 'Will output as a tree. Default is true.')
-    .describe('o', 'if -j, will output json into a file: <file>_log. If a file is given, outputs to that it. Default is false.')
+    .describe('d', 'debug flag. Will output the file and line of the code being checked when an error is thrown')
+    .alias('d', 'debug')
     .showHelpOnFail(false);
+    // .describe('o', 'if -j, will output json into a file: <file>_log. If a file is given, outputs to that it. Default is false.')
 
 var colors  = require('colors'),
 	fs = require('fs'),
@@ -37,7 +39,12 @@ if (argv.h) {
 }
 
 var check = require('../check.js');
-check.setFlags({verbose: argv.v, recursive: argv.r, json: argv.j});
+check.setFlags({
+	verbose: argv.v,
+	recursive: argv.r,
+	json: argv.j,
+	debug: argv.d
+});
 var Scope = check.Scope;
 
 if (!argv.j)

check.js

@@ -20,7 +20,8 @@ var sources = require('./danger.json').sources;
 var flags = module.exports.flags = {
 	verbose: false,
 	recursive: false,
-	json: true
+	json: true,
+	debug: false
 };
 
 var reports = module.exports.reports = [];
@@ -30,6 +31,7 @@ module.exports.setFlags = function(flags) {
 	flags.verbose = flags.verbose;
 	flags.recursive = flags.recursive;
 	flags.json = flags.json || true;
+	flags.debug = flags.debug;
 
 	if (flags.recursive) {
 		// function to handle loading and traversing a file upon require()
@@ -177,11 +179,23 @@ traverse = module.exports.traverse = function(ast, scope) {
 		Scope.log('SOURCES', ast, scope.sources);
 	}
 
-	ast.body.forEach(function (node) {
-		if (node.type == 'ExpressionStatement')
-			node = node.expression;
-		scope.resolveStatement(node);
-	});
+	if (flags.debug) {
+		try {
+			ast.body.forEach(function (node) {
+				if (node.type == 'ExpressionStatement')
+					node = node.expression;
+				scope.resolveStatement(node);
+			});
+		} catch (e) {
+			console.log(e);
+		}
+	} else {
+		ast.body.forEach(function (node) {
+			if (node.type == 'ExpressionStatement')
+				node = node.expression;
+			scope.resolveStatement(node);
+		});
+	}
 
 	if (flags.verbose && !flags.json)
 		Scope.Scope.leaveScope();