Refine logic for finding activation Pos to correctly handle discarding rules

reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/ExecutionQueue.kt

@@ -90,13 +90,13 @@ internal class ExecutionQueue(
 
             // Returns null for matches with occurrences only from this session
             //  because journalIndex indexes only previous session.
-            val pos = journalIndex.activationPos(m)
+            val pos2occ = journalIndex.activationPos(m)
 
             // if it is a future match
-            if (pos != null && journalIndex.compare(lastIncrementalRootPos, pos) < 0) {
-                val idOcc = Id(pos.occ)
+            if (pos2occ != null && journalIndex.compare(lastIncrementalRootPos, pos2occ.first) < 0) {
+                val idOcc = Id(pos2occ.second)
                 postponedMatches[idOcc] = (postponedMatches[idOcc] ?: emptyList()) + listOf(m)
-                offer(pos)
+                offer(pos2occ.first, pos2occ.second)
             } else {
                 currentMatches.add(m)
             }

reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/MatchJournal.kt

@@ -107,6 +107,14 @@ interface MatchJournal : MutableIterable<MatchJournal.Chunk> {
          */
         fun activatingChunkOf(occId: Id<Occurrence>): OccChunk?
 
+        /**
+         * Returns [Chunk] which is the last descendant of the [occChunk]
+         * according to justifications. May return activation chunk of
+         * the occurrence if it has no descendants.
+         * Returns null for non-principal occurrences.
+         */
+        fun lastDescendantOf(occChunk: OccChunk): Chunk?
+
         // todo: remove
         /**
          * Returns [Pos] at which provided [RuleMatch] can be inserted
@@ -120,12 +128,7 @@ interface MatchJournal : MutableIterable<MatchJournal.Chunk> {
          * according to its indexed head [Occurrence]s.
          * May return null for matches of non-principal rules.
          */
-        fun activationPos(match: RuleMatchEx): Pos? =
-            // The latest matched occurrence from match's head is (by definition)
-            //  the occurrence which activated this match.
-            match.signature().mapNotNull { occSig ->
-                occSig?.let { activatingChunkOf(it)?.toPos() }
-            }.maxWith(this) // compare positions: find latest
+        fun activationPos(match: RuleMatchEx): Pair<Pos, Occurrence>?
 
         /**
          * Length of the indexed [MatchJournal]

reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/MatchJournalImpl.kt

@@ -218,18 +218,35 @@ internal open class MatchJournalImpl(
         val last: E get() = if (l is LinkedList<E>) l.last else l.last()
     }
 
-    private class IndexImpl(chunks: Iterable<Chunk>): MatchJournal.Index
+    private class IndexImpl(chunks: Collection<Chunk>): MatchJournal.Index
     {
-        private val chunkOrder = HashMap<Int, Int>()
+        private val chunkOrder = HashMap<Int, Int>() // chunk.id to its index
         private val occChunks = HashMap<Id<Occurrence>, OccChunk>()
+        private val occChunk2LastDescendant = HashMap<Int, Chunk>()
 
         init {
-            chunks.forEachIndexed { index, chunk ->
-                chunkOrder[chunk.id] = index
+            if (chunks.isNotEmpty()) {
+                val occChunksTree = LinkedList<OccChunk>()
 
-                if (chunk is OccChunk) {
-                    occChunks[Id(chunk.occ)] = chunk
+                chunks.forEachIndexed { index, chunk ->
+                    chunkOrder[chunk.id] = index
+
+                    if (chunk is OccChunk) {
+                        occChunks[Id(chunk.occ)] = chunk
+                        occChunksTree.push(chunk)
+                    }
+
+                    occChunksTree.peek()?.let {
+                        if (chunk.isDescendantOf(it.id)) {
+                            // after iteration ends will store the last descendant
+                            occChunk2LastDescendant[it.id] = chunk
+                        } else {
+                            // means descendant chunks ended
+                            occChunksTree.pop()
+                        }
+                    }
                 }
+
             }
         }
 
@@ -237,11 +254,37 @@ internal open class MatchJournalImpl(
 
         override fun activatingChunkOf(occId: Id<Occurrence>) = occChunks[occId]
 
-        // todo: throw for invalid positions?
-        override fun compare(lhs: MatchJournal.Pos, rhs: MatchJournal.Pos): Int {
-            val co = compareBy<MatchJournal.Pos>{ chunkOrder[it.chunk.id] }.compare(lhs, rhs)
-            return if (co == 0) lhs.entriesCount.compareTo(rhs.entriesCount) else co
+        override fun lastDescendantOf(occChunk: OccChunk): Chunk? = occChunk2LastDescendant[occChunk.id]
+
+        override fun activationPos(match: RuleMatchEx): Pair<Pos, Occurrence>? {
+            // The latest matched occurrence from match's head is
+            //  (by definition) the occurrence which activated this match.
+
+            val parentChunks: List<OccChunk> =
+                match.signature().mapNotNull { occSig ->
+                    occSig?.let { activatingChunkOf(it) }
+                }
+
+            val activatingChunk: OccChunk = parentChunks.maxBy { chunkOrder[it.id]!! }
+                ?: return null
+
+            // If rule discards its occurrences then it must be inserted after
+            //  all existing matches which are descendants of activating occurrence.
+            val discardingRule = match.rule().headReplaced().count() > 0
+            val posChunk =
+                if (discardingRule)
+                    // not null if activatingChunk is not null
+                    lastDescendantOf(activatingChunk)!!
+                else
+                    activatingChunk
+            return posChunk.toPos() to activatingChunk.occ
         }
+
+        // todo: throw for invalid positions?
+        override fun compare(lhs: Pos, rhs: Pos): Int =
+            compareBy<Pos>{ chunkOrder[it.chunk.id] }
+                .thenComparingInt { it.entriesCount }
+                .compare(lhs, rhs)
     }