diff options
| author | Lev Walkin <vlm@lionet.info> | 2006-03-09 09:08:49 +0000 |
|---|---|---|
| committer | Lev Walkin <vlm@lionet.info> | 2006-03-09 09:08:49 +0000 |
| commit | 548687567bb45cd9b73d12179a40a0d9da73aa04 (patch) | |
| tree | bf2e913782e8172648ae32159e6ae2756cafea1f | |
| parent | 915636a0775a662136172b5d37101d361f7fad4a (diff) | |
temporarily simplify syntax
| -rw-r--r-- | libasn1parser/asn1p_y.y | 45 |
1 files changed, 16 insertions, 29 deletions
diff --git a/libasn1parser/asn1p_y.y b/libasn1parser/asn1p_y.y index 41f566d7..36d9bafd 100644 --- a/libasn1parser/asn1p_y.y +++ b/libasn1parser/asn1p_y.y @@ -1000,16 +1000,6 @@ ClassField: $$->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 ? */ | TOK_valuefieldreference DefinedObjectClass optMarker { $$ = asn1p_expr_new(yylineno); @@ -1021,14 +1011,13 @@ ClassField: $$->marker = $3; } - /* ObjectSetFieldSpec ::= objectsetfieldreference DefinedObjectClass ObjectOptionalitySpec ? */ - | TOK_typefieldreference DefinedObjectClass optMarker { + /* VariableTypeValueSetFieldSpec ::= valuesetfieldreference FieldName ValueOptionalitySpec ? */ + | TOK_typefieldreference FieldName optMarker { $$ = asn1p_expr_new(yylineno); - checkmem($$); $$->Identifier = $1; - $$->reference = $2; $$->meta_type = AMT_OBJECTFIELD; - $$->expr_type = A1TC_CLASSFIELD_OSFS; + $$->expr_type = A1TC_CLASSFIELD_VTVSFS; + $$->reference = $2; $$->marker = $3; } @@ -1043,20 +1032,16 @@ ClassField: $$->marker = $3; } - /* - DefinedObjectClass: - TOK_capitalreference { - $$ = asn1p_ref_new(yylineno); - asn1p_ref_add_component($$, $1, RLT_CAPITALS); - } - | TypeRefName '.' TOK_capitalreference { - $$ = asn1p_ref_new(yylineno); - asn1p_ref_add_component($$, $1, RLT_AmpUppercase); - asn1p_ref_add_component($$, $3, RLT_CAPITALS); - } - ; - */ - + /* ObjectSetFieldSpec ::= objectsetfieldreference DefinedObjectClass ObjectOptionalitySpec ? */ + | TOK_typefieldreference DefinedObjectClass optMarker { + $$ = asn1p_expr_new(yylineno); + checkmem($$); + $$->Identifier = $1; + $$->reference = $2; + $$->meta_type = AMT_OBJECTFIELD; + $$->expr_type = A1TC_CLASSFIELD_OSFS; + $$->marker = $3; + } ; optWithSyntax: @@ -1409,11 +1394,13 @@ DefinedObjectClass: $$ = asn1p_ref_new(yylineno); asn1p_ref_add_component($$, $1, RLT_CAPITALS); } +/* | TypeRefName '.' TOK_capitalreference { $$ = asn1p_ref_new(yylineno); asn1p_ref_add_component($$, $1, RLT_AmpUppercase); asn1p_ref_add_component($$, $3, RLT_CAPITALS); } +*/ ; |