i += (n < 0) ? -1 : 1;
}
- return new Token("", "VOID", "STREAM_ERROR"); // because null isn't an object and caller always expects an object
+ // return new Token("", "VOID", "STREAM_ERROR"); // because null isn't an object and caller always expects an object
}
}
// should not get here!
- return -1;
+ // return -1;
}
i += (n < 0) ? -1 : 1;
}
// should never get here..
- return new Token("", "VOID", "END_OF_STREAM");; // because null isn't an object and caller always expects an object;
+ // return new Token("", "VOID", "END_OF_STREAM");; // because null isn't an object and caller always expects an object;
}
return new Gee.ArrayList<Token>();
}
- public Token getMatchingToken(string start, string stop)
+ public Token? getMatchingToken(string start, string stop)
{
var depth = 0;
var cursor = this.cursor;
var ns = Lang.matching(start);
stop = ns;
}
+ Token token;
- while (null !== (token = this.tokens[cursor])) {
+ while (null != (token = this.tokens[cursor])) {
if (token.is(start)) {
depth++;
}
- if (token.is(stop) && cursor) {
+ if (token.is(stop) && cursor != 0) {
depth--;
- if (depth == 0) return this.tokens[cursor];
+ if (depth == 0) {
+ return this.tokens[cursor];
+ }
}
cursor++;
}
- return false;
+ return null;
}
-
- public Gee.ArrayList<Token> insertAhead(Token token) {
+ /*
+ public Gee.ArrayList<Token> insertAhead(Token token)
+ {
this.tokens.splice(this.cursor+1, 0, token); // fixme...
}
+ */
public Gee.ArrayList<Token> remaining() {
var ret = new Gee.ArrayList<Token>();
if (tok.is("VOID")) {
return ret;
}
- ret.push(this.next(1));
+ var nt = this.next();
+ if (nt != null) {
+ ret.add(nt);
+ }
}
}