aboutsummaryrefslogtreecommitdiffstats
path: root/lib/asn1/src/asn1ct_tok.erl
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2014-09-08 10:13:57 +0200
committerBjörn Gustavsson <[email protected]>2014-09-08 10:13:57 +0200
commit6e2fd45bad619fd7e06f21798eac94d415dff64e (patch)
tree9bc7f0d233c93c7e1921d5ce0c864859eff15be3 /lib/asn1/src/asn1ct_tok.erl
parent90106cfb3b0e9126c504e84d0df83fd8fc97d271 (diff)
parentf2491c28caea8244eab619321bc95832257bf146 (diff)
downloadotp-6e2fd45bad619fd7e06f21798eac94d415dff64e.tar.gz
otp-6e2fd45bad619fd7e06f21798eac94d415dff64e.tar.bz2
otp-6e2fd45bad619fd7e06f21798eac94d415dff64e.zip
Merge branch 'bjorn/asn1/misc-bug-fixes/OTP-12125' into maint
* bjorn/asn1/misc-bug-fixes/OTP-12125: Workaround for combining two object sets separated by extension Clean up and correct handling of parameters for parameterized types Check the formal parameter for parameterized type definitions Report errors also for unused parameterized types Remove unused code for ABSTRACT-SYNTAX and TYPE-IDENTIFIER Correct expansion of parameterized types Add the module name to the #classdef{} record Eliminate the use of #identifier{} outside the tokeniser and parser Fix problem with object identifiers in external modules Rewrite get_referenced_type/2 Teach the ASN.1 compiler to handle objects in field names Teach the ASN.1 compiler to understand "EXPORTS ALL" Teach the ASN.1 compiler the parse option
Diffstat (limited to 'lib/asn1/src/asn1ct_tok.erl')
-rw-r--r--lib/asn1/src/asn1ct_tok.erl2
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/asn1/src/asn1ct_tok.erl b/lib/asn1/src/asn1ct_tok.erl
index 33f4379173..8687ed955c 100644
--- a/lib/asn1/src/asn1ct_tok.erl
+++ b/lib/asn1/src/asn1ct_tok.erl
@@ -309,7 +309,6 @@ check_hex(_) ->
%% returns rstrtype if A is a reserved word in the group
%% RestrictedCharacterStringType
reserved_word('ABSENT') -> true;
-%reserved_word('ABSTRACT-SYNTAX') -> true; % impl as predef item
reserved_word('ALL') -> true;
reserved_word('ANY') -> true;
reserved_word('APPLICATION') -> true;
@@ -380,7 +379,6 @@ reserved_word('T61String') -> rstrtype;
reserved_word('TAGS') -> true;
reserved_word('TeletexString') -> rstrtype;
reserved_word('TRUE') -> true;
-%% reserved_word('TYPE-IDENTIFIER') -> true; % impl as predef item
reserved_word('UNION') -> true;
reserved_word('UNIQUE') -> true;
reserved_word('UNIVERSAL') -> true;