16mm
/
mcopy
1
0
Fork 0
Code Issues 14 Pull Requests Projects 2 Releases 13 Wiki Activity

'use strict' all of mscript. made it 20% faster.

This commit is contained in:
Matt 2016-04-17 10:28:20 -04:00
parent 4c9b607efc
commit d7414d9b7f
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/lib/mscript.js
View File

@ -4,6 +4,7 @@ var fs,
var mscript = {}; var mscript = {};
mscript.arg = function arg (shrt, lng) { mscript.arg = function arg (shrt, lng) {
'use strict';
if (process.argv.indexOf(shrt) !== -1 || if (process.argv.indexOf(shrt) !== -1 ||
process.argv.indexOf(lng) !== -1) { process.argv.indexOf(lng) !== -1) {
return true; return true;
@ -12,6 +13,7 @@ mscript.arg = function arg (shrt, lng) {
}; };
mscript.arg_pos = function arg_pos (shrt, lng) { mscript.arg_pos = function arg_pos (shrt, lng) {
'use strict';
var pos = -1; var pos = -1;
pos = process.argv.indexOf(shrt); pos = process.argv.indexOf(shrt);
if (pos === -1) { if (pos === -1) {
@ -39,6 +41,7 @@ mscript.alts = {
'L ' : ['LIGHT', 'COLOR', 'LAMP'] 'L ' : ['LIGHT', 'COLOR', 'LAMP']
}; };
mscript.alts_unique = function alts_unique () { mscript.alts_unique = function alts_unique () {
'use strict';
var ids = Object.keys(mscript.alts), var ids = Object.keys(mscript.alts),
all = []; all = [];
for (var i = 0; i < ids.length; i++) { for (var i = 0; i < ids.length; i++) {
@ -51,6 +54,7 @@ mscript.alts_unique = function alts_unique () {
}; };
mscript.state = {}; mscript.state = {};
mscript.state_clear = function state_clear () { mscript.state_clear = function state_clear () {
'use strict';
mscript.state = { mscript.state = {
cam : 0, cam : 0,
proj : 0, proj : 0,
@ -59,6 +63,7 @@ mscript.state_clear = function state_clear () {
}; };
}; };
mscript.interpret = function interpret (text, callback) { mscript.interpret = function interpret (text, callback) {
'use strict';
mscript.state_clear(); mscript.state_clear();
if (typeof text === 'undefined') { if (typeof text === 'undefined') {
mscript.fail('No input'); mscript.fail('No input');
@ -163,14 +168,15 @@ mscript.interpret = function interpret (text, callback) {
} }
}; };
mscript.last_loop = function last_loop () { mscript.last_loop = function last_loop () {
'use strict';
return mscript.state.loops[mscript.state.loops.length - 1]; return mscript.state.loops[mscript.state.loops.length - 1];
}; };
mscript.parent_loop = function parent_loop () { mscript.parent_loop = function parent_loop () {
'use script';
return mscript.state.loops[mscript.state.loops.length - 2]; return mscript.state.loops[mscript.state.loops.length - 2];
}; };
mscript.state_update = function state_update (cmd, val) { mscript.state_update = function state_update (cmd, val) {
'use strict';
if (cmd === 'END') { if (cmd === 'END') {
for (var i = 0; i < val; i++) { for (var i = 0; i < val; i++) {
if (mscript.state.rec === 0) { if (mscript.state.rec === 0) {
@ -220,6 +226,7 @@ mscript.state_update = function state_update (cmd, val) {
} }
}; };
mscript.str_to_arr = function str_to_arr (str, cmd) { mscript.str_to_arr = function str_to_arr (str, cmd) {
'use strict';
var cnt = str.split(cmd), var cnt = str.split(cmd),
c = parseInt(cnt[1]), c = parseInt(cnt[1]),
arr = []; arr = [];
@ -235,14 +242,16 @@ mscript.str_to_arr = function str_to_arr (str, cmd) {
return arr; return arr;
}; };
mscript.loop_count = function loop_count (str) { mscript.loop_count = function loop_count (str) {
'use strict';
return parseInt(str.split('LOOP ')[1]); return parseInt(str.split('LOOP ')[1]);
}; };
mscript.fail = function fail (reason) { mscript.fail = function fail (reason) {
'use strict';
console.error(JSON.stringify({success: false, error: true, msg : reason})); console.error(JSON.stringify({success: false, error: true, msg : reason}));
if (process) process.exit(); if (process) process.exit();
}; };
mscript.output = function output (data) { mscript.output = function output (data) {
'use strict';
var json = true; //default var json = true; //default
if (mscript.arg('-j', '--json')) { if (mscript.arg('-j', '--json')) {
json = true; json = true;
@ -262,6 +271,7 @@ mscript.output = function output (data) {
} }
}; };
mscript.init = function init () { mscript.init = function init () {
'use strict';
if (mscript.arg('-t', '--tests')) { if (mscript.arg('-t', '--tests')) {
return mscript.tests(); return mscript.tests();
} }
@ -291,6 +301,7 @@ mscript.init = function init () {
}; };
mscript.tests = function tests () { mscript.tests = function tests () {
'use strict';
console.log('Running mscript tests'); console.log('Running mscript tests');
console.time('Tests took'); console.time('Tests took');
@ -365,6 +376,8 @@ mscript.tests = function tests () {
} }
}); });
//Lighting tests
console.log('All tests completed'); console.log('All tests completed');
console.timeEnd('Tests took'); console.timeEnd('Tests took');
}; };