Commit 54868756 authored by Lev Walkin's avatar Lev Walkin

temporarily simplify syntax

parent 915636a0
...@@ -1000,16 +1000,6 @@ ClassField: ...@@ -1000,16 +1000,6 @@ ClassField:
$$->marker = $3; $$->marker = $3;
} }
/* VariableTypeValueSetFieldSpec ::= valuesetfieldreference FieldName ValueOptionalitySpec ? */
| TOK_typefieldreference FieldName optMarker {
$$ = asn1p_expr_new(yylineno);
$$->Identifier = $1;
$$->meta_type = AMT_OBJECTFIELD;
$$->expr_type = A1TC_CLASSFIELD_VTVSFS;
$$->reference = $2;
$$->marker = $3;
}
/* ObjectFieldSpec ::= objectfieldreference DefinedObjectClass ObjectOptionalitySpec ? */ /* ObjectFieldSpec ::= objectfieldreference DefinedObjectClass ObjectOptionalitySpec ? */
| TOK_valuefieldreference DefinedObjectClass optMarker { | TOK_valuefieldreference DefinedObjectClass optMarker {
$$ = asn1p_expr_new(yylineno); $$ = asn1p_expr_new(yylineno);
...@@ -1021,14 +1011,13 @@ ClassField: ...@@ -1021,14 +1011,13 @@ ClassField:
$$->marker = $3; $$->marker = $3;
} }
/* ObjectSetFieldSpec ::= objectsetfieldreference DefinedObjectClass ObjectOptionalitySpec ? */ /* VariableTypeValueSetFieldSpec ::= valuesetfieldreference FieldName ValueOptionalitySpec ? */
| TOK_typefieldreference DefinedObjectClass optMarker { | TOK_typefieldreference FieldName optMarker {
$$ = asn1p_expr_new(yylineno); $$ = asn1p_expr_new(yylineno);
checkmem($$);
$$->Identifier = $1; $$->Identifier = $1;
$$->reference = $2;
$$->meta_type = AMT_OBJECTFIELD; $$->meta_type = AMT_OBJECTFIELD;
$$->expr_type = A1TC_CLASSFIELD_OSFS; $$->expr_type = A1TC_CLASSFIELD_VTVSFS;
$$->reference = $2;
$$->marker = $3; $$->marker = $3;
} }
...@@ -1043,20 +1032,16 @@ ClassField: ...@@ -1043,20 +1032,16 @@ ClassField:
$$->marker = $3; $$->marker = $3;
} }
/* /* ObjectSetFieldSpec ::= objectsetfieldreference DefinedObjectClass ObjectOptionalitySpec ? */
DefinedObjectClass: | TOK_typefieldreference DefinedObjectClass optMarker {
TOK_capitalreference { $$ = asn1p_expr_new(yylineno);
$$ = asn1p_ref_new(yylineno); checkmem($$);
asn1p_ref_add_component($$, $1, RLT_CAPITALS); $$->Identifier = $1;
} $$->reference = $2;
| TypeRefName '.' TOK_capitalreference { $$->meta_type = AMT_OBJECTFIELD;
$$ = asn1p_ref_new(yylineno); $$->expr_type = A1TC_CLASSFIELD_OSFS;
asn1p_ref_add_component($$, $1, RLT_AmpUppercase); $$->marker = $3;
asn1p_ref_add_component($$, $3, RLT_CAPITALS); }
}
;
*/
; ;
optWithSyntax: optWithSyntax:
...@@ -1409,11 +1394,13 @@ DefinedObjectClass: ...@@ -1409,11 +1394,13 @@ DefinedObjectClass:
$$ = asn1p_ref_new(yylineno); $$ = asn1p_ref_new(yylineno);
asn1p_ref_add_component($$, $1, RLT_CAPITALS); asn1p_ref_add_component($$, $1, RLT_CAPITALS);
} }
/*
| TypeRefName '.' TOK_capitalreference { | TypeRefName '.' TOK_capitalreference {
$$ = asn1p_ref_new(yylineno); $$ = asn1p_ref_new(yylineno);
asn1p_ref_add_component($$, $1, RLT_AmpUppercase); asn1p_ref_add_component($$, $1, RLT_AmpUppercase);
asn1p_ref_add_component($$, $3, RLT_CAPITALS); asn1p_ref_add_component($$, $3, RLT_CAPITALS);
} }
*/
; ;
......
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