Improve implementation of ParserATNSimulator::getConflictingAlts()

andreasbuhr · andreasbuhr · commit 4977cd98ea4a · 2024-04-11T10:44:18.000+02:00
PredictionModeClass::getAlts(configs)
yields the same result as
PredictionModeClass::getAlts(
  PredictionModeClass::getConflictingAltSubsets(configs)
)
Both return a BitSet with bits set for all alts which occur in configs.

Signed-off-by: Andreas Buhr &lt;andreas@andreasbuhr.de&gt;
diff --git a/runtime/Cpp/runtime/src/atn/ParserATNSimulator.cpp b/runtime/Cpp/runtime/src/atn/ParserATNSimulator.cpp
@@ -1201,8 +1201,7 @@ Ref<ATNConfig> ParserATNSimulator::ruleTransition(Ref<ATNConfig> const& config,
 }
 
 BitSet ParserATNSimulator::getConflictingAlts(ATNConfigSet *configs) {
-  std::vector<BitSet> altsets = PredictionModeClass::getConflictingAltSubsets(configs);
-  return PredictionModeClass::getAlts(altsets);
+  return PredictionModeClass::getAlts(configs);
 }
 
 BitSet ParserATNSimulator::getConflictingAltsOrUniqueAlt(ATNConfigSet *configs) {

Original file line number	Diff line number	Diff line change
`@@ -1201,8 +1201,7 @@ Ref<ATNConfig> ParserATNSimulator::ruleTransition(Ref<ATNConfig> const& config,`
`1201`	`1201`	`}`
`1202`	`1202`
`1203`	`1203`	`BitSet ParserATNSimulator::getConflictingAlts(ATNConfigSet *configs) {`
`1204`		`- std::vector<BitSet> altsets = PredictionModeClass::getConflictingAltSubsets(configs);`
`1205`		`- return PredictionModeClass::getAlts(altsets);`
	`1204`	`+ return PredictionModeClass::getAlts(configs);`
`1206`	`1205`	`}`
`1207`	`1206`
`1208`	`1207`	`BitSet ParserATNSimulator::getConflictingAltsOrUniqueAlt(ATNConfigSet *configs) {`