Skip to content

Allow + prefix to be part of unsigned numeric literals #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 28, 2022
Merged

Allow + prefix to be part of unsigned numeric literals #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/parser.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1157,9 +1157,12 @@ function parse_unary(ps::ParseState)
parse_factor(ps)
return
end
t2 = peek_token(ps, 2)
k2 = kind(t2)
if op_k in KSet"- +" && !is_decorated(op_t)
t2 = peek_token(ps, 2)
if !preceding_whitespace(t2) && kind(t2) in KSet"Integer Float Float32"
if !preceding_whitespace(t2) && (k2 in KSet"Integer Float Float32" ||
(op_k == K"+" && k2 in KSet"BinInt HexInt OctInt"))

k3 = peek(ps, 3)
if is_prec_power(k3) || k3 in KSet"[ {"
# `[`, `{` (issue #18851) and `^` have higher precedence than
Expand All @@ -1176,13 +1179,12 @@ function parse_unary(ps::ParseState)
# +2.0 ==> 2.0
# -1.0f0 ==> -1.0f0
# -2*x ==> (call-i -2 * x)
# +0xff ==> 0xff
bump_glue(ps, kind(t2), EMPTY_FLAGS, 2)
end
return
end
end
t2 = peek_token(ps, 2)
k2 = kind(t2)
if is_closing_token(ps, k2) || k2 in KSet"NewlineWs ="
if is_dotted(op_t)
# Standalone dotted operators are parsed as (|.| op)
Expand Down
6 changes: 4 additions & 2 deletions src/value_parsing.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ function parse_int_literal(str::AbstractString)
end

function parse_uint_literal(str::AbstractString, k)
str = replace(replace(str, '_'=>""), '−'=>'-')
str = replace(str, '_'=>"")
if startswith(str, '+')
str = str[2:end]
end
ndigits = length(str)-2
if k == K"HexInt"
return ndigits <= 2 ? Base.parse(UInt8, str) :
Expand All @@ -30,7 +33,6 @@ function parse_uint_literal(str::AbstractString, k)
ndigits <= 32 ? Base.parse(UInt128, str) :
Base.parse(BigInt, str)
elseif k == K"BinInt"
str = replace(replace(str, '_'=>""), '−'=>'-')
ndigits = length(str)-2
return ndigits <= 8 ? Base.parse(UInt8, str) :
ndigits <= 16 ? Base.parse(UInt16, str) :
Expand Down
8 changes: 8 additions & 0 deletions test/parser.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,17 @@ tests = [
"isa::T" => "(:: isa T)"
"-2^x" => "(call-pre - (call-i 2 ^ x))"
"-2[1, 3]" => "(call-pre - (ref 2 1 3))"
# signed literals
"-2" => "-2"
"+2.0" => "2.0"
"-1.0f0" => "-1.0f0"
"-0xf.0p0" => "-15.0"
"+0b10010" => "0x12"
"+0o22" => "0x12"
"+0x12" => "0x12"
"-0b10010" => "(call-pre - 0x12)"
"-0o22" => "(call-pre - 0x12)"
"-0x12" => "(call-pre - 0x12)"
# Standalone dotted operators are parsed as (|.| op)
".+" => "(. +)"
".+\n" => "(. +)"
Expand Down