Merge branch 'master' of https://github.com/JuliaLang/julia

.travis.yml

@@ -24,6 +24,6 @@ before_install:
 script:
  - make $BUILDOPTS prefix=/tmp/julia install
  - cd .. && mv julia julia2
- - cd /tmp/julia/share/julia/test && /tmp/julia/bin/julia-debug-basic runtests.jl all
+ - cd /tmp/julia/share/julia/test && /tmp/julia/bin/julia-debug runtests.jl all
  - cd - && mv julia2 julia
  - echo "Ready for packaging..."

Make.inc

@@ -162,7 +162,6 @@ fPIC = -fPIC
 EXE =
 endif
 
-DEFAULT_REPL = basic
 JULIAGC = MARKSWEEP
 USE_COPY_STACKS = 1
 
@@ -600,8 +599,8 @@ wine_pathsearch = $(firstword $(wildcard $(addsuffix /$(1),$(shell printf %s\n '
 endif
 pathsearch = $(firstword $(wildcard $(addsuffix /$(1),$(subst :, ,$(2)))))
 
-JULIA_EXECUTABLE_debug = $(build_bindir)/julia-debug-$(DEFAULT_REPL)$(EXE)
-JULIA_EXECUTABLE_release = $(build_bindir)/julia-$(DEFAULT_REPL)$(EXE)
+JULIA_EXECUTABLE_debug = $(build_bindir)/julia-debug$(EXE)
+JULIA_EXECUTABLE_release = $(build_bindir)/julia$(EXE)
 
 ifeq ($(OS), WINNT)
 JULIA_EXECUTABLE = $(JULIA_EXECUTABLE_release)

Makefile

@@ -34,10 +34,10 @@ debug release: | $(DIRS) $(build_datarootdir)/julia/base $(build_datarootdir)/ju
  $(MAKE) $(QUIET_MAKE) LD_LIBRARY_PATH=$(build_libdir):$(LD_LIBRARY_PATH) JULIA_EXECUTABLE="$(JULIA_EXECUTABLE_$@)" $(build_private_libdir)/sys.$(SHLIB_EXT)
 
 julia-debug-symlink:
- @ln -sf $(build_bindir)/julia-debug-$(DEFAULT_REPL) julia
+ @ln -sf $(build_bindir)/julia-debug julia
 
 julia-release-symlink:
- @ln -sf $(build_bindir)/julia-$(DEFAULT_REPL) julia
+ @ln -sf $(build_bindir)/julia julia
 
 julia-debug julia-release: git-submodules
  @$(MAKE) $(QUIET_MAKE) -C deps
@@ -177,7 +177,6 @@ ifeq ($(OS),WINNT)
  -$(INSTALL_M) $(build_bindir)/*.dll $(build_bindir)/*.bat $(DESTDIR)$(bindir)/
 else
  -cp -a $(build_libexecdir) $(DESTDIR)$(prefix)
- cd $(DESTDIR)$(bindir) && ln -sf julia-$(DEFAULT_REPL) julia
 
  for suffix in $(JL_LIBS) ; do \
  $(INSTALL_M) $(build_libdir)/lib$${suffix}*.$(SHLIB_EXT)* $(DESTDIR)$(private_libdir) ; \
@@ -211,27 +210,27 @@ endif
  # Update RPATH entries of Julia if $(private_libdir_rel) != $(build_private_libdir_rel)
 ifneq ($(private_libdir_rel),$(build_private_libdir_rel))
 ifeq ($(OS), Darwin)
- for julia in $(DESTDIR)$(bindir)/julia-* ; do \
+ for julia in $(DESTDIR)$(bindir)/julia* ; do \
  install_name_tool -rpath @executable_path/$(build_private_libdir_rel) @executable_path/$(private_libdir_rel) $$julia; \
  install_name_tool -rpath @executable_path/$(build_libdir_rel) @executable_path/$(libdir_rel) $$julia; \
  done
 else ifeq ($(OS), Linux)
- for julia in $(DESTDIR)$(bindir)/julia-* ; do \
+ for julia in $(DESTDIR)$(bindir)/julia* ; do \
  patchelf --set-rpath '$$ORIGIN/$(private_libdir_rel):$$ORIGIN/$(libdir_rel)' $$julia; \
  done
 endif
 endif
 
  # Overwrite JL_SYSTEM_IMAGE_PATH in julia binaries:
- for julia in $(DESTDIR)$(bindir)/julia-* ; do \
+ for julia in $(DESTDIR)$(bindir)/julia* ; do \
  $(build_bindir)/stringpatch $$(strings -t x - $$julia | grep "sys.ji$$" | awk '{print $$1;}' ) "$(private_libdir_rel)/sys.ji" 256 $(call cygpath_w,$$julia); \
  done
 
  mkdir -p $(DESTDIR)$(sysconfdir)
  cp -R $(build_sysconfdir)/julia $(DESTDIR)$(sysconfdir)/
 
 dist-clean:
- rm -fr julia-*.tar.gz julia-*.exe julia-*.7z julia-$(JULIA_COMMIT)
+ rm -fr julia-*.tar.gz julia*.exe julia-*.7z julia-$(JULIA_COMMIT)
 
 dist: dist-clean
 ifeq ($(USE_SYSTEM_BLAS),0)

README.windows.md

@@ -169,7 +169,7 @@ Julia runs on Windows XP SP2 or later (including Windows Vista, Windows 7, and W
 
  - Using the Julia executables directly
  ```
- usr/bin/julia-basic
+ usr/bin/julia
 ```
 
 ## Cross-compiling
@@ -246,10 +246,9 @@ Finally, the build and install process for Julia:
 
 1. `git clone https://github.com/JuliaLang/julia.git julia-win32`
 2. `echo override XC_HOST = i686-w64-mingw32 >> Make.user`
-3. `echo override DEFAULT_REPL = basic >> Make.user`
-4. `make`
-5. `make win-extras` (Necessary before running `make dist`p)
-4. `make dist`
+3. `make`
+4. `make win-extras` (Necessary before running `make dist`p)
+5. `make dist`
 6. move the julia-* directory / zip file to the target machine
 
 If you are building for 64-bit windows, the steps are essentially the same. Just replace i686 in XC_HOST with x86_64. (note: on Mac, wine only runs in 32-bit mode)

base/REPL.jl

@@ -384,7 +384,7 @@ function respond(f,d,main,req,rep)
  if !isempty(line)
  reset(d)
  (val,bt) = send_to_backend(f(line),req,rep)
- if !ends_with_semicolon(line)
+ if !ends_with_semicolon(line) || !is(bt,nothing)
  print_response(d,val,bt,true,have_color(s))
  end
  end
@@ -522,7 +522,7 @@ function setup_interface(d::REPLDisplay,req,rep;extra_repl_keymap=Dict{Any,Any}[
  input = replace(input,'\r','\n')
  if position(LineEdit.buffer(s)) == 0
  indent = Base.indentation(input)[1]
- input = Base.unindent(input[(indent+1):end],indent)
+ input = Base.unindent(lstrip(input),indent)
  end
  buf = copy(LineEdit.buffer(s))
  edit_insert(buf,input)

base/file.jl

@@ -2,15 +2,13 @@
 
 function pwd()
  b = Array(Uint8,1024)
- @unix_only p = ccall(:getcwd, Ptr{Uint8}, (Ptr{Uint8}, Csize_t), b, length(b))
- @windows_only p = ccall(:_getcwd, Ptr{Uint8}, (Ptr{Uint8}, Cint), b, length(b))
- systemerror(:getcwd, p == C_NULL)
- bytestring(p)
+ len = Csize_t[length(b),]
+ uv_error(:getcwd, ccall(:uv_cwd, Cint, (Ptr{Uint8}, Ptr{Csize_t}), b, len))
+ bytestring(b[1:len[1]])
 end
 
 function cd(dir::String) 
- @windows_only systemerror("chdir $dir", ccall(:_chdir,Int32,(Ptr{Uint8},),dir) == -1)
- @unix_only systemerror("chdir $dir", ccall(:chdir,Int32,(Ptr{Uint8},),dir) == -1)
+ uv_error("chdir $dir", ccall(:uv_chdir, Cint, (Ptr{Uint8},), bytestring(dir)))
 end
 cd() = cd(homedir())
 

base/multi.jl

@@ -797,8 +797,10 @@ function create_message_handler_loop(sock::AsyncStream) #returns immediately
  schedule(@task begin
  global PGRP
  #println("message_handler_loop")
+ disable_nagle(sock)
  start_reading(sock)
  wait_connected(sock)
+
  try
  while true
  msg = deserialize(sock)
@@ -943,6 +945,7 @@ function start_worker(out::IO)
  disable_threaded_libs()
 
  ccall(:jl_install_sigint_handler, Void, ())
+ disable_nagle(sock)
 
  try
  check_master_connect(60.0)
@@ -1169,7 +1172,7 @@ end
 # to be mutually reachable without a tunnel, as is often the case in a cluster.
 function addprocs_internal(np::Integer;
  tunnel=false, dir=JULIA_HOME,
- exename=(ccall(:jl_is_debugbuild,Cint,())==0?"./julia-basic":"./julia-debug-basic"),
+ exename=(ccall(:jl_is_debugbuild,Cint,())==0?"./julia":"./julia-debug"),
  sshflags::Cmd=``, cman=LocalManager(), exeflags=``)
 
  config={:dir=>dir, :exename=>exename, :exeflags=>`$exeflags --worker`, :tunnel=>tunnel, :sshflags=>sshflags}
@@ -1524,3 +1527,13 @@ function interrupt(pids::AbstractVector=workers())
  end
 end
 
+function disable_nagle(sock)
+ # disable nagle on all OSes
+ ccall(:uv_tcp_nodelay, Cint, (Ptr{Void}, Cint), sock.handle, 1)
+ @linux_only begin
+ # tcp_quickack is a linux only option
+ if ccall(:jl_tcp_quickack, Cint, (Ptr{Void}, Cint), sock.handle, 1) < 0 
+ warn("Error enabling TCP_QUICKACK : ", strerror(errno))
+ end
+ end
+end

base/pkg/entry.jl

@@ -663,7 +663,7 @@ function updatehook(pkgs::Vector)
  """)
 end
 
-const JULIA = joinpath(JULIA_HOME, "julia-basic")
+const JULIA = joinpath(JULIA_HOME, "julia")
 
 function test!(pkg::String, errs::Vector{String}, notests::Vector{String})
  const reqs_path = abspath(pkg,"test","REQUIRE")

contrib/debug_bootstrap.gdb

@@ -1,3 +1,3 @@
-file ../usr/bin/julia-debug-basic
+file ../usr/bin/julia-debug
 r --build ../usr/lib/julia/sys0.bc sysimg.jl
 bt

contrib/vagrant/README.md

@@ -40,4 +40,4 @@ downloaded during provisioning. To take advantage of these dependencies, use
 the `jlmake` alias in place of `make`.
 
 When the build is complete, you can run
-`~/julia/usr/bin/julia-basic` to start Julia.
+`~/julia/usr/bin/julia` to start Julia.

contrib/windows/build-installer.nsi

@@ -38,7 +38,7 @@ Section "Dummy Section" SecDummy
  SetOutPath $INSTDIR
  File /a /r "julia-${Commit}\*"
  WriteUninstaller "$INSTDIR\Uninstall.exe"
- CreateShortcut "$INSTDIR\julia.lnk" "$INSTDIR\bin\julia-basic.exe"
+ CreateShortcut "$INSTDIR\julia.lnk" "$INSTDIR\bin\julia.exe"
 SectionEnd
 
 Section "uninstall"

contrib/windows/prepare-julia-env.bat

@@ -8,7 +8,7 @@
 
 set SYS_PATH=%PATH%
 set PATH=%~dp0;%~dp0bin;%~dp0usr\bin;%~dp0..\usr\bin;%~dp0..\..\usr\bin;%SYS_PATH%
-set JULIA_EXE=julia-basic.exe
+set JULIA_EXE=julia.exe
 for %%A in (%JULIA_EXE%) do set JULIA_HOME=%%~dp$PATH:A
 set JULIA=%JULIA_HOME%%JULIA_EXE%
 set PATH=%SYS_PATH%

contrib/windows/test-julia.bat

@@ -13,7 +13,7 @@ pushd %cd%
 setlocal enableextensions enabledelayedexpansion
 call "%~dp0prepare-julia-env.bat" %tests%
 cd "%JULIA_HOME%..\share\julia\test"
-call "%JULIA_HOME%julia-basic.exe" runtests.jl %tests%
+call "%JULIA_HOME%julia.exe" runtests.jl %tests%
 endlocal
 popd
 pause

doc/man/julia.1

@@ -26,7 +26,7 @@
 
 .\" from the front page of https://julialang.org/
 .SH NAME
-julia, julia-basic - high-level, high-performance dynamic programming language for technical computing
+julia - high-level, high-performance dynamic programming language for technical computing
 
 .SH SYNOPSIS
 julia [option] [program] [args..]
@@ -50,8 +50,6 @@ For a more in-depth discussion of the rationale and advantages of Julia
 over other systems, please see the online manual:
 https://docs.julialang.org/en/latest/manual/
 
-\fBjulia\fP is an alias for \fBjulia-basic\fP.
-
 If a Julia source file is given as \fIprogram\fP (possibly with arguments in
 \fIargs\fP) then, instead of launching an interactive session, Julia executes
 the program and exits.

doc/manual/faq.rst

@@ -656,7 +656,7 @@ Now:
 - From a shell (called shell 1), type ``xterm -e oterm &``. You'll see
  a new window pop up; this will be called terminal 2.
 
-- From within shell 1, ``gdb julia-debug-basic``. You can find this
+- From within shell 1, ``gdb julia-debug``. You can find this
  executable within ``julia/usr/bin``.
 
 - From within shell 1, ``(gdb) tty /dev/pts/#`` where ``#`` is the
@@ -679,7 +679,7 @@ Now:
 Within emacs
 ^^^^^^^^^^^^
 
-- ``M-x gdb``, then enter ``julia-debug-basic`` (this is easiest from
+- ``M-x gdb``, then enter ``julia-debug`` (this is easiest from
  within julia/usr/bin, or you can specify the full path)
 
 - ``(gdb) run``

src/intrinsics.cpp

@@ -1253,7 +1253,7 @@ static Value *emit_intrinsic(intrinsic f, jl_value_t **args, size_t nargs,
  HANDLE(powi_llvm,2) {
  x = FP(x);
  y = JL_INT(y);
- Type *ts[2] = { x->getType(), T_int32 };
+ Type *ts[1] = { x->getType() };
  return builder.CreateCall2(Intrinsic::getDeclaration(jl_Module, Intrinsic::powi,
  ArrayRef<Type*>(ts)),
  x, y);