diff options
| author | Marcus Arendt <[email protected]> | 2014-09-01 12:07:34 +0200 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-09-01 12:07:34 +0200 |
| commit | 71194f856f0842a70fd22f3771fb88f7d3c8f0c9 (patch) | |
| tree | 1e3641e9f9bb5f876a81f7557f0bf0b3b80cc001 /lib/stdlib/src | |
| parent | cbba3cb28d92b381f8e983f5ea326851136e064d (diff) | |
| parent | 974ad849638c922aa291c74566636b996d2cf9d7 (diff) | |
| download | otp-71194f856f0842a70fd22f3771fb88f7d3c8f0c9.tar.gz otp-71194f856f0842a70fd22f3771fb88f7d3c8f0c9.tar.bz2 otp-71194f856f0842a70fd22f3771fb88f7d3c8f0c9.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/stdlib/src')
| -rw-r--r-- | lib/stdlib/src/erl_scan.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stdlib/src/erl_scan.erl b/lib/stdlib/src/erl_scan.erl index ae59d5f44f..6fd6bb888b 100644 --- a/lib/stdlib/src/erl_scan.erl +++ b/lib/stdlib/src/erl_scan.erl @@ -1075,7 +1075,7 @@ scan_number([$#|Cs]=Cs0, St, Line, Col, Toks, Ncs0) -> Ncs = lists:reverse(Ncs0), case catch list_to_integer(Ncs) of B when B >= 2, B =< 1+$Z-$A+10 -> - Bcs = ?STR(St, Ncs++[$#]), + Bcs = Ncs++[$#], scan_based_int(Cs, St, Line, Col, Toks, {B,[],Bcs}); B -> Len = length(Ncs), @@ -1108,7 +1108,7 @@ scan_based_int(Cs, St, Line, Col, Toks, {B,Ncs0,Bcs}) -> Ncs = lists:reverse(Ncs0), case catch erlang:list_to_integer(Ncs, B) of N when is_integer(N) -> - tok3(Cs, St, Line, Col, Toks, integer, ?STR(St, Bcs++Ncs), N); + tok3(Cs, St, Line, Col, Toks, integer, Bcs++Ncs, N); _ -> Len = length(Bcs)+length(Ncs), Ncol = incr_column(Col, Len), |