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

diff --git a/JSDOC/Token.js b/JSDOC/Token.js
index 63908dc..95f84ca 100644
--- a/JSDOC/Token.js
+++ b/JSDOC/Token.js
@@ -1,36 +1,55 @@
 //<Script type="text/javascript">
 
-imports['Object.js'].load(Object);
-JSDOC   = imports['JSDOC.js'].JSDOC;
-console = imports['console.js'].console;
+XObject = imports.XObject.XObject;
+ 
+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
- *     COMM  (comment)   - name is MULTI_LINE_COMM, JSDOC, SINGLE_LINE_COMM
- *     NAME  (name / identifier) - name is NAME
- *     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   (regular expression) - name is REGX
+ *     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 = Object.define(
-    function(data, type, name) {
+Token = XObject.define(
+    function(data, type, name, line) {
         this.data = data;
         this.type = type;
         this.name = name;
-        this.prefix = '';
+        this.line = line;
+        this.prefix = '';    
+        this.outData = false; // used by packer/scopeparser
+        this.identifier = false; // used by scope
     }, 
     Object, 
     {
+         toString: function()
+        {
+            return 'line:' + this.line + ', type:' + this.type + ', name:' + this.name + ', data:' + this.data;
+        },
+        
         
         toRaw : function(lvl)
         {