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

diff --git a/JSDOC/Token.js b/JSDOC/Token.js
index 5ae1876..52689ba 100644
--- a/JSDOC/Token.js
+++ b/JSDOC/Token.js
@@ -1,14 +1,15 @@
 //<Script type="text/javascript">
 
-imports['Object.js'].load(Object);
-JSDOC   = imports['JSDOC.js'].JSDOC;
-console = imports['console.js'].console;
+const XObject = imports.XObject.XObject;
+ 
+const console = imports.console.console;
 /**
  *	@class Token
  * 
  *  @prop data {String} raw value of token
  *  @prop type {String} type of token
  *     TOKN  (unknown)          - name is UNKNOWN_TOKEN
+ * 
  *     KEYW  (keyword)          - name is upper case version of keyword
  *     NAME  (name/identifier)  - name is NAME
  *     COMM  (comment)          - name is MULTI_LINE_COMM, JSDOC, SINGLE_LINE_COMM
@@ -18,25 +19,39 @@ console = imports['console.js'].console;
  *     NUMB  (number)           - name is OCTAL,DECIMAL,HEC_DEC
  *     REGX   (reg.expression)  - name is REGX
  *  @prop name {String} see type details above
- *  @prop indentifier {Identifier} identifier class if relivant
+ *  @prop identifier {Identifier} identifier class if relivant
+ * 
+ * 
+ * 
+ * old mappings:
+ * 
+ * Script.TOKidentifier  - type == 'NAME'
+ * Script.TOKassign  = data == '='
+ * Script.TOKsemicolon data == '';
+ * 
+ * 
  * 
 */
 
-Token = Object.define(
-    function(data, type, name) {
+const Token = XObject.define(
+    function(data, type, name, line) {
         this.data = data;
         this.type = type;
         this.name = name;
+        this.line = line;
         this.prefix = '';    
         this.outData = false; // used by packer/scopeparser
         this.identifier = false; // used by scope
+        this.id = Token.id++;
     }, 
     Object, 
     {
-        function toString()
+         toString: function()
         {
-            return '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));
+        },
         
         
         toRaw : function(lvl)
@@ -44,12 +59,14 @@ Token = Object.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);
@@ -61,7 +78,7 @@ Token = Object.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);
                     })
                     
@@ -91,4 +108,4 @@ Token = Object.define(
             return this.name === what || this.type === what;
         }
 });
-     
\ No newline at end of file
+Token.id = 0;     
\ No newline at end of file