X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FWalker2.js;h=fd730b2be7e355bc3e632712248bb6309c3627d1;hp=11a22a0e12f8a6eb5f8279a66920ca9b5ddd33f7;hb=0ffd98bd2f45d842e82f28e550065a0cbb210f79;hpb=386ff85ef38a818f06e13f2bdaf88d8a8c629887 diff --git a/JSDOC/Walker2.js b/JSDOC/Walker2.js index 11a22a0..fd730b2 100644 --- a/JSDOC/Walker2.js +++ b/JSDOC/Walker2.js @@ -4,7 +4,7 @@ XObject = imports.XObject.XObject; Scope = imports.Scope.Scope; DocComment = imports.DocComment.DocComment; Symbol = imports.Symbol.Symbol; -Parser = imports.Parser.Parser; + /** * Scope stuff @@ -71,6 +71,7 @@ Walker2 = XObject.define( this.mode = 'BUILDING_SYMBOL_TREE'; this.parseScope(this.globalScope); + }, @@ -155,29 +156,30 @@ Walker2 = XObject.define( //print(JSON.stringify(this.ts, null, 4)); Seed.quit(); while (null != (token = this.ts.next())) { - print("TOK"+ token.toString()); + //print("TOK"+ token.toString()); // this.timerPrint("parseScope AFTER lookT: " + token.toString()); - if (token.is('WHIT')) { + if (token.is('COMM')) { if (token.name != 'JSDOC') { + //print("Walker2 : spce is not JSDOC"); continue; //skip. } if (this.currentDoc) { // add it to the current scope???? this.addSymbol('', true); - + print ( "Unconsumed Doc: " + token.toString()) //throw "Unconsumed Doc (TOKwhitespace): " + this.currentDoc.toSource(); } - + print ( "NEW COMMENT: " + token.toString()) var newDoc = new DocComment(token.data); // it's a scope changer.. if (newDoc.getTag("scope").length) { - //print(newDoc.getTag("scope").toSource()); + //print("Walker2 : doctag changes scope"); //throw "done"; scope.ident = '$private$|' + newDoc.getTag("scope")[0].desc; continue; @@ -187,6 +189,7 @@ Walker2 = XObject.define( if (newDoc.getTag("scopeAlias").length) { //print(newDoc.getTag("scopeAlias").toSource()); // @scopeAlias a=b + //print("Walker2 : doctag changes scope (alias)"); var sal = newDoc.getTag("scopeAlias")[0].desc.split("="); aliases[sal[0]] = sal[1]; @@ -196,6 +199,7 @@ Walker2 = XObject.define( /// got a doc comment.. //token.data might be this.??? (not sure though) + //print("Walker2 : setting currentDoc"); this.currentDoc = newDoc; continue; } @@ -207,8 +211,8 @@ Walker2 = XObject.define( // things that stop comments carrying on...?? if (this.currentDoc && ( - token.tokN.data == ';' || - token.tokN.data == '}')) { + token.data == ';' || + token.data == '}')) { this.addSymbol('', true); //throw "Unconsumed Doc ("+ token.toString() +"): " + this.currentDoc.toSource(); } @@ -243,14 +247,10 @@ Walker2 = XObject.define( // a << scope // xxx.applyIf(a, { // a << scope - if (token.type = 'NAME') { + if (token.type == 'NAME') { //print("TOK(ident)"+ token.toString()); - - - - - + if (/\.extend$/.test(token.data) && this.ts.lookTok(1).data == '(' && this.ts.lookTok(2).type == 'NAME' && @@ -329,14 +329,15 @@ Walker2 = XObject.define( // apply ( XXXX, { + /* print(JSON.stringify([ token.data, - this.ts.lookTok(2).data , - this.ts.lookTok(3).type , - this.ts.lookTok(4).data , - this.ts.lookTok(5).data + this.ts.lookTok(1).data , + this.ts.lookTok(2).type , + this.ts.lookTok(3).data , + this.ts.lookTok(4).data ], null, 4)); - + */ if (/\.(applyIf|apply)$/.test(token.data) && this.ts.lookTok(1).data == '(' && @@ -355,14 +356,13 @@ Walker2 = XObject.define( if (this.currentDoc) { this.addSymbol(scopeName,false,'OBJECT'); - } this.ts.nextTok(); /// , this.ts.nextTok(); // { - scopeName = fixAlias(scopeName); + scopeName = fixAlias(scopeName); var fnScope = new Scope(this.braceNesting, scope, token.n, scopeName); this.indexedScopes[this.ts.cursor] = fnScope; scope = fnScope; @@ -417,19 +417,7 @@ Walker2 = XObject.define( } - - - - - - - - - - - - - + @@ -450,23 +438,32 @@ Walker2 = XObject.define( if (((this.ts.lookTok(1).data == ':' )|| (this.ts.lookTok(1).data == '=')) && (this.ts.lookTok(2).name == "FUNCTION") ) { + this.ts.nextTok(); + this.ts.nextTok(); atype = 'FUNCTION'; } //print("ADD SYM:" + atype + ":" + token.toString() + this.ts.lookTok(1).toString() + this.ts.lookTok(2).toString()); this.addSymbol( - this.ts.lookTok(-1).tokN == Script.TOKdot ? token.data : fixAlias(token.data), + this.ts.lookTok(-1).data == '.' ? token.data : fixAlias(token.data), false, atype); + + + } continue; // dont care about other idents.. - } - if (token.type == "STRN") { + } + + //print ("NOT NAME"); + + + if (token.type == "STRN") { // THIS WILL NOT HAPPEN HERE?!!? if (this.currentDoc) { this.addSymbol(token.data.substring(1,token.data.length-1),false,'OBJECT'); @@ -476,13 +473,16 @@ Walker2 = XObject.define( // really we only have to deal with object constructs and function calls that change the scope... - if (token.name == 'FUNCTION') { - + if (token.name == 'FUNCTION') { + //print("GOT FUNCTION"); // see if we have an unconsumed doc... if (this.currentDoc) { - print(this.ts.dumpToCur()); - throw "Unhandled doc (TOKfunction)" + token.toString(); + throw { + name: "ArgumentError", + message: "Unhandled doc (TOKfunction)" + token.toString() + }; + //this.addSymbol(this.currentDoc.getTag('class')[0].name, true); //throw "Unconsumed Doc: (TOKrbrace)" + this.currentDoc.toSource(); @@ -500,7 +500,7 @@ Walker2 = XObject.define( (this.ts.lookTok(-2).type == 'NAME') ) { scopeName = this.ts.lookTok(-2).data; - this.ts.balanceN('('); + this.ts.balance('('); token = this.ts.nextTok(); // should be { //print("FOO=FUNCITON() {}" + this.ts.context() + "\n" + token.toString()); @@ -508,6 +508,7 @@ Walker2 = XObject.define( scopeName = fixAlias(scopeName); var fnScope = new Scope(this.braceNesting, scope, token.n, '$this$='+scopeName+'.prototype|$private$|'+scopeName+'.prototype'); + this.indexedScopes[this.ts.cursor] = fnScope; //scope = fnScope; //this.scopesIn(fnScope); @@ -566,7 +567,7 @@ Walker2 = XObject.define( //print("got for : function() {"); //scopeName = this.ts.look(-3).data; - this.ts.balanceN(Script.TOKlparen); + this.ts.balance('('); //print(token.toString()) token = this.ts.nextTok(); // should be { //print(token.toString()) @@ -589,7 +590,7 @@ Walker2 = XObject.define( (this.ts.lookTok(1).type == 'NAME') ) { //scopeName = this.ts.look(-3).data; - this.ts.balanceN('('); + this.ts.balance('('); token = this.ts.nextTok(); // should be { var fnScope = new Scope(this.braceNesting, scope, token.n, ''); @@ -617,7 +618,7 @@ Walker2 = XObject.define( // (this.ts.lookTok(-4).tokN == Script.TOKidentifier) ) { //scopeName = this.ts.look(-3).data; - this.ts.balanceN('('); + this.ts.balance('('); token = this.ts.nextTok(); // should be { var fnScope = new Scope(this.braceNesting, scope, token.n, '$private$'); this.indexedScopes[this.ts.cursor] = fnScope; @@ -632,8 +633,12 @@ Walker2 = XObject.define( } - print(this.ts.context()); - throw "dont know how to handle function syntax??"; + throw { + name: "ArgumentError", + message: "dont know how to handle function syntax??\n" + + token.toString() + }; + continue; @@ -735,6 +740,7 @@ Walker2 = XObject.define( addSymbol: function(lastIdent, appendIt, atype ) { + //print("Walker.addSymbol : " + lastIdent); /*if (!this.currentDoc.tags.length) { @@ -752,18 +758,18 @@ Walker2 = XObject.define( //print(this.currentDoc.toSource()); this.currentDoc = false; - print("SKIP ADD SYM: it's private"); + //print("SKIP ADD SYM: it's private"); return; } - var token = this.ts.cur(); + var token = this.ts.lookTok(0); if (typeof(appendIt) == 'undefined') { appendIt= false; } // print(this.currentDoc.toSource();); if (this.currentDoc.getTag('event').length) { //?? why does it end up in desc - and not name/... - print(this.currentDoc.getTag('event')[0]); + //print(this.currentDoc.getTag('event')[0]); lastIdent = '*' + this.currentDoc.getTag('event')[0].desc; //lastIdent = '*' + lastIdent ; } @@ -784,7 +790,7 @@ Walker2 = XObject.define( s.push(lastIdent); var s = s.join('|').split('|'); - print("Walker:ADDSymbol: " + s.join('|') ); + //print("Walker:ADDSymbol: " + s.join('|') ); var _t = ''; _s = ''; @@ -811,7 +817,7 @@ Walker2 = XObject.define( /// calc scope!! //print("ADDING SYMBOL: "+ s.join('|') +"\n"+ _s + "\n" +Script.prettyDump(this.currentDoc.toSource())); - + //print("Walker.addsymbol - add : " + _s); if (appendIt && !lastIdent.length) { // append, and no symbol??? @@ -820,6 +826,7 @@ Walker2 = XObject.define( if (this.currentDoc.getTag('class').length) { _s = this.currentDoc.getTag('class')[0].desc; var symbol = new Symbol(_s, [], "CONSTRUCTOR", this.currentDoc); + Parser = imports.Parser.Parser; Parser.addSymbol(symbol); this.symbols[_s] = symbol; return; @@ -832,10 +839,16 @@ Walker2 = XObject.define( _s = _s.replace(/\.prototype.*$/, ''); if (typeof(this.symbols[_s]) == 'undefined') { - print("Symbol:" + _s); - print(this.currentDoc.src); - - throw "Trying to append symbol, but no doc available"; + //print("Symbol:" + _s); + //print(this.currentDoc.src); + + throw { + name: "ArgumentError", + message: "Trying to append symbol '" + _s + "', but no doc available\n" + + token.toString() + }; + + } for (var i =0; i < this.currentDoc.tags.length;i++) { @@ -845,22 +858,30 @@ Walker2 = XObject.define( return; } } + //print("Walker.addsymbol - chkdup: " + _s); if (typeof(this.symbols[_s]) != 'undefined') { if (this.symbols[_s].comment.hasTags) { // then existing comment doesnt has tags - throw "DUPLICATE Symbol " + _s; + //throw { + // name: "ArgumentError", + // message:"DUPLICATE Symbol " + _s + "\n" + token.toString() + //}; + return; } // otherwise existing comment has tags - overwrite.. } + //print("Walker.addsymbol - ATYPE: " + _s); + if (typeof(atype) == "undefined") { atype = 'OBJECT'; //this.currentDoc.getTag('class').length ? 'OBJECT' : 'FUNCTION';; } + //print("Walker.addsymbol - add : "); var symbol = new Symbol(_s, [], atype, this.currentDoc); - + Parser = imports.Parser.Parser; Parser.addSymbol(symbol); this.symbols[_s] = symbol;