From 5c841bcb4b00ac85ff8fd4db7d980170581140fe Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Tue, 10 Aug 2010 18:08:49 +0800 Subject: [PATCH] Update Packer code to working copy Packer code now is tested and runs against test libraries see: http://www.akbkhome.com/blog.php for more details --- JSDOC/Collapse.js | 6 ++ JSDOC/Packer.js | 74 +++++++++++++++---- JSDOC/Scope.js | 26 ++++++- JSDOC/ScopeParser.js | 165 ++++++++++++++++--------------------------- JSDOC/TokenReader.js | 86 ++++++++++++++-------- JSDOC/TokenStream.js | 5 +- pack.js | 22 +++++- 7 files changed, 234 insertions(+), 150 deletions(-) diff --git a/JSDOC/Collapse.js b/JSDOC/Collapse.js index 62b3a73..71a89fd 100644 --- a/JSDOC/Collapse.js +++ b/JSDOC/Collapse.js @@ -194,6 +194,12 @@ Collapse = XObject.define( g.push(ar[i]); continue; } + // var a=..., b =... + if ((ar[i].data != ';') && g.length && (g[0].name == "VAR")) {; + g.push(ar[i]); + continue; + } + g.push(ar[i]); ret.push(g); g = []; diff --git a/JSDOC/Packer.js b/JSDOC/Packer.js index 933156d..22a3757 100644 --- a/JSDOC/Packer.js +++ b/JSDOC/Packer.js @@ -10,6 +10,7 @@ CompressWhite = imports.CompressWhite.CompressWhite; Collapse = imports.Collapse.Collapse; GLib = imports.gi.GLib; +Gio = imports.gi.Gio; /** * @namespace JSDOC * @class Packer @@ -83,32 +84,61 @@ Packer = function(cfg) throw "No Files"; } - + var link = false; + if (cfg.autoBuild) { + var version = 0; + this.files.forEach(function(f) { + version = Math.max(File.mtime(f), version); + }); + var dirname = GLib.path_get_dirname(this.files[0]); + var outname = this.module ? this.module : GLib.path_get_basename(dirname); + this.target = dirname + '/compiled/' + outname + '-' + version + '.js'; + if (File.exists(this.target)) { + print("Target file already exists: " + this.target); + Seed.quit(); + } + this.prefix = dirname +'/'; + this.translateJSON = dirname + '/compiled/_translation_.js'; + + } + + print(this.translateJSON); this.timer = new Date() * 1; this.packAll(); + + } Packer.prototype = { /** - * @prop srcfiles {String} file containing a list of files/or classes to use. + * @cfg {String} srcfiles file containing a list of files/or classes to use. */ srcfile : false, /** - * @prop files {Array} list of files to compress (must be full path) + * @cfg {Array} files list of files to compress (must be full path) */ files : false, /** - * @prop target {String} target to write files to - must be full path. + * @cfg {String} target to write files to - must be full path. */ target : '', /** - * @prop debugTarget {String} target to write files debug version to (uncompacted)- must be full path. + * @cfg {Boolean} autoBuild - turn on autobuild feature (puts files in compiled directory, + * and enables translation toolkit. + */ + autoBuild : false, + /** + * @cfg {String} module used with autoBuild to force a file name + */ + module: false, + /** + * @cfg {String} debugTargettarget to write files debug version to (uncompacted)- must be full path. */ debugTarget : '', // merged file without compression. /** - * @prop tmpDir {String} (optional) where to put the temporary files. + * @cfg {String} tmpDir (optional) where to put the temporary files. * if you set this, then files will not be cleaned up */ tmpDir : '/tmp', @@ -116,18 +146,29 @@ Packer.prototype = { translateJSON : '', // json based list of strings in all files. /** - * @prop cleanup {Boolean} (optional) clean up temp files after done - + * @cfg {Boolean} cleanup (optional) clean up temp files after done - * Defaults to false if you set tmpDir, otherwise true. */ cleanup : true, + /** + * @cfg {Boolean} keepWhite (optional) do not remove white space in output. + * usefull for debugging compressed files. + */ + + keepWhite: true, /** - * @prop prefix {String} (optional) prefix of directory to be stripped of when + * @cfg {String} prefix (optional) prefix of directory to be stripped of when * Calculating md5 of filename */ prefix : '', out : '', // if no target is specified - then this will contain the result + /** + * load a dependancy list -f option + * @param {String} srcfile sourcefile to parse + * + */ loadSourceFile : function(srcfile) { @@ -297,6 +338,8 @@ Packer.prototype = { } } + print("Output file: " + this.target); + if (this.debugTarget) print("Output debug file: " + this.debugTarget); @@ -319,7 +362,8 @@ Packer.prototype = { keepWhite : true, keepComments : true, sepIdents : true, - collapseWhite : false + collapseWhite : false, + filename : fn }); this.timerPrint("START" + fn); @@ -353,8 +397,9 @@ Packer.prototype = { print(sp.warnings.join("\n")); - //var out = CompressWhite(new TokenStream(toks), this, true); // do not kill whitespace.. - var out = CompressWhite(new TokenStream(toks), this, false); + var out = CompressWhite(new TokenStream(toks), this, this.keepWhite); // do not kill whitespace.. + + this.timerPrint("Compressed"); return out; @@ -416,10 +461,13 @@ Packer.prototype = { File.write(transmd5, ''); for(v in map) { - File.append(transfile, l + "\n\t \"" + v + '" : "' + v + '"'); + if (!v.length) { + continue; + } + File.append(transfile, l + "\n\t" + JSON.stringify(v) + " : " + JSON.stringify(v)); l = ','; // strings are raw... - as the where encoded to start with!!! - File.append(transmd5, '_T["' + this.md5(ffn + '-' + v) + '"]="'+v+"\";\n"); + File.append(transmd5, '_T["' + this.md5(ffn + '-' + v) + '"]='+JSON.stringify(v)+";\n"); } File.append(transfile, "\n},"); // always one trailing.. diff --git a/JSDOC/Scope.js b/JSDOC/Scope.js index aa145c3..2161c97 100644 --- a/JSDOC/Scope.js +++ b/JSDOC/Scope.js @@ -24,7 +24,7 @@ function Scope(braceN, parent, startTokN, lastIdent, token) this.hints = { }; this.ident = lastIdent; this.gid = Scope.gid++; - + this.token = token; //print("ADD SCOPE(" + this.gid + ") TO "+ (parent ? this.parent.gid : 'TOP') + ' : ' + // (token ? token.toString() : '')); @@ -53,7 +53,29 @@ Scope.prototype = { munged : false, protectedVars : {}, // only used by to parent.. - declareIdentifier : function(symbol, token) { + + /** + * dump the scope to StdOut... + * + */ + dump : function(indent) + { + indent = indent || ''; + print( + indent + "Scope: " + this.id + "\n" + + indent + "Started: " + ( this.token ? this.token.line : 'TOP' ) + "\n" + + indent + "- " + XObject.keys(this.identifiers).join(", ") + "\n" + ); + this.subScopes.forEach(function(s) { + s.dump(indent + ' '); + }); + + + }, + + + declareIdentifier : function(symbol, token) + { //print("SCOPE : " + this.gid + " :SYM: " + symbol + " " + token.toString()+""); diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js index d608dbd..a908c68 100644 --- a/JSDOC/ScopeParser.js +++ b/JSDOC/ScopeParser.js @@ -5,21 +5,7 @@ TokenStream = imports.TokenStream.TokenStream; /** * Scope stuff * -* // FIXME - I need this to do next() without doccomments.. -* -* -* -* Need to make this alot simpler... -* -* so debugging is possible. -* -* -* at present it just runs along the stream and finds stuff then calls parseExpr .. etc,, -* -* -* It would be better to parse blocks of code rather than the whole stream.. -* -* +* This code now uses the collapsed tree * * * @@ -28,8 +14,7 @@ TokenStream = imports.TokenStream.TokenStream; ScopeParser = function(ts) { this.ts = ts; // {TokenStream} this.warnings = []; - this.scopes = []; - this.indexedScopes = {}; + this.indexedg = {}; this.timer = new Date() * 1; this.debug = false; } @@ -122,7 +107,6 @@ ScopeParser.prototype = { // defaults should not be initialized here =- otherwise they get duped on new, rather than initalized.. warnings : false, ts : false, - scopes : false, global : false, mode : "", //"BUILDING_SYMBOL_TREE", braceNesting : 0, @@ -139,13 +123,12 @@ ScopeParser.prototype = { this.ts.rewind(); this.braceNesting = 0; - this.scopes = []; // print(JSON.stringify(this.ts.tokens, null,4)); this.globalScope = new Scope(-1, false, -1, ''); - indexedScopes = { 0 : this.globalScope }; + this.indexedScopes = { 0 : this.globalScope }; this.mode = 'BUILDING_SYMBOL_TREE'; this.parseScope(this.globalScope); @@ -183,12 +166,15 @@ ScopeParser.prototype = { this.ts.rewind(); this.braceNesting = 0; - this.scopes= []; this.mode = 'PASS2_SYMBOL_TREE'; //println("MUNGING?"); this.parseScope(this.globalScope); + + //this.globalScope.dump(); + + this.globalScope.munge(); }, @@ -223,12 +209,7 @@ ScopeParser.prototype = { var isObjectLitAr = [ false ]; var isInObjectLitAr; - thisScope = scope; - if (thisScope && thisScope.gid != this.scopes[this.scopes.length-1]) { - this.scopes.push(scope); - } else { - thisScope = this.scopes[this.scopes.length-1] - } + //var scopeIndent = ''; //this.scopes.forEach(function() { @@ -258,7 +239,7 @@ ScopeParser.prototype = { while (true) { token = this.ts.nextTok(); //!this.debug|| print( token.toString()); - //print('SCOPE-VAR-VAL:' + JSON.stringify(token, null, 4)); + // print('SCOPE-VAR-VAL:' + JSON.stringify(token, null, 4)); if (!token) { // can return false at EOF! break; } @@ -277,10 +258,10 @@ ScopeParser.prototype = { if (this.mode == "BUILDING_SYMBOL_TREE") { - identifier = thisScope.getIdentifier(token.data,token) ; + identifier = scope.getIdentifier(token.data,token) ; if (identifier == false) { - thisScope.declareIdentifier(token.data, token); + scope.declareIdentifier(token.data, token); } else { token.identifier = identifier; this.warn("(SCOPE) The variable " + token.data + ' (line:' + token.line + ") has already been declared in the same scope..."); @@ -311,7 +292,7 @@ ScopeParser.prototype = { if (nts.length) { var TS = this.ts; this.ts = new TokenStream(nts); - this.parseExpression(); + this.parseExpression(scope); this.ts = TS; } @@ -320,7 +301,8 @@ ScopeParser.prototype = { //this.logR("parseScope DONE : ParseExpression - tok is:" + this.ts.lookT(0).toString()); token = this.ts.lookTok(1); - !this.debug|| print("AFTER EXP: " + token.toString()); + //!this.debug|| + // print("AFTER EXP: " + token.toString()); if (token.data == ';') { break; } @@ -331,12 +313,14 @@ ScopeParser.prototype = { //this.ts.dump(vstart , this.ts.cursor); break; + + case "KEYW.FUNCTION": //if (this.mode == 'BUILDING_SYMBOL_TREE') // print('SCOPE-FUNC:' + JSON.stringify(token,null,4)); //println(""+token.data+""); var bn = this.braceNesting; - this.parseFunctionDeclaration(); + this.parseFunctionDeclaration(scope); this.braceNesting = bn; break; @@ -356,14 +340,14 @@ ScopeParser.prototype = { // parse a function.. this.ts = new TokenStream(token.props[prop].val); this.ts.nextTok(); - this.parseFunctionDeclaration(); + this.parseFunctionDeclaration(scope); continue; } // key value.. this.ts = new TokenStream(token.props[prop].val); - this.parseExpression(); + this.parseExpression(scope); } this.ts = curTS; @@ -376,8 +360,14 @@ ScopeParser.prototype = { var _this = this; token.items.forEach(function(expr) { - _this.ts = new TokenStream(expr); - _this.parseExpression() + //print(JSON.stringify(expr, null,4)); + _this.ts = new TokenStream(expr); + //if (curTS.data == '(') { + _this.parseScope(scope) + //} else { + // _this.parseExpression(scope) + //} + }); this.ts = curTS; //print("NOT PROPS"); Seed.quit(); @@ -391,26 +381,7 @@ ScopeParser.prototype = { case "PUNC.RIGHT_CURLY": // } //print("<< EXIT SCOPE"); return; - /* - //println(""+token.data+""); - this.braceNesting--; - isObjectLitAr.pop(); - //print(">>>>>> OBJLIT POP"+ this.braceNesting); - //assert braceNesting >= scope.getBra ceNesting(); - - if (this.braceNesting < expressionBraceNesting) { - var ls = this.scopes.pop(); - ls.getUsedSymbols(); - // eat symbol if we are currently at { - if (this.ts.look(0).data == '{') { - this.ts.nextTok(); - } - - print("<<<<<<"+token.data+""); @@ -420,7 +391,7 @@ ScopeParser.prototype = { // object member. As a consequence, the only thing we can // do is turn the obfuscation off for the highest scope // containing the 'with' block. - this.protectScopeFromObfuscation(thisScope); + this.protectScopeFromObfuscation(scope); this.warn("Using 'with' is not recommended." + (this.munge ? " Moreover, using 'with' reduces the level of compression!" : ""), true); } break; @@ -428,17 +399,9 @@ ScopeParser.prototype = { case "KEYW.CATCH": //print('SCOPE-CATCH:' + token.toString()); //println(""+token.data+""); - this.parseCatch(); + this.parseCatch(scope); break; - /* - case Token.SPECIALCOMMENT: - if (mode == BUILDING_SYMBOL_TREE) { - protectScopeFromObfuscation(scope); - this.warn("Using JScript conditional comments is not recommended." + (munge ? " Moreover, using JScript conditional comments reduces the level of compression." : ""), true); - } - break; - */ - + case "STRN.DOUBLE_QUOTE": // used for object lit detection.. case "STRN.SINGLE_QUOTE": // print('SCOPE-STRING:' + token.toString()); @@ -466,18 +429,13 @@ ScopeParser.prototype = { } - - break; case "NAME.NAME": //print('SCOPE-NAME:' + token.toString()); //print("DEAL WITH NAME:"); // got identifier.. - // look for { ** : <- indicates obj literal.. ** this could occur with numbers .. - - // skip anyting with "." before it..!! if (this.ts.lookTok(-1).data == ".") { @@ -500,7 +458,7 @@ ScopeParser.prototype = { //println("GOT IDENT: " + symbol + "
"); //println("GOT IDENT (2): " + symbol + "
"); - identifier = this.getIdentifier(symbol, thisScope, token); + identifier = this.getIdentifier(symbol, scope, token); if (identifier == false) { // BUG!find out where builtin is defined... @@ -544,7 +502,7 @@ ScopeParser.prototype = { var _t = this; token.prefix.replace(/eval:var:([a-z_]+)/ig, function(m, a) { //print("GOT: " + a); - var hi = _t.getIdentifier(a, thisScope, token); + var hi = _t.getIdentifier(a, scope, token); // println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING")); if (hi) { // print("PROTECT "+a+" from munge"); @@ -558,7 +516,7 @@ ScopeParser.prototype = { } else { - this.protectScopeFromObfuscation(thisScope); + this.protectScopeFromObfuscation(scope); this.warn("Using 'eval' is not recommended. (use eval:var:noreplace in comments to optimize) " + (this.munge ? " Moreover, using 'eval' reduces the level of compression!" : ""), true); } @@ -581,7 +539,7 @@ ScopeParser.prototype = { }, expN : 0, - parseExpression : function() { + parseExpression : function(scope) { // Parse the expression until we encounter a comma or a semi-colon // in the same brace nesting, bracket nesting and paren nesting. @@ -596,7 +554,7 @@ ScopeParser.prototype = { var symbol; var token; - var currentScope; + var identifier; var expressionBraceNesting = this.braceNesting + 0; @@ -605,7 +563,7 @@ ScopeParser.prototype = { var isInObjectLitAr; var isObjectLitAr = [ false ]; - currentScope = this.scopes[this.scopes.length-1]; + //print(scopeIndent + ">> ENTER EXPRESSION" + this.expN); @@ -624,7 +582,7 @@ ScopeParser.prototype = { */ //this.dumpToken(token, this.scopes, this.braceNesting ); - //print('EXPR' + token.toString()); + //print('EXPR' + token.toString()); //println(""+token.data+""); @@ -662,13 +620,13 @@ ScopeParser.prototype = { // parse a function.. this.ts = new TokenStream(token.props[prop].val); this.ts.nextTok(); - this.parseFunctionDeclaration(); + this.parseFunctionDeclaration(scope); continue; } // key value.. this.ts = new TokenStream(token.props[prop].val); - this.parseExpression(); + this.parseExpression(scope); } this.ts = curTS; @@ -682,7 +640,7 @@ ScopeParser.prototype = { var _this = this; token.items.forEach(function(expr) { _this.ts = new TokenStream(expr); - _this.parseExpression() + _this.parseExpression(scope) }); this.ts = curTS; @@ -744,7 +702,7 @@ ScopeParser.prototype = { if (this.mode == 'PASS2_SYMBOL_TREE') { - identifier = this.getIdentifier(symbol, currentScope, token); + identifier = this.getIdentifier(symbol, scope, token); //println("??"); if (identifier == false) { @@ -782,12 +740,11 @@ ScopeParser.prototype = { //print('EXPR-KEYW:' + token.toString()); if (token.name == "FUNCTION") { - this.parseFunctionDeclaration(); + this.parseFunctionDeclaration(scope); break; } - - + symbol = token.data; if (this.mode == 'BUILDING_SYMBOL_TREE') { @@ -802,7 +759,7 @@ ScopeParser.prototype = { //print("PROTECT: " + a); - var hi = _t.getIdentifier(a, currentScope, token); + var hi = _t.getIdentifier(a, scope, token); //println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING")); if (hi) { // println("PROTECT "+a+" from munge"); @@ -813,7 +770,7 @@ ScopeParser.prototype = { }); } else { - this.protectScopeFromObfuscation(currentScope); + this.protectScopeFromObfuscation(scope); this.warn("Using 'eval' is not recommended." + (this.munge ? " Moreover, using 'eval' reduces the level of compression!" : ""), true); } @@ -833,33 +790,35 @@ ScopeParser.prototype = { }, - parseCatch : function() { + parseCatch : function(scope) { var symbol; var token; - var currentScope; + var scope; var identifier; //token = getToken(-1); //assert token.getType() == Token.CATCH; - token = this.ts.nextTok(); + token = this.ts.nextTok(1); + token = this.ts.nextTok(1); - //print(JSON.stringify(token,null,4)); + + //print(JSON.stringify(this.ts,null,4)); //assert token.getType() == Token.LP; ( //token = this.ts.nextTok(); //assert token.getType() == Token.NAME; symbol = token.items[0][0].data; - currentScope = this.scopes[this.scopes.length-1]; + if (this.mode == 'BUILDING_SYMBOL_TREE') { // We must declare the exception identifier in the containing function // scope to avoid errors related to the obfuscation process. No need to // display a warning if the symbol was already declared here... - currentScope.declareIdentifier(symbol, token.items[0][0]); + scope.declareIdentifier(symbol, token.items[0][0]); } else { //?? why inc the refcount?? - that should be set when building the tree??? - identifier = this.getIdentifier(symbol, currentScope, token.items[0][0]); + identifier = this.getIdentifier(symbol, scope, token.items[0][0]); identifier.refcount++; } @@ -867,28 +826,28 @@ ScopeParser.prototype = { //assert token.getType() == Token.RP; // ) }, - parseFunctionDeclaration : function() + parseFunctionDeclaration : function(scope) { //print("PARSE FUNCTION"); var symbol; var token; - var currentScope = false; + var fnScope = false; var identifier; var b4braceNesting = this.braceNesting + 0; //this.logR("PARSING FUNCTION"); - currentScope = this.scopes[this.scopes.length-1]; + token = this.ts.nextTok(); if (token.type == "NAME") { if (this.mode == 'BUILDING_SYMBOL_TREE') { // Get the name of the function and declare it in the current scope. symbol = token.data; - if (currentScope.getIdentifier(symbol,token) != false) { + if (scope.getIdentifier(symbol,token) != false) { this.warn("The function " + symbol + " has already been declared in the same scope...", true); } - currentScope.declareIdentifier(symbol,token); + scope.declareIdentifier(symbol,token); } token = this.ts.nextTok(); } @@ -896,7 +855,7 @@ ScopeParser.prototype = { // return function() {.... while (token.data != "(") { - print(token.toString()); + //print(token.toString()); token = this.ts.nextTok(); @@ -906,7 +865,7 @@ ScopeParser.prototype = { //assert token.getType() == Token.LP; if (this.mode == 'BUILDING_SYMBOL_TREE') { - fnScope = new Scope(1, currentScope, token.n, '', token); + fnScope = new Scope(1, scope, token.n, '', token); //println("STORING SCOPE" + this.ts.cursor); diff --git a/JSDOC/TokenReader.js b/JSDOC/TokenReader.js index e367849..21db9f0 100644 --- a/JSDOC/TokenReader.js +++ b/JSDOC/TokenReader.js @@ -14,17 +14,24 @@ Lang = imports.Lang.Lang; TokenReader = XObject.define( function(o) { - this.keepDocs = true; - this.keepWhite = false; - this.keepComments = false; - this.sepIdents = false; // seperate '.' in identifiers.. XObject.extend(this, o || {}); }, Object, { + /** @cfg {Boolean} collapseWhite merge multiple whitespace/comments into a single token **/ collapseWhite : false, // only reduces white space... - + /** @cfg {Boolean} keepDocs keep JSDOC comments **/ + keepDocs : true, + /** @cfg {Boolean} keepWhite keep White space **/ + keepWhite : false, + /** @cfg {Boolean} keepComments keep all comments **/ + keepComments : false, + /** @cfg {Boolean} sepIdents seperate identifiers (eg. a.b.c into ['a', '.', 'b', '.', 'c'] ) **/ + sepIdents : false, + /** @cfg {String} filename name of file being parsed. **/ + filename : '', + /** * tokenize a stream * @return {Array} of tokens @@ -40,8 +47,10 @@ TokenReader = XObject.define( tokenize : function(/**JSDOC.TextStream*/stream) { this.line =1; var tokens = []; - /**@ignore*/ tokens.last = function() { return tokens[tokens.length-1]; } - /**@ignore*/ tokens.lastSym = function() { + /**@ignore*/ + tokens.last = function() { return tokens[tokens.length-1]; } + /**@ignore*/ + tokens.lastSym = function() { for (var i = tokens.length-1; i >= 0; i--) { if (!(tokens[i].is("WHIT") || tokens[i].is("COMM"))) return tokens[i]; } @@ -80,29 +89,36 @@ TokenReader = XObject.define( if (found === "") { return false; } - else { - var name; - if ((name = Lang.keyword(found))) { - tokens.push(new Token(found, "KEYW", name, this.line)); - return true; - } - if (!this.sepIdents || found.indexOf('.') < 0 ) { - tokens.push(new Token(found, "NAME", "NAME", this.line)); - return true; + + var name; + if ((name = Lang.keyword(found))) { + if (found == 'return' && tokens.lastSym().data == ')') { + throw { + name : "ArgumentError", + message: "\n" + this.filename + ':' + this.line + " Error - return found after )" + } } - var n = found.split('.'); - var p = false; - var _this = this; - n.forEach(function(nm) { - if (p) { - tokens.push(new Token('.', "PUNC", "DOT", _this.line)); - } - p=true; - tokens.push(new Token(nm, "NAME", "NAME", _this.line)); - }); - return true; + tokens.push(new Token(found, "KEYW", name, this.line)); + return true; + } + if (!this.sepIdents || found.indexOf('.') < 0 ) { + tokens.push(new Token(found, "NAME", "NAME", this.line)); + return true; } + var n = found.split('.'); + var p = false; + var _this = this; + n.forEach(function(nm) { + if (p) { + tokens.push(new Token('.', "PUNC", "DOT", _this.line)); + } + p=true; + tokens.push(new Token(nm, "NAME", "NAME", _this.line)); + }); + return true; + + }, /** @@ -115,13 +131,23 @@ TokenReader = XObject.define( found += stream.next(); } + if (found === "") { return false; } - else { - tokens.push(new Token(found, "PUNC", Lang.punc(found), this.line)); - return true; + + if ((found == '}' || found == ']') && tokens.lastSym().data == ',') { + //print("Error - comma found before " + found); + //print(JSON.stringify(tokens.lastSym(), null,4)); + throw { + name : "ArgumentError", + message: "\n" + this.filename + ':' + this.line + " Error - comma found before " + found + } } + + tokens.push(new Token(found, "PUNC", Lang.punc(found), this.line)); + return true; + }, /** diff --git a/JSDOC/TokenStream.js b/JSDOC/TokenStream.js index 7b3328f..aee0b5a 100644 --- a/JSDOC/TokenStream.js +++ b/JSDOC/TokenStream.js @@ -114,7 +114,10 @@ TokenStream = XObject.define( // print(i); if (i < 0) { if (n > -1) { - i = 0; continue; + i = 0; + count++; + continue; + } return new Token("", "VOID", "END_OF_STREAM"); } diff --git a/pack.js b/pack.js index c51f006..c31d342 100755 --- a/pack.js +++ b/pack.js @@ -11,6 +11,11 @@ * -C no cleanup (use with -w if you need are using a cache directory.) * -p prefix for translation md5 generator (directory that files are in, and is removed * from path when generating an md5 for the translated name. + * -k keepWhite - keeps the white space in the output files. + + * + * -m module name used with autoBuild to force a module name. + * -a autoBuild - puts target in INPUTDIR/compiled/MODULE-TIMESTAMP.js and enables translastion* * compresses files listed as arguments and outputs result */ @@ -27,7 +32,9 @@ args.shift(); // pack.js var cfg = { files : [], target : false, - srcfiles : [] + srcfiles : [], + autoBuild : false, + keepWhite : false } @@ -67,6 +74,19 @@ for(var i =0; i < args.length;i++) { i++; continue; } + if (args[i] == '-m') { + cfg.module = args[i+1]; + i++; + continue; + } + if (args[i] == '-a') { + cfg.autoBuild = true + continue; + } + if (args[i] == '-k') { + cfg.keepWhite = true + continue; + } if (cfg.files.indexOf(args[i]) > -1) { continue; // remove dupes. } -- 2.39.2