Skip to content

Commit 0169166

Browse files
authored
Merge pull request #258 from JuliaLang/c42f/release-0.3.5
Hot fixes for release 0.3.5
2 parents 4db7ccb + 1ca505b commit 0169166

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "JuliaSyntax"
22
uuid = "70703baa-626e-46a2-a12c-08ffd08c73b4"
33
authors = ["Chris Foster <[email protected]> and contributors"]
4-
version = "0.3.4"
4+
version = "0.3.5"
55

66
[compat]
77
julia = "1.0"

src/expr.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ function is_stringchunk(node)
1111
return k == K"String" || k == K"CmdString"
1212
end
1313

14-
function reorder_parameters!(args, params_pos)
14+
function reorder_parameters!(args::Vector{Any}, params_pos)
1515
p = 0
1616
for i = length(args):-1:1
1717
if !Meta.isexpr(args[i], :parameters)
@@ -24,7 +24,7 @@ function reorder_parameters!(args, params_pos)
2424
end
2525
# nest frankentuples parameters sections
2626
for i = length(args)-1:-1:p
27-
pushfirst!(args[i].args, pop!(args))
27+
pushfirst!((args[i]::Expr).args, pop!(args))
2828
end
2929
# Move parameters to args[params_pos]
3030
insert!(args, params_pos, pop!(args))

src/kinds.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1062,7 +1062,7 @@ function untokenize(k::Kind; unique=true)
10621062
end
10631063

10641064
# Error kind => description
1065-
_token_error_descriptions = Dict{Kind, String}(
1065+
const _token_error_descriptions = Dict{Kind, String}(
10661066
K"ErrorEofMultiComment" => "unterminated multi-line comment #= ... =#",
10671067
K"ErrorInvalidNumericConstant" => "invalid numeric constant",
10681068
K"ErrorHexFloatMustContainP" => "hex float literal must contain `p` or `P`",

src/parse_stream.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,7 @@ example
717717
TODO: Are these the only cases? Can we replace this general utility with a
718718
simpler one which only splits preceding dots?
719719
"""
720-
function bump_split(stream::ParseStream, split_spec...)
720+
function bump_split(stream::ParseStream, split_spec::Vararg{Any, N}) where {N}
721721
tok = stream.lookahead[stream.lookahead_index]
722722
stream.lookahead_index += 1
723723
b = _next_byte(stream)

0 commit comments

Comments
 (0)