diff options
| author | Marcus Arendt <[email protected]> | 2014-09-01 12:07:11 +0200 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-09-01 12:07:11 +0200 |
| commit | 974ad849638c922aa291c74566636b996d2cf9d7 (patch) | |
| tree | 74cf75cf44e419abbc7c9c8c40a189bfc970ad43 /lib/stdlib/src | |
| parent | 847c28ea7dfdc0a33f6baf9a6450d2902d586938 (diff) | |
| parent | 29b264e02f2dcd6b76fcf609387189e4048524b5 (diff) | |
| download | otp-974ad849638c922aa291c74566636b996d2cf9d7.tar.gz otp-974ad849638c922aa291c74566636b996d2cf9d7.tar.bz2 otp-974ad849638c922aa291c74566636b996d2cf9d7.zip | |
Merge branch 'nox/erl_scan-fix-column-tracking' into maint
* nox/erl_scan-fix-column-tracking:
Properly track column numbers in erl_scan
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), |