diff options
| author | Björn Gustavsson <[email protected]> | 2011-09-14 17:18:39 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-09-14 17:18:39 +0200 |
| commit | 4a809e4a7cf666afbffe3fd94d88c78f2c261a7b (patch) | |
| tree | d3732fcca1aaaf245306728875f43cbf97ddbd69 /lib/compiler | |
| parent | 3239beb53276e0086e70b37c14a19cd22cfdd7e1 (diff) | |
| parent | 68c96ca855821adb42a25ced5b69446ae7ccc635 (diff) | |
| download | otp-4a809e4a7cf666afbffe3fd94d88c78f2c261a7b.tar.gz otp-4a809e4a7cf666afbffe3fd94d88c78f2c261a7b.tar.bz2 otp-4a809e4a7cf666afbffe3fd94d88c78f2c261a7b.zip | |
Merge branch 'dev' into major
* dev:
sys_pre_expand: Don't duplicate options given in the source code
Diffstat (limited to 'lib/compiler')
| -rw-r--r-- | lib/compiler/src/sys_pre_expand.erl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/compiler/src/sys_pre_expand.erl b/lib/compiler/src/sys_pre_expand.erl index 480954adac..dd6f24e21f 100644 --- a/lib/compiler/src/sys_pre_expand.erl +++ b/lib/compiler/src/sys_pre_expand.erl @@ -223,10 +223,8 @@ attribute(export, Es, _L, St) -> St#expand{exports=union(from_list(Es), St#expand.exports)}; attribute(import, Is, _L, St) -> import(Is, St); -attribute(compile, C, _L, St) when is_list(C) -> - St#expand{compile=St#expand.compile ++ C}; -attribute(compile, C, _L, St) -> - St#expand{compile=St#expand.compile ++ [C]}; +attribute(compile, _C, _L, St) -> + St; attribute(Name, Val, Line, St) when is_list(Val) -> St#expand{attributes=St#expand.attributes ++ [{Name,Line,Val}]}; attribute(Name, Val, Line, St) -> |