projects
/
gnome.introspection-doc-generator
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JSDOC/Walker2.js
[gnome.introspection-doc-generator]
/
JSDOC
/
ScopeParser.js
diff --git
a/JSDOC/ScopeParser.js
b/JSDOC/ScopeParser.js
index
b77f6ee
..
bc695ef
100644
(file)
--- 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_CURLY": // {
case "PUNC.LEFT_PAREN": // (
+ case "PUNC.LEFT_BRACE": // [
//print('SCOPE-CURLY/PAREN:' + token.toString());
//println("<i>"+token.data+"</i>");
var curTS = this.ts;
//print('SCOPE-CURLY/PAREN:' + token.toString());
//println("<i>"+token.data+"</i>");
var curTS = this.ts;
@@
-348,7
+349,7
@@
ScopeParser.prototype = {
// key value..
this.ts = new TokenStream(token.props[prop].val);
// key value..
this.ts = new TokenStream(token.props[prop].val);
- this.parse
Scope(false
);
+ this.parse
Expression(
);
}
this.ts = curTS;
}
this.ts = curTS;
@@
-628,20
+629,23
@@
ScopeParser.prototype = {
case '{': //Token.LC:
case '[': //Token.LB:
//print('SCOPE-CURLY/PAREN/BRACE:' + token.toString());
case '{': //Token.LC:
case '[': //Token.LB:
//print('SCOPE-CURLY/PAREN/BRACE:' + token.toString());
+ // print('SCOPE-CURLY/PAREN/BRACE:' + JSON.stringify(token, null,4));
//println("<i>"+token.data+"</i>");
var curTS = this.ts;
if (token.props) {
for (var prop in token.props) {
//println("<i>"+token.data+"</i>");
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..
// 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);
continue;
}
// key value..
this.ts = new TokenStream(token.props[prop].val);
- this.parse
Scope(false
);
+ this.parse
Expression(
);
}
this.ts = curTS;
}
this.ts = curTS;
@@
-858,7
+862,7
@@
ScopeParser.prototype = {
//assert token.getType() == Token.LP;
if (this.mode == 'BUILDING_SYMBOL_TREE') {
//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);
//println("STORING SCOPE" + this.ts.cursor);