Collapse = imports.Collapse.Collapse;
GLib = imports.gi.GLib;
+Gio = imports.gi.Gio;
/**
* @namespace JSDOC
* @class Packer
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',
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)
{
}
}
+ print("Output file: " + this.target);
+ if (this.debugTarget) print("Output debug file: " + this.debugTarget);
keepWhite : true,
keepComments : true,
sepIdents : true,
- collapseWhite : false
+ collapseWhite : false,
+ filename : fn
});
this.timerPrint("START" + fn);
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;
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..
/**
* 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
*
*
*
ScopeParser = function(ts) {
this.ts = ts; // {TokenStream}
this.warnings = [];
- this.scopes = [];
- this.indexedScopes = {};
+ this.indexedg = {};
this.timer = new Date() * 1;
this.debug = false;
}
// 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,
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);
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();
},
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() {
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;
}
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...");
if (nts.length) {
var TS = this.ts;
this.ts = new TokenStream(nts);
- this.parseExpression();
+ this.parseExpression(scope);
this.ts = TS;
}
//this.logR("parseScope DONE : <B>ParseExpression</B> - 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;
}
//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("<i>"+token.data+"</i>");
var bn = this.braceNesting;
- this.parseFunctionDeclaration();
+ this.parseFunctionDeclaration(scope);
this.braceNesting = bn;
break;
// 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;
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();
case "PUNC.RIGHT_CURLY": // }
//print("<< EXIT SCOPE");
return;
- /*
- //println("<i>"+token.data+"</i>");
- 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("<<<<<<<EXIT SCOPE" +this.scopes.length);
- return;
- }
- break;
-*/
+
case "KEYW.WITH":
//print('SCOPE-WITH:' + token.toString());
//println("<i>"+token.data+"</i>");
// 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;
case "KEYW.CATCH":
//print('SCOPE-CATCH:' + token.toString());
//println("<i>"+token.data+"</i>");
- 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());
}
-
-
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 == ".") {
//println("GOT IDENT: <B>" + symbol + "</B><BR/>");
//println("GOT IDENT (2): <B>" + symbol + "</B><BR/>");
- identifier = this.getIdentifier(symbol, thisScope, token);
+ identifier = this.getIdentifier(symbol, scope, token);
if (identifier == false) {
// BUG!find out where builtin is defined...
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");
} 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);
}
},
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.
var symbol;
var token;
- var currentScope;
+
var identifier;
var expressionBraceNesting = this.braceNesting + 0;
var isInObjectLitAr;
var isObjectLitAr = [ false ];
- currentScope = this.scopes[this.scopes.length-1];
+
//print(scopeIndent + ">> ENTER EXPRESSION" + this.expN);
*/
//this.dumpToken(token, this.scopes, this.braceNesting );
- //print('EXPR' + token.toString());
+ //print('EXPR' + token.toString());
//println("<i>"+token.data+"</i>");
// 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;
var _this = this;
token.items.forEach(function(expr) {
_this.ts = new TokenStream(expr);
- _this.parseExpression()
+ _this.parseExpression(scope)
});
this.ts = curTS;
if (this.mode == 'PASS2_SYMBOL_TREE') {
- identifier = this.getIdentifier(symbol, currentScope, token);
+ identifier = this.getIdentifier(symbol, scope, token);
//println("<B>??</B>");
if (identifier == false) {
//print('EXPR-KEYW:' + token.toString());
if (token.name == "FUNCTION") {
- this.parseFunctionDeclaration();
+ this.parseFunctionDeclaration(scope);
break;
}
-
-
+
symbol = token.data;
if (this.mode == 'BUILDING_SYMBOL_TREE') {
//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");
});
} 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);
}
},
- 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++;
}
//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("<B>PARSING FUNCTION</B>");
- 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();
}
// return function() {....
while (token.data != "(") {
- print(token.toString());
+ //print(token.toString());
token = this.ts.nextTok();
//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);
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
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];
}
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;
+
+
},
/**
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;
+
},
/**
projects / gnome.introspection-doc-generator / commitdiff