X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=00c01a66225d067554ece8e41a6ceeb6a00e7f13;hp=3ca7931b7eb454fb0b4cd06d6600556a3043a1a6;hb=46559a97aac8eed4b0e701b700ae6f8b8744317d;hpb=66eaf75821e884a2fde92794eb1ab4df33bfd30a diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js index 3ca7931..00c01a6 100644 --- a/JSDOC/ScopeParser.js +++ b/JSDOC/ScopeParser.js @@ -141,7 +141,7 @@ ScopeParser.prototype = { this.braceNesting = 0; this.scopes = []; - + print(JSON.stringify(this.ts.tokens, null,4)); this.globalScope = new Scope(-1, false, -1, ''); @@ -223,13 +223,18 @@ ScopeParser.prototype = { var isObjectLitAr = [ false ]; var isInObjectLitAr; - this.scopes.push(scope); + 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() { // scopeIndent += ' '; //}); - print(">> ENTER SCOPE"); + //print(">> ENTER SCOPE"); @@ -246,14 +251,14 @@ ScopeParser.prototype = { switch(token.type + '.' + token.name) { case "KEYW.VAR": case "KEYW.CONST": // not really relivant as it's only mozzy that does this. - print('SCOPE-VAR:' + token.toString()); + //print('SCOPE-VAR:' + token.toString()); var vstart = this.ts.cursor +1; //this.log("parseScope GOT VAR/CONST : " + token.toString()); while (true) { token = this.ts.nextTok(); //!this.debug|| print( token.toString()); - print('SCOPE-VAR:' + token.toString()); + //print('SCOPE-VAR-VAL:' + JSON.stringify(token, null, 4)); if (!token) { // can return false at EOF! break; } @@ -272,10 +277,10 @@ ScopeParser.prototype = { if (this.mode == "BUILDING_SYMBOL_TREE") { - identifier = scope.getIdentifier(token.data) ; + identifier = thisScope.getIdentifier(token.data,token) ; if (identifier == false) { - scope.declareIdentifier(token.data, token); + thisScope.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..."); @@ -295,7 +300,21 @@ ScopeParser.prototype = { } else { //var bn = this.braceNesting; var bn = this.braceNesting; - this.parseExpression(); + var nts = []; + while (true) { + if (!token || token.type == 'VOID' || token.data == ',') { + break; + } + nts.push(token); + token = this.ts.nextTok(); + } + if (nts.length) { + var TS = this.ts; + this.ts = new TokenStream(nts); + this.parseExpression(); + this.ts = TS; + } + this.braceNesting = bn; //this.braceNesting = bn; //this.logR("parseScope DONE : ParseExpression - tok is:" + this.ts.lookT(0).toString()); @@ -313,8 +332,8 @@ ScopeParser.prototype = { break; case "KEYW.FUNCTION": - if (this.mode == 'BUILDING_SYMBOL_TREE') - print('SCOPE-FUNC:' + JSON.stringify(token,null,4)); + //if (this.mode == 'BUILDING_SYMBOL_TREE') + // print('SCOPE-FUNC:' + JSON.stringify(token,null,4)); //println(""+token.data+""); var bn = this.braceNesting; this.parseFunctionDeclaration(); @@ -323,17 +342,20 @@ ScopeParser.prototype = { case "PUNC.LEFT_CURLY": // { case "PUNC.LEFT_PAREN": // ( - print('SCOPE-CURLY/PAREN:' + token.toString()); + case "PUNC.LEFT_BRACE": // [ + //print('SCOPE-CURLY/PAREN:' + token.toString()); //println(""+token.data+""); var curTS = this.ts; if (token.props) { for (var prop in token.props) { - print('SCOPE-PROPS:' + JSON.stringify(token.props[prop],null,4)); + + // print('SCOPE-PROPS:' + JSON.stringify(token.props[prop],null,4)); if (token.props[prop].val[0].data == 'function') { // parse a function.. this.ts = new TokenStream(token.props[prop].val); + this.ts.nextTok(); this.parseFunctionDeclaration(); continue; @@ -341,7 +363,7 @@ ScopeParser.prototype = { // key value.. this.ts = new TokenStream(token.props[prop].val); - this.parseScope(scope); + this.parseExpression(); } this.ts = curTS; @@ -355,7 +377,7 @@ ScopeParser.prototype = { var _this = this; token.items.forEach(function(expr) { _this.ts = new TokenStream(expr); - _this.parseExpression(scope) + _this.parseExpression() }); this.ts = curTS; //print("NOT PROPS"); Seed.quit(); @@ -367,7 +389,7 @@ ScopeParser.prototype = { break; case "PUNC.RIGHT_CURLY": // } - print("<< EXIT SCOPE"); + //print("<< EXIT SCOPE"); return; /* //println(""+token.data+""); @@ -390,7 +412,7 @@ ScopeParser.prototype = { break; */ case "KEYW.WITH": - print('SCOPE-WITH:' + token.toString()); + //print('SCOPE-WITH:' + token.toString()); //println(""+token.data+""); if (this.mode == "BUILDING_SYMBOL_TREE") { // Inside a 'with' block, it is impossible to figure out @@ -398,13 +420,13 @@ 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(scope); + this.protectScopeFromObfuscation(thisScope); 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()); + //print('SCOPE-CATCH:' + token.toString()); //println(""+token.data+""); this.parseCatch(); break; @@ -419,7 +441,7 @@ ScopeParser.prototype = { case "STRN.DOUBLE_QUOTE": // used for object lit detection.. case "STRN.SINGLE_QUOTE": - print('SCOPE-STRING:' + token.toString()); + // print('SCOPE-STRING:' + token.toString()); //println(""+token.data+""); if (this.ts.lookTok(-1).data == '{' && this.ts.lookTok(1).data == ':') { @@ -449,27 +471,12 @@ ScopeParser.prototype = { break; case "NAME.NAME": - print('SCOPE-NAME:' + token.toString()); + //print('SCOPE-NAME:' + token.toString()); //print("DEAL WITH NAME:"); // got identifier.. // look for { ** : <- indicates obj literal.. ** this could occur with numbers .. - if ((this.ts.lookTok(-1).data == "{") && (this.ts.lookTok(1).data == ":")) { - isObjectLitAr.pop(); - isObjectLitAr.push(true); - //print(">>>>>> OBJLIT REPUSH(true)"); - //println(""+token.data+""); - break; - } - // print("DEAL WITH obj lit:"); - isInObjectLitAr = isObjectLitAr[isObjectLitAr.length-1]; - - if (isInObjectLitAr && (this.ts.lookTok(1).data == ":") && (this.ts.lookTok(-1).data == ",")) { - // skip, it's an object lit key.. - //println(""+token.data+""); - break; - } - + // skip anyting with "." before it..!! @@ -481,6 +488,9 @@ ScopeParser.prototype = { //print("SYMBOL: " + token.toString()); symbol = token.data; + if (symbol == 'this') { + break; + } if (this.mode == 'PASS2_SYMBOL_TREE') { //println("GOT IDENT: -2 : " + this.ts.lookT(-2).toString() + "
..... -1 : " + this.ts.lookT(-1).toString() + "
"); @@ -490,7 +500,7 @@ ScopeParser.prototype = { //println("GOT IDENT: " + symbol + "
"); //println("GOT IDENT (2): " + symbol + "
"); - identifier = this.getIdentifier(symbol, scope); + identifier = this.getIdentifier(symbol, thisScope, token); if (identifier == false) { // BUG!find out where builtin is defined... @@ -516,7 +526,7 @@ ScopeParser.prototype = { if (token.type != 'KEYW') { break; } - print('SCOPE-KEYW:' + token.toString()); + print('SCOPE-KEYW:' + token.toString()); // print("Check eval:"); symbol = token.data; @@ -525,12 +535,13 @@ ScopeParser.prototype = { if (symbol == "eval") { // look back one and see if we can find a comment!!! - if (this.ts.look(-1).type == "COMM") { + //if (this.ts.look(-1).type == "COMM") { + if (token.prefix && token.prefix.match('/eval/')) { // look for eval:var:noreplace\n var _t = this; - this.ts.look(-1).data.replace(/eval:var:([a-z_]+)/ig, function(m, a) { + token.prefix.replace(/eval:var:([a-z_]+)/ig, function(m, a) { - var hi = _t.getIdentifier(a, scope); + var hi = _t.getIdentifier(a, thisScope, token); // println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING")); if (hi) { // println("PROTECT "+a+" from munge"); @@ -543,7 +554,7 @@ ScopeParser.prototype = { } else { - this.protectScopeFromObfuscation(scope); + this.protectScopeFromObfuscation(thisScope); 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); } @@ -561,7 +572,7 @@ ScopeParser.prototype = { //if (this.ts.nextT()) break; } - print("<<< EXIT SCOPE"); + //print("<<< EXIT SCOPE"); //print("<<<<<<"+token.data+""); //this.log("EXP:" + token.data); switch (token.type) { case 'PUNC': - print("EXPR-PUNC:" + token.toString()); + //print("EXPR-PUNC:" + token.toString()); switch(token.data) { case ';': - print("<< EXIT EXPRESSION"); + //print("<< EXIT EXPRESSION"); break; case ',': @@ -632,21 +643,24 @@ ScopeParser.prototype = { case '(': //Token.LP: case '{': //Token.LC: case '[': //Token.LB: - print('SCOPE-CURLY/PAREN/BRACE:' + token.toString()); + //print('SCOPE-CURLY/PAREN/BRACE:' + token.toString()); + // print('SCOPE-CURLY/PAREN/BRACE:' + JSON.stringify(token, null,4)); //println(""+token.data+""); var curTS = this.ts; if (token.props) { for (var prop in token.props) { - if (token.props[prop].val.data == 'function') { + if (token.props[prop].val[0].data == 'function') { // parse a function.. - this.parseFunctProp(token.props[prop]); + this.ts = new TokenStream(token.props[prop].val); + this.ts.nextTok(); + this.parseFunctionDeclaration(); continue; } // key value.. this.ts = new TokenStream(token.props[prop].val); - this.parseScope(currentScope); + this.parseExpression(); } this.ts = curTS; @@ -676,7 +690,7 @@ ScopeParser.prototype = { case ')': //Token.RP: case ']': //Token.RB: case '}': //Token.RB: - print("<< EXIT EXPRESSION"); + //print("<< EXIT EXPRESSION"); return; @@ -690,65 +704,39 @@ ScopeParser.prototype = { break; case 'STRN': // used for object lit detection.. - if (this.mode == 'BUILDING_SYMBOL_TREE') - print("EXPR-STR:" + JSON.stringify(token, null, 4)); - if (this.ts.lookTok(-1).data == "{" && this.ts.lookTok(1).data == ":" ) { - // then we are in an object lit.. -> we need to flag the brace as such... - isObjectLitAr.pop(); - isObjectLitAr.push(true); - //print(">>>>> EXP PUSH(true)"); - } - - + //if (this.mode == 'BUILDING_SYMBOL_TREE') + //print("EXPR-STR:" + JSON.stringify(token, null, 4)); + - isInObjectLitAr = isObjectLitAr[isObjectLitAr.length-1]; - if (isInObjectLitAr && this.ts.lookTok(1).data == ":" && - ( this.ts.lookTok(-1).data == "{" || this.ts.lookTok(-1).data == "," )) { - // see if we can replace.. - // remove the quotes.. - var str = token.data.substring(1,token.data.length-1); - if (/^[a-z_]+$/i.test(str) && ScopeParser.idents.indexOf(str) < 0) { - token.outData = str; - } - - - - } - break; case 'NAME': - if (this.mode == 'BUILDING_SYMBOL_TREE') - print("EXPR-NAME:" + JSON.stringify(token, null, 4)); + if (this.mode == 'BUILDING_SYMBOL_TREE') { + + //print("EXPR-NAME:" + JSON.stringify(token, null, 4)); + } else { + //print("EXPR-NAME:" + token.toString()); + } symbol = token.data; //print("in NAME = " + token.toString()); //print("in NAME 0: " + this.ts.look(0).toString()); //print("in NAME 2: " + this.ts.lookTok(2).toString()); - if (this.ts.look(0).data == "{" && this.ts.lookTok(2).data == ":") { - // then we are in an object lit.. -> we need to flag the brace as such... - isObjectLitAr.pop(); - isObjectLitAr.push(true); - //print(">>>>> EXP PUSH(true)"); - break; - } - - isInObjectLitAr = isObjectLitAr[isObjectLitAr.length-1]; - //print ("isInObjectLitAr : " + isInObjectLitAr + ' ' + token.toString()); - if (isInObjectLitAr && this.ts.lookTok(0).data == "," && this.ts.lookTok(2).data == ":") { - break; - } - //print(this.ts.lookTok(0).data); - if (this.ts.lookTok(0).data == ".") { + //print(this.ts.lookTok(-1).data); + // prefixed with '.' + if (this.ts.lookTok(-1).data == ".") { //skip '.' break; } + if (symbol == 'this') { + break; + } - if (this.mode == 'PASS2_SYMBOL_TREE') { + if (this.mode == 'PASS2_SYMBOL_TREE') { - identifier = this.getIdentifier(symbol, currentScope); + identifier = this.getIdentifier(symbol, currentScope, token); //println("??"); if (identifier == false) { @@ -759,8 +747,10 @@ ScopeParser.prototype = { // any conflict with other munged symbols. this.globalScope.declareIdentifier(symbol, token); this.warn("Found an undeclared symbol: " + symbol + ' (line:' + token.line + ')', true); + //print("Found an undeclared symbol: " + symbol + ' (line:' + token.line + ')'); + //throw "OOPS"; } else { - //println("undeclared") + //print("undeclared:" + token.toString()) } @@ -778,8 +768,10 @@ ScopeParser.prototype = { //println("EID"); case 'KEYW': - if (this.mode == 'BUILDING_SYMBOL_TREE') - print("EXPR-KEYW:" + JSON.stringify(token, null, 4)); + //if (this.mode == 'BUILDING_SYMBOL_TREE') + // print("EXPR-KEYW:" + JSON.stringify(token, null, 4)); + + print('EXPR-KEYW:' + token.toString()); if (token.name == "FUNCTION") { this.parseFunctionDeclaration(); @@ -790,13 +782,14 @@ ScopeParser.prototype = { symbol = token.data; if (this.mode == 'BUILDING_SYMBOL_TREE') { - - if (symbol == "eval") { - if (this.ts.look(-1).type == 'COMM') { + + if (token.name == "EVAL") { + print(JSON.stringify(token,null,4)); + if (token.prefix && token.prefix.match('/eval/')) { // look for eval:var:noreplace\n var _t = this; - this.ts.look(-1).data.replace(/eval:var:([a-z]+)/ig, function(m, a) { - var hi = _t.getIdentifier(a, currentScope); + token.prefix.replace(/eval:var:([a-z]+)/ig, function(m, a) { + var hi = _t.getIdentifier(a, currentScope, token); //println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING")); if (hi) { // println("PROTECT "+a+" from munge"); @@ -816,13 +809,13 @@ ScopeParser.prototype = { break; } default: - if (this.mode == 'BUILDING_SYMBOL_TREE') - print("EXPR-SKIP:" + JSON.stringify(token, null, 4)); + //if (this.mode == 'BUILDING_SYMBOL_TREE') + // print("EXPR-SKIP:" + JSON.stringify(token, null, 4)); break; } } - print("<< EXIT EXPRESSION"); + //print("<< EXIT EXPRESSION"); this.expN--; }, @@ -833,28 +826,30 @@ ScopeParser.prototype = { var token; var currentScope; var identifier; - + //token = getToken(-1); //assert token.getType() == Token.CATCH; token = this.ts.nextTok(); + + //print(JSON.stringify(token,null,4)); //assert token.getType() == Token.LP; ( - token = this.ts.nextTok(); + //token = this.ts.nextTok(); //assert token.getType() == Token.NAME; - symbol = token.data; + 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); + currentScope.declareIdentifier(symbol, token.items[0][0]); } else { //?? why inc the refcount?? - that should be set when building the tree??? - identifier = this.getIdentifier(symbol, currentScope); + identifier = this.getIdentifier(symbol, currentScope, token.items[0][0]); identifier.refcount++; } - + token = this.ts.nextTok(); //assert token.getType() == Token.RP; // ) }, @@ -877,35 +872,45 @@ ScopeParser.prototype = { 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) != false) { + if (currentScope.getIdentifier(symbol,token) != false) { this.warn("The function " + symbol + " has already been declared in the same scope...", true); } currentScope.declareIdentifier(symbol,token); } token = this.ts.nextTok(); } - + + + // return function() {.... + while (token.data != "(") { + print(token.toString()); + token = this.ts.nextTok(); + + + + } + + //assert token.getType() == Token.LP; if (this.mode == 'BUILDING_SYMBOL_TREE') { - fnScope = new Scope(this.braceNesting, currentScope, token.n, ''); + fnScope = new Scope(1, currentScope, token.n, '', token); //println("STORING SCOPE" + this.ts.cursor); - this.indexedScopes[this.ts.cursor] = fnScope; + this.indexedScopes[token.id] = fnScope; } else { //qln("FETCHING SCOPE" + this.ts.cursor); - fnScope = this.indexedScopes[this.ts.cursor]; - + fnScope = this.indexedScopes[token.id]; } - if (this.mode == 'BUILDING_SYMBOL_TREE') - print('FUNC-PARSE:' + JSON.stringify(token,null,4)); + //if (this.mode == 'BUILDING_SYMBOL_TREE') + // print('FUNC-PARSE:' + JSON.stringify(token,null,4)); // Parse function arguments. var args = token.items; for (var argpos =0; argpos < args.length; argpos++) { token = args[argpos][0]; - // print ("FUNC ARGS: " + token.toString()) + //print ("FUNC ARGS: " + token.toString()) //assert token.getType() == Token.NAME || // token.getType() == Token.COMMA; if (token.type == 'NAME' && this.mode == 'BUILDING_SYMBOL_TREE') { @@ -915,7 +920,7 @@ ScopeParser.prototype = { // Exception for Prototype 1.6... identifier.preventMunging(); } - argpos++; + //argpos++; } } @@ -934,6 +939,7 @@ ScopeParser.prototype = { _this.ts = new TokenStream(tar); _this.parseScope(fnScope); + }); //print(JSON.stringify(this.ts,null,4)); @@ -965,10 +971,10 @@ ScopeParser.prototype = { scope.preventMunging(); }, - getIdentifier: function(symbol, scope) { + getIdentifier: function(symbol, scope, token) { var identifier; while (scope != false) { - identifier = scope.getIdentifier(symbol); + identifier = scope.getIdentifier(symbol, token); //println("ScopeParser.getIdentgetUsedSymbols("+symbol+")=" + scope.getUsedSymbols().join(',')); if (identifier) { return identifier;