X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FTokenReader.js;h=a635ede5b9e84f9b1da81418c2461c1043dad5e2;hp=611868c46889a25a2abd5d31722702bfc8be4570;hb=f2fca134e0b3284adaaabd66a14d06433d52d55a;hpb=43d1eaaaab5908ba234c9e85b48558b3563d2631

diff --git a/JSDOC/TokenReader.js b/JSDOC/TokenReader.js
index 611868c..a635ede 100644
--- a/JSDOC/TokenReader.js
+++ b/JSDOC/TokenReader.js
@@ -1,12 +1,12 @@
 //<script type="text/javascript">
 
-//imports['Object.js'].load(Object);
+ 
 XObject = imports.XObject.XObject;
-console = imports['console.js'].console;
+console = imports.console.console;
 
-JSDOC   = imports['JSDOC.js'].JSDOC;
-Token   = imports['JSDOC/Token.js'].Token;
-Lang    = imports['JSDOC/Lang.js'].Lang;
+
+Token   = imports.Token.Token;
+Lang    = imports.Lang.Lang;
 
 /**
 	@class Search a {@link JSDOC.TextStream} for language tokens.
@@ -26,11 +26,19 @@ TokenReader = XObject.define(
             
 
         /**
-            @type {JSDOC.Token[]}
+         * tokenize a stream
+         * @return {Array} of tokens
+         * 
+         * ts = new TextStream(File.read(str));
+         * tr = TokenReader({ keepComments : true, keepWhite : true });
+         * tr.tokenize(ts)
+         * 
          */
+            
 
 
         tokenize : function(/**JSDOC.TextStream*/stream) {
+            this.line =1;
             var tokens = [];
             /**@ignore*/ tokens.last    = function() { return tokens[tokens.length-1]; }
             /**@ignore*/ tokens.lastSym = function() {
@@ -52,7 +60,7 @@ TokenReader = XObject.define(
                 if (this.read_word(stream, tokens))      continue;
                 
                 // if execution reaches here then an error has happened
-                tokens.push(new Token(stream.next(), "TOKN", "UNKNOWN_TOKEN"));
+                tokens.push(new Token(stream.next(), "TOKN", "UNKNOWN_TOKEN", this.line));
             }
             
             
@@ -75,16 +83,21 @@ TokenReader = XObject.define(
             else {
                 var name;
                 if ((name = Lang.keyword(found))) {
-                    tokens.push(new Token(found, "KEYW", name));
+                    tokens.push(new Token(found, "KEYW", name, this.line));
                     return true;
                 }
-                if (found.indexOf('.') < 0) {
-                    tokens.push(new Token(found, "NAME", "NAME"));
+                if (!this.sepIdents || found.indexOf('.') < 0 ) {
+                    tokens.push(new Token(found, "NAME", "NAME", this.line));
                     return true;
                 }
                 var n = found.split('.');
+                var p = false;
                 n.forEach(function(nm) {
-                    tokens.push(new Token(nm, "NAME", "NAME"));
+                    if (p) {
+                        tokens.push(new Token('.', "PUNC", "DOT", this.line));
+                    }
+                    p=true;
+                    tokens.push(new Token(nm, "NAME", "NAME", this.line));
                 });
                 return true;
                 
@@ -105,7 +118,7 @@ TokenReader = XObject.define(
                 return false;
             }
             else {
-                tokens.push(new Token(found, "PUNC", Lang.punc(found)));
+                tokens.push(new Token(found, "PUNC", Lang.punc(found), this.line));
                 return true;
             }
         },
@@ -125,7 +138,7 @@ TokenReader = XObject.define(
             }
             else {
                 if (this.collapseWhite) found = " ";
-                if (this.keepWhite) tokens.push(new Token(found, "WHIT", "SPACE"));
+                if (this.keepWhite) tokens.push(new Token(found, "WHIT", "SPACE", this.line));
                 return true;
             }
         },
@@ -137,6 +150,7 @@ TokenReader = XObject.define(
             var found = "";
             
             while (!stream.look().eof && Lang.isNewline(stream.look())) {
+                this.line++;
                 found += stream.next();
             }
             
@@ -145,7 +159,7 @@ TokenReader = XObject.define(
             }
             else {
                 if (this.collapseWhite) found = "\n";
-                if (this.keepWhite) tokens.push(new Token(found, "WHIT", "NEWLINE"));
+                if (this.keepWhite) tokens.push(new Token(found, "WHIT", "NEWLINE", this.line));
                 return true;
             }
         },
@@ -156,14 +170,16 @@ TokenReader = XObject.define(
         read_mlcomment : function(/**JSDOC.TokenStream*/stream, tokens) {
             if (stream.look() == "/" && stream.look(1) == "*") {
                 var found = stream.next(2);
-                
+                var c = '';
                 while (!stream.look().eof && !(stream.look(-1) == "/" && stream.look(-2) == "*")) {
-                    found += stream.next();
+                    c = stream.next();
+                    if (c == "\n") this.line++;
+                    found += c;
                 }
                 
                 // to start doclet we allow /** or /*** but not /**/ or /****
-                if (/^\/\*\*([^\/]|\*[^*])/.test(found) && this.keepDocs) tokens.push(new Token(found, "COMM", "JSDOC"));
-                else if (this.keepComments) tokens.push(new Token(found, "COMM", "MULTI_LINE_COMM"));
+                if (/^\/\*\*([^\/]|\*[^*])/.test(found) && this.keepDocs) tokens.push(new Token(found, "COMM", "JSDOC", this.line));
+                else if (this.keepComments) tokens.push(new Token(found, "COMM", "MULTI_LINE_COMM", this.line));
                 return true;
             }
             return false;
@@ -185,8 +201,9 @@ TokenReader = XObject.define(
                 }
                 
                 if (this.keepComments) {
-                    tokens.push(new Token(found, "COMM", "SINGLE_LINE_COMM"));
+                    tokens.push(new Token(found, "COMM", "SINGLE_LINE_COMM", this.line));
                 }
+                this.line++;
                 return true;
             }
             return false;
@@ -214,7 +231,7 @@ TokenReader = XObject.define(
                     }
                     else if (stream.look() == "\"") {
                         string += stream.next();
-                        tokens.push(new Token(string, "STRN", "DOUBLE_QUOTE"));
+                        tokens.push(new Token(string, "STRN", "DOUBLE_QUOTE", this.line));
                         return true;
                     }
                     else {
@@ -239,7 +256,7 @@ TokenReader = XObject.define(
                     }
                     else if (stream.look() == "'") {
                         string += stream.next();
-                        tokens.push(new Token(string, "STRN", "SINGLE_QUOTE"));
+                        tokens.push(new Token(string, "STRN", "SINGLE_QUOTE", this.line));
                         return true;
                     }
                     else {
@@ -268,8 +285,8 @@ TokenReader = XObject.define(
                 return false;
             }
             else {
-                if (/^0[0-7]/.test(found)) tokens.push(new Token(found, "NUMB", "OCTAL"));
-                else tokens.push(new Token(found, "NUMB", "DECIMAL"));
+                if (/^0[0-7]/.test(found)) tokens.push(new Token(found, "NUMB", "OCTAL", this.line));
+                else tokens.push(new Token(found, "NUMB", "DECIMAL", this.line));
                 return true;
             }
         },
@@ -306,7 +323,7 @@ TokenReader = XObject.define(
             
             while (!stream.look().eof) {
                 if (Lang.isHexDec(found) && !Lang.isHexDec(found+stream.look())) { // done
-                    tokens.push(new Token(found, "NUMB", "HEX_DEC"));
+                    tokens.push(new Token(found, "NUMB", "HEX_DEC", this.line));
                     return true;
                 }
                 else {
@@ -351,7 +368,7 @@ TokenReader = XObject.define(
                             regex += stream.next();
                         }
                         
-                        tokens.push(new Token(regex, "REGX", "REGX"));
+                        tokens.push(new Token(regex, "REGX", "REGX", this.line));
                         return true;
                     }
                     else {