do all unescaping and interpolation handling for normal strings in th…

…e parser

for custom strings, handle only \\ and \" in the parser
b_str no longer has interpolation (b_str should maybe be removed)
remove str, I_str, E_str, L_str, L_mstr, I_mstr, E_mstr
fixes #107

base/exports.jl

@@ -1129,17 +1129,10 @@ export
     unsafe_pointer_to_objref,
 
 # Macros
-    @str,
-    @I_str,
-    @E_str,
     @b_str,
-    @L_str,
     @r_str,
     @v_str,
     @mstr,
-    @L_mstr,
-    @I_mstr,
-    @E_mstr,
     @unexpected,
     @assert,
     @cmd,

base/string.jl

@@ -489,7 +489,7 @@ end
 ## string escaping & unescaping ##
 
 escape_nul(s::String, i::Int) =
-    !done(s,i) && '0' <= next(s,i)[1] <= '7' ? L"\x00" : L"\0"
+    !done(s,i) && '0' <= next(s,i)[1] <= '7' ? "\\x00" : "\\0"
 
 isxdigit(c::Char) = '0'<=c<='9' || 'a'<=c<='f' || 'A'<=c<='F'
 need_full_hex(s::String, i::Int) = !done(s,i) && isxdigit(next(s,i)[1])
@@ -499,14 +499,14 @@ function print_escaped(io, s::String, esc::String)
     while !done(s,i)
         c, j = next(s,i)
         c == '\0'       ? print(io, escape_nul(s,j)) :
-        c == '\e'       ? print(io, L"\e") :
+        c == '\e'       ? print(io, "\\e") :
         c == '\\'       ? print(io, "\\\\") :
         contains(esc,c) ? print(io, '\\', c) :
         7 <= c <= 13    ? print(io, '\\', "abtnvfr"[int(c-6)]) :
         isprint(c)      ? print(io, c) :
-        c <= '\x7f'     ? print(io, L"\x", hex(c, 2)) :
-        c <= '\uffff'   ? print(io, L"\u", hex(c, need_full_hex(s,j) ? 4 : 2)) :
-                          print(io, L"\U", hex(c, need_full_hex(s,j) ? 8 : 4))
+        c <= '\x7f'     ? print(io, "\\x", hex(c, 2)) :
+        c <= '\uffff'   ? print(io, "\\u", hex(c, need_full_hex(s,j) ? 4 : 2)) :
+                          print(io, "\\U", hex(c, need_full_hex(s,j) ? 8 : 4))
         i = j
     end
 end
@@ -659,7 +659,7 @@ function unindent(s::String, indent::Int)
     takebuf_string(buf)
 end
 
-function triplequoted(unescape::Function, args...)
+function triplequoted(args...)
     sx = { isa(arg,ByteString) ? arg : esc(arg) for arg in args }
 
     indent = 0
@@ -684,7 +684,7 @@ function triplequoted(unescape::Function, args...)
 
     for i in 1:length(sx)
         if isa(sx[i],ByteString)
-            sx[i] = unescape(unindent(sx[i], indent))
+            sx[i] = unindent(sx[i], indent)
         end
     end
 
@@ -700,28 +700,9 @@ end
 
 ## core string macros ##
 
-function singlequoted(unescape::Function, args...)
-    if length(args) == 1 return unescape(args[1]) end
-    sx = { isa(arg,ByteString) ? unescape(arg) : esc(arg) for arg in args }
-    Expr(:call, :string, sx...)
-end
-
-macro   str(s...); singlequoted(unescape_string, s...); end
-macro I_str(s...); singlequoted(x->unescape_chars(x,"\""), s...); end
-macro E_str(s); check_utf8(unescape_string(s)); end
-
-function byteliteral(args...)
-    sx = { isa(arg,ByteString) ? unescape_string(arg) : esc(arg) for arg in args }
-    writer(io,x...) = for w=x; write(io,w); end
-    Expr(:call, :sprint, writer, sx...)
-end
-
-macro b_str(s...); ex = byteliteral(s...); :(($ex).data); end
+macro b_str(s); :($(unescape_string(s)).data); end
 
-macro   mstr(s...); triplequoted(unescape_string, s...); end
-macro L_mstr(s); s; end
-macro I_mstr(s...); triplequoted(x->unescape_chars(x,"\""), s...); end
-macro E_mstr(s); triplequoted(unescape_string, s); end
+macro mstr(s...); triplequoted(s...); end
 
 ## shell-like command parsing ##
 

base/sysimg.jl

@@ -314,7 +314,7 @@ end
 
 end # baremodule Base
 
-using Base.@str, Base.get, Base.ENV
+using Base.get, Base.ENV
 
 let JL_PRIVATE_LIBDIR = get(ENV, "JL_PRIVATE_LIBDIR", "lib/julia")
 # create system image file

base/version.jl

@@ -219,16 +219,17 @@ end
 begin
 const version_string = "Version $VERSION"
 const banner_plain =
-I"               _
+"""
+               _
    _       _ _(_)_     |  A fresh approach to technical computing
   (_)     | (_) (_)    |  Documentation: http://docs.julialang.org
-   _ _   _| |_  __ _   |  Type \"help()\" to list help topics
+   _ _   _| |_  __ _   |  Type "help()" to list help topics
   | | | | | | |/ _` |  |
   | | |_| | | | (_| |  |  $version_string
- _/ |\__'_|_|_|\__'_|  |  $commit_string
+ _/ |\\__'_|_|_|\\__'_|  |  $commit_string
 |__/                   |
 
-"
+"""
 local tx = "\033[0m\033[1m" # text
 local jl = "\033[0m\033[1m" # julia
 local d1 = "\033[34m" # first dot