//<script type="text/javascript">
-Walker = imports.Walker.Walker;
+Walker2 = imports.Walker2.Walker2;
Symbol = imports.Symbol.Symbol;
+SymbolSet = imports.SymbolSet.SymbolSet;
DocComment = imports.DocComment.DocComment;
Options = imports.Options.Options;
/**
print("init parser conf!?");
this.conf = {
loaded : true,
- ignoreCode: Options.n,
+ //ignoreCode: Options.n,
ignoreAnonymous: true, // factory: true
treatUnderscoredAsPrivate: true, // factory: true
explain: false // factory: false
// not a nice way to set stuff...
- JSDOC.Symbol.srcFile = (srcFile || "");
- JSDOC.DocComment.shared = ""; // shared comments don't cross file boundaries
+ Symbol.srcFile = (srcFile || "");
+ DocComment.shared = ""; // shared comments don't cross file boundaries
- this.filesSymbols[JSDOC.Symbol.srcFile] = new JSDOC.SymbolSet();
+ this.filesSymbols[Symbol.srcFile] = new SymbolSet();
+
+ Options.LOG.inform("Parser - run walker");
+ this.walker = new Walker2(ts);
+ this.walker.buildSymbolTree();
+
+
- this.walker = new JSDOC.Walker2(ts);
- this.walker.buildSymbolTree()
//this.walker.walk(ts); // adds to our symbols
// throw "done sym tree";
-
+ Options.LOG.inform("Parser - checking symbols");
// filter symbols by option
for (p in this.symbols._index) {
var symbol = this.symbols.getSymbol(p);
+ print(JSON.stringify(symbol, null,4));
+
if (!symbol) continue;
if (symbol.is("FILE") || symbol.is("GLOBAL")) {
continue;
}
- else if (!JSDOC.opt.a && !symbol.comment.isUserComment) {
+ //else if (!Options.a && !symbol.comment.isUserComment) {
//print("Deleting Symbols (no a / user comment): " + symbol.alias);
//this.symbols.deleteSymbol(symbol.alias);
- //this.filesSymbols[JSDOC.Symbol.srcFile].deleteSymbol(symbol.alias);
- }
+ //this.filesSymbols[Symbol.srcFile].deleteSymbol(symbol.alias);
+ //}
if (/#$/.test(symbol.alias)) { // we don't document prototypes - this should not happen..
// rename the symbol ??
print("Renaming Symbol (got a #): " + symbol.alias);
var n = '' + symbol.alias;
this.symbols.renameSymbol( n ,n.substring(0,n-1));
- this.filesSymbols[JSDOC.Symbol.srcFile].renameSymbol( n ,n.substring(0,n-1));
+ this.filesSymbols[Symbol.srcFile].renameSymbol( n ,n.substring(0,n-1));
continue;
}
*/
print("Deleting Symbols (got a #): " + symbol.alias);
this.symbols.deleteSymbol(symbol.alias);
- this.filesSymbols[JSDOC.Symbol.srcFile].deleteSymbol(symbol.alias);
+ this.filesSymbols[Symbol.srcFile].deleteSymbol(symbol.alias);
}
}
- //print(JSDOC.prettyDump(JSDOC.toQDump(this.filesSymbols[JSDOC.Symbol.srcFile]._index,'{','}')));
+ //print(prettyDump(toQDump(this.filesSymbols[Symbol.srcFile]._index,'{','}')));
//print("AfterParse: " + this.symbols.keys().toSource().split(",").join(",\n "));
return this.symbols.toArray();
},
if (oldSymbol.comment.isUserComment && !oldSymbol.comment.hasTags) {
if (symbol.comment.isUserComment) { // old and new are both documented
- JSDOC.opt.LOG.warn("The symbol '"+symbol.alias+"' is documented more than once.");
+ Options.LOG.warn("The symbol '"+symbol.alias+"' is documented more than once.");
}
else { // old is documented but new isn't
return;
}
// -p flag is required to document private things
- if ((symbol.isInner || symbol.isPrivate) && !JSDOC.opt.p) return;
+ if ((symbol.isInner || symbol.isPrivate) && !Options.p) return;
// ignored things are not documented, this doesn't cascade
if (symbol.isIgnored) return;
// add it to the file's list... (for dumping later..)
- if (JSDOC.Symbol.srcFile) {
- this.filesSymbols[JSDOC.Symbol.srcFile].addSymbol(symbol);
+ if (Symbol.srcFile) {
+ this.filesSymbols[Symbol.srcFile].addSymbol(symbol);
}
this.symbols.addSymbol(symbol);
addBuiltin: function(name) {
- var builtin = new JSDOC.Symbol(name, [], "CONSTRUCTOR", new JSDOC.DocComment(""));
+ var builtin = new Symbol(name, [], "CONSTRUCTOR", new DocComment(""));
builtin.isNamespace = false;
builtin.srcFile = "";
builtin.isPrivate = false;