X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FToken.js;h=52689bac562105d396e82227d464a4f03349878d;hb=4874ad3e1d08502e88986231f3de271795ca2302;hp=95f84ca380fee72c8d89459092b7bef8e7704191;hpb=f95ea424bedf9b84475c028cb465d5e097a8fc18;p=gnome.introspection-doc-generator

diff --git a/JSDOC/Token.js b/JSDOC/Token.js
index 95f84ca..52689ba 100644
--- a/JSDOC/Token.js
+++ b/JSDOC/Token.js
@@ -1,8 +1,8 @@
 //<Script type="text/javascript">
 
-XObject = imports.XObject.XObject;
+const XObject = imports.XObject.XObject;
  
-console = imports.console.console;
+const console = imports.console.console;
 /**
  *	@class Token
  * 
@@ -33,7 +33,7 @@ console = imports.console.console;
  * 
 */
 
-Token = XObject.define(
+const Token = XObject.define(
     function(data, type, name, line) {
         this.data = data;
         this.type = type;
@@ -42,12 +42,15 @@ Token = XObject.define(
         this.prefix = '';    
         this.outData = false; // used by packer/scopeparser
         this.identifier = false; // used by scope
+        this.id = Token.id++;
     }, 
     Object, 
     {
          toString: function()
         {
-            return 'line:' + this.line + ', type:' + this.type + ', name:' + this.name + ', data:' + this.data;
+            return 'line:' + this.line + ', type:' + this.type + 
+                ', name:' + this.name + ', data:' + this.data + 
+                ((this.outData === false) ? '' : ( 'outData : ' + this.outData));
         },
         
         
@@ -56,12 +59,14 @@ Token = XObject.define(
             lvl = lvl || 0;
             
             var ret =  this.data ;
+            
+            
             if (this.items) {
                 var ar = [];
-                Roo.each(this.items, function(ai) {
+                this.items.forEach(  function(ai) {
                     
                     var str = '';
-                    Roo.each(ai, function(it) {
+                    ai.forEach(  function(it) {
                         str += it.toRaw(lvl + 1);
                     })
                     ar.push(str);
@@ -73,7 +78,7 @@ Token = XObject.define(
             if (this.props) {
                 for (var i in this.props) {
                     ret += this.props[i].key.toRaw(lvl+1) + ' : ';
-                    Roo.each(this.props[i].val, function(e) {
+                    this.props[i].val.forEach( function(e) {
                         ret+=e.toRaw(lvl+1);
                     })
                     
@@ -103,4 +108,4 @@ Token = XObject.define(
             return this.name === what || this.type === what;
         }
 });
-     
\ No newline at end of file
+Token.id = 0;     
\ No newline at end of file