X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FTextStream.js;h=073c626ecfd2c8e586e5c6f589ef270e1fba1414;hb=b85554bcc3d6985efcf6691a161dea7c85d9d81b;hp=007a98272c6a6b91a0882c7f3bc119285139ad03;hpb=109b8349b9418a05e20e50ecede10bd80386b062;p=gnome.introspection-doc-generator

diff --git a/JSDOC/TextStream.js b/JSDOC/TextStream.js
index 007a982..073c626 100644
--- a/JSDOC/TextStream.js
+++ b/JSDOC/TextStream.js
@@ -1,50 +1,49 @@
 //<script type="text/javscript">
 
+const XObject = imports.XObject.XObject;
 
-imports['Object.js'].load(Object);
-
-JSDOC   = imports['JSDOC.js'].JSDOC;
 
 /**
 	@constructor
 */
-TextStream = function(text) {
-	if (typeof(text) == "undefined") text = "";
-	text = ""+text;
-	this.text = text;
-	this.cursor = 0;
-}
-
-Object.extend( TextStream.prototype, { 
-    
-    look : function(n) {
-        if (typeof n == "undefined") n = 0;
-        
-        if (this.cursor+n < 0 || this.cursor+n >= this.text.length) {
-            var result = new String("");
-            result.eof = true;
-            return result;
-        }
-        return this.text.charAt(this.cursor+n);
+const TextStream = XObject.define(
+    function(text) {
+        if (typeof(text) == "undefined") text = "";
+        text = ""+text;
+        this.text = text;
+        this.cursor = 0;
     },
-
-    next : function(n) {
-        if (typeof n == "undefined") n = 1;
-        if (n < 1) return null;
+    Object, 
+    { 
         
-        var pulled = "";
-        for (var i = 0; i < n; i++) {
-            if (this.cursor+i < this.text.length) {
-                pulled += this.text.charAt(this.cursor+i);
-            }
-            else {
+        look : function(n) {
+            if (typeof n == "undefined") n = 0;
+            
+            if (this.cursor+n < 0 || this.cursor+n >= this.text.length) {
                 var result = new String("");
                 result.eof = true;
                 return result;
             }
-        }
+            return this.text.charAt(this.cursor+n);
+        },
 
-        this.cursor += n;
-        return pulled;
-    }
+        next : function(n) {
+            if (typeof n == "undefined") n = 1;
+            if (n < 1) return null;
+            
+            var pulled = "";
+            for (var i = 0; i < n; i++) {
+                if (this.cursor+i < this.text.length) {
+                    pulled += this.text.charAt(this.cursor+i);
+                }
+                else {
+                    var result = new String("");
+                    result.eof = true;
+                    return result;
+                }
+            }
+
+            this.cursor += n;
+            return pulled;
+        }
 });
\ No newline at end of file