} else {
//var bn = this.braceNesting;
var bn = this.braceNesting;
- var nts = [];
+ var nts = new Gee.ArrayList<Token>();
while (true) {
- if (!token || token.type == 'VOID' || token.data == ',') {
+ if (!token || token.type == "VOID" || token.data == ",") {
break;
}
- nts.push(token);
+ nts.add(token);
token = this.ts.nextTok();
}
- if (nts.length) {
+ if (nts.size > 0) {
var TS = this.ts;
this.ts = new TokenStream(nts);
this.parseExpression(scope);
token = this.ts.lookTok(1);
//!this.debug||
// print("AFTER EXP: " + token.toString());
- if (token.data == ';') {
+ if (token.data == ";") {
break;
}
}
//print('SCOPE-CURLY/PAREN:' + token.toString());
//println("<i>"+token.data+"</i>");
var curTS = this.ts;
- if (token.props) {
+ if (token.props.size() > 0) {
// { a : ... , c : .... }
+ var iter = token.props.map_iterator();
- for (var prop in token.props) {
+ while(iter.next()) {
+
+ TokenKeyMap val = iter.get_value(); // TokenKeyMap
// print('SCOPE-PROPS:' + JSON.stringify(token.props[prop],null,4));
- if (token.props[prop].val[0].data == '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);
}
// key value..
- this.ts = new TokenStream(token.props[prop].val);
+ this.ts = new TokenStream(val.vals);
this.parseExpression(scope);
}
// ( ... ) or { .... } not object literals..
- var _this = this;
- for (var xx =0; xx < token.items.length; xx++) {
- expr = token.items[xx];
+
+ for (var xx =0; xx < token.items.size; xx++) {
+ expr = token.items.get(xx);
//token.items.forEach(function(expr) {
//print(expr.toString());
- _this.ts = new TokenStream(expr);
+ this.ts = new TokenStream(expr);
//if (curTS.data == '(') {
- _this.parseScope(scope)
+ this.parseScope(scope);
//} else {
// _this.parseExpression(scope)
//}