diff options
author | Adam Lindberg <[email protected]> | 2012-02-29 14:47:44 +0100 |
---|---|---|
committer | Adam Lindberg <[email protected]> | 2012-02-29 14:47:44 +0100 |
commit | eda0a2d866060b18af6f06abbc9ea9e920de43b7 (patch) | |
tree | 2de8dc6101afe1f856d8ce8ac2d613168653c7cd /lib/asn1/src/asn1ct_gen.erl | |
parent | cc3122ab804299810c817f3819323234ff3e23c3 (diff) | |
parent | 9ec0a0babace0932d78accf7c10b237a32dc801c (diff) | |
download | otp-eda0a2d866060b18af6f06abbc9ea9e920de43b7.tar.gz otp-eda0a2d866060b18af6f06abbc9ea9e920de43b7.tar.bz2 otp-eda0a2d866060b18af6f06abbc9ea9e920de43b7.zip |
Merge branch 'alind/asn1/parallel-tests' into maint
* alind/asn1/parallel-tests:
[asn1] Refactor test cases and remove extra suites
[asn1] Replace 'driver' option with 'nif'
[asn1] Correct test suite dependencies
[asn1] Parallelize test suites
[asn1] Make tables and processes unnamed
[asn1] Abstract out table access to new module
[asn1] Run asn1 compilation in a separate process
Diffstat (limited to 'lib/asn1/src/asn1ct_gen.erl')
-rw-r--r-- | lib/asn1/src/asn1ct_gen.erl | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/asn1/src/asn1ct_gen.erl b/lib/asn1/src/asn1ct_gen.erl index 0f8833f716..fda4e1c6d9 100644 --- a/lib/asn1/src/asn1ct_gen.erl +++ b/lib/asn1/src/asn1ct_gen.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2011. All Rights Reserved. +%% Copyright Ericsson AB 1997-2012. 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 @@ -169,7 +169,7 @@ pgen_objectsets(Rtmod,Erules,Module,[H|T]) -> pgen_objectsets(Rtmod,Erules,Module,T). pgen_check_defaultval(Erules,Module) -> - CheckObjects = ets:tab2list(check_functions), + CheckObjects = asn1ct_table:to_list(check_functions), case get(asndebug) of true -> FileName = lists:concat([Module,".table"]), @@ -1598,7 +1598,7 @@ gen_check_call(TopType,Cname,Type,InnerType,WhatKind,DefaultValue,Element) -> NameList = [Cname|TopType], Name = list2name(NameList ++ [check]), emit({"'",Name,"'(",DefaultValue,", ",Element,")"}), - ets:insert(check_functions,{Name,Type}), + asn1ct_table:insert(check_functions, {Name, Type}), %% Must look for check functions in InnerType, %% that may be referenced or internal defined %% constructed types not used elsewhere. @@ -1744,10 +1744,9 @@ lookahead_reference(#'Externaltypereference'{module=M,type=T}) -> end. insert_once(Table,Object) -> - _Info = ets:info(Table), - case ets:lookup(Table,element(1,Object)) of + case asn1ct_table:lookup(Table, element(1, Object)) of [] -> - ets:insert(Table,Object); %returns true + asn1ct_table:insert(Table, Object); %returns true _ -> false end. |