Merge commit '42b3d905f8a89accdf79ae79064a3899978f8053' into anj/cholmod

Conflicts:
	base/sparse/cholmod.jl

Author: andreasnoack

ARM.inc

@@ -1,13 +1,16 @@
-FORCE_ARMV7=1
-LLVM_ASSERTIONS=1
+BFORCE_ARMV7=1
+
+override LLVM_ASSERTIONS=1
 LLVM_FLAGS+="--with-cpu=cortex-a9 --with-float=hard --with-abi=aapcs-vfp --with-fpu=neon --enable-targets=arm --enable-optimized --enable-assertions"
 
 override OPENBLAS_DYNAMIC_ARCH=0
 override OPENBLAS_TARGET_ARCH=ARMV7
 override USE_BLAS64=0
 
-override LLVM_VER=3.5.0
+override LLVM_VER=3.5.1
 
 override USE_SYSTEM_FFTW=1
 override USE_SYSTEM_GMP=1
 override USE_SYSTEM_MPFR=1
+
+JCFLAGS += -fsigned-char

CONTRIBUTING.md

@@ -25,7 +25,7 @@ A useful bug report filed as a GitHub issue provides information about how to re
   - Try some simple debugging techniques to help isolate the problem.
     - Try running the code with the debug build of Julia with `make debug`, which produces the `usr/bin/julia-debug`.
     - Consider running `julia-debug` with a debugger such as `gdb` or `lldb`. Obtaining even a simple [backtrace](http://www.unknownroad.com/rtfm/gdbtut/gdbsegfault.html) is very useful.
-    - If Julia segfaults, try following [these debugging tips](https://gist.github.com/staticfloat/6188418#segfaults-during-bootstrap-sysimgjl) to help track down the specific origin of the bug.
+    - If Julia segfaults, try following [these debugging tips](http://julia.readthedocs.org/en/latest/devdocs/backtraces/#segfaults-during-bootstrap-sysimg-jl) to help track down the specific origin of the bug.
 
 2. If the problem is caused by a Julia package rather than core Julia, file a bug report with the relevant package author rather than here.
 

DISTRIBUTING.md

@@ -127,7 +127,7 @@ Notes on BLAS and LAPACK
 
 Julia builds OpenBLAS by default, which includes the BLAS and LAPACK
 libraries. On 32-bit architectures, Julia builds OpenBLAS to use
-32-bit integers, while on 64-bit architectuers, Julia builds OpenBLAS
+32-bit integers, while on 64-bit architectures, Julia builds OpenBLAS
 to use 64-bit integers (ILP64). It is essential that all Julia functions
 that call BLAS and LAPACK API routines use integers of the correct width.
 

NEWS.md

@@ -30,6 +30,9 @@ New language features
 Language changes
 ----------------
 
+  * `[x,y]` constructs a vector of `x` and `y` instead of concatenating them
+    ([#3737], [#2488], [#8599]).
+
   * `error(::Exception)` and `error(::Type{Exception})` have been deprecated
      in favor of using an explicit `throw` ([#9690]).
 
@@ -100,7 +103,7 @@ Library improvements
 
   * Symmetric and Hermitian immutables are now parametrized on matrix type ([#7992]).
 
-  * New `ordschur` and `ordschur!` functions for sorting a schur factorization by the eigenvalues.
+  * New `ordschur` and `ordschur!` functions for sorting a schur factorization by the eigenvalues. ([#8467],[#9701])
 
   * Givens type doesn't have a size anymore and is no longer a subtype of AbstractMatrix ([#8660])
 
@@ -178,7 +181,7 @@ Deprecated or removed
 
   * `median` and `median!` no longer accept a `checknan` keyword argument ([#8605]).
 
-  * `inf` and `nan` are now deprecated in favor of `T(Inf)` and `NaN`, respectively ([#8776]).
+  * `inf` and `nan` are now deprecated in favor of `T(Inf)` and `T(NaN)`, respectively ([#8776]).
 
   * `oftype(T::Type, x)` is deprecated in favor of `convert(T,x)` (or `T(x)`).
 
@@ -941,6 +944,7 @@ Too numerous to mention.
 [#2380]: https://github.com/JuliaLang/julia/issues/2380
 [#2403]: https://github.com/JuliaLang/julia/issues/2403
 [#2468]: https://github.com/JuliaLang/julia/issues/2468
+[#2488]: https://github.com/JuliaLang/julia/issues/2488
 [#2515]: https://github.com/JuliaLang/julia/issues/2515
 [#2516]: https://github.com/JuliaLang/julia/issues/2516
 [#2597]: https://github.com/JuliaLang/julia/issues/2597
@@ -986,6 +990,7 @@ Too numerous to mention.
 [#3688]: https://github.com/JuliaLang/julia/issues/3688
 [#3697]: https://github.com/JuliaLang/julia/issues/3697
 [#3719]: https://github.com/JuliaLang/julia/issues/3719
+[#3737]: https://github.com/JuliaLang/julia/issues/3737
 [#3759]: https://github.com/JuliaLang/julia/issues/3759
 [#3790]: https://github.com/JuliaLang/julia/issues/3790
 [#3819]: https://github.com/JuliaLang/julia/issues/3819
@@ -1143,9 +1148,11 @@ Too numerous to mention.
 [#8501]: https://github.com/JuliaLang/julia/issues/8501
 [#8560]: https://github.com/JuliaLang/julia/issues/8560
 [#8578]: https://github.com/JuliaLang/julia/issues/8578
+[#8599]: https://github.com/JuliaLang/julia/issues/8599
 [#8605]: https://github.com/JuliaLang/julia/issues/8605
 [#8624]: https://github.com/JuliaLang/julia/issues/8624
 [#8660]: https://github.com/JuliaLang/julia/issues/8660
+[#8672]: https://github.com/JuliaLang/julia/issues/8672
 [#8712]: https://github.com/JuliaLang/julia/issues/8712
 [#8734]: https://github.com/JuliaLang/julia/issues/8734
 [#8750]: https://github.com/JuliaLang/julia/issues/8750
@@ -1173,12 +1180,22 @@ Too numerous to mention.
 [#9132]: https://github.com/JuliaLang/julia/issues/9132
 [#9133]: https://github.com/JuliaLang/julia/issues/9133
 [#9144]: https://github.com/JuliaLang/julia/issues/9144
+[#9198]: https://github.com/JuliaLang/julia/issues/9198
 [#9249]: https://github.com/JuliaLang/julia/issues/9249
 [#9261]: https://github.com/JuliaLang/julia/issues/9261
 [#9271]: https://github.com/JuliaLang/julia/issues/9271
 [#9294]: https://github.com/JuliaLang/julia/issues/9294
+[#9309]: https://github.com/JuliaLang/julia/issues/9309
 [#9418]: https://github.com/JuliaLang/julia/issues/9418
 [#9425]: https://github.com/JuliaLang/julia/issues/9425
+[#9434]: https://github.com/JuliaLang/julia/issues/9434
 [#9452]: https://github.com/JuliaLang/julia/issues/9452
 [#9569]: https://github.com/JuliaLang/julia/issues/9569
+[#9575]: https://github.com/JuliaLang/julia/issues/9575
 [#9578]: https://github.com/JuliaLang/julia/issues/9578
+[#9690]: https://github.com/JuliaLang/julia/issues/9690
+[#9745]: https://github.com/JuliaLang/julia/issues/9745
+[#9779]: https://github.com/JuliaLang/julia/issues/9779
+[#9957]: https://github.com/JuliaLang/julia/issues/9957
+[#10024]: https://github.com/JuliaLang/julia/issues/10024
+[#10031]: https://github.com/JuliaLang/julia/issues/10031

README.windows.md

@@ -15,7 +15,7 @@ Instructions for adding fonts to the terminal are available at:
 
 Additionally, rather than sticking with the default command prompt, you may want to use a different terminal emulator program, such as [`Conemu`](https://code.google.com/p/conemu-maximus5/) or [`Mintty`](https://code.google.com/p/mintty/)
 (note that running Julia on Mintty needs a copy of `stty.exe` in your `%PATH%` to work properly).
-Alternatively, you may prefer the features of a more full-function IDE, such as [`LightTable`](https://github.com/one-more-minute/Jupiter-LT), [`Sublime-IJulia`](https://github.com/quinnj/Sublime-IJulia), or [`IJulia`](https://github.com/JuliaLang/IJulia.jl).
+Alternatively, you may prefer the features of a more full-function IDE, such as [`Juno`](http://junolab.org), [`LightTable`](https://github.com/one-more-minute/Jupiter-LT), [`Sublime-IJulia`](https://github.com/quinnj/Sublime-IJulia), or [`IJulia`](https://github.com/JuliaLang/IJulia.jl).
 
 
 # Binary distribution

base/LineEdit.jl

@@ -944,7 +944,7 @@ function keymap{D<:Dict}(keymaps::Array{D})
 end
 
 const escape_defaults = merge!(
-    AnyDict([char(i) => nothing for i=[1:26, 28:31]]), # Ignore control characters by default
+    AnyDict([char(i) => nothing for i=vcat(1:26, 28:31)]), # Ignore control characters by default
     AnyDict( # And ignore other escape sequences by default
     "\e*" => nothing,
     "\e[*" => nothing,

base/REPLCompletions.jl

@@ -134,16 +134,79 @@ function complete_path(path::AbstractString, pos)
     return matches, nextind(path, pos - sizeof(prefix) - length(matchall(r" ", prefix))):pos, length(matches) > 0
 end
 
-function complete_methods(input::AbstractString)
-    tokens = split(input, '.')
-    fn = Main
-    for token in tokens
-        sym = symbol(token)
-        isdefined(fn, sym) || return UTF8String[]
-        fn = fn.(sym)
+# Determines whether method_complete should be tried. It should only be done if
+# the string endswiths ',' or '(' when disregarding whitespace_chars
+function should_method_complete(s::AbstractString)
+    for c in reverse(s)
+        if c in [',', '(']
+            return true
+        elseif !(c in whitespace_chars)
+            return false
+        end
+    end
+    false
+end
+
+# Returns a range that includes the method name in front of the first non
+# closed start brace from the end of the string.
+function find_start_brace(s::AbstractString)
+    braces = 0
+    r = RevString(s)
+    i = start(r)
+    while !done(r, i)
+        c, i = next(r, i)
+        if c == '('
+            braces += 1
+        elseif c == ')'
+            braces -= 1
+        end
+        braces == 1 && break
+    end
+    braces != 1 && return 0:-1
+    method_name_end = reverseind(r, i)
+    startind = nextind(s, rsearch(s, non_identifier_chars, method_name_end))
+    return startind:endof(s), method_name_end
+end
+
+# Returns the value in a expression if sym is defined in current namespace fn.
+# This method is used to iterate to the value of a expression like:
+# :(Base.REPLCompletions.whitespace_chars) a `dump` of this expression
+# will show it consist of Expr, QuoteNode's and Symbol's which all needs to
+# be handled differently to iterate down to get the value of whitespace_chars.
+function get_value(sym::Expr, fn)
+    sym.head != :. && return
+    for ex in sym.args
+        fn = get_value(ex, fn)
+        fn == nothing && return
     end
-    isgeneric(fn) || return UTF8String[]
-    UTF8String[string(m) for m in methods(fn)]
+    fn
+end
+get_value(sym::Symbol, fn) = isdefined(fn, sym) ? fn.(sym) : nothing
+get_value(sym::QuoteNode, fn) = isdefined(fn, sym.value) ? fn.(sym.value) : nothing
+get_value(sym, fn) = sym
+
+# Takes the argument of a function call and determine the type of signature of the method.
+# If the function gets called with a val::DataType then it returns Type{val} else typeof(val)
+method_type_of_arg(val::DataType) = Type{val}
+method_type_of_arg(val) = typeof(val)
+
+# Method completion on function call expression that look like :(max(1))
+function complete_methods(ex_org::Expr)
+    args_ex = Any[]
+    for ex in ex_org.args # First ex is the function name
+        val = get_value(ex, Main)
+        val == nothing && return UTF8String[]
+        push!(args_ex, val)
+    end
+    isgeneric(args_ex[1]) || return UTF8String[]
+    out = UTF8String[]
+    t_in = tuple([method_type_of_arg(arg) for arg in args_ex[2:end]]...) # Input types
+    for method in methods(args_ex[1])
+        # Check if the method's type signature intersects the input types
+        typeintersect(method.sig[1 : min(length(args_ex)-1, end)], t_in) != None &&
+            push!(out,string(method))
+    end
+    return out
 end
 
 include("latex_symbols.jl")
@@ -206,10 +269,12 @@ function completions(string, pos)
     # Make sure that only latex_completions is working on strings
     inc_tag==:string && return UTF8String[], 0:-1, false
 
-    if inc_tag == :other && string[pos] == '('
-        endpos = prevind(string, pos)
-        startpos = nextind(string, rsearch(string, non_identifier_chars, endpos))
-        return complete_methods(string[startpos:endpos]), startpos:endpos, false
+     if inc_tag == :other && should_method_complete(partial)
+        frange, method_name_end = find_start_brace(partial)
+        ex = parse(partial[frange] * ")", raise=false)
+        if isa(ex, Expr) && ex.head==:call
+            return complete_methods(ex), start(frange):method_name_end, false
+        end
     elseif inc_tag == :comment
         return UTF8String[], 0:-1, false
     end
@@ -228,7 +293,7 @@ function completions(string, pos)
         # also search for packages
         s = string[startpos:pos]
         if dotpos <= startpos
-            for dir in [Pkg.dir(), LOAD_PATH, pwd()]
+            for dir in [Pkg.dir(); LOAD_PATH; pwd()]
                 isdir(dir) || continue
                 for pname in readdir(dir)
                     if pname[1] != '.' && pname != "METADATA" &&