Merge pull request #499 from JuliaLang/fe/backports-0.4.10

Backports for release 0.4.10

Author: fredrikekre

Project.toml

@@ -1,7 +1,7 @@
 name = "JuliaSyntax"
 uuid = "70703baa-626e-46a2-a12c-08ffd08c73b4"
 authors = ["Claire Foster <[email protected]> and contributors"]
-version = "0.4.9"
+version = "0.4.10"
 
 [compat]
 julia = "1.0"

src/parser.jl

@@ -475,7 +475,7 @@ function parse_block(ps::ParseState, down=parse_eq, mark=position(ps))
 end
 
 # Parse a block, but leave emitting the block up to the caller.
-function parse_block_inner(ps::ParseState, down)
+function parse_block_inner(ps::ParseState, down::F) where {F <: Function}
     parse_Nary(ps, down, KSet"NewlineWs ;", KSet"end else elseif catch finally")
 end
 
@@ -1585,7 +1585,7 @@ function parse_call_chain(ps::ParseState, mark, is_macrocall=false)
                        ckind == K"vcat"          ? K"typed_vcat"           :
                        ckind == K"comprehension" ? K"typed_comprehension"  :
                        ckind == K"ncat"          ? K"typed_ncat"           :
-                       internal_error("unrecognized kind in parse_cat ", ckind)
+                       internal_error("unrecognized kind in parse_cat ", string(ckind))
                 emit(ps, mark, outk, cflags)
                 check_ncat_compat(ps, mark, ckind)
             end
@@ -2011,7 +2011,7 @@ function parse_resword(ps::ParseState)
     elseif word == K"do"
         bump(ps, TRIVIA_FLAG, error="invalid `do` syntax")
     else
-        internal_error("unhandled reserved word ", word)
+        internal_error("unhandled reserved word ", string(word))
     end
 end
 

src/utils.jl

@@ -19,15 +19,15 @@ _unsafe_wrap_substring(s) = (s.offset, unsafe_wrap(Vector{UInt8}, s.string))
 #--------------------------------------------------
 #
 # Internal error, used as assertion failure for cases we expect can't happen.
-@noinline function internal_error(strs...)
+@noinline function internal_error(strs::Vararg{String, N}) where {N}
     error("Internal error: ", strs...)
 end
 
 # Like @assert, but always enabled and calls internal_error()
 macro check(ex, msgs...)
     msg = isempty(msgs) ? ex : msgs[1]
     if isa(msg, AbstractString)
-        msg = msg
+        msg = String(msg)
     elseif !isempty(msgs) && (isa(msg, Expr) || isa(msg, Symbol))
         msg = :(string($(esc(msg))))
     else
@@ -133,4 +133,3 @@ function _printstyled(io::IO, text; fgcolor=nothing, bgcolor=nothing, href=nothi
         first = false
     end
 end
-