Merge branch 'master' of git://github.com/JuliaLang/julia into moon/hygienic-macros

Pull down lots of changes to bring my local Julia up to date.

Author: Dave Moon

Make.inc

@@ -42,7 +42,7 @@ USE_INTEL_JITEVENTS = 0
 USE_LIBCPP = 0
 
 # Select the cpu architecture to target
-# Current available options are "native" and "core2"
+# Current available options are "native", "core2" and "i386"
 JULIA_CPU_TARGET = native
 
 # we include twice to pickup user definitions better
@@ -266,6 +266,8 @@ ifeq ($(JULIA_CPU_TARGET),native)
   JCPPFLAGS += -DJULIA_TARGET_NATIVE
 else ifeq ($(JULIA_CPU_TARGET),core2)
   JCPPFLAGS += -DJULIA_TARGET_CORE2
+else ifeq ($(JULIA_CPU_TARGET),i386)
+  JCPPFLAGS += -DJULIA_TARGET_I386
 else
   $(error Unknown cpu target architecture)
 endif

NEWS.md

@@ -40,17 +40,29 @@ New language features
     characters, and operator symbols are not allowed in identifiers.
     Number-like characters cannot begin identifiers ([#5936]).
 
-  * Support for a limited number of infix Unicode operators ([#552], [#6582]):
+  * Define a limited number of infix Unicode operators ([#552], [#6582]):
 
     | Precedence class | Operators (with synonyms, if any)
     | ---------------- | ---------------------------------
-    |   ==             |  ≥ (>=) ≤ (<=) ≡ (===) ≠ (!=) ≢ (!==) .≥ (.>=) .≤ (.<=) .!= (.≠) ∈ (`in`) ∉ (`(x,y)->!in(x, y)`) ∋ (`(x,y)->in(y, x)`) ∌ (`(x,y)->!in(y, x)`) ⊆ (`issubset`) ⊈ (`(x,y)->!issubset(x, y)`) ⊊ (`(x,y)->x⊆y && x!=y`) ⊂ ⊄ |
-    |   +              | ⊕ ⊖ ⊞ ⊟ ∪ (`union`) ∨ ⊔ |
-    |   *              | ÷ (`div`) ⋅ (`dot`) ∘ × (`cross`) ∩ (`intersect`) ∧ ⊓ ⊗ ⊘ ⊙ ⊚ ⊛ ⊠ ⊡ |
-    |   unary          | √ |
+    |   ==             |  ≥ (>=) ≤ (<=) ≡ (===) ≠ (!=) ≢ (!==) .≥ (.>=) .≤ (.<=) .!= (.≠) ∈ (`in`) ∉ (`(x,y)->!in(x, y)`) ∋ (`(x,y)->in(y, x)`) ∌ (`(x,y)->!in(y, x)`) ⊆ (`issubset`) ⊈ (`(x,y)->!issubset(x, y)`) ⊊ (`(x,y)->x⊆y && x!=y`) |
+    |   +              | ∪ (`union`) |
+    |   *              | ÷ (`div`) ⋅ (`dot`) × (`cross`) ∩ (`intersect`) |
+    |   unary          | √ ∛ |
+
+    In addition to these, many of the Unicode operator symbols are parsed
+    as infix operators and are available for user-defined methods ([#6929]).
 
   * Improved reporting of syntax errors ([#6179])
 
+REPL improvements
+-----------------
+
+  * New native-Julia REPL implementation, eliminating many problems
+    stemming from the old GNU Readline-based REPL ([#6270]).
+
+  * Tab-substitution of LaTeX math symbols (e.g. `\alpha` by `α`) ([#6911]).
+    This also works in IJulia and in Emacs ([#6920]).
+
 Library improvements
 --------------------
 
@@ -311,7 +323,7 @@ Deprecated or removed
 
   * `factorize!` is deprecated in favor of `factorize`. ([#5526])
 
-  * `nnz` is removed. Use `countnz` or `nfilled` instead ([#5538])
+  * `nnz` counts the number of structural nonzeros in a sparse matrix. Use `countnz` for the actual number of nonzeros. ([#6769])
 
   * `setfield` is renamed `setfield!` ([#5748])
 
@@ -330,6 +342,8 @@ Deprecated or removed
 
   * `bitmix` is replaced by a 2-argument form of `hash`.
 
+  * `readsfrom` and `writesto` are replaced by `open` ([#6948]).
+
 [#4042]: https://github.com/JuliaLang/julia/issues/4042
 [#5164]: https://github.com/JuliaLang/julia/issues/5164
 [#4026]: https://github.com/JuliaLang/julia/issues/4026
@@ -374,7 +388,7 @@ Deprecated or removed
 [#4888]: https://github.com/JuliaLang/julia/pull/4888
 [#5475]: https://github.com/JuliaLang/julia/pull/5475
 [#5526]: https://github.com/JuliaLang/julia/pull/5526
-[#5538]: https://github.com/JuliaLang/julia/pull/5538
+[#6769]: https://github.com/JuliaLang/julia/pull/6769
 [#5726]: https://github.com/JuliaLang/julia/pull/5726
 [#5811]: https://github.com/JuliaLang/julia/pull/5811
 [#5462]: https://github.com/JuliaLang/julia/pull/5462
@@ -413,6 +427,7 @@ Deprecated or removed
 [#6582]: https://github.com/JuliaLang/julia/pull/6582
 [#6624]: https://github.com/JuliaLang/julia/pull/6624
 [#5936]: https://github.com/JuliaLang/julia/issues/5936
+[#6179]: https://github.com/JuliaLang/julia/issues/6179
 
 Julia v0.2.0 Release Notes
 ==========================

README.md

@@ -15,6 +15,7 @@ The main homepage for Julia can be found at [julialang.org](http://julialang.org
 This is the GitHub repository of Julia source code, including instructions for compiling and installing Julia, below.
 
 <a name="Resources"/>
+## Resources
 
 - **Homepage:** <http://julialang.org>
 - **Binaries:** <http://julialang.org/downloads/>
@@ -30,6 +31,16 @@ The mailing list for developer discussion is
 of messages is higher, and the discussions tend to be more esoteric. New
 developers may find the notes in [CONTRIBUTING](https://github.com/JuliaLang/julia/blob/master/CONTRIBUTING.md) helpful to start contributing to the Julia codebase.
 
+### External Resources
+<a name="External-Resources"/>
+
+- [**StackOverflow**](https://stackoverflow.com/questions/tagged/julia-lang)
+- [**Youtube**](https://www.youtube.com/channel/UC9IuUwwE2xdjQUT_LMLONoA)
+- [**Twitter**](https://twitter.com/JuliaLanguage)
+- [**Facebook Group**](https://www.facebook.com/juliaLanguageUserGroup)
+- [**Google+**](https://plus.google.com/communities/111295162646766639102)
+- [**Meetup**](http://julia.meetup.com/)
+
 <a name="Currently-Supported-Platforms"/>
 ## Currently Supported Platforms
 

README.windows.md

@@ -63,7 +63,7 @@ Julia runs on Windows XP SP2 or later (including Windows Vista, Windows 7, and W
     Now `exit` the MSYS2 shell and restart it,  *even if you already restarted it above*. This is necessary in case the system upgrade updated the main MSYS2 libs. Reopen the MSYS2 shell and continue with:
 
     ```
-    pacman -S diffutils git m4 make patch tar
+    pacman -S diffutils git m4 make patch tar msys/openssh
 ```
 
   5. Configure your MSYS2 shell for convenience:
@@ -114,6 +114,8 @@ Julia runs on Windows XP SP2 or later (including Windows Vista, Windows 7, and W
     touch deps/pcre-8.31/checked  # This path will depend on the version of PCRE.
     make -j 4   # Adjust the number of cores (4) to match your build environment.
 ```
+6. Setup Package Development Environment
+  1. The `Pkg` module in Base provides many convenient tools for [developing and publishing packages](http://docs.julialang.org/en/latest/manual/packages/). One of the packages added through pacman above was `openssh`, which will allow secure access to GitHub APIs. Follow GitHub's [guide](https://help.github.com/articles/generating-ssh-keys) to setting up SSH keys to ensure your local machine can communicate with GitHub effectively.
 
 ## Building on Windows with MinGW-builds/MSYS
 

base/LineEdit.jl

@@ -1,8 +1,8 @@
 module LineEdit
 
-using Base.Terminals
+using ..Terminals
 
-import Base.Terminals: raw!, width, height, cmove, getX,
+import ..Terminals: raw!, width, height, cmove, getX,
                        getY, clear_line, beep
 
 import Base: ensureroom, peek, show
@@ -29,10 +29,13 @@ end
 type Prompt <: TextInterface
     prompt
     first_prompt
-    prompt_color::ASCIIString
+    # A string or function to be printed before the prompt. May not change the length of the prompt.
+    # This may be used for changing the color, issuing other terminal escape codes, etc.
+    prompt_prefix
+    # Same as prefix except after the prompt
+    prompt_suffix
     keymap_func
     keymap_func_data
-    input_color
     complete
     on_enter
     on_done
@@ -602,10 +605,12 @@ default_enter_cb(_) = true
 
 write_prompt(terminal, s::PromptState) = write_prompt(terminal, s, s.p.prompt)
 function write_prompt(terminal, s::PromptState, prompt)
-    write(terminal, s.p.prompt_color)
+    prefix = isa(s.p.prompt_prefix,Function) ? s.p.prompt_prefix() : s.p.prompt_prefix
+    suffix = isa(s.p.prompt_suffix,Function) ? s.p.prompt_suffix() : s.p.prompt_suffix
+    write(terminal, prefix)
     write(terminal, prompt)
     write(terminal, Base.text_colors[:normal])
-    write(terminal, s.p.input_color)
+    write(terminal, suffix)
 end
 write_prompt(terminal, s::ASCIIString) = write(terminal, s)
 
@@ -1270,17 +1275,17 @@ const default_keymap_func = @LineEdit.keymap [LineEdit.default_keymap, LineEdit.
 
 function Prompt(prompt;
     first_prompt = prompt,
-    prompt_color = "",
+    prompt_prefix = "",
+    prompt_suffix = "",
     keymap_func = default_keymap_func,
     keymap_func_data = nothing,
-    input_color = "",
     complete = EmptyCompletionProvider(),
     on_enter = default_enter_cb,
     on_done = ()->nothing,
     hist = EmptyHistoryProvider())
 
-    Prompt(prompt, first_prompt, prompt_color, keymap_func, keymap_func_data,
-           input_color, complete, on_enter, on_done, hist)
+    Prompt(prompt, first_prompt, prompt_prefix, prompt_suffix, keymap_func, keymap_func_data,
+        complete, on_enter, on_done, hist)
 end
 
 run_interface(::Prompt) = nothing