X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FToken.js;h=95f84ca380fee72c8d89459092b7bef8e7704191;hb=2a10119befba6ac7ea16a3df614a64078890158d;hp=98a9f2c9a1b8488acf37910774a0fc47ef9afba1;hpb=d29d581b911370e5350ca88a2eecaab1ae3d7073;p=gnome.introspection-doc-generator

diff --git a/JSDOC/Token.js b/JSDOC/Token.js
index 98a9f2c..95f84ca 100644
--- a/JSDOC/Token.js
+++ b/JSDOC/Token.js
@@ -1,72 +1,106 @@
 //<Script type="text/javascript">
-JSDOC   = imports['JSDOC.js'].JSDOC;
-Roo     = imports['Roo.js'].Roo;
-console = imports['console.js'].console;
+
+XObject = imports.XObject.XObject;
+ 
+console = imports.console.console;
 /**
-	@constructor
+ *	@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
+ *     PUNC  (puctuation)       - name is String description of punctionan (eg LEFTPARAM)
+ *     WHIT  (white space)      - name is SPACE,NEWLINE
+ *     STRN  (string)           - name is DOBULE_QUOTE, SINGLE_QUOTE
+ *     NUMB  (number)           - name is OCTAL,DECIMAL,HEC_DEC
+ *     REGX   (reg.expression)  - name is REGX
+ *  @prop name {String} see type details above
+ *  @prop identifier {Identifier} identifier class if relivant
+ * 
+ * 
+ * 
+ * old mappings:
+ * 
+ * Script.TOKidentifier  - type == 'NAME'
+ * Script.TOKassign  = data == '='
+ * Script.TOKsemicolon data == '';
+ * 
+ * 
+ * 
 */
-Token = function(data, type, name) {
-	this.data = data;
-	this.type = type;
-	this.name = name;
-    this.prefix = '';
-}
 
-//JSDOC.Token.prototype.toString = function() { 
-//	return "<"+this.type+" name=\""+this.name+"\">"+this.data+"</"+this.type+">";
-//}
-Roo.apply( Token.prototype, {
-    
-    toRaw : function(lvl)
+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
+    }, 
+    Object, 
     {
-        lvl = lvl || 0;
+         toString: function()
+        {
+            return 'line:' + this.line + ', type:' + this.type + ', name:' + this.name + ', data:' + this.data;
+        },
         
-        var ret =  this.data ;
-        if (this.items) {
-            var ar = [];
-            Roo.each(this.items, function(ai) {
-                
-                var str = '';
-                Roo.each(ai, function(it) {
-                    str += it.toRaw(lvl + 1);
-                })
-                ar.push(str);
-                
-            })
-            ret +=   ar.join('');
+        
+        toRaw : function(lvl)
+        {
+            lvl = lvl || 0;
             
-        }
-        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) {
-                    ret+=e.toRaw(lvl+1);
+            var ret =  this.data ;
+            if (this.items) {
+                var ar = [];
+                Roo.each(this.items, function(ai) {
+                    
+                    var str = '';
+                    Roo.each(ai, function(it) {
+                        str += it.toRaw(lvl + 1);
+                    })
+                    ar.push(str);
+                    
                 })
+                ret +=   ar.join('');
                 
             }
-        }
-        
-        
-        
-        return this.prefix +   ret;
+            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) {
+                        ret+=e.toRaw(lvl+1);
+                    })
+                    
+                }
+            }
+            
+            
+            
+            return this.prefix +   ret;
+             
+        },
+
+        toJS : function() {
+            
+            try {
+                var _tmp = '';
+                eval( "_tmp = " + this.data);
+                return _tmp;
+            } catch( e) {
+                return "ERROR unparsable" + this.data;
+            }
+        },
          
-    },
+                        
 
-    toJS : function() {
-        
-        try {
-            var _tmp = '';
-            eval( "_tmp = " + this.data);
-            return _tmp;
-        } catch( e) {
-            return "ERROR unparsable" + this.data;
+        is : function(what) {
+            return this.name === what || this.type === what;
         }
-    },
-     
-                    
-
-    is : function(what) {
-        return this.name === what || this.type === what;
-    }
 });
      
\ No newline at end of file