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/Packer.vala
[gnome.introspection-doc-generator]
/
JSDOC
/
TokenStream.vala
diff --git
a/JSDOC/TokenStream.vala
b/JSDOC/TokenStream.vala
index
7f2058e
..
b9291a7
100644
(file)
--- a/
JSDOC/TokenStream.vala
+++ b/
JSDOC/TokenStream.vala
@@
-12,11
+12,14
@@
namespace JSDOC {
namespace JSDOC {
+ public errordomain TokenStreamError {
+ ArgumentError
+ }
public class TokenStream : Object
{
public class TokenStream : Object
{
- Gee.ArrayList<Token> tokens;
- int cursor; // where are we in the stream.
+
protected
Gee.ArrayList<Token> tokens;
+ public int cursor; // where are we in the stream.
public TokenStream(Gee.ArrayList<Token> tokens) {
public TokenStream(Gee.ArrayList<Token> tokens) {
@@
-55,7
+58,7
@@
namespace JSDOC {
if (i < 0) {
return new Token("", "VOID", "START_OF_STREAM");
}
if (i < 0) {
return new Token("", "VOID", "START_OF_STREAM");
}
- if (i > this.tokens.size) {
+ if (i >
=
this.tokens.size) {
return new Token("", "VOID", "END_OF_STREAM");
}
return new Token("", "VOID", "END_OF_STREAM");
}
@@
-71,7
+74,7
@@
namespace JSDOC {
i += (n < 0) ? -1 : 1;
}
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
}
}
@@
-91,7
+94,7
@@
namespace JSDOC {
}
// should not get here!
}
// should not get here!
- return -1;
+
//
return -1;
}
}
@@
-118,7
+121,7
@@
namespace JSDOC {
}
return new Token("", "VOID", "END_OF_STREAM");
}
}
return new Token("", "VOID", "END_OF_STREAM");
}
- if (i >
this.tokens.length
) {
+ if (i >
= this.tokens.size
) {
return new Token("", "VOID", "END_OF_STREAM");
}
return new Token("", "VOID", "END_OF_STREAM");
}
@@
-134,7
+137,7
@@
namespace JSDOC {
i += (n < 0) ? -1 : 1;
}
// should never get here..
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;
}
}
@@
-158,11
+161,11
@@
namespace JSDOC {
}
}
- 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) {
//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>();
}
var got = new Gee.ArrayList<Token>();
@@
-190,7
+193,7
@@
namespace JSDOC {
{
while (true) {
{
while (true) {
- tok = this.next();
+
var
tok = this.next();
if (tok == null) {
return null;
}
if (tok == null) {
return null;
}
@@
-207,26
+210,29
@@
namespace JSDOC {
* @param start {String} token name or data (eg. '{'
* @param stop {String} (Optional) token name or data (eg. '}'
*/
* @param start {String} token name or data (eg. '{'
* @param stop {String} (Optional) token name or data (eg. '}'
*/
- public Gee.ArrayList<Token> balance (string start, string stop = "") {
+ public Gee.ArrayList<Token> balance (string start, string in_stop = "") throws TokenStreamError
+ {
// accepts names or "{" etc..
// accepts names or "{" etc..
-
+ var stop = in_stop;
start = Lang.punc(start) == null ? start : Lang.punc(start);
if (stop=="") {
start = Lang.punc(start) == null ? start : Lang.punc(start);
if (stop=="") {
- stop = Lang.matching(start);
+ var newstop = Lang.matching(start);
+ stop = newstop;
}
if (stop == null) {
}
if (stop == null) {
- throw new
JSDOC.TokenStream
Error("balance called with invalid start/stop : %s",start);
+ throw new
TokenStreamError.Argument
Error("balance called with invalid start/stop : %s",start);
}
}
-
+ debug("START=%s, STOP=%s \n", start,stop);
var depth = 0;
var got = new Gee.ArrayList<Token>();
var started = false;
//Seed.print("START:" + start);
//Seed.print("STOP:" + stop);
var depth = 0;
var got = new Gee.ArrayList<Token>();
var started = false;
//Seed.print("START:" + start);
//Seed.print("STOP:" + stop);
+ Token token;
- while (
(token = this.look(
))) {
+ while (
null != (token = this.look(1,false
))) {
if (token.is(start)) {
// Seed.print("balance: START : " + depth + " " + token.data);
depth++;
if (token.is(start)) {
// Seed.print("balance: START : " + depth + " " + token.data);
depth++;
@@
-234,7
+240,7
@@
namespace JSDOC {
}
if (started) {
}
if (started) {
- got.
push
(token);
+ got.
add
(token);
}
if (token.is(stop)) {
}
if (token.is(stop)) {
@@
-244,53
+250,74
@@
namespace JSDOC {
return got;
}
}
return got;
}
}
- if (
!
this.next()) {
+ if (
null ==
this.next()) {
break;
}
}
return new Gee.ArrayList<Token>();
}
break;
}
}
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;
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;
}
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(start)) {
depth++;
}
- if (token.is(stop) && cursor) {
+ if (token.is(stop) && cursor
!= 0
) {
depth--;
depth--;
- if (depth == 0) return this.tokens[cursor];
+ if (depth == 0) {
+ return this.tokens[cursor];
+ }
}
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);
while (true) {
var tok = this.look(1,true);
- if (
!tok || !tok.is || tok.is('VOID'
)) {
+ if (
tok.is("VOID"
)) {
return ret;
}
return ret;
}
- ret.push(this.next(1));
+ var nt = this.next();
+ if (nt != null) {
+ ret.add(nt);
+ }
}
}
- }
,
+ }
-
+
+ public void printRange(int start, int end) {
+
+ for(var i = start; i < end +1; i++) {
+ print(this.tokens.get(i).asString());
+ }
+ }
+
+ /*
arrayToString : function(ar) {
console.log(typeof(ar));
var ret = [];
arrayToString : function(ar) {
console.log(typeof(ar));
var ret = [];
@@
-299,16
+326,29
@@
namespace JSDOC {
})
return ret.join('');
},
})
return ret.join('');
},
- dump: function(start, end)
+ */
+ public void dump(int start, int end)
{
{
- start =
Math.max(start || 0
, 0);
- end =
Math.min(end || this.tokens.length, this.tokens.length
);
- var
out=''
;
+ start =
int.max(start
, 0);
+ end =
int.min(end, this.tokens.size
);
+ var
outs = "";
;
for (var i =start;i < end; i++) {
for (var i =start;i < end; i++) {
- out += (this.tokens[i].outData == false) ? this.tokens[i].data : this.tokens[i].outData;
- };
- print(out);
+ outs += (this.tokens[i].outData == "") ? this.tokens[i].data : this.tokens[i].outData;
+ }
+ print(outs);
+ }
+
+ public void dumpAll(string indent)
+ {
+ for (var i = 0;i < this.tokens.size; i++) {
+
+ this.tokens[i].dump("");
+ }
+
}
}
-});
+
+
+ }
+}