diff options
| author | Niclas Eklund <[email protected]> | 2011-08-15 14:11:29 +0200 |
|---|---|---|
| committer | Niclas Eklund <[email protected]> | 2011-08-15 14:11:29 +0200 |
| commit | 90fb6ccf9292c909a0639f3874b36a1805204bc8 (patch) | |
| tree | 8de0748ce1efaffe37af94e0fb7492ac361c9f68 /lib/ic/src/ic_pragma.erl | |
| parent | 82dba8f37f312e8ae0f4b175d8e0a522788571a7 (diff) | |
| parent | 40dd124c64b737e9efd14d6a663244ffb38e7a81 (diff) | |
| download | otp-90fb6ccf9292c909a0639f3874b36a1805204bc8.tar.gz otp-90fb6ccf9292c909a0639f3874b36a1805204bc8.tar.bz2 otp-90fb6ccf9292c909a0639f3874b36a1805204bc8.zip | |
Merge branch 'nick/lht-idl-compiler-opt/OTP-9460' into dev
* nick/lht-idl-compiler-opt/OTP-9460:
Changed version, added release note and updated license headers.
ic: Implement multiple include optimization
ic: Fix preprocessor double expanded included files
ic: Improve ic_pragma performance by using ets:match
Diffstat (limited to 'lib/ic/src/ic_pragma.erl')
| -rw-r--r-- | lib/ic/src/ic_pragma.erl | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/lib/ic/src/ic_pragma.erl b/lib/ic/src/ic_pragma.erl index 45cb64c9c8..7f2216b9dc 100644 --- a/lib/ic/src/ic_pragma.erl +++ b/lib/ic/src/ic_pragma.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1998-2010. All Rights Reserved. +%% Copyright Ericsson AB 1998-2011. 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 @@ -1600,9 +1600,8 @@ remove_inheriters(S,RS,InheriterList) -> [_OneOnly] -> ReducedInhList; _Other -> - EtsList = ets:tab2list(S), CleanList = - [X || X <- EtsList, element(1,X) == inherits], + ets:match(S, {inherits,'_','_'}), % CodeOptList = % [X || X <- EtsList, element(1,X) == codeopt], NoInheriters =remove_inheriters2(S,ReducedInhList,CleanList), @@ -1648,9 +1647,8 @@ remove_inh([X],[Y],List,EtsList) -> %%% from others in the list %%%---------------------------------------------- remove_inherited(S,InheriterList) -> - EtsList = ets:tab2list(S), CleanList = - [X || X <- EtsList, element(1,X) == inherits], + ets:match(S, {inherits, '_', '_'}), remove_inherited(S,InheriterList,CleanList). @@ -1694,11 +1692,8 @@ remove_inhed([X],[Y],List,EtsList) -> %% are inherited from scope in the list %%%---------------------------------------------- get_inherited(S,Scope,OpScopeList) -> - EtsList = ets:tab2list(S), - [[element(3,X)] || X <- EtsList, - element(1,X) == inherits, - element(2,X) == Scope, - member([element(3,X)],OpScopeList)]. + EtsList1 = ets:match(S, {inherits, Scope, '$1'}), + [X || X <- EtsList1, member(X, OpScopeList)]. @@ -1771,9 +1766,7 @@ inherits2(_X,Y,Z,EtsList) -> %% false otherwise %% is_inherited_by(Interface1,Interface2,PragmaTab) -> - FullList = ets:tab2list(PragmaTab), - InheritsList = - [X || X <- FullList, element(1,X) == inherits], + InheritsList = ets:match(PragmaTab, {inherits, '_', '_'}), inherits(Interface2,Interface1,InheritsList). |