JSDOC/TokenReader.js

[gnome.introspection-doc-generator] / JSDOC / TextStream.vala

diff --git a/JSDOC/TextStream.vala b/JSDOC/TextStream.vala
index 450c379..f5bb725 100644 (file)
--- 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 "";