Simplify extension declaration a bit

dsyer · dsyer · commit 72088a4974b1 · 2025-09-29T16:14:12.000Z
Duplicates one of the changes from antlr#4632
diff --git a/protobuf/protobuf2/Protobuf2.g4 b/protobuf/protobuf2/Protobuf2.g4
@@ -132,7 +132,7 @@ type_
 // Extensions
 
 extensions
-    : EXTENSIONS ranges (LB (verificationDef | declarationsDef) RB)? SEMI
+    : EXTENSIONS ranges (LB (verificationDef | declarations) RB)? SEMI
     ;
 
 verificationDef
@@ -144,16 +144,12 @@ verification
     | UNVERIFIED_LIT
     ;
 
-declarationsDef
-    : declarationDef (COMMA declarationDef)*
-    ;
-
-declarationDef
-    : DECLARATION EQ LC (declaration (declaration)*)? RC
+declarations
+    : declaration (COMMA declaration)*
     ;
 
 declaration
-    : fieldName COLON constant (COMMA)?
+    : DECLARATION EQ blockLit
     ;
 
 // Reserved

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ type_`
`132`	`132`	`// Extensions`
`133`	`133`
`134`	`134`	`extensions`
`135`		`- : EXTENSIONS ranges (LB (verificationDef \| declarationsDef) RB)? SEMI`
	`135`	`+ : EXTENSIONS ranges (LB (verificationDef \| declarations) RB)? SEMI`
`136`	`136`	`;`
`137`	`137`
`138`	`138`	`verificationDef`
`@@ -144,16 +144,12 @@ verification`
`144`	`144`	`\| UNVERIFIED_LIT`
`145`	`145`	`;`
`146`	`146`
`147`		`-declarationsDef`
`148`		`- : declarationDef (COMMA declarationDef)*`
`149`		`- ;`
`150`		`-`
`151`		`-declarationDef`
`152`		`- : DECLARATION EQ LC (declaration (declaration)*)? RC`
	`147`	`+declarations`
	`148`	`+ : declaration (COMMA declaration)*`
`153`	`149`	`;`
`154`	`150`
`155`	`151`	`declaration`
`156`		`- : fieldName COLON constant (COMMA)?`
	`152`	`+ : DECLARATION EQ blockLit`
`157`	`153`	`;`
`158`	`154`
`159`	`155`	`// Reserved`