X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FTextStream.vala;h=f5bb7258fce7e3965ceb9fc1f595af5dd86f1873;hb=4874ad3e1d08502e88986231f3de271795ca2302;hp=450c37919ab5a1c9d5238cccc1b648b6a1844534;hpb=797d08578169fb42cd738d7a36c11f2e3d304af6;p=gnome.introspection-doc-generator diff --git a/JSDOC/TextStream.vala b/JSDOC/TextStream.vala index 450c379..f5bb725 100644 --- a/JSDOC/TextStream.vala +++ b/JSDOC/TextStream.vala @@ -27,7 +27,7 @@ namespace JSDOC { this.text = text; - this.length = text.char_count() + this.length = text.length; // text.char_count(); this.cursor = 0; } @@ -37,16 +37,16 @@ namespace JSDOC { if (this.cursor+n < 0 || this.cursor+n >= this.length) { return '\0'; } - return this.get_char(this.cursor+n); - }, + return this.text[this.cursor+n]; // this.text.get_char(this.cursor+n); + } public bool lookEOF(int n = 0) { - if (this.cursor+n < 0 || this.cursor+n >= this.length)) { + if (this.cursor+n < 0 || this.cursor+n >= this.length) { return true; } - return false - }, + return false; + } /** * @param n - number of characters to return.. @@ -55,16 +55,16 @@ namespace JSDOC { { if (n < 1) { //?? eof??? - return '\0'; + return "\0"; } - string pulled; + string pulled = ""; var i = 0; while (i < n) { if (this.cursor+i < this.length) { - var add = this.text.get_char(this.cursor+i).to_string() - pulled += add; - i += add.length; + var add = this.text[this.cursor+i]; //this.text.get_char(this.cursor+i).to_string(); + pulled += add.to_string(); + i += 1;// add.length; } else { return "";