X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=a0d02bc0b283aa253bef29382c170e94e5c032ac;hp=b77f6ee11d9b206b0c6a32400a53c1251d79d33d;hb=b7a44d56fcd63ee57ebd6e649f72b0f3a1304376;hpb=632b7ff2d420baf9dd4a77edb7a714a5c8040fa4
diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index b77f6ee..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;
@@ -627,21 +628,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(false);
+ this.parseExpression();
}
this.ts = curTS;
@@ -858,7 +862,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);