Merge pull request #205 from tkelman/patch-1

use more specific VERSION cutoffs
tonyhffong · Mar 14, 2017 · 14da1fc · 14da1fc
2 parents 1dfcfd4 + 1f247ea
commit 14da1fc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/exprutils.jl b/src/exprutils.jl
@@ -66,14 +66,14 @@ Return the first entry of the given pair expression, determined lexically.
 Note that on v0.5, this is the first argument of the expression, whereas on
 v0.6, this is the second argument of the expression.
 """
-lexicalfirst(x) = VERSION < v"0.6-" ? x.args[1] : x.args[2]
+lexicalfirst(x) = VERSION < v"0.6.0-dev.2613" ? x.args[1] : x.args[2] # changed by julia PR #20327
 
 """
 Return the last entry of the given pair expression, determined lexically.  Note
 that on v0.5, this is the second argument of the expression, whereas on v0.6,
 this is the third argument of the expression.
 """
-lexicallast(x) = VERSION < v"0.6-" ? x.args[2] : x.args[3]
+lexicallast(x) = VERSION < v"0.6.0-dev.2613" ? x.args[2] : x.args[3] # changed by julia PR #20327
 
 """
 Return `true` if the value represented by expression `x` is exactly `x` itself;

diff --git a/src/statictype.jl b/src/statictype.jl
@@ -9,7 +9,7 @@ return `Nullable(n)`. Otherwise, return `Nullable{Int}()`.
 length(::Type{Union{}}) = Nullable(0)
 length(::Type) = Nullable{Int}()
 length{T<:Pair}(::Type{T}) = 2
-if VERSION < v"0.6-"
+if VERSION < v"0.6.0-dev.2123" # where syntax introduced by julia PR #18457
     length{T<:Tuple}(::Type{T}) = Nullable{Int}(Base.length(T.parameters))
 else
     include_string("""