- var toks = add.size > 0 ? this.collapse(add) : [];
- tok.items = new Gee.ArrayList<Token>(); //?? needed?
- tok.props = false;
-
+ var toks = add.size > 0 ? this.collapse(add) : add;
+ tok.items = new Gee.ArrayList<Token>(); //?? needed?
+ tok.props = new Gee.HashMap<string,Gee.ArrayList<Token>>();
+
- if (tok.data != '{') {
+ if (tok.data != "{") {
// paramters or array elements..
- tok.items = this.toItems(toks, [',']);
+ tok.items = this.toItems(toks, ","]);
} else {
// check for types.. it could be a list of statements.. or object
+ // format "{" "xXXX" ":" << looks for the ':'.. seems to work.. not sure if it's foolproof...
var ost = new TokenStream(toks);
//console.dump(ost.look(2,true) );
if (ost.look(2,true) && ost.look(2,true).data == ":") {
+ // object properties...
tok.props = this.toProps(toks);
} else {
// list of statemetns..
- tok.items = this.toItems(toks,[ ';', '{'] );;
+ tok.items = this.toItems(toks, ";{");;
}