JSDOC/PrettyPrint.js

diff --git a/JSDOC/PrettyPrint.js b/JSDOC/PrettyPrint.js
index f872e38..13e154a 100644 (file)
--- a/JSDOC/PrettyPrint.js
+++ b/JSDOC/PrettyPrint.js
@@ -1,12 +1,15 @@
 
 // <script type="text/javascript">
 
+TokenReader = imports.TokenReader.TokenReader;
+ScopeParser= imports.ScopeParser.ScopeParser;
+TokenStream = imports.TokenStream.TokenStream;
 
-toPretty = function toPretty(str)
+function toPretty(str)
 {
-    var tr = new JSDOC.TokenReader();
+    var tr = new TokenReader();
     var toks = tr.tokenize(str,false); // dont merge xxx + . + yyyy etc.
-    var sp = new JSDOC.ScopeParser(new JSDOC.TokenStream(toks));
+    var sp = new ScopeParser(new TokenStream(toks));
     sp.buildSymbolTree();
    // sp.mungeSymboltree();
     var r = '';
@@ -20,17 +23,17 @@ 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)) {