X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=1b7731207e7ab13863ed098a72dd9d4fdc641bce;hp=b77f6ee11d9b206b0c6a32400a53c1251d79d33d;hb=2a675f4404cc62cbac76f436efdad426088ec3d8;hpb=632b7ff2d420baf9dd4a77edb7a714a5c8040fa4 diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js index b77f6ee..1b77312 100644 --- a/JSDOC/ScopeParser.js +++ b/JSDOC/ScopeParser.js @@ -627,15 +627,17 @@ 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()); //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.. @@ -858,7 +860,7 @@ ScopeParser.prototype = { //assert token.getType() == Token.LP; if (this.mode == 'BUILDING_SYMBOL_TREE') { - fnScope = new Scope(1, currentScope, token.n, ''); + fnScope = new Scope(1, currentScope, token.n, '', token); //println("STORING SCOPE" + this.ts.cursor);