JSDOC/TokenReader.js

[gnome.introspection-doc-generator] / JSDOC / PackerRun.vala

diff --git a/JSDOC/PackerRun.vala b/JSDOC/PackerRun.vala
index d0ebb24..71bf5ea 100644 (file)
--- a/JSDOC/PackerRun.vala
+++ b/JSDOC/PackerRun.vala
@@ -2,17 +2,23 @@
 /** 
   the application
   -- in theory this code  can be used as a library... but this is the standard command line version...
+  
+  
+  valac  --vapidir=/usr/share/vala/vapi 
+     --vapidir=/usr/share/vala/vapi 
+    --vapidir=/usr/share/vala-0.30/vapi 
+        --thread  -g  
+      JSDOC/Lang.vala JSDOC/TextStream.vala JSDOC/TokenReader.vala JSDOC/Token.vala JSDOC/TokenStream.vala JSDOC/Packer.vala 
+      JSDOC/Collapse.vala JSDOC/ScopeParser.vala JSDOC/Scope.vala JSDOC/Identifier.vala JSDOC/CompressWhite.vala 
+       JSDOC/PackerRun.vala --pkg glib-2.0 --pkg gee-1.0 --pkg gio-2.0 --pkg posix -o /tmp/jspack --target-glib=2.32  -X -lm
+
+  
 */
 
 namespace JSDOC
 {
        // --------------- <<<<<<< <MAIN HERE....
-       public static int main(string[] args) 
-       {
-               new PackerRun(args);
-               return 0;
-       }
-
+       
 
        class PackerRun : Application  
        {
@@ -20,28 +26,59 @@ namespace JSDOC
                public static string opt_debug_target = "";
                public static string opt_tmpdir = "";
                
-               
+               [CCode (array_length = false, array_null_terminated = true)]
                private static string[]? opt_files = null;
+               [CCode (array_length = false, array_null_terminated = true)]
                private static string[]? opt_files_from = null;
                public static bool opt_debug = false;
-               
+               public static bool opt_keep_whitespace = false; 
 
                
                const OptionEntry[] options = {
                
                        { "jsfile", 'f', 0, OptionArg.FILENAME_ARRAY, ref opt_files ,"add a file to compile", null },
-               //      { "target", 't', 0, OptionArg.STRING, ref opt_target, "Target File to write (eg. roojs.js)", null },
-               //      { "debug-target", 'T', 0, OptionArg.STRING, ref opt_debug_target, "Target File to write debug code (eg. roojs-debug.js)", null },
-       //              { "tmpdir", 'm', 0, OptionArg.STRING, ref opt_tmpdir, "Temporary Directory to use", null },
+                       { "target", 't', 0, OptionArg.STRING, ref opt_target, "Target File to write (eg. roojs.js)", null },
+                       { "debug-target", 'T', 0, OptionArg.STRING, ref opt_debug_target, "Target File to write debug code (eg. roojs-debug.js)", null },
+                       { "tmpdir", 'm', 0, OptionArg.STRING, ref opt_tmpdir, "Temporary Directory to use", null },
 
-//                     { "index-files", 'i', 0, OptionArg.FILENAME_ARRAY, ref opt_files_from ,"files that contain listing of files to compile", null },                 
- 
+                       { "index-files", 'i', 0, OptionArg.FILENAME_ARRAY, ref opt_files_from ,"files that contain listing of files to compile", null },                 
+                       { "keep-whitespace", 'w', 0, OptionArg.NONE, ref opt_keep_whitespace, "Keep whitespace", null },
                        { "debug", 0, 0, OptionArg.NONE, ref opt_debug, "Show debug messages", null },
                        // fixme -- keepwhite.. cleanup 
                        
                        { null }
                };
+               public static int main(string[] args) 
+               {
+                       foreach(var a in args) {
+                               print("ARG: %s\n", a);
+                       }
+                       
+                       var opt_context = new OptionContext ("JSDOC Packer");
+                       
+                               try {
+                                       opt_context.set_help_enabled (true);
+                                       opt_context.add_main_entries (options, null);
+                                       if (!opt_context.parse ( ref args)) {
+                                               print("options parse error");
+                                               GLib.Process.exit(Posix.EXIT_FAILURE);
+                                       }
+
+                               
+                                        
+                               
+                               } catch (OptionError e) {
+                                       stdout.printf ("error: %s\n", e.message);
+                                       stdout.printf ("Run '%s --help' to see a full list of available command line options.\n %s", 
+                                                                args[0], opt_context.get_help(true,null));
+                                       GLib.Process.exit(Posix.EXIT_FAILURE);
+                                        
+                               }
                
+                       new PackerRun(args);
+                       return 0;
+               }
+
 
        
                public PackerRun (string[] args)
@@ -53,26 +90,7 @@ namespace JSDOC
                        );
                                         
                         
-                       var opt_context = new OptionContext ("JSDOC Packer");
                        
-                       try {
-                               opt_context.set_help_enabled (true);
-                               opt_context.add_main_entries (options, null);
-                               if (!opt_context.parse ( ref args)) {
-                                       print("options parse error");
-                                       GLib.Process.exit(Posix.EXIT_FAILURE);
-                               }
-
-                               
-                                
-                               
-                       } catch (OptionError e) {
-                               stdout.printf ("error: %s\n", e.message);
-                               stdout.printf ("Run '%s --help' to see a full list of available command line options.\n %s", 
-                                                        args[0], opt_context.get_help(true,null));
-                               GLib.Process.exit(Posix.EXIT_FAILURE);
-                                
-                       }
                        // what's required...
                        if (opt_debug) {
                                GLib.Log.set_handler(null, 
@@ -84,8 +102,11 @@ namespace JSDOC
                        
                        // now run the Packer...
                        var p = new Packer(opt_target, opt_debug_target);
+                       p.keepWhite = opt_keep_whitespace;
+                       
+                       
                        if (opt_files != null) {
-                               GLib.debug("Adding File %s", string.join(", ",opt_files));
+                        
                                foreach (string f in opt_files) {
                                        GLib.debug("Adding File %s", f);
                                        p.loadFile(f);