support of 'ANY DEFINED BY' from X.208 which is obsolete but still used in some RFCs

svn path=/trunk/; revision=23043

1 files changed, 12 insertions, 6 deletions

diff --git a/tools/asn2wrs.py b/tools/asn2wrs.py
index a8754b55cc..4a7a87fccf 100755
--- a/tools/asn2wrs.py
+++ b/tools/asn2wrs.py
@@ -283,8 +283,9 @@ reserved_words = {
   'UNIVERSAL'   : 'UNIVERSAL',
   'UTCTime'     : 'UTCTime',
   'WITH'        : 'WITH',
-# obsolete but still used
+# X.208 obsolete but still used
   'ANY'         : 'ANY',
+  'DEFINED'     : 'DEFINED',
 }
 
 for k in static_tokens.keys():
@@ -6048,11 +6049,6 @@ def p_Class_2 (t):
     t[0] = 'CONTEXT'
 
 
-def p_AnyType (t):
-    'AnyType : ANY'
-    t[0] = AnyType ()
-
-
 # 31 Notation for the object identifier type ----------------------------------
 
 # 31.1
@@ -6498,6 +6494,16 @@ def p_number (t):
   t[0] = t[1]
 
 
+#--- ITU-T Recommendation X.208 -----------------------------------------------
+
+# 27 Notation for the any type ------------------------------------------------
+
+# 27.1
+def p_AnyType (t):
+  '''AnyType : ANY
+             | ANY DEFINED BY identifier'''
+  t[0] = AnyType()
+
 #--- ITU-T Recommendation X.681 -----------------------------------------------
 
 # 7 ASN.1 lexical items -------------------------------------------------------