X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=a0d02bc0b283aa253bef29382c170e94e5c032ac;hp=3cbac3c8759ec9d984126c422ed7937bbdad3b74;hb=b7a44d56fcd63ee57ebd6e649f72b0f3a1304376;hpb=ec8e35596cf1e205cfb6e7d5614aaaada6f29472 diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js index 3cbac3c..a0d02bc 100644 --- a/JSDOC/ScopeParser.js +++ b/JSDOC/ScopeParser.js @@ -328,6 +328,7 @@ ScopeParser.prototype = { case "PUNC.LEFT_CURLY": // { case "PUNC.LEFT_PAREN": // ( + case "PUNC.LEFT_BRACE": // ( //print('SCOPE-CURLY/PAREN:' + token.toString()); //println(""+token.data+""); var curTS = this.ts; @@ -348,7 +349,7 @@ ScopeParser.prototype = { // key value.. this.ts = new TokenStream(token.props[prop].val); - this.parseScope(false); + this.parseExpression(); } this.ts = curTS; @@ -628,7 +629,7 @@ ScopeParser.prototype = { case '{': //Token.LC: case '[': //Token.LB: print('SCOPE-CURLY/PAREN/BRACE:' + token.toString()); - print('SCOPE-CURLY/PAREN/BRACE:' + JSON.stringify(token, null,4)); + // print('SCOPE-CURLY/PAREN/BRACE:' + JSON.stringify(token, null,4)); //println(""+token.data+""); var curTS = this.ts; if (token.props) { @@ -644,7 +645,7 @@ ScopeParser.prototype = { // key value.. this.ts = new TokenStream(token.props[prop].val); - this.parseScope(false); + this.parseExpression(); } this.ts = curTS;