namespace JSDOC {
+ public errordomain TokenStreamError {
+ ArgumentError
+ }
public class TokenStream : Object
{
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;
}
}
return new Token("", "VOID", "END_OF_STREAM");
}
- if (i > this.tokens.length) {
+ if (i > this.tokens.size) {
return new Token("", "VOID", "END_OF_STREAM");
}
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;
}
}
- public Gee.ArrayList<Token> nextM(uint howMany) {
+ public Gee.ArrayList<Token>? nextM(int howMany) throws TokenStreamError {
//if (typeof howMany == "undefined") howMany = 1;
if (howMany < 2) {
- throw new JSDOC.TokenStreamError("nextM called with wrong number : %d",howMany);
+ throw new TokenStreamError.ArgumentError("nextM called with wrong number : %d", howMany);
}
var got = new Gee.ArrayList<Token>();
// what about comments after 'function'...
// is this used ???
- nextTok : function() {
+ public Token? nextTok() {
return this.nextNonSpace();
- },
- nextNonSpace : function ()
+ }
+
+ public Token? nextNonSpace ()
{
while (true) {
- tok = this.next(1);
- if (!tok) {
- return false;
+ var tok = this.next();
+ if (tok == null) {
+ return null;
}
- if (tok.is('WHIT') || tok.is('COMM')) {
+ if (tok.is("WHIT") || tok.is("COMM")) {
continue;
}
return tok;
}
- },
+ }
+
/**
- * @type JSDOC.Token[]
+ * balance
+ * -- returns all the tokens betweeen and including stop token eg.. from {... to }
* @param start {String} token name or data (eg. '{'
* @param stop {String} (Optional) token name or data (eg. '}'
*/
- balance : function(/**String*/start, /**String*/stop) {
+ public Gee.ArrayList<Token> balance (string start, string stop = "") throws TokenStreamError
+ {
+ // accepts names or "{" etc..
- start = typeof(Lang.punc(start)) == 'undefined' ? start : Lang.punc(start);
+ start = Lang.punc(start) == null ? start : Lang.punc(start);
- if (!stop) stop = Lang.matching(start);
+ if (stop=="") {
+ var newstop = Lang.matching(start);
+ stop = newstop;
+ }
+ if (stop == null) {
+ throw new TokenStreamError.ArgumentError("balance called with invalid start/stop : %s",start);
+ }
var depth = 0;
- var got = [];
+ var got = new Gee.ArrayList<Token>();
var started = false;
//Seed.print("START:" + start);
//Seed.print("STOP:" + stop);
- while ((token = this.look())) {
+ Token token;
+
+ while (null != (token = this.look(1,false))) {
if (token.is(start)) {
// Seed.print("balance: START : " + depth + " " + token.data);
depth++;
}
if (started) {
- got.push(token);
+ got.add(token);
}
if (token.is(stop)) {
depth--;
// Seed.print("balance: STOP: " + depth + " " + token.data);
- if (depth < 1) return got;
+ if (depth < 1) {
+ return got;
+ }
}
- if (!this.next()) break;
+ if (null == this.next()) {
+ break;
+ }
}
- return false;
- },
+ return new Gee.ArrayList<Token>();
+ }
- getMatchingToken : function(/**String*/start, /**String*/stop) {
+ public Token? getMatchingToken(string start, string stop)
+ {
var depth = 0;
var cursor = this.cursor;
- if (!start) {
- start = Lang.matching(stop);
+ if (start.length < 1) {
+ var ns = Lang.matching(stop);
+ start = ns;
depth = 1;
}
- if (!stop) stop = Lang.matching(start);
+ if (stop.length < 1) {
+ var ns = Lang.matching(start);
+ stop = ns;
+ }
+ Token token;
- while ((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;
- },
-
- insertAhead : function(/**JSDOC.Token*/token) {
- this.tokens.splice(this.cursor+1, 0, token);
- },
+ return null;
+ }
+ /*
+ public Gee.ArrayList<Token> insertAhead(Token token)
+ {
+ this.tokens.splice(this.cursor+1, 0, token); // fixme...
+ }
+ */
- remaining : function() {
- var ret = [];
+ public Gee.ArrayList<Token> remaining() {
+ var ret = new Gee.ArrayList<Token>();
while (true) {
var tok = this.look(1,true);
- if (!tok || !tok.is || tok.is('VOID')) {
+ if (tok.is("VOID")) {
return ret;
}
- ret.push(this.next(1));
+ var nt = this.next();
+ if (nt != null) {
+ ret.add(nt);
+ }
}
- },
+ }
-
+ /*
arrayToString : function(ar) {
console.log(typeof(ar));
var ret = [];
};
print(out);
}
-});
+ */
+ }
+}