X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=rconv.js;h=d1bc388654ab51625d2796b5e941e8b0b3e0ce45;hb=33c63d94e6bdec4ac4e618d4d42d70f7ae20581c;hp=d9cd6f6097e79f632e1cded4d438009f9f3e2576;hpb=c505867c4fa20cea51382d4d05ff9b6e5185420c;p=gnome.introspection-doc-generator

diff --git a/rconv.js b/rconv.js
index d9cd6f6..d1bc388 100644
--- a/rconv.js
+++ b/rconv.js
@@ -9,7 +9,7 @@
 
 var RooFile = imports.JSDOC.RooFile.RooFile;
 var TokenReader = imports.JSDOC.TokenReader.TokenReader;
-var TokenStream = imports.JSDOC.TokenStream.TokenStream;
+var TextStream = imports.JSDOC.TextStream.TextStream;
 
 var File = imports.File.File;
 
@@ -28,17 +28,19 @@ print(JSON.stringify(args, null,4));
 
 var tr = new  TokenReader(  { 
     keepDocs :true, 
-    keepWhite : true,  
+    keepWhite : false,  
     keepComments : true, 
     sepIdents : true,
-    collapseWhite : false,
-    filename : fn
+    collapseWhite : true,
+    filename : args[0]
 });
 
 var str = File.read(args[0])
 
 var toks = tr.tokenize(new TextStream(str));  
 
+print(JSON.stringify(toks, null,4));
+
 var rf = new RooFile(toks);
 
 rf.parse();