diff options
author | Fredrik Gustafsson <[email protected]> | 2012-08-14 15:27:18 +0200 |
---|---|---|
committer | Fredrik Gustafsson <[email protected]> | 2012-08-14 15:27:18 +0200 |
commit | df8e67e203b83f95d1e098fec88ad5d0ad840069 (patch) | |
tree | 7609e4eddc4fd4757791ce131f6dc131060b7bfc /lib/stdlib/src/erl_scan.erl | |
parent | 0c9d90f314f364e5b1301ec89d762baabc57c7aa (diff) | |
parent | d932ad582676f1593d917f222b1d8dec71fe88b3 (diff) | |
download | otp-df8e67e203b83f95d1e098fec88ad5d0ad840069.tar.gz otp-df8e67e203b83f95d1e098fec88ad5d0ad840069.tar.bz2 otp-df8e67e203b83f95d1e098fec88ad5d0ad840069.zip |
Merge branch 'nox/compile-column-numbers' into maint
* nox/compile-column-numbers:
Fix messages ordering with column numbers
Fix type compile:err_info/0
Test column number reporting in error_SUITE
Fix printing of errors with column numbers
Create a new "column" option in compile
Allow setting of initial position in epp
Export type erl_scan:location/0
Diffstat (limited to 'lib/stdlib/src/erl_scan.erl')
-rw-r--r-- | lib/stdlib/src/erl_scan.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/src/erl_scan.erl b/lib/stdlib/src/erl_scan.erl index 10b2ed2e49..be64b428b1 100644 --- a/lib/stdlib/src/erl_scan.erl +++ b/lib/stdlib/src/erl_scan.erl @@ -55,7 +55,7 @@ token_info/1,token_info/2, attributes_info/1,attributes_info/2,set_attribute/3]). --export_type([error_info/0, line/0, tokens_result/0]). +-export_type([error_info/0, line/0, location/0, tokens_result/0]). %%% %%% Defines and type definitions |