OPTIONAL UNIQUE -> UNIQUE OPTIONAL

b7c45ca3 · Lev Walkin · 7aedc5ee · b7c45ca3 · b7c45ca3
Commit b7c45ca3 authored Nov 24, 2004 by Lev Walkin
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 199 additions and 201 deletions

libasn1parser/asn1p_y.c libasn1parser/asn1p_y.c +193 -195

libasn1parser/asn1p_y.y libasn1parser/asn1p_y.y +6 -6

No files found.
--- a/libasn1parser/asn1p_y.c
+++ b/libasn1parser/asn1p_y.c
--- a/libasn1parser/asn1p_y.y
+++ b/libasn1parser/asn1p_y.y
@@ -950,13 +950,13 @@ ClassField:
 		$$->meta_type = AMT_OBJECTFIELD;
 		$$->marker = $2;
 	}
-	| ClassFieldIdentifier Type optMarker optUnique {
+	| ClassFieldIdentifier Type optUnique optMarker {
 		$$ = $2;
 		$$->Identifier = $1.name;
-		$$->marker = $3;
-		$$->unique = $4;
+		$$->marker = $4;
+		$$->unique = $3;
 	}
-	| ClassFieldIdentifier ClassFieldIdentifier optMarker optUnique {
+	| ClassFieldIdentifier ClassFieldIdentifier optUnique optMarker {
 		int ret;
 		$$ = asn1p_expr_new(yylineno);
 		checkmem($$);
@@ -968,8 +968,8 @@ ClassField:
 		checkmem(ret == 0);
 		$$->expr_type = A1TC_CLASSFIELD;
 		$$->meta_type = AMT_OBJECTFIELD;
-		$$->marker = $3;
-		$$->unique = $4;
+		$$->marker = $4;
+		$$->unique = $3;
 	}
 	;