Commit 70853058 authored by Lev Walkin's avatar Lev Walkin

upgrade

parent 04affbfa
...@@ -176,7 +176,7 @@ typedef struct asn1p_expr_s { ...@@ -176,7 +176,7 @@ typedef struct asn1p_expr_s {
enum asn1p_expr_marker_e { enum asn1p_expr_marker_e {
EM_NOMARK, EM_NOMARK,
EM_INDIRECT = 0x01, /* 00001 Represent as pointer */ EM_INDIRECT = 0x01, /* 00001 Represent as pointer */
EM_OMITABLE = 0x03, /* 00011 May be absent in encoding */ EM_OMITABLE = 0x02, /* 00010 May be absent in encoding */
EM_OPTIONAL = 0x07, /* 00111 Optional member */ EM_OPTIONAL = 0x07, /* 00111 Optional member */
EM_DEFAULT = 0x0F, /* 01111 default_value */ EM_DEFAULT = 0x0F, /* 01111 default_value */
EM_UNRECURSE = 0x10, /* 10000 Use safe naming */ EM_UNRECURSE = 0x10, /* 10000 Use safe naming */
...@@ -225,6 +225,7 @@ typedef struct asn1p_expr_s { ...@@ -225,6 +225,7 @@ typedef struct asn1p_expr_s {
*/ */
int _anonymous_type; /* This type is unnamed */ int _anonymous_type; /* This type is unnamed */
int _type_unique_index; /* A per top-level-type unique index */ int _type_unique_index; /* A per top-level-type unique index */
int _type_referenced; /* This type is referenced from another place */
/* /*
* Opaque data may be attached to this structure, * Opaque data may be attached to this structure,
......
This diff is collapsed.
...@@ -575,9 +575,8 @@ ModuleSpecificationElement: ...@@ -575,9 +575,8 @@ ModuleSpecificationElement:
*/ */
| BasicString { | BasicString {
return yyerror( return yyerror(
"Attempt to redefine a standard basic type, " "Attempt to redefine a standard basic string type, "
"use -ftypesXY to switch back " "please comment out or remove this type redefinition.");
"to older version of ASN.1 standard");
} }
; ;
...@@ -1944,7 +1943,7 @@ optMarker: ...@@ -1944,7 +1943,7 @@ optMarker:
Marker: Marker:
TOK_OPTIONAL { TOK_OPTIONAL {
$$.flags = EM_OPTIONAL; $$.flags = EM_OPTIONAL | EM_INDIRECT;
$$.default_value = 0; $$.default_value = 0;
} }
| TOK_DEFAULT Value { | TOK_DEFAULT Value {
......
...@@ -138,22 +138,6 @@ _asn1p_set_flags(enum asn1p_flags flags) { ...@@ -138,22 +138,6 @@ _asn1p_set_flags(enum asn1p_flags flags) {
asn1p__flex_debug = 1; asn1p__flex_debug = 1;
} }
/*
* Restrict embedded types to ASN.1:1988 version of standard.
*/
if(flags & A1P_TYPES_RESTRICT_TO_1988) {
flags &= ~A1P_TYPES_RESTRICT_TO_1988;
asn1p_lexer_types_year = 1988;
}
/*
* Restrict embedded types to ASN.1:1988 version of standard.
*/
if(flags & A1P_TYPES_RESTRICT_TO_1988) {
flags &= ~A1P_TYPES_RESTRICT_TO_1988;
asn1p_lexer_types_year = 1988;
}
/* /*
* Check that we haven't missed an unknown flag. * Check that we haven't missed an unknown flag.
*/ */
......
...@@ -57,15 +57,7 @@ enum asn1p_flags { ...@@ -57,15 +57,7 @@ enum asn1p_flags {
/* /*
* Enable verbose debugging output from lexer. * Enable verbose debugging output from lexer.
*/ */
A1P_LEXER_DEBUG = 0x0001, A1P_LEXER_DEBUG = 0x0001
/*
* Embedded types restricted to ASN.1:1988
*/
A1P_TYPES_RESTRICT_TO_1988 = 0x0010,
/*
* Embedded constructs (concepts) restricted to ASN.1:1990
*/
A1P_CONSTRUCTS_RESTRICT_TO_1990 = 0x0020,
}; };
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment