Fixed symbolic conflicts

mike-lischke · mike-lischke · commit 41dabd07b986 · 2023-11-28T19:19:02.000+01:00
These have been there for a while already, but were never detected due to a bug in ANTLR.
diff --git a/apt/apt.g4 b/apt/apt.g4
@@ -8,7 +8,7 @@ grammar apt;
 
 //  productions
 record
-    : commented = commenterR? rType = TypeR WSS options = optionsR? uri = uriR WSS distribution = wordWithDash components = componentsR WSS? EOF
+    : commented = commenterR? rType = TypeR WSS options_ = optionsR? uri = uriR WSS distribution = wordWithDash components = componentsR WSS? EOF
     ;
 
 wordWithDashSegment
diff --git a/sql/tsql/TSqlParser.g4 b/sql/tsql/TSqlParser.g4
@@ -4088,7 +4088,7 @@ group_by_item
 
 option_clause
 // https://msdn.microsoft.com/en-us/library/ms181714.aspx
-    : OPTION '(' options += option (',' options += option)* ')'
+    : OPTION '(' options_ += option (',' options_ += option)* ')'
     ;
 
 option

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ grammar apt;`
`8`	`8`
`9`	`9`	`// productions`
`10`	`10`	`record`
`11`		`- : commented = commenterR? rType = TypeR WSS options = optionsR? uri = uriR WSS distribution = wordWithDash components = componentsR WSS? EOF`
	`11`	`+ : commented = commenterR? rType = TypeR WSS options_ = optionsR? uri = uriR WSS distribution = wordWithDash components = componentsR WSS? EOF`
`12`	`12`	`;`
`13`	`13`
`14`	`14`	`wordWithDashSegment`
Original file line number	Diff line number	Diff line change
`@@ -4088,7 +4088,7 @@ group_by_item`
`4088`	`4088`
`4089`	`4089`	`option_clause`
`4090`	`4090`	`// https://msdn.microsoft.com/en-us/library/ms181714.aspx`
`4091`		`- : OPTION '(' options += option (',' options += option)* ')'`
	`4091`	`+ : OPTION '(' options_ += option (',' options_ += option)* ')'`
`4092`	`4092`	`;`
`4093`	`4093`
`4094`	`4094`	`option`