X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FTokenStream.js;h=cc3f6af92bc78b72bcd1bfaf8d074811f12b3ccd;hb=109b8349b9418a05e20e50ecede10bd80386b062;hp=3e9e348eed3de432abf6723522f4a33f7b31e030;hpb=d29d581b911370e5350ca88a2eecaab1ae3d7073;p=gnome.introspection-doc-generator

diff --git a/JSDOC/TokenStream.js b/JSDOC/TokenStream.js
index 3e9e348..cc3f6af 100644
--- a/JSDOC/TokenStream.js
+++ b/JSDOC/TokenStream.js
@@ -1,49 +1,100 @@
 //<script type="text/javscript">
+
+imports['Object.js'].load(Object);
+
 JSDOC   = imports['JSDOC.js'].JSDOC;
-Roo     = imports['Roo.js'].Roo;
 console = imports['console.js'].console;
-
-Token = imports['JSDOC/Token.js'].Token;
-Lang = imports['JSDOC/Lang.js'].Lang;
+Token   = imports['JSDOC/Token.js'].Token;
+Lang    = imports['JSDOC/Lang.js'].Lang;
 
 /**
 	@constructor
 */
  
-TokenStream = function(tokens) {
- 
-    
-	this.tokens = (tokens || []);
-   // Seed.print(this.tokens.length);
-	this.rewind();
-}
-
- 
-Roo.apply( TokenStream.prototype , {
-    
-    rewind : function() {
-        this.cursor = -1;
+TokenStream = Object.define(
+    function(tokens) {
+     
+        
+        this.tokens = (tokens || []);
+       // Seed.print(this.tokens.length);
+        this.rewind();
     },
+    Object,
+    {
+        
+        rewind : function() {
+            this.cursor = -1;
+        },
+
+        /**
+            @type JSDOC.Token
+        */
+        look : function(/**Number*/n, /**Boolean*/considerWhitespace) {
+            if (typeof n == "undefined") n = 0;
+
+            if (considerWhitespace == true) {
+                if (this.cursor+n < 0 || this.cursor+n > this.tokens.length) return {};
+                return this.tokens[this.cursor+n];
+            }
+            else {
+                var count = 0;
+                var i = this.cursor;
+
+                while (true) {
+                    if (i < 0) return new Token("", "VOID", "START_OF_STREAM");
+                    else if (i > this.tokens.length) return new Token("", "VOID", "END_OF_STREAM");
+
+                    if (i != this.cursor && (this.tokens[i] === undefined || this.tokens[i].is("WHIT"))) {
+                        if (n < 0) i--; else i++;
+                        continue;
+                    }
+                    
+                    if (count == Math.abs(n)) {
+                        return this.tokens[i];
+                    }
+                    count++;
+                    (n < 0)? i-- : i++;
+                }
 
-    /**
-        @type JSDOC.Token
-    */
-    look : function(/**Number*/n, /**Boolean*/considerWhitespace) {
-        if (typeof n == "undefined") n = 0;
+                return new Token("", "VOID", "STREAM_ERROR"); // because null isn't an object and caller always expects an object
+            }
+        },
 
-        if (considerWhitespace == true) {
-            if (this.cursor+n < 0 || this.cursor+n > this.tokens.length) return {};
-            return this.tokens[this.cursor+n];
-        }
-        else {
+        lookFor : function (data)
+        {
+            // non tree version..
+            var i = this.cursor < 0 ? 0 : this.cursor ;
+            
+            while (true) {
+                if (i >= this.tokens.length) return -1;
+                if (this.tokens[i].data == data) {
+                    return i;
+                }
+                i++;
+                
+            }
+            // should not get here!
+            return -1;
+
+        },
+
+
+        /**
+         * look ahead (or back) x number of tokens (which are not comment or whitespace)
+         * ?? used any more?
+         */
+        lookTok : function(/**Number*/n) {
+            if (typeof n == "undefined") n = 1;
+
+            
             var count = 0;
             var i = this.cursor;
 
             while (true) {
-                if (i < 0) return new Token("", "VOID", "START_OF_STREAM");
-                else if (i > this.tokens.length) return new Token("", "VOID", "END_OF_STREAM");
+                if (i < 0) return false;
+                else if (i > this.tokens.length) return false;
 
-                if (i != this.cursor && (this.tokens[i] === undefined || this.tokens[i].is("WHIT"))) {
+                if (i != this.cursor && (this.tokens[i] === undefined || this.tokens[i].is("WHIT") || this.tokens[i].is("COMM"))) {
                     if (n < 0) i--; else i++;
                     continue;
                 }
@@ -55,172 +106,122 @@ Roo.apply( TokenStream.prototype , {
                 (n < 0)? i-- : i++;
             }
 
-            return new Token("", "VOID", "STREAM_ERROR"); // because null isn't an object and caller always expects an object
-        }
-    },
-
-    lookFor : function (data)
-    {
-        // non tree version..
-        var i = this.cursor < 0 ? 0 : this.cursor ;
-        
-        while (true) {
-            if (i >= this.tokens.length) return -1;
-            if (this.tokens[i].data == data) {
-                return i;
-            }
-            i++;
+            return false; // because null isn't an object and caller always expects an object;
             
-        }
-        // should not get here!
-        return -1;
-
-    },
-
-
-    /**
-     * look ahead (or back) x number of tokens (which are not comment or whitespace)
-     * ?? used any more?
-     */
-    lookTok : function(/**Number*/n) {
-        if (typeof n == "undefined") n = 1;
-
-        
-        var count = 0;
-        var i = this.cursor;
-
-        while (true) {
-            if (i < 0) return false;
-            else if (i > this.tokens.length) return false;
-
-            if (i != this.cursor && (this.tokens[i] === undefined || this.tokens[i].is("WHIT") || this.tokens[i].is("COMM"))) {
-                if (n < 0) i--; else i++;
-                continue;
-            }
-            
-            if (count == Math.abs(n)) {
-                return this.tokens[i];
+        },
+
+        /**
+            @type JSDOC.Token|JSDOC.Token[]| null!
+        */
+        next : function(/**Number*/howMany) {
+            if (typeof howMany == "undefined") howMany = 1;
+            if (howMany < 1) return null;
+            var got = [];
+
+            for (var i = 1; i <= howMany; i++) {
+                if (this.cursor+i >= this.tokens.length) {
+                    return null;
+                }
+                got.push(this.tokens[this.cursor+i]);
             }
-            count++;
-            (n < 0)? i-- : i++;
-        }
+            this.cursor += howMany;
 
-        return false; // because null isn't an object and caller always expects an object;
-        
-    },
-
-    /**
-        @type JSDOC.Token|JSDOC.Token[]| null!
-    */
-    next : function(/**Number*/howMany) {
-        if (typeof howMany == "undefined") howMany = 1;
-        if (howMany < 1) return null;
-        var got = [];
-
-        for (var i = 1; i <= howMany; i++) {
-            if (this.cursor+i >= this.tokens.length) {
-                return null;
+            if (howMany == 1) {
+                return got[0];
             }
-            got.push(this.tokens[this.cursor+i]);
-        }
-        this.cursor += howMany;
+            else return got;
+        },
+        // what about comments after 'function'...
+        // is this used ???
 
-        if (howMany == 1) {
-            return got[0];
-        }
-        else return got;
-    },
-    // what about comments after 'function'...
-    // is this used ???
-
-    nextNonSpace : function ()
-    {
-        
-        while (true) {
-            tok = this.next(1);
-            if (!tok) {
-                return false;
-            }
-            if (tok.is('WHIT') ||  tok.is('COMM')) {
-                continue;
-            }
-            return tok;
-        }
-    },
-    /**
-        @type JSDOC.Token[]
-    */
-    balance : function(/**String*/start, /**String*/stop) {
-        if (!stop) stop = Lang.matching(start);
-        
-        var depth = 0;
-        var got = [];
-        var started = false;
-        //Seed.print("STOP:" + stop);
-        while ((token = this.look())) {
-            if (token.is(start)) {
-                depth++;
-                started = true;
-            }
+        nextNonSpace : function ()
+        {
             
-            if (started) {
-                got.push(token);
+            while (true) {
+                tok = this.next(1);
+                if (!tok) {
+                    return false;
+                }
+                if (tok.is('WHIT') ||  tok.is('COMM')) {
+                    continue;
+                }
+                return tok;
             }
+        },
+        /**
+            @type JSDOC.Token[]
+        */
+        balance : function(/**String*/start, /**String*/stop) {
+            if (!stop) stop = Lang.matching(start);
             
-            if (token.is(stop)) {
-                depth--;
-                if (depth == 0) return got;
+            var depth = 0;
+            var got = [];
+            var started = false;
+            //Seed.print("STOP:" + stop);
+            while ((token = this.look())) {
+                if (token.is(start)) {
+                    depth++;
+                    started = true;
+                }
+                
+                if (started) {
+                    got.push(token);
+                }
+                
+                if (token.is(stop)) {
+                    depth--;
+                    if (depth == 0) return got;
+                }
+                if (!this.next()) break;
             }
-            if (!this.next()) break;
-        }
-    },
+        },
 
-    getMatchingToken : function(/**String*/start, /**String*/stop) {
-        var depth = 0;
-        var cursor = this.cursor;
-        
-        if (!start) {
-            start = Lang.matching(stop);
-            depth = 1;
-        }
-        if (!stop) stop = Lang.matching(start);
-        
-        while ((token = this.tokens[cursor])) {
-            if (token.is(start)) {
-                depth++;
+        getMatchingToken : function(/**String*/start, /**String*/stop) {
+            var depth = 0;
+            var cursor = this.cursor;
+            
+            if (!start) {
+                start = Lang.matching(stop);
+                depth = 1;
             }
+            if (!stop) stop = Lang.matching(start);
             
-            if (token.is(stop) && cursor) {
-                depth--;
-                if (depth == 0) return this.tokens[cursor];
+            while ((token = this.tokens[cursor])) {
+                if (token.is(start)) {
+                    depth++;
+                }
+                
+                if (token.is(stop) && cursor) {
+                    depth--;
+                    if (depth == 0) return this.tokens[cursor];
+                }
+                cursor++;
             }
-            cursor++;
-        }
-    },
-
-    insertAhead : function(/**JSDOC.Token*/token) {
-        this.tokens.splice(this.cursor+1, 0, token);
-    },
-     
-    remaining : function() {
-        var ret = [];
-        while (true) {
-            var tok = this.look(1,true);
-            if (!tok || !tok.is || tok.is('VOID')) {
-                return ret;
+        },
+
+        insertAhead : function(/**JSDOC.Token*/token) {
+            this.tokens.splice(this.cursor+1, 0, token);
+        },
+         
+        remaining : function() {
+            var ret = [];
+            while (true) {
+                var tok = this.look(1,true);
+                if (!tok || !tok.is || tok.is('VOID')) {
+                    return ret;
+                }
+                ret.push(this.next(1));
             }
-            ret.push(this.next(1));
+        },
+         
+
+        arrayToString : function(ar) {
+            console.log(typeof(ar));
+            var ret = [];
+            Roo.each(ar, function(e) {
+                ret.push(e.data);
+            })
+            return ret.join('');
         }
-    },
-     
-
-    arrayToString : function(ar) {
-        console.log(typeof(ar));
-        var ret = [];
-        Roo.each(ar, function(e) {
-            ret.push(e.data);
-        })
-        return ret.join('');
-    }
 });
     
\ No newline at end of file