natas_hw
/
mps-coderules
mirror of https://github.com/JetBrains/mps-coderules
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Roll back an optimisation discriminating non-primary constraint symbols. 

Doing so would change the semantics too much without apparent gains.
This commit is contained in:
Fedor Isakov 2017-11-09 12:02:27 +01:00
parent 2fb1f25d4c
commit 7b113d5a21
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
reactor/Core/src/jetbrains/mps/logic/reactor/core/RuleIndex.kt
View File

@ -32,10 +32,10 @@ import java.util.*
class RuleIndex : Iterable<Rule> {
private val allSymbol2valueIndex = HashMap<ConstraintSymbol, ValueIndex>()
private val primarySymbol2valueIndex = HashMap<ConstraintSymbol, ValueIndex>()
private val auxSymbol2valueIndex = HashMap<ConstraintSymbol, ValueIndex>()
private val tag2rule = LinkedHashMap<String, Rule>()
constructor(handlers: Iterable<Handler>) {
@ -51,7 +51,7 @@ class RuleIndex : Iterable<Rule> {
fun forOccurrence(occ: ConstraintOccurrence): Iterable<Rule> =
primarySymbol2valueIndex.get(occ.constraint().symbol())?.select(occ) ?:
(allSymbol2valueIndex.get(occ.constraint().symbol())?.select(occ) ?: emptyList())
(auxSymbol2valueIndex.get(occ.constraint().symbol())?.select(occ) ?: emptyList())
override fun iterator(): Iterator<Rule> = tag2rule.values.iterator()
@ -62,17 +62,16 @@ class RuleIndex : Iterable<Rule> {
.forEach { symbol -> primarySymbol2valueIndex.getOrPut(symbol) { ValueIndex(symbol) } }
for (h in handlers) {
val hPrimSyms = h.primarySymbols().toSet()
val primSymbols = h.primarySymbols().toSet()
for (r in h.rules()) {
for (c in (r.headKept() + r.headReplaced())) {
val symbol = c.symbol()
if (symbol in hPrimSyms) {
if (symbol in primSymbols) {
primarySymbol2valueIndex[symbol]?.update(r, c)
} else {
auxSymbol2valueIndex.getOrPut(symbol) { ValueIndex(symbol) }.update(r, c)
}
else if (hPrimSyms.isEmpty()) {
allSymbol2valueIndex.getOrPut(symbol) { ValueIndex(symbol) }.update(r, c)
}
// else ignore the constraint -- it's not meant to be processed by this handler, as it is not a primary
}
}
}