toolcontext: `process_options` require arguments.

Having it to access directly `sys.args` broke some isolation concerns.

This commit also updates all tools to avoid breakage.

Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/src/debugger_commons.nit b/src/debugger_commons.nit
index ad03be6..dcfebbd 100644 (file)
--- a/src/debugger_commons.nit
+++ b/src/debugger_commons.nit
@@ -43,7 +43,7 @@ class InterpretCommons
                var opt_mixins = new OptionArray("Additionals module to min-in", "-m")
                toolcontext.option_context.add_option(opt_mixins)
                # We do not add other options, so process them now!
-               toolcontext.process_options
+               toolcontext.process_options(args)
                
                # We need a model to collect stufs
                var model = new Model

diff --git a/src/metrics/metrics_base.nit b/src/metrics/metrics_base.nit
index 64770df..ee153de 100644 (file)
--- a/src/metrics/metrics_base.nit
+++ b/src/metrics/metrics_base.nit
@@ -86,7 +86,7 @@ redef class ToolContext
                self.option_context.add_option(opt_nocolors)
        end
 
-       redef fun process_options
+       redef fun process_options(args)
        do
                super
                var val = self.opt_dir.value

diff --git a/src/nitdbg_client.nit b/src/nitdbg_client.nit
index 489e1d7..3b06cf5 100644 (file)
--- a/src/nitdbg_client.nit
+++ b/src/nitdbg_client.nit
@@ -105,7 +105,7 @@ end
 var toolcontext = new ToolContext
 toolcontext.tooldescription = "Usage: nitdbg_client [OPTION]...\nConnects to a nitdbg_server and controls it."
 toolcontext.accept_no_arguments = true
-toolcontext.process_options
+toolcontext.process_options(args)
 
 var debug: DebugClient
 

diff --git a/src/nitdoc.nit b/src/nitdoc.nit
index 3ec48a9..57af655 100644 (file)
--- a/src/nitdoc.nit
+++ b/src/nitdoc.nit
@@ -74,7 +74,7 @@ class NitdocContext
                toolcontext.option_context.add_option(opt_piwik_tracker)
                toolcontext.option_context.add_option(opt_piwik_site_id)
                toolcontext.tooldescription = "Usage: nitdoc [OPTION]... <file.nit>...\nGenerates HTML pages of API documentation from Nit source files."
-               toolcontext.process_options
+               toolcontext.process_options(args)
                self.arguments = toolcontext.option_context.rest
 
                self.process_options

diff --git a/src/nitg.nit b/src/nitg.nit
index 9a6e69d..965be59 100644 (file)
--- a/src/nitg.nit
+++ b/src/nitg.nit
@@ -39,7 +39,7 @@ toolcontext.option_context.add_option(opt_mixins)
 toolcontext.tooldescription = "Usage: nitg [OPTION]... file.nit\nCompiles Nit programs."
 
 # We do not add other options, so process them now!
-toolcontext.process_options
+toolcontext.process_options(args)
 
 # We need a model to collect stufs
 var model = new Model

diff --git a/src/nitlight.nit b/src/nitlight.nit
index 7ead6b9..5f22329 100644 (file)
--- a/src/nitlight.nit
+++ b/src/nitlight.nit
@@ -31,7 +31,7 @@ toolcontext.tooldescription = "Usage: nitlight [OPTION]... <file.nit>...\nGenera
 var model = new Model
 var modelbuilder = new ModelBuilder(model, toolcontext)
 
-toolcontext.process_options
+toolcontext.process_options(args)
 var args = toolcontext.option_context.rest
 
 var mmodules = modelbuilder.parse(args)

diff --git a/src/nitls.nit b/src/nitls.nit
index c058219..3c24c20 100644 (file)
--- a/src/nitls.nit
+++ b/src/nitls.nit
@@ -33,7 +33,7 @@ var opt_depends = new OptionBool("List dependencies of given modules", "-M", "--
 
 tc.option_context.add_option(opt_keep, opt_recursive, opt_tree, opt_source, opt_project, opt_depends)
 tc.tooldescription = "Usage: nitls [OPTION]... <file.nit|directory>...\nLists the projects and/or paths of Nit sources files."
-tc.process_options
+tc.process_options(args)
 
 var sum = opt_tree.value.to_i + opt_source.value.to_i + opt_project.value.to_i + opt_depends.value.to_i
 if sum > 1 then

diff --git a/src/nitmetrics.nit b/src/nitmetrics.nit
index 01b3654..d3faeb0 100644 (file)
--- a/src/nitmetrics.nit
+++ b/src/nitmetrics.nit
@@ -26,7 +26,7 @@ var toolcontext = new ToolContext
 toolcontext.tooldescription = "Usage: nitmetrics [OPTION]... <file.nit>...\mComputes various metrics on Nit programs."
 
 # We do not add other options, so process them now!
-toolcontext.process_options
+toolcontext.process_options(args)
 
 # Get arguments
 var arguments = toolcontext.option_context.rest

diff --git a/src/nitunit.nit b/src/nitunit.nit
index 46c8254..4dceda0 100644 (file)
--- a/src/nitunit.nit
+++ b/src/nitunit.nit
@@ -223,7 +223,7 @@ var toolcontext = new ToolContext
 toolcontext.option_context.add_option(toolcontext.opt_full, toolcontext.opt_output, toolcontext.opt_dir)
 toolcontext.tooldescription = "Usage: nitunit [OPTION]... <file.nit>...\nExecutes the unit tests from Nit source files."
 
-toolcontext.process_options
+toolcontext.process_options(args)
 var args = toolcontext.option_context.rest
 
 var model = new Model

diff --git a/src/nitx.nit b/src/nitx.nit
index 7225571..d70c9e3 100644 (file)
--- a/src/nitx.nit
+++ b/src/nitx.nit
@@ -868,7 +868,7 @@ end
 # Create a tool context to handle options and paths
 var toolcontext = new ToolContext
 toolcontext.tooldescription = "Usage: nitx [OPTION]... <file.nit> [query]\nDisplays specific pieces of API information from Nit source files."
-toolcontext.process_options
+toolcontext.process_options(args)
 
 # Here we launch the nit index
 var ni = new NitIndex(toolcontext)

diff --git a/src/test_markdown.nit b/src/test_markdown.nit
index 24b48f7..d9c9060 100644 (file)
--- a/src/test_markdown.nit
+++ b/src/test_markdown.nit
@@ -58,7 +58,7 @@ var opt_full = new OptionBool("Process also imported modules", "--full")
 toolcontext.option_context.add_option(opt_full)
 toolcontext.tooldescription = "Usage: test_markdown [OPTION]... <file.nit>...\nGenerates HTML of comments of documentation from Nit source files."
 
-toolcontext.process_options
+toolcontext.process_options(args)
 var args = toolcontext.option_context.rest
 
 var model = new Model

diff --git a/src/test_phase.nit b/src/test_phase.nit
index 8594a5b..9898913 100644 (file)
--- a/src/test_phase.nit
+++ b/src/test_phase.nit
@@ -25,7 +25,7 @@ var toolcontext = new ToolContext
 toolcontext.tooldescription = "Usage: [OPTION]... <file.nit>..."
 
 # We do not add other options, so process them now!
-toolcontext.process_options
+toolcontext.process_options(args)
 
 # Get arguments
 var arguments = toolcontext.option_context.rest

diff --git a/src/toolcontext.nit b/src/toolcontext.nit
index 4e26321..85d7cd6 100644 (file)
--- a/src/toolcontext.nit
+++ b/src/toolcontext.nit
@@ -197,7 +197,7 @@ class ToolContext
        end
 
        # Parse and process the options given on the command line
-       fun process_options
+       fun process_options(args: Sequence[String])
        do
                self.opt_warn.value = 1