X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FPrettyPrint.js;h=bcec9fcbea6e8113253c0a06037993324ae00900;hp=1f99003e663aeb5240d87ffc1e5b815a82d822ad;hb=df1ca652314ef73a3d4579508be493b3789335fa;hpb=01741d040d0903397d9c0e4f04d790cc3098a2ad

diff --git a/JSDOC/PrettyPrint.js b/JSDOC/PrettyPrint.js
index 1f99003..bcec9fc 100644
--- a/JSDOC/PrettyPrint.js
+++ b/JSDOC/PrettyPrint.js
@@ -3,27 +3,32 @@
 
 TokenReader = imports.TokenReader.TokenReader;
 ScopeParser= imports.ScopeParser.ScopeParser;
-TokenStream = imports.TokenStream.TokenStream;
+Collapse = imports.Collapse.Collapse;
+TextStream = imports.TextStream.TextStream;
+ 
 
-function  escapeHTML() {                                        
-    return(                                                                 
-        this.replace(/&/g,'&').                                         
-            replace(/>/g,'>').                                           
-            replace(/</g,'&lt;').                                           
-            replace(/"/g,'&quot;')                                         
-    );                                                                      
+function  escapeHTML(str) { 
+    return str.replace(/&/g,'&amp;').
+            replace(/>/g,'&gt;'). 
+            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 sp = new ScopeParser(new TokenStream(toks));
-    sp.buildSymbolTree();
+    
+    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 = '';
-    r += sp.warnings.join("<BR>");
-    r == "<BR>";
+    //r += sp.warnings.join("<BR>");
+    //r == "<BR>";
     
     
     
@@ -42,7 +47,7 @@ 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)) {
@@ -68,9 +73,10 @@ function toPretty(str)
                 continue;
                 
         }
-        r += escapeHTML(toks[i].data).replace(/\n/g, '<BR>');
+        r += escapeHTML(toks[i].data).replace(/\n/g, "<BR/>\n");
     }
     if (cs.length) r +='</span>';
+    print("DONE!");
     return '<code class="jsdoc-pretty">'+r+'</code>';