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/ScopeParser.vala
[gnome.introspection-doc-generator]
/
JSDOC
/
ScopeParser.vala
diff --git
a/JSDOC/ScopeParser.vala
b/JSDOC/ScopeParser.vala
index
4a358ae
..
b8bf9a7
100644
(file)
--- a/
JSDOC/ScopeParser.vala
+++ b/
JSDOC/ScopeParser.vala
@@
-640,14
+640,14
@@
namespace JSDOC {
if (val.vals.get(0).data == "function") {
// parse a function..
if (val.vals.get(0).data == "function") {
// parse a function..
- this.ts = new TokenStream(
token.props[prop].val
);
+ this.ts = new TokenStream(
val.vals
);
this.ts.nextTok();
this.parseFunctionDeclaration(scope);
continue;
}
// key value..
this.ts.nextTok();
this.parseFunctionDeclaration(scope);
continue;
}
// key value..
- this.ts = new TokenStream(
token.props[prop].val
);
+ this.ts = new TokenStream(
val.vals
);
this.parseExpression(scope);
}
this.parseExpression(scope);
}
@@
-659,11
+659,12
@@
namespace JSDOC {
}
}
- var _this = this;
- token.items.forEach(function(expr) {
- _this.ts = new TokenStream(expr);
- _this.parseExpression(scope)
- });
+
+ foreach(var expr in token.items) {
+
+ this.ts = new TokenStream(expr);
+ this.parseExpression(scope);
+ }
this.ts = curTS;
this.ts = curTS;
@@
-675,9
+676,9
@@
namespace JSDOC {
- case
')'
: //Token.RP:
- case
']'
: //Token.RB:
- case
'}'
: //Token.RB:
+ case
")"
: //Token.RP:
+ case
"]"
: //Token.RB:
+ case
"}"
: //Token.RB:
//print("<< EXIT EXPRESSION");
return;
//print("<< EXIT EXPRESSION");
return;
@@
-691,7
+692,7
@@
namespace JSDOC {
}
break;
}
break;
- case
'STRN'
: // used for object lit detection..
+ case
"STRN"
: // used for object lit detection..
//if (this.mode == 'BUILDING_SYMBOL_TREE')
//print("EXPR-STR:" + JSON.stringify(token, null, 4));
//if (this.mode == 'BUILDING_SYMBOL_TREE')
//print("EXPR-STR:" + JSON.stringify(token, null, 4));
@@
-700,8
+701,8
@@
namespace JSDOC {
- case
'NAME'
:
- if (this.mode ==
'BUILDING_SYMBOL_TREE'
) {
+ case
"NAME"
:
+ if (this.mode ==
ScopeParserMode.BUILDING_SYMBOL_TREE
) {
//print("EXPR-NAME:" + JSON.stringify(token, null, 4));
} else {
//print("EXPR-NAME:" + JSON.stringify(token, null, 4));
} else {
@@
-718,11
+719,11
@@
namespace JSDOC {
//skip '.'
break;
}
//skip '.'
break;
}
- if (symbol ==
'this'
) {
+ if (symbol ==
"this"
) {
break;
}
break;
}
- if (this.mode ==
'PASS2_SYMBOL_TREE'
) {
+ if (this.mode ==
ScopeParserMode.PASS2_SYMBOL_TREE
) {
identifier = this.getIdentifier(symbol, scope, token);
//println("<B>??</B>");
identifier = this.getIdentifier(symbol, scope, token);
//println("<B>??</B>");