X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FPrettyPrint.js;h=eb2d94c714be7e27eb937a9a40a0a6b80d5768ee;hp=13e154ac4febae142fad001290c90c3a2d3e45a0;hb=a67931117fc1f532da5016752f7dd3c625ce25d3;hpb=464361c733c46365e950e07d7b1bfc3ca60d402e

diff --git a/JSDOC/PrettyPrint.js b/JSDOC/PrettyPrint.js
index 13e154a..eb2d94c 100644
--- a/JSDOC/PrettyPrint.js
+++ b/JSDOC/PrettyPrint.js
@@ -4,11 +4,23 @@
 TokenReader = imports.TokenReader.TokenReader;
 ScopeParser= imports.ScopeParser.ScopeParser;
 TokenStream = imports.TokenStream.TokenStream;
+TextStream = imports.TextStream.TextStream;
+ 
+
+function  escapeHTML(str) { 
+    return str.replace(/&/g,'&').
+            replace(/>/g,'>'). 
+            replace(/</g,'&lt;'). 
+            replace(/"/g,'&quot;');
+};
 
 function toPretty(str)
 {
-    var tr = new TokenReader();
-    var toks = tr.tokenize(str,false); // dont merge xxx + . + yyyy etc.
+    
+    var txs = new TextStream(str);
+    var tr = new TokenReader({ keepComments : true, keepWhite : true });
+    var toks = tr.tokenize(txs)
+    
     var sp = new ScopeParser(new TokenStream(toks));
     sp.buildSymbolTree();
    // sp.mungeSymboltree();
@@ -33,14 +45,13 @@ function toPretty(str)
             return 'string';
         }
         // other 'vary things??
-        if (tok.is('NAME') || tok.data == '.' || tok.name == '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...?
     
@@ -56,11 +67,11 @@ 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>';