X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FTokenStream.js;h=a6608734eb18340edba1f52e9138ed7ba19f252e;hb=3c287c0bc7f97e6b840f52522b4f4f72f0551669;hp=cb87d2e1828680fe564bc65b3814cd1ef94864d9;hpb=1c25a404cc18bda3f5271b2a89679b1f4413d2d4;p=gnome.introspection-doc-generator

diff --git a/JSDOC/TokenStream.js b/JSDOC/TokenStream.js
index cb87d2e..a660873 100644
--- a/JSDOC/TokenStream.js
+++ b/JSDOC/TokenStream.js
@@ -1,13 +1,13 @@
 //<script type="text/javscript">
 
 
-XObject = imports.XObject.XObject;
+const XObject = imports.XObject.XObject;
  
 
 
-console = imports.console.console;
-Token   = imports.Token.Token;
-Lang    = imports.Lang.Lang;
+const console = imports.console.console;
+const Token   = imports.Token.Token;
+const Lang    = imports.Lang.Lang;
 
 
 /**
@@ -21,7 +21,7 @@ Lang    = imports.Lang.Lang;
  */
 	
  
-TokenStream = XObject.define(
+const TokenStream = XObject.define(
 
     /**
      * @constructor
@@ -114,7 +114,10 @@ TokenStream = XObject.define(
                // print(i);
                 if (i < 0) {
                     if (n > -1) {
-                        i = 0; continue;
+                        i = 0; 
+                        count++;
+                        continue;
+                        
                     }
                     return   new Token("", "VOID", "END_OF_STREAM");
                 }
@@ -138,6 +141,7 @@ TokenStream = XObject.define(
 
         /**
          *  @return {Token|null}
+         * next token (with white space)
          */
             
            
@@ -185,17 +189,19 @@ TokenStream = XObject.define(
          */
         balance : function(/**String*/start, /**String*/stop) {
             
-            start = typeof(Lang.matching(start)) == 'undefined' ? Lang.punc(start) : start;
+            
+            start = typeof(Lang.punc(start)) == 'undefined' ? start : Lang.punc(start);
             
             if (!stop) stop = Lang.matching(start);
             
             var depth = 0;
             var got = [];
             var started = false;
-            Seed.print("STOP:" + stop);
+            //Seed.print("START:" + start);
+            //Seed.print("STOP:" + stop);
             while ((token = this.look())) {
                 if (token.is(start)) {
-                    Seed.print("balance: START : " + token.data);
+              //      Seed.print("balance: START : " + depth + " " + token.data);
                     depth++;
                     started = true;
                 }
@@ -206,11 +212,12 @@ TokenStream = XObject.define(
                 
                 if (token.is(stop)) {
                     depth--;
-                    Seed.print("balance: STOP: " + token.data);
-                    if (depth == 0) return got;
+                //    Seed.print("balance: STOP: "  + depth + " " + token.data);
+                    if (depth < 1) return got;
                 }
                 if (!this.next()) break;
             }
+            return false;
         },
 
         getMatchingToken : function(/**String*/start, /**String*/stop) {
@@ -234,6 +241,7 @@ TokenStream = XObject.define(
                 }
                 cursor++;
             }
+            return false;
         },
 
         insertAhead : function(/**JSDOC.Token*/token) {
@@ -266,9 +274,10 @@ TokenStream = XObject.define(
             end = Math.min(end || this.tokens.length, this.tokens.length);
             var out='';
             for (var i =start;i < end; i++) {
-                out += this.tokens[i].data;
+                
+                out += (this.tokens[i].outData == false) ? this.tokens[i].data : this.tokens[i].outData;
             };
             print(out);
         }
 });
-    
\ No newline at end of file
+