Merge 51b72cd into 22f6672

carlobaldassi · Mar 10, 2017 · 074c005 · 074c005
2 parents 22f6672 + 51b72cd
commit 074c005
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 15 deletions.
diff --git a/precompile/precompile.jl b/precompile/precompile.jl
@@ -1,7 +1,6 @@
 function _precompile_()
     ccall(:jl_generating_output, Cint, ()) == 1 || return nothing
     precompile(ArgParse.usage_string, (ArgParse.ArgParseSettings,))
-    precompile(ArgParse.call, (Array{Any, 1}, Type{ArgParse.ArgParseSettings},))
     precompile(ArgParse.import_settings, (ArgParse.ArgParseSettings, ArgParse.ArgParseSettings, Bool,))
     precompile(ArgParse.override_duplicates, (Array{ArgParse.ArgParseField, 1}, ArgParse.ArgParseField,))
     precompile(ArgParse.parse1_optarg, (ArgParse.ParserState, ArgParse.ArgParseSettings, ArgParse.ArgParseField, Compat.UTF8String, Compat.UTF8String,))
@@ -22,9 +21,6 @@ function _precompile_()
     precompile(ArgParse.check_short_opt_name, (Compat.UTF8String, ArgParse.ArgParseSettings,))
     precompile(ArgParse.parse_long_opt, (ArgParse.ParserState, ArgParse.ArgParseSettings,))
     precompile(ArgParse.convert_to_symbols, (Base.Dict{AbstractString, Any},))
-    precompile(ArgParse.call, (Type{ArgParse.ParserState}, Array{Compat.ASCIIString, 1}, ArgParse.ArgParseSettings, Bool,))
-    precompile(ArgParse.call, (Type{ArgParse.ParserState}, Array{Compat.UTF8String, 1}, ArgParse.ArgParseSettings, Bool,))
-    precompile(ArgParse.call, (Type{ArgParse.ParserState}, Array{Any, 1}, ArgParse.ArgParseSettings, Bool,))
     precompile(ArgParse.check_settings_can_use_symbols, (ArgParse.ArgParseSettings,))
     precompile(ArgParse.check_name_format, (Array{Compat.ASCIIString, 1},))
     precompile(ArgParse.check_settings_are_compatible, (ArgParse.ArgParseSettings, ArgParse.ArgParseSettings,))
@@ -52,7 +48,6 @@ function _precompile_()
     precompile(ArgParse.set_default_arg_group, (ArgParse.ArgParseSettings, Compat.ASCIIString,))
     precompile(ArgParse.check_long_opt_name, (Compat.ASCIIString, ArgParse.ArgParseSettings,))
     precompile(ArgParse.override_conflicts_with_commands, (ArgParse.ArgParseSettings, Compat.ASCIIString,))
-    precompile(ArgParse.call, (Array{Any, 1}, Type{ArgParse.ArgParseSettings}, Compat.ASCIIString, Bool,))
     precompile(ArgParse.name_to_fieldnames, (Compat.ASCIIString, ArgParse.ArgParseSettings,))
     precompile(ArgParse.check_range_default_multi, (Array{Any, 1}, Function,))
     precompile(ArgParse.check_arg_makes_sense, (ArgParse.ArgParseSettings, ArgParse.ArgParseField,))
@@ -61,10 +56,8 @@ function _precompile_()
     precompile(ArgParse.add_arg_field, (Array{Any, 1}, ArgParse.ArgParseSettings, Array{Compat.ASCIIString, 1},))
     precompile(ArgParse.test_required_args, (ArgParse.ArgParseSettings, Base.Set{AbstractString},))
     precompile(ArgParse.add_arg_field, (Array{Any, 1}, ArgParse.ArgParseSettings, Compat.ASCIIString,))
-    precompile(ArgParse.call, (Type{ArgParse.ArgParseSettings},))
     precompile(ArgParse.check_metavar, (Compat.UTF8String,))
     precompile(ArgParse.check_metavar, (Compat.ASCIIString,))
-    precompile(ArgParse.call, (Array{Any, 1}, Type{ArgParse.ArgParseSettings}, Compat.ASCIIString,))
     precompile(ArgParse.parse_command_args, (ArgParse.ParserState, ArgParse.ArgParseSettings,))
     precompile(ArgParse.add_arg_field, (Array{Any, 1}, ArgParse.ArgParseSettings, Array{Compat.UTF8String, 1},))
     precompile(ArgParse.add_arg_field, (Array{Any, 1}, ArgParse.ArgParseSettings, Compat.UTF8String,))
@@ -82,7 +75,6 @@ function _precompile_()
     precompile(ArgParse.get_cmd_prog_hint, (ArgParse.ArgParseField,))
     precompile(ArgParse.check_group_name, (Compat.ASCIIString,))
     precompile(ArgParse.test_range, (Function, Compat.ASCIIString, Compat.UTF8String,))
-    precompile(ArgParse.call, (Type{ArgParse.ArgParseTable},))
     precompile(ArgParse.test_range, (Function, Float64, Compat.ASCIIString,))
     precompile(ArgParse.test_range, (Function, Compat.UTF8String, Compat.UTF8String,))
     precompile(ArgParse.test_range, (Function, Compat.ASCIIString, Compat.ASCIIString,))
@@ -97,8 +89,6 @@ function _precompile_()
     precompile(ArgParse.idstring, (ArgParse.ArgParseField,))
     precompile(ArgParse.check_arg_name, (Compat.ASCIIString,))
     precompile(ArgParse.is_multi_nargs, (ArgParse.ArgConsumerType,))
-    precompile(ArgParse.call, (Type{ArgParse.ArgConsumerType}, Symbol,))
-    precompile(ArgParse.call, (Type{ArgParse.ArgConsumerType}, Int64,))
     precompile(ArgParse.parse_item, (Type{Int64}, Compat.ASCIIString,))
     precompile(ArgParse._add_arg_group, (ArgParse.ArgParseSettings, Compat.ASCIIString, Compat.ASCIIString, Bool,))
     precompile(ArgParse.getindex, (ArgParse.ArgParseSettings, Compat.ASCIIString,))
@@ -108,7 +98,6 @@ function _precompile_()
     precompile(ArgParse.argparse_error, (Compat.UTF8String, Vararg{Any},))
     precompile(ArgParse.auto_metavar, (Compat.ASCIIString, Bool,))
     precompile(ArgParse.is_flag_action, (Symbol,))
-    precompile(ArgParse.call, (Type{ArgParse.ArgConsumerType}, Char,))
     precompile(ArgParse.is_command_action, (Symbol,))
     precompile(ArgParse.add_arg_group, (ArgParse.ArgParseSettings, Compat.ASCIIString,))
     precompile(ArgParse.argparse_error, (Compat.UTF8String, Vararg{Compat.UTF8String},))
@@ -122,7 +111,6 @@ function _precompile_()
     precompile(ArgParse.add_arg_field, (ArgParse.ArgParseSettings, Array{Compat.ASCIIString, 1},))
     precompile(ArgParse.add_arg_group, (ArgParse.ArgParseSettings, Compat.ASCIIString, Compat.ASCIIString,))
     precompile(ArgParse.default_action, (Int64,))
-    precompile(ArgParse.call, (Type{ArgParse.ArgParseError}, Compat.UTF8String,))
     precompile(ArgParse.default_action, (Char,))
     precompile(ArgParse.parse_item, (Type{Any}, Compat.UTF8String,))
     precompile(ArgParse.check_range_default_multi2, (Void, Function,))
@@ -137,4 +125,31 @@ function _precompile_()
     precompile(ArgParse.parse_args, (Array{Compat.UTF8String, 1}, ArgParse.ArgParseSettings,))
     precompile(ArgParse.parse_args, (Array{Any, 1}, ArgParse.ArgParseSettings,))
     precompile(ArgParse.set_default_arg_group, (ArgParse.ArgParseSettings,))
+    if VERSION < v"0.5"
+      precompile(ArgParse.call, (Array{Any, 1}, Type{ArgParse.ArgParseSettings},))
+      precompile(ArgParse.call, (Type{ArgParse.ParserState}, Array{Compat.ASCIIString, 1}, ArgParse.ArgParseSettings, Bool,))
+      precompile(ArgParse.call, (Type{ArgParse.ParserState}, Array{Compat.UTF8String, 1}, ArgParse.ArgParseSettings, Bool,))
+      precompile(ArgParse.call, (Type{ArgParse.ParserState}, Array{Any, 1}, ArgParse.ArgParseSettings, Bool,))
+      precompile(ArgParse.call, (Array{Any, 1}, Type{ArgParse.ArgParseSettings}, Compat.ASCIIString, Bool,))
+      precompile(ArgParse.call, (Type{ArgParse.ArgParseSettings},))
+      precompile(ArgParse.call, (Array{Any, 1}, Type{ArgParse.ArgParseSettings}, Compat.ASCIIString,))
+      precompile(ArgParse.call, (Type{ArgParse.ArgParseTable},))
+      precompile(ArgParse.call, (Type{ArgParse.ArgConsumerType}, Symbol,))
+      precompile(ArgParse.call, (Type{ArgParse.ArgConsumerType}, Int64,))
+      precompile(ArgParse.call, (Type{ArgParse.ArgConsumerType}, Char,))
+      precompile(ArgParse.call, (Type{ArgParse.ArgParseError}, Compat.UTF8String,))
+    else
+      precompile(Array{Any, 1}, (Type{ArgParse.ArgParseSettings},))
+      precompile(Type{ArgParse.ParserState}, (Array{Compat.ASCIIString, 1}, ArgParse.ArgParseSettings, Bool,))
+      precompile(Type{ArgParse.ParserState}, (Array{Compat.UTF8String, 1}, ArgParse.ArgParseSettings, Bool,))
+      precompile(Type{ArgParse.ParserState}, (Array{Any, 1}, ArgParse.ArgParseSettings, Bool,))
+      precompile(Array{Any, 1}, (Type{ArgParse.ArgParseSettings}, Compat.ASCIIString, Bool,))
+      precompile(Type{ArgParse.ArgParseSettings},())
+      precompile(Array{Any, 1}, (Type{ArgParse.ArgParseSettings}, Compat.ASCIIString,))
+      precompile(Type{ArgParse.ArgParseTable},())
+      precompile(Type{ArgParse.ArgConsumerType}, (Symbol,))
+      precompile(Type{ArgParse.ArgConsumerType}, (Int64,))
+      precompile(Type{ArgParse.ArgConsumerType}, (Char,))
+      precompile(Type{ArgParse.ArgParseError}, (Compat.UTF8String,))
+    end
 end
diff --git a/src/ArgParse.jl b/src/ArgParse.jl
@@ -595,6 +595,10 @@ macro add_arg_table(s, x...)
             # in-place and restart from the same position
             splice!(x, i, y.args)
             continue
+        elseif isa(y, Expr) && y.head == :macrocall && true
+            # julia >= 0.6 thinks it found a docstring.
+            splice!(x, i, y.args[2:end])
+            continue
         elseif isa(y, AbstractString) || (isa(y, Expr) && (y.head == :vcat || y.head == :tuple))
             # found a string, or a vector expression, or a tuple:
             # this must be the option name

diff --git a/test/argparse_test10.jl b/test/argparse_test10.jl
@@ -143,7 +143,7 @@ for s = [ap_settings10(), ap_settings10b()]
                        before an option (default: Any["no_arg_given"])
 
         optional arguments:
-          --opt1 A B   an option (type: $Int, default: [0,1])
+          --opt1 A B   an option (type: $Int, default: $([0,1]))
           -f, --flag   a flag
           -k, --karma  increase karma
 

diff --git a/test/argparse_test3.jl b/test/argparse_test3.jl
@@ -80,7 +80,7 @@ let s = ap_settings3()
           -k                    provide the answer
           -u                    provide the answer as floating point
           --array ARRAY         create an array (type: Array{$Int,1},
-                                default: [7,3,2])
+                                default: $([7,3,2]))
         """ * (VERSION < v"0.4-" || VERSION ≥ v"0.5-" ?
         """
           --custom CUSTOM       the only accepted argument is "custom" (type:

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -3,7 +3,7 @@ module ArgParseTests
 include("common.jl")
 
 for i = 1:10
-    print("\rRunning argparse_test$i")
+    println("Running argparse_test$i")
     try
         include("argparse_test$i.jl")
     catch err