X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FPrettyPrint.js;h=1ef2c6bb1fafd6c77373e33150f297e5af87be5e;hp=f872e3857b46d0aab43c72a75a817e595d8b004e;hb=575a9448659524a199fc7f940e498462451d7cb6;hpb=3511aedc02c820e846e0a7a81b96682a9c04c331

diff --git a/JSDOC/PrettyPrint.js b/JSDOC/PrettyPrint.js
index f872e38..1ef2c6b 100644
--- a/JSDOC/PrettyPrint.js
+++ b/JSDOC/PrettyPrint.js
@@ -1,12 +1,27 @@
 
 // <script type="text/javascript">
 
+TokenReader = imports.TokenReader.TokenReader;
+ScopeParser= imports.ScopeParser.ScopeParser;
+Collapse = imports.Collapse.Collapse;
+TextStream = imports.TextStream.TextStream;
+ 
 
-toPretty = function toPretty(str)
+function  escapeHTML(str) { 
+    return str.replace(/&/g,'&amp;').
+            replace(/>/g,'&gt;'). 
+            replace(/</g,'&lt;'). 
+            replace(/"/g,'&quot;');
+};
+
+function toPretty(str)
 {
-    var tr = new JSDOC.TokenReader();
-    var toks = tr.tokenize(str,false); // dont merge xxx + . + yyyy etc.
-    var sp = new JSDOC.ScopeParser(new JSDOC.TokenStream(toks));
+    
+    var txs = new TextStream(str);
+    var tr = new TokenReader({ keepComments : true, keepWhite : true });
+    var toks = tr.tokenize(txs)
+    
+    var sp = new ScopeParser(new Collapse(toks));
     sp.buildSymbolTree();
    // sp.mungeSymboltree();
     var r = '';
@@ -20,24 +35,23 @@ toPretty = function toPretty(str)
     
     function toStyle(tok)
     {
-        if (tok.isType("whitespace")) {
+        if (tok.is("WHIT") || tok.is("COMM") ) {
             if (tok.data.indexOf("/") > -1) {
                 return 'comment';
             }
             return cs; // keep the same..
         }
-        if (tok.isType('string')) {
+        if (tok.is('STRN')) {
             return 'string';
         }
         // other 'vary things??
-        if (tok.isType('identifier') || tok.isType('dot') || tok.isType('this')) {
+        if (tok.is('NAME') || tok.data == '.' || tok.name == 'THIS') {
             return 'var';
         }
         if (/^[a-z]+/i.test(tok.data)) {
             return 'keyword';
         }
         return 'syntax'
-        
     }
     // loop through and print it...?
     
@@ -53,11 +67,11 @@ toPretty = function toPretty(str)
         if (toks[i].identifier) {
             
             r += '<span class="with-ident2">' +
-                htmlescape(toks[i].data) + '</span>';
+                escapeHTML(toks[i].data) + '</span>';
                 continue;
                 
         }
-        r += htmlescape(toks[i].data).replace(/\n/g, '<BR>');
+        r += escapeHTML(toks[i].data).replace(/\n/g, "<BR/>\n");
     }
     if (cs.length) r +='</span>';
     return '<code class="jsdoc-pretty">'+r+'</code>';