rewrote HeapVars a bit to allow for more flexibility (removal of values?)

compiler/src/prog8/ast/AstChecker.kt

@@ -52,7 +52,7 @@ class AstChecker(private val namespace: INameScope,
     private val heapStringSentinel: Int
     init {
         val stringSentinel = heap.allEntries().firstOrNull {it.value.str==""}
-        heapStringSentinel = stringSentinel?.index ?: heap.add(DataType.STR, "")
+        heapStringSentinel = stringSentinel?.key ?: heap.add(DataType.STR, "")
     }
 
     fun result(): List<AstException> {

compiler/src/prog8/compiler/Compiler.kt

@@ -50,7 +50,8 @@ class HeapValues {
         val arraysize: Int = array?.size ?: doubleArray?.size ?: 0
     }
 
-    private val heap = mutableListOf<HeapValue>()
+    private val heap = mutableMapOf<Int, HeapValue>()
+    private var heapId = 1
 
     fun size(): Int = heap.size
 
@@ -60,48 +61,56 @@ class HeapValues {
 
         // strings are 'interned' and shared if they're the same
         val value = HeapValue(type, str, null, null)
-        val existing = heap.indexOf(value)
+
-        if(existing>=0)
+        val existing = heap.filter { it.value==value }.map { it.key }.firstOrNull()
+        if(existing!=null)
             return existing
-        heap.add(value)
+        val newId = heapId++
-        return heap.size-1
+        heap[newId] = value
+        return newId
     }
 
     fun add(type: DataType, array: IntArray): Int {
-        // arrays are never shared
+        // arrays are never shared, don't check for existing
-        heap.add(HeapValue(type, null, array, null))
+        val newId = heapId++
-        return heap.size-1
+        heap[newId] = HeapValue(type, null, array, null)
+        return newId
     }
 
     fun add(type: DataType, darray: DoubleArray): Int {
-        // arrays are never shared
+        // arrays are never shared, don't check for existing
-        heap.add(HeapValue(type, null, null, darray))
+        val newId = heapId++
-        return heap.size-1
+        heap[newId] = HeapValue(type, null, null, darray)
+        return newId
     }
 
     fun update(heapId: Int, str: String) {
-        when(heap[heapId].type){
+        val oldVal = heap[heapId] ?: throw IllegalArgumentException("heapId not found in heap")
+        when(oldVal.type){
             DataType.STR,
             DataType.STR_P,
             DataType.STR_S,
             DataType.STR_PS -> {
-                if(heap[heapId].str!!.length!=str.length)
+                if(oldVal.str!!.length!=str.length)
                     throw IllegalArgumentException("heap string length mismatch")
-                heap[heapId] = heap[heapId].copy(str=str)
+                heap[heapId] = oldVal.copy(str=str)
             }
             else-> throw IllegalArgumentException("heap data type mismatch")
         }
     }
 
     fun update(heapId: Int, heapval: HeapValue) {
+        if(heapId !in heap)
+            throw IllegalArgumentException("heapId not found in heap")
         heap[heapId] = heapval
     }
 
-    fun get(heapId: Int): HeapValue = heap[heapId]
+    fun get(heapId: Int): HeapValue {
+        return heap[heapId] ?:
+            throw IllegalArgumentException("heapId not found in heap")
+    }
 
-    // TODO remove function
+    fun allEntries() = heap.entries
-
-    fun allEntries() = heap.withIndex().toList()
 }
 
 

compiler/src/prog8/compiler/intermediate/IntermediateProgram.kt

@@ -404,11 +404,11 @@ class IntermediateProgram(val name: String, var loadAddress: Int, val heap: Heap
         heap.allEntries().forEach {
             when {
                 it.value.str!=null ->
-                    out.println("${it.index}  ${it.value.type.toString().toLowerCase()}  \"${escape(it.value.str!!)}\"")
+                    out.println("${it.key}  ${it.value.type.toString().toLowerCase()}  \"${escape(it.value.str!!)}\"")
                 it.value.array!=null ->
-                    out.println("${it.index}  ${it.value.type.toString().toLowerCase()}  ${it.value.array!!.toList()}")
+                    out.println("${it.key}  ${it.value.type.toString().toLowerCase()}  ${it.value.array!!.toList()}")
                 it.value.doubleArray!=null ->
-                    out.println("${it.index}  ${it.value.type.toString().toLowerCase()}  ${it.value.doubleArray!!.toList()}")
+                    out.println("${it.key}  ${it.value.type.toString().toLowerCase()}  ${it.value.doubleArray!!.toList()}")
                 else -> throw CompilerException("invalid heap entry $it")
             }
         }

compiler/src/prog8/optimizing/StatementOptimizer.kt

@@ -51,7 +51,6 @@ class StatementOptimizer(private val namespace: INameScope, private val heap: He
             if(stringVar!=null) {
                 val heapId = stringVar.heapId(namespace)
                 val string = heap.get(heapId).str!!
-                // TODO heap.remove(heapId)
                 if(string.length==1) {
                     val petscii = Petscii.encodePetscii(string, true)[0]
                     functionCall.arglist.clear()