diff options
author | Erlang/OTP <[email protected]> | 2010-02-10 10:03:53 +0000 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2010-02-10 11:07:36 +0100 |
commit | fcdb09923b20934123f52814458c065a1dd27cf3 (patch) | |
tree | ca860d3e70df87786a959043bbe6a970f633db96 /lib/compiler/src/v3_core.erl | |
parent | d115b311ca388145fb1aebf385206c47d3cc9ec1 (diff) | |
parent | a612e99fb5aaa934fe5a8591db0f083d7fa0b20a (diff) | |
download | otp-fcdb09923b20934123f52814458c065a1dd27cf3.tar.gz otp-fcdb09923b20934123f52814458c065a1dd27cf3.tar.bz2 otp-fcdb09923b20934123f52814458c065a1dd27cf3.zip |
Merge branch 'ks/compiler' into ccase/r13b04_dev
* ks/compiler:
compiler: keep line numbers for attributes
compiler Makefile: alphabetize module names
compile.erl: eliminate compiler warning
Diffstat (limited to 'lib/compiler/src/v3_core.erl')
-rw-r--r-- | lib/compiler/src/v3_core.erl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/compiler/src/v3_core.erl b/lib/compiler/src/v3_core.erl index a39a3c538f..dfe15de4ff 100644 --- a/lib/compiler/src/v3_core.erl +++ b/lib/compiler/src/v3_core.erl @@ -1,19 +1,19 @@ %% %% %CopyrightBegin% -%% -%% Copyright Ericsson AB 1999-2009. All Rights Reserved. -%% +%% +%% Copyright Ericsson AB 1999-2010. All Rights Reserved. +%% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in %% compliance with the License. You should have received a copy of the %% Erlang Public License along with this software. If not, it can be %% retrieved online at http://www.erlang.org/. -%% +%% %% Software distributed under the License is distributed on an "AS IS" %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See %% the License for the specific language governing rights and limitations %% under the License. -%% +%% %% %CopyrightEnd% %% %% Purpose : Transform normal Erlang to Core Erlang @@ -164,8 +164,8 @@ form({attribute,_,file,{File,_Line}}, {Fs,As,Es,Ws,_}, _Opts) -> form({attribute,_,_,_}=F, {Fs,As,Es,Ws,File}, _Opts) -> {Fs,[attribute(F)|As],Es,Ws,File}. -attribute({attribute,_,Name,Val}) -> - {#c_literal{val=Name},#c_literal{val=Val}}. +attribute({attribute,Line,Name,Val}) -> + {#c_literal{val=Name, anno=[Line]}, #c_literal{val=Val, anno=[Line]}}. function({function,_,Name,Arity,Cs0}, Es0, Ws0, File, Opts) -> %%ok = io:fwrite("~p - ", [{Name,Arity}]), |