correct version 1.70

improved array literal datatype detection

.gitignore

@@ -1,4 +1,5 @@
 .idea/workspace.xml
+.idea/discord.xml
 /build/
 /dist/
 /output/

.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +1,16 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="DuplicatedCode" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <Languages>
+        <language minSize="100" isEnabled="false" name="JavaScript" />
+        <language isEnabled="false" name="Groovy" />
+        <language isEnabled="false" name="Style Sheets" />
+        <language minSize="70" name="Kotlin" />
+        <language isEnabled="false" name="TypeScript" />
+        <language isEnabled="false" name="ActionScript" />
+      </Languages>
+    </inspection_tool>
     <inspection_tool class="SpellCheckingInspection" enabled="true" level="TYPO" enabled_by_default="true">
       <option name="processCode" value="false" />
       <option name="processLiterals" value="true" />

.idea/libraries/antlr_4_8_complete.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="antlr-4.8-complete">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/parser/antlr/lib/antlr-4.8-complete.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/antlr_runtime_4_8.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="antlr-runtime-4.8">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/parser/antlr/lib/antlr-runtime-4.8.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/kotlinx_cli_jvm_0_1_0_dev_5.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="kotlinx-cli-jvm-0.1.0-dev-5">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/compiler/lib/kotlinx-cli-jvm-0.1.0-dev-5.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/markdown-navigator-enh.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MarkdownEnhProjectSettings">
+    <AnnotatorSettings targetHasSpaces="true" linkCaseMismatch="true" wikiCaseMismatch="true" wikiLinkHasDashes="true" notUnderWikiHome="true" targetNotWikiPageExt="true" notUnderSourceWikiHome="true" targetNameHasAnchor="true" targetPathHasAnchor="true" wikiLinkHasSlash="true" wikiLinkHasSubdir="true" wikiLinkHasOnlyAnchor="true" linkTargetsWikiHasExt="true" linkTargetsWikiHasBadExt="true" notUnderSameRepo="true" targetNotUnderVcs="false" linkNeedsExt="true" linkHasBadExt="true" linkTargetNeedsExt="true" linkTargetHasBadExt="true" wikiLinkNotInWiki="true" imageTargetNotInRaw="true" repoRelativeAcrossVcsRoots="true" multipleWikiTargetsMatch="true" unresolvedLinkReference="true" linkIsIgnored="true" anchorIsIgnored="true" anchorIsUnresolved="true" anchorLineReferenceIsUnresolved="true" anchorLineReferenceFormat="true" anchorHasDuplicates="true" abbreviationDuplicates="true" abbreviationNotUsed="true" attributeIdDuplicateDefinition="true" attributeIdNotUsed="true" footnoteDuplicateDefinition="true" footnoteUnresolved="true" footnoteDuplicates="true" footnoteNotUsed="true" macroDuplicateDefinition="true" macroUnresolved="true" macroDuplicates="true" macroNotUsed="true" referenceDuplicateDefinition="true" referenceUnresolved="true" referenceDuplicates="true" referenceNotUsed="true" referenceUnresolvedNumericId="true" enumRefDuplicateDefinition="true" enumRefUnresolved="true" enumRefDuplicates="true" enumRefNotUsed="true" enumRefLinkUnresolved="true" enumRefLinkDuplicates="true" simTocUpdateNeeded="true" simTocTitleSpaceNeeded="true" />
+    <HtmlExportSettings updateOnSave="false" parentDir="" targetDir="" cssDir="css" scriptDir="js" plainHtml="false" imageDir="" copyLinkedImages="false" imagePathType="0" targetPathType="2" targetExt="" useTargetExt="false" noCssNoScripts="false" useElementStyleAttribute="false" linkToExportedHtml="true" exportOnSettingsChange="true" regenerateOnProjectOpen="false" linkFormatType="HTTP_ABSOLUTE" />
+    <LinkMapSettings>
+      <textMaps />
+    </LinkMapSettings>
+  </component>
+  <component name="MarkdownNavigatorHistory">
+    <PasteImageHistory checkeredTransparentBackground="false" filename="image" directory="" onPasteImageTargetRef="3" onPasteLinkText="0" onPasteImageElement="1" onPasteLinkElement="1" onPasteReferenceElement="2" cornerRadius="20" borderColor="0" transparentColor="16777215" borderWidth="1" trimTop="0" trimBottom="0" trimLeft="0" trimRight="0" transparent="false" roundCorners="false" showPreview="true" bordered="false" scaled="false" cropped="false" hideInapplicableOperations="false" preserveLinkFormat="false" scale="50" scalingInterpolation="1" transparentTolerance="0" saveAsDefaultOnOK="false" linkFormat="0" addHighlights="false" showHighlightCoordinates="true" showHighlights="false" mouseSelectionAddsHighlight="false" outerFilled="false" outerFillColor="0" outerFillTransparent="true" outerFillAlpha="30">
+      <highlightList />
+      <directories />
+      <filenames />
+    </PasteImageHistory>
+    <CopyImageHistory checkeredTransparentBackground="false" filename="image" directory="" onPasteImageTargetRef="3" onPasteLinkText="0" onPasteImageElement="1" onPasteLinkElement="1" onPasteReferenceElement="2" cornerRadius="20" borderColor="0" transparentColor="16777215" borderWidth="1" trimTop="0" trimBottom="0" trimLeft="0" trimRight="0" transparent="false" roundCorners="false" showPreview="true" bordered="false" scaled="false" cropped="false" hideInapplicableOperations="false" preserveLinkFormat="false" scale="50" scalingInterpolation="1" transparentTolerance="0" saveAsDefaultOnOK="false" linkFormat="0" addHighlights="false" showHighlightCoordinates="true" showHighlights="false" mouseSelectionAddsHighlight="false" outerFilled="false" outerFillColor="0" outerFillTransparent="true" outerFillAlpha="30">
+      <highlightList />
+      <directories />
+      <filenames />
+    </CopyImageHistory>
+    <PasteLinkHistory onPasteImageTargetRef="3" onPasteTargetRef="1" onPasteLinkText="0" onPasteImageElement="1" onPasteLinkElement="1" onPasteWikiElement="2" onPasteReferenceElement="2" hideInapplicableOperations="false" preserveLinkFormat="false" useHeadingForLinkText="false" linkFormat="0" saveAsDefaultOnOK="false" />
+    <TableToJsonHistory>
+      <entries />
+    </TableToJsonHistory>
+    <TableSortHistory>
+      <entries />
+    </TableSortHistory>
+  </component>
+</project>

.idea/markdown-navigator.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="FlexmarkProjectSettings">
+    <FlexmarkHtmlSettings flexmarkSpecExampleRendering="0" flexmarkSpecExampleRenderHtml="false">
+      <flexmarkSectionLanguages>
+        <option name="1" value="Markdown" />
+        <option name="2" value="HTML" />
+        <option name="3" value="flexmark-ast:1" />
+      </flexmarkSectionLanguages>
+    </FlexmarkHtmlSettings>
+  </component>
+  <component name="MarkdownProjectSettings">
+    <PreviewSettings splitEditorLayout="SPLIT" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.0" maxImageWidth="0" synchronizePreviewPosition="true" highlightPreviewType="LINE" highlightFadeOut="5" highlightOnTyping="true" synchronizeSourcePosition="true" verticallyAlignSourceAndPreviewSyncPosition="true" showSearchHighlightsInPreview="true" showSelectionInPreview="true" lastLayoutSetsDefault="false">
+      <PanelProvider>
+        <provider providerId="com.vladsch.md.nav.editor.javafx.html.panel" providerName="JavaFX WebView" />
+      </PanelProvider>
+    </PreviewSettings>
+    <ParserSettings gitHubSyntaxChange="false" correctedInvalidSettings="false" emojiShortcuts="1" emojiImages="0">
+      <PegdownExtensions>
+        <option name="ANCHORLINKS" value="true" />
+        <option name="ATXHEADERSPACE" value="true" />
+        <option name="FENCED_CODE_BLOCKS" value="true" />
+        <option name="INTELLIJ_DUMMY_IDENTIFIER" value="true" />
+        <option name="RELAXEDHRULES" value="true" />
+        <option name="STRIKETHROUGH" value="true" />
+        <option name="TABLES" value="true" />
+        <option name="TASKLISTITEMS" value="true" />
+      </PegdownExtensions>
+      <ParserOptions>
+        <option name="COMMONMARK_LISTS" value="true" />
+        <option name="EMOJI_SHORTCUTS" value="true" />
+        <option name="GFM_TABLE_RENDERING" value="true" />
+        <option name="PRODUCTION_SPEC_PARSER" value="true" />
+        <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
+      </ParserOptions>
+    </ParserSettings>
+    <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" addPageHeader="false" imageUriSerials="false" addDocTypeHtml="true" noParaTags="false" plantUmlConversion="0">
+      <GeneratorProvider>
+        <provider providerId="com.vladsch.md.nav.editor.javafx.html.generator" providerName="JavaFx HTML Generator" />
+      </GeneratorProvider>
+      <headerTop />
+      <headerBottom />
+      <bodyTop />
+      <bodyBottom />
+    </HtmlSettings>
+    <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssUriSerial="true" isCssTextEnabled="false" isDynamicPageWidth="true">
+      <StylesheetProvider>
+        <provider providerId="com.vladsch.md.nav.editor.javafx.html.css" providerName="Default JavaFx Stylesheet" />
+      </StylesheetProvider>
+      <ScriptProviders>
+        <provider providerId="com.vladsch.md.nav.editor.hljs.html.script" providerName="HighlightJS Script" />
+      </ScriptProviders>
+      <cssText />
+      <cssUriHistory />
+    </CssSettings>
+  </component>
+</project>

.idea/misc.xml

@@ -1,5 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="ANTLRGenerationPreferences">
+    <option name="perGrammarGenerationSettings">
+      <list>
+        <PerGrammarGenerationSettings>
+          <option name="fileName" value="$PROJECT_DIR$/parser/antlr/prog8.g4" />
+          <option name="autoGen" value="true" />
+          <option name="outputDir" value="$PROJECT_DIR$/parser/src/prog8/parser" />
+          <option name="libDir" value="" />
+          <option name="encoding" value="" />
+          <option name="pkg" value="" />
+          <option name="language" value="" />
+          <option name="generateListener" value="false" />
+        </PerGrammarGenerationSettings>
+      </list>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="Kotlin SDK" project-jdk-type="KotlinSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>

.idea/modules.xml

@@ -2,7 +2,6 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/DeprecatedStackVm/DeprecatedStackVm.iml" filepath="$PROJECT_DIR$/DeprecatedStackVm/DeprecatedStackVm.iml" />
       <module fileurl="file://$PROJECT_DIR$/compiler/compiler.iml" filepath="$PROJECT_DIR$/compiler/compiler.iml" />
       <module fileurl="file://$PROJECT_DIR$/docs/docs.iml" filepath="$PROJECT_DIR$/docs/docs.iml" />
       <module fileurl="file://$PROJECT_DIR$/examples/examples.iml" filepath="$PROJECT_DIR$/examples/examples.iml" />

.idea/vcs.xml

@@ -3,4 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
+</project>

DeprecatedStackVm/DeprecatedStackVm.iml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
-  </component>
-</module>

DeprecatedStackVm/src/compiler/intermediate/Instruction.kt

@@ -1,51 +0,0 @@
-package compiler.intermediate
-
-import prog8.vm.RuntimeValue
-import prog8.vm.stackvm.Syscall
-
-open class Instruction(val opcode: Opcode,
-                       val arg: RuntimeValue? = null,
-                       val arg2: RuntimeValue? = null,
-                       val callLabel: String? = null,
-                       val callLabel2: String? = null)
-{
-    var branchAddress: Int? = null
-
-    override fun toString(): String {
-        val argStr = arg?.toString() ?: ""
-        val result =
-                when {
-                    opcode== Opcode.LINE -> "_line  $callLabel"
-                    opcode== Opcode.INLINE_ASSEMBLY -> {
-                        // inline assembly is not written out (it can't be processed as intermediate language)
-                        // instead, it is converted into a system call that can be intercepted by the vm
-                        if(callLabel!=null)
-                            "syscall  SYSASM.$callLabel\n    return"
-                        else
-                            "inline_assembly"
-                    }
-                    opcode== Opcode.INCLUDE_FILE -> {
-                        "include_file \"$callLabel\" $arg $arg2"
-                    }
-                    opcode== Opcode.SYSCALL -> {
-                        val syscall = Syscall.values().find { it.callNr==arg!!.numericValue() }
-                        "syscall  $syscall"
-                    }
-                    opcode in opcodesWithVarArgument -> {
-                        // opcodes that manipulate a variable
-                        "${opcode.name.toLowerCase()}  ${callLabel?:""}  ${callLabel2?:""}".trimEnd()
-                    }
-                    callLabel==null -> "${opcode.name.toLowerCase()}  $argStr"
-                    else -> "${opcode.name.toLowerCase()}  $callLabel  $argStr"
-                }
-                .trimEnd()
-
-        return "    $result"
-    }
-}
-
-class LabelInstr(val name: String, val asmProc: Boolean) : Instruction(Opcode.NOP, null, null) {
-    override fun toString(): String {
-        return "\n$name:"
-    }
-}

DeprecatedStackVm/src/compiler/intermediate/IntermediateProgram.kt

@@ -1,548 +0,0 @@
-package compiler.intermediate
-
-import prog8.ast.antlr.escape
-import prog8.ast.base.*
-import prog8.ast.expressions.NumericLiteralValue
-import prog8.ast.expressions.ReferenceLiteralValue
-import prog8.ast.statements.StructDecl
-import prog8.ast.statements.VarDecl
-import prog8.ast.statements.ZeropageWish
-import prog8.compiler.CompilerException
-import prog8.compiler.HeapValues
-import prog8.compiler.Zeropage
-import prog8.compiler.ZeropageDepletedError
-import prog8.vm.RuntimeValue
-import java.io.PrintStream
-import java.nio.file.Path
-
-
-class IntermediateProgram(val name: String, var loadAddress: Int, val heap: HeapValues, val source: Path) {
-
-    class VariableParameters (val zp: ZeropageWish, val memberOfStruct: StructDecl?)
-    class Variable(val scopedname: String, val value: RuntimeValue, val params: VariableParameters)
-
-    class ProgramBlock(val name: String,
-                       var address: Int?,
-                       val instructions: MutableList<Instruction> = mutableListOf(),
-                       val variables: MutableList<Variable> = mutableListOf(),
-                       val memoryPointers: MutableMap<String, Pair<Int, DataType>> = mutableMapOf(),
-                       val labels: MutableMap<String, Instruction> = mutableMapOf(),        // names are fully scoped
-                       val force_output: Boolean)
-
-    val allocatedZeropageVariables = mutableMapOf<String, Pair<Int, DataType>>()
-    val blocks = mutableListOf<ProgramBlock>()
-    val memory = mutableMapOf<Int, List<RuntimeValue>>()
-    private lateinit var currentBlock: ProgramBlock
-
-    fun allocateZeropage(zeropage: Zeropage) {          // TODO not used anymore???
-        // allocates all @zp marked variables on the zeropage (for all blocks, as long as there is space in the ZP)
-        var notAllocated = 0
-        for(block in blocks) {
-            val zpVariables = block.variables.filter { it.params.zp==ZeropageWish.REQUIRE_ZEROPAGE || it.params.zp==ZeropageWish.PREFER_ZEROPAGE }
-            if (zpVariables.isNotEmpty()) {
-                for (variable in zpVariables) {
-                    if(variable.params.zp==ZeropageWish.NOT_IN_ZEROPAGE || variable.params.memberOfStruct!=null)
-                        throw CompilerException("zp conflict")
-                    try {
-                        val address = zeropage.allocate(variable.scopedname, variable.value.type, null)
-                        allocatedZeropageVariables[variable.scopedname] = Pair(address, variable.value.type)
-                    } catch (x: ZeropageDepletedError) {
-                        printWarning(x.toString() + " variable ${variable.scopedname} type ${variable.value.type}")
-                        notAllocated++
-                    }
-                }
-            }
-        }
-        if(notAllocated>0)
-            printWarning("$notAllocated variables marked for Zeropage could not be allocated there")
-    }
-
-    fun optimize() {
-        println("Optimizing stackVM code...")
-        // remove nops (that are not a label)
-        for (blk in blocks) {
-            blk.instructions.removeIf { it.opcode== Opcode.NOP && it !is LabelInstr }
-        }
-
-        optimizeDataConversionAndUselessDiscards()
-        optimizeVariableCopying()
-        optimizeMultipleSequentialLineInstrs()
-        optimizeCallReturnIntoJump()
-        optimizeConditionalBranches()
-        // todo: add more optimizations to intermediate code!
-
-        optimizeRemoveNops()    //  must be done as the last step
-        optimizeMultipleSequentialLineInstrs()      // once more
-        optimizeRemoveNops()    // once more
-    }
-
-    private fun optimizeConditionalBranches() {
-        // conditional branches that consume the value on the stack
-        // sometimes these are just constant values, so we can statically determine the branch
-        // or, they are preceded by a NOT instruction so we can simply remove that and flip the branch condition
-        val pushvalue = setOf(Opcode.PUSH_BYTE, Opcode.PUSH_WORD)
-        val notvalue = setOf(Opcode.NOT_BYTE, Opcode.NOT_WORD)
-        val branchOpcodes = setOf(Opcode.JZ, Opcode.JNZ, Opcode.JZW, Opcode.JNZW)
-        for(blk in blocks) {
-            val instructionsToReplace = mutableMapOf<Int, Instruction>()
-            blk.instructions.asSequence().withIndex().filter {it.value.opcode!= Opcode.LINE }.windowed(2).toList().forEach {
-                if (it[1].value.opcode in branchOpcodes) {
-                    if (it[0].value.opcode in pushvalue) {
-                        val value = it[0].value.arg!!.asBoolean
-                        instructionsToReplace[it[0].index] = Instruction(Opcode.NOP)
-                        val replacement: Instruction =
-                                if (value) {
-                                    when (it[1].value.opcode) {
-                                        Opcode.JNZ -> Instruction(Opcode.JUMP, callLabel = it[1].value.callLabel)
-                                        Opcode.JNZW -> Instruction(Opcode.JUMP, callLabel = it[1].value.callLabel)
-                                        else -> Instruction(Opcode.NOP)
-                                    }
-                                } else {
-                                    when (it[1].value.opcode) {
-                                        Opcode.JZ -> Instruction(Opcode.JUMP, callLabel = it[1].value.callLabel)
-                                        Opcode.JZW -> Instruction(Opcode.JUMP, callLabel = it[1].value.callLabel)
-                                        else -> Instruction(Opcode.NOP)
-                                    }
-                                }
-                        instructionsToReplace[it[1].index] = replacement
-                    }
-                    else if (it[0].value.opcode in notvalue) {
-                        instructionsToReplace[it[0].index] = Instruction(Opcode.NOP)
-                        val replacement: Instruction =
-                                when (it[1].value.opcode) {
-                                    Opcode.JZ -> Instruction(Opcode.JNZ, callLabel = it[1].value.callLabel)
-                                    Opcode.JZW -> Instruction(Opcode.JNZW, callLabel = it[1].value.callLabel)
-                                    Opcode.JNZ -> Instruction(Opcode.JZ, callLabel = it[1].value.callLabel)
-                                    Opcode.JNZW -> Instruction(Opcode.JZW, callLabel = it[1].value.callLabel)
-                                    else -> Instruction(Opcode.NOP)
-                                }
-                        instructionsToReplace[it[1].index] = replacement
-                    }
-                }
-            }
-
-            for (rins in instructionsToReplace) {
-                blk.instructions[rins.key] = rins.value
-            }
-        }
-    }
-
-    private fun optimizeRemoveNops() {
-        // remove nops (that are not a label)
-        for (blk in blocks)
-            blk.instructions.removeIf { it.opcode== Opcode.NOP && it !is LabelInstr }
-    }
-
-    private fun optimizeCallReturnIntoJump() {
-        // replaces call X followed by return, by jump X
-        for(blk in blocks) {
-            val instructionsToReplace = mutableMapOf<Int, Instruction>()
-
-            blk.instructions.asSequence().withIndex().filter {it.value.opcode!= Opcode.LINE }.windowed(2).toList().forEach {
-                if(it[0].value.opcode== Opcode.CALL && it[1].value.opcode== Opcode.RETURN) {
-                    instructionsToReplace[it[1].index] = Instruction(Opcode.JUMP, callLabel = it[0].value.callLabel)
-                    instructionsToReplace[it[0].index] = Instruction(Opcode.NOP)
-                }
-            }
-
-            for (rins in instructionsToReplace) {
-                blk.instructions[rins.key] = rins.value
-            }
-        }
-    }
-
-    private fun optimizeMultipleSequentialLineInstrs() {
-        for(blk in blocks) {
-            val instructionsToReplace = mutableMapOf<Int, Instruction>()
-
-            blk.instructions.asSequence().withIndex().windowed(2).toList().forEach {
-                if (it[0].value.opcode == Opcode.LINE && it[1].value.opcode == Opcode.LINE)
-                    instructionsToReplace[it[0].index] = Instruction(Opcode.NOP)
-            }
-
-            for (rins in instructionsToReplace) {
-                blk.instructions[rins.key] = rins.value
-            }
-        }
-    }
-
-    private fun optimizeVariableCopying() {
-        for(blk in blocks) {
-
-            val instructionsToReplace = mutableMapOf<Int, Instruction>()
-
-            blk.instructions.asSequence().withIndex().windowed(2).toList().forEach {
-                when (it[0].value.opcode) {
-                    Opcode.PUSH_VAR_BYTE ->
-                        if (it[1].value.opcode == Opcode.POP_VAR_BYTE) {
-                            if (it[0].value.callLabel == it[1].value.callLabel) {
-                                instructionsToReplace[it[0].index] = Instruction(Opcode.NOP)
-                                instructionsToReplace[it[1].index] = Instruction(Opcode.NOP)
-                            }
-                        }
-                    Opcode.PUSH_VAR_WORD ->
-                        if (it[1].value.opcode == Opcode.POP_VAR_WORD) {
-                            if (it[0].value.callLabel == it[1].value.callLabel) {
-                                instructionsToReplace[it[0].index] = Instruction(Opcode.NOP)
-                                instructionsToReplace[it[1].index] = Instruction(Opcode.NOP)
-                            }
-                        }
-                    Opcode.PUSH_VAR_FLOAT ->
-                        if (it[1].value.opcode == Opcode.POP_VAR_FLOAT) {
-                            if (it[0].value.callLabel == it[1].value.callLabel) {
-                                instructionsToReplace[it[0].index] = Instruction(Opcode.NOP)
-                                instructionsToReplace[it[1].index] = Instruction(Opcode.NOP)
-                            }
-                        }
-                    Opcode.PUSH_MEM_B, Opcode.PUSH_MEM_UB ->
-                        if(it[1].value.opcode == Opcode.POP_MEM_BYTE) {
-                            if(it[0].value.arg == it[1].value.arg) {
-                                instructionsToReplace[it[0].index] = Instruction(Opcode.NOP)
-                                instructionsToReplace[it[1].index] = Instruction(Opcode.NOP)
-                            }
-                        }
-                    Opcode.PUSH_MEM_W, Opcode.PUSH_MEM_UW ->
-                        if(it[1].value.opcode == Opcode.POP_MEM_WORD) {
-                            if(it[0].value.arg == it[1].value.arg) {
-                                instructionsToReplace[it[0].index] = Instruction(Opcode.NOP)
-                                instructionsToReplace[it[1].index] = Instruction(Opcode.NOP)
-                            }
-                        }
-                    Opcode.PUSH_MEM_FLOAT ->
-                        if(it[1].value.opcode == Opcode.POP_MEM_FLOAT) {
-                            if(it[0].value.arg == it[1].value.arg) {
-                                instructionsToReplace[it[0].index] = Instruction(Opcode.NOP)
-                                instructionsToReplace[it[1].index] = Instruction(Opcode.NOP)
-                            }
-                        }
-                    else -> {}
-                }
-            }
-
-            for (rins in instructionsToReplace) {
-                blk.instructions[rins.key] = rins.value
-            }
-        }
-    }
-
-    private fun optimizeDataConversionAndUselessDiscards() {
-        // - push value followed by a data type conversion -> push the value in the correct type and remove the conversion
-        // - push something followed by a discard -> remove both
-        val instructionsToReplace = mutableMapOf<Int, Instruction>()
-
-        fun optimizeDiscardAfterPush(index0: Int, index1: Int, ins1: Instruction) {
-            if (ins1.opcode == Opcode.DISCARD_FLOAT || ins1.opcode == Opcode.DISCARD_WORD || ins1.opcode == Opcode.DISCARD_BYTE) {
-                instructionsToReplace[index0] = Instruction(Opcode.NOP)
-                instructionsToReplace[index1] = Instruction(Opcode.NOP)
-            }
-        }
-
-        fun optimizeFloatConversion(index0: Int, index1: Int, ins1: Instruction) {
-            when (ins1.opcode) {
-                Opcode.DISCARD_FLOAT -> {
-                    instructionsToReplace[index0] = Instruction(Opcode.NOP)
-                    instructionsToReplace[index1] = Instruction(Opcode.NOP)
-                }
-                Opcode.DISCARD_BYTE, Opcode.DISCARD_WORD -> throw CompilerException("invalid discard type following a float")
-                else -> throw CompilerException("invalid conversion opcode ${ins1.opcode} following a float")
-            }
-        }
-
-        fun optimizeWordConversion(index0: Int, ins0: Instruction, index1: Int, ins1: Instruction) {
-            when (ins1.opcode) {
-                Opcode.CAST_UW_TO_B, Opcode.CAST_W_TO_B -> {
-                    val ins = Instruction(Opcode.PUSH_BYTE, ins0.arg!!.cast(DataType.BYTE))
-                    instructionsToReplace[index0] = ins
-                    instructionsToReplace[index1] = Instruction(Opcode.NOP)
-                }
-                Opcode.CAST_W_TO_UB, Opcode.CAST_UW_TO_UB -> {
-                    val ins = Instruction(Opcode.PUSH_BYTE, RuntimeValue(DataType.UBYTE, ins0.arg!!.integerValue() and 255))
-                    instructionsToReplace[index0] = ins
-                    instructionsToReplace[index1] = Instruction(Opcode.NOP)
-                }
-                Opcode.MSB -> {
-                    val ins = Instruction(Opcode.PUSH_BYTE, RuntimeValue(DataType.UBYTE, ins0.arg!!.integerValue() ushr 8 and 255))
-                    instructionsToReplace[index0] = ins
-                    instructionsToReplace[index1] = Instruction(Opcode.NOP)
-                }
-                Opcode.CAST_W_TO_F, Opcode.CAST_UW_TO_F -> {
-                    val ins = Instruction(Opcode.PUSH_FLOAT, RuntimeValue(DataType.FLOAT, ins0.arg!!.integerValue().toDouble()))
-                    instructionsToReplace[index0] = ins
-                    instructionsToReplace[index1] = Instruction(Opcode.NOP)
-                }
-                Opcode.CAST_UW_TO_W -> {
-                    val cv = ins0.arg!!.cast(DataType.WORD)
-                    instructionsToReplace[index0] = Instruction(Opcode.PUSH_WORD, cv)
-                    instructionsToReplace[index1] = Instruction(Opcode.NOP)
-                }
-                Opcode.CAST_W_TO_UW -> {
-                    val cv = ins0.arg!!.cast(DataType.UWORD)
-                    instructionsToReplace[index0] = Instruction(Opcode.PUSH_WORD, cv)
-                    instructionsToReplace[index1] = Instruction(Opcode.NOP)
-                }
-                Opcode.DISCARD_WORD -> {
-                    instructionsToReplace[index0] = Instruction(Opcode.NOP)
-                    instructionsToReplace[index1] = Instruction(Opcode.NOP)
-                }
-                Opcode.DISCARD_BYTE, Opcode.DISCARD_FLOAT -> throw CompilerException("invalid discard type following a byte")
-                else -> throw CompilerException("invalid conversion opcode ${ins1.opcode} following a word")
-            }
-        }
-
-        fun optimizeByteConversion(index0: Int, ins0: Instruction, index1: Int, ins1: Instruction) {
-            when (ins1.opcode) {
-                Opcode.CAST_B_TO_UB, Opcode.CAST_UB_TO_B,
-                Opcode.CAST_W_TO_B, Opcode.CAST_W_TO_UB,
-                Opcode.CAST_UW_TO_B, Opcode.CAST_UW_TO_UB -> instructionsToReplace[index1] = Instruction(Opcode.NOP)
-                Opcode.MSB -> throw CompilerException("msb of a byte")
-                Opcode.CAST_UB_TO_UW -> {
-                    val ins = Instruction(Opcode.PUSH_WORD, RuntimeValue(DataType.UWORD, ins0.arg!!.integerValue()))
-                    instructionsToReplace[index0] = ins
-                    instructionsToReplace[index1] = Instruction(Opcode.NOP)
-                }
-                Opcode.CAST_B_TO_W -> {
-                    val ins = Instruction(Opcode.PUSH_WORD, RuntimeValue(DataType.WORD, ins0.arg!!.integerValue()))
-                    instructionsToReplace[index0] = ins
-                    instructionsToReplace[index1] = Instruction(Opcode.NOP)
-                }
-                Opcode.CAST_B_TO_UW -> {
-                    val ins = Instruction(Opcode.PUSH_WORD, ins0.arg!!.cast(DataType.UWORD))
-                    instructionsToReplace[index0] = ins
-                    instructionsToReplace[index1] = Instruction(Opcode.NOP)
-                }
-                Opcode.CAST_UB_TO_W -> {
-                    val ins = Instruction(Opcode.PUSH_WORD, ins0.arg!!.cast(DataType.WORD))
-                    instructionsToReplace[index0] = ins
-                    instructionsToReplace[index1] = Instruction(Opcode.NOP)
-                }
-                Opcode.CAST_B_TO_F, Opcode.CAST_UB_TO_F -> {
-                    val ins = Instruction(Opcode.PUSH_FLOAT, RuntimeValue(DataType.FLOAT, ins0.arg!!.integerValue().toDouble()))
-                    instructionsToReplace[index0] = ins
-                    instructionsToReplace[index1] = Instruction(Opcode.NOP)
-                }
-                Opcode.CAST_W_TO_F, Opcode.CAST_UW_TO_F -> throw CompilerException("invalid conversion following a byte")
-                Opcode.DISCARD_BYTE -> {
-                    instructionsToReplace[index0] = Instruction(Opcode.NOP)
-                    instructionsToReplace[index1] = Instruction(Opcode.NOP)
-                }
-                Opcode.DISCARD_WORD, Opcode.DISCARD_FLOAT -> throw CompilerException("invalid discard type following a byte")
-                Opcode.MKWORD -> {}
-                else -> throw CompilerException("invalid conversion opcode ${ins1.opcode}")
-            }
-        }
-
-        for(blk in blocks) {
-            instructionsToReplace.clear()
-
-            val typeConversionOpcodes = setOf(
-                    Opcode.MSB,
-                    Opcode.MKWORD,
-                    Opcode.CAST_UB_TO_B,
-                    Opcode.CAST_UB_TO_UW,
-                    Opcode.CAST_UB_TO_W,
-                    Opcode.CAST_UB_TO_F,
-                    Opcode.CAST_B_TO_UB,
-                    Opcode.CAST_B_TO_UW,
-                    Opcode.CAST_B_TO_W,
-                    Opcode.CAST_B_TO_F,
-                    Opcode.CAST_UW_TO_UB,
-                    Opcode.CAST_UW_TO_B,
-                    Opcode.CAST_UW_TO_W,
-                    Opcode.CAST_UW_TO_F,
-                    Opcode.CAST_W_TO_UB,
-                    Opcode.CAST_W_TO_B,
-                    Opcode.CAST_W_TO_UW,
-                    Opcode.CAST_W_TO_F,
-                    Opcode.CAST_F_TO_UB,
-                    Opcode.CAST_F_TO_B,
-                    Opcode.CAST_F_TO_UW,
-                    Opcode.CAST_F_TO_W,
-                    Opcode.DISCARD_BYTE,
-                    Opcode.DISCARD_WORD,
-                    Opcode.DISCARD_FLOAT
-            )
-            blk.instructions.asSequence().withIndex().windowed(2).toList().forEach {
-                if (it[1].value.opcode in typeConversionOpcodes) {
-                    when (it[0].value.opcode) {
-                        Opcode.PUSH_BYTE -> optimizeByteConversion(it[0].index, it[0].value, it[1].index, it[1].value)
-                        Opcode.PUSH_WORD -> optimizeWordConversion(it[0].index, it[0].value, it[1].index, it[1].value)
-                        Opcode.PUSH_FLOAT -> optimizeFloatConversion(it[0].index, it[1].index, it[1].value)
-                        Opcode.PUSH_VAR_FLOAT,
-                        Opcode.PUSH_VAR_WORD,
-                        Opcode.PUSH_VAR_BYTE,
-                        Opcode.PUSH_MEM_B, Opcode.PUSH_MEM_UB,
-                        Opcode.PUSH_MEM_W, Opcode.PUSH_MEM_UW,
-                        Opcode.PUSH_MEM_FLOAT -> optimizeDiscardAfterPush(it[0].index, it[1].index, it[1].value)
-                        else -> {
-                        }
-                    }
-                }
-            }
-
-            for (rins in instructionsToReplace) {
-                blk.instructions[rins.key] = rins.value
-            }
-        }
-    }
-
-    fun variable(scopedname: String, decl: VarDecl) {
-        when(decl.type) {
-            VarDeclType.VAR -> {
-                // var decls that are defined inside of a StructDecl are skipped in the output
-                //   because every occurrence of the members will have a separate mangled vardecl for that occurrence
-                if(decl.parent is StructDecl)
-                    return
-
-                val valueparams = VariableParameters(decl.zeropage, decl.struct)
-                val value = when(decl.datatype) {
-                    in NumericDatatypes -> {
-                        RuntimeValue(decl.datatype, (decl.value as NumericLiteralValue).number)
-                    }
-                    in StringDatatypes -> {
-                        val litval = (decl.value as ReferenceLiteralValue)
-                        if(litval.heapId==null)
-                            throw CompilerException("string should already be in the heap")
-                        RuntimeValue(decl.datatype, heapId = litval.heapId)
-                    }
-                    in ArrayDatatypes -> {
-                        val litval = (decl.value as? ReferenceLiteralValue)
-                        if(litval!=null && litval.heapId==null)
-                            throw CompilerException("array should already be in the heap")
-                        if(litval!=null){
-                            RuntimeValue(decl.datatype, heapId = litval.heapId)
-                        } else {
-                            throw CompilerException("initialization value expected")
-                        }
-                    }
-                    DataType.STRUCT -> {
-                        // struct variables have been flattened already
-                        return
-                    }
-                    else -> throw CompilerException("weird datatype")
-                }
-                currentBlock.variables.add(Variable(scopedname, value, valueparams))
-            }
-            VarDeclType.MEMORY -> {
-                // note that constants are all folded away, but assembly code may still refer to them
-                val lv = decl.value as NumericLiteralValue
-                if(lv.type!= DataType.UWORD && lv.type!= DataType.UBYTE)
-                    throw CompilerException("expected integer memory address $lv")
-                currentBlock.memoryPointers[scopedname] = Pair(lv.number.toInt(), decl.datatype)
-            }
-            VarDeclType.CONST -> {
-                // note that constants are all folded away, but assembly code may still refer to them (if their integers)
-                // floating point constants are not generated at all!!
-                val lv = decl.value as NumericLiteralValue
-                if(lv.type in IntegerDatatypes)
-                    currentBlock.memoryPointers[scopedname] = Pair(lv.number.toInt(), decl.datatype)
-            }
-        }
-    }
-
-    fun instr(opcode: Opcode, arg: RuntimeValue? = null, arg2: RuntimeValue? = null, callLabel: String? = null, callLabel2: String? = null) {
-        currentBlock.instructions.add(Instruction(opcode, arg, arg2, callLabel, callLabel2))
-    }
-
-    fun label(labelname: String, asmProc: Boolean=false) {
-        val instr = LabelInstr(labelname, asmProc)
-        currentBlock.instructions.add(instr)
-        currentBlock.labels[labelname] = instr
-    }
-
-    fun line(position: Position) {
-        currentBlock.instructions.add(Instruction(Opcode.LINE, callLabel = "${position.line} ${position.file}"))
-    }
-
-    fun removeLastInstruction() {
-        currentBlock.instructions.removeAt(currentBlock.instructions.lastIndex)
-    }
-
-    fun memoryPointer(name: String, address: Int, datatype: DataType) {
-        currentBlock.memoryPointers[name] = Pair(address, datatype)
-    }
-
-    fun newBlock(name: String, address: Int?, options: Set<String>) {
-        currentBlock = ProgramBlock(name, address, force_output = "force_output" in options)
-        blocks.add(currentBlock)
-    }
-
-    fun writeCode(out: PrintStream, embeddedLabels: Boolean=true) {
-        out.println("; stackVM program code for '$name'")
-        writeMemory(out)
-        writeHeap(out)
-        for(blk in blocks) {
-            writeBlock(out, blk, embeddedLabels)
-        }
-    }
-
-    private fun writeHeap(out: PrintStream) {
-        out.println("%heap")
-        heap.allEntries().forEach {
-            out.print("${it.key}  ${it.value.type.name.toLowerCase()}  ")
-            when {
-                it.value.str!=null ->
-                    out.println("\"${escape(it.value.str!!)}\"")
-                it.value.array!=null -> {
-                    // this array can contain both normal integers, and pointer values
-                    val arrayvalues = it.value.array!!.map { av ->
-                        when {
-                            av.integer!=null -> av.integer.toString()
-                            av.addressOf!=null -> {
-                                if(av.addressOf.scopedname==null)
-                                    throw CompilerException("AddressOf scopedname should have been set")
-                                else
-                                    "&${av.addressOf.scopedname}"
-                            }
-                            else -> throw CompilerException("weird array value")
-                        }
-                    }
-                    out.println(arrayvalues)
-                }
-                it.value.doubleArray!=null ->
-                    out.println(it.value.doubleArray!!.toList())
-                else -> throw CompilerException("invalid heap entry $it")
-            }
-        }
-        out.println("%end_heap")
-    }
-
-    private fun writeBlock(out: PrintStream, blk: ProgramBlock, embeddedLabels: Boolean) {
-        out.println("\n%block ${blk.name} ${blk.address?.toString(16) ?: ""}")
-
-        out.println("%variables")
-        for (variable in blk.variables) {
-            if(variable.params.zp==ZeropageWish.REQUIRE_ZEROPAGE)
-                throw CompilerException("zp conflict")
-            val valuestr = variable.value.toString()
-            val struct =  if(variable.params.memberOfStruct==null) "" else "struct=${variable.params.memberOfStruct.name}"
-            out.println("${variable.scopedname}  ${variable.value.type.name.toLowerCase()}  $valuestr  zp=${variable.params.zp} s=$struct")
-        }
-        out.println("%end_variables")
-        out.println("%memorypointers")
-        for (iconst in blk.memoryPointers) {
-            out.println("${iconst.key}  ${iconst.value.second.name.toLowerCase()}  uw:${iconst.value.first.toString(16)}")
-        }
-        out.println("%end_memorypointers")
-        out.println("%instructions")
-        val labels = blk.labels.entries.associateBy({ it.value }) { it.key }
-        for (instr in blk.instructions) {
-            if (!embeddedLabels) {
-                val label = labels[instr]
-                if (label != null)
-                    out.println("$label:")
-            } else {
-                out.println(instr)
-            }
-        }
-        out.println("%end_instructions")
-
-        out.println("%end_block")
-    }
-
-    private fun writeMemory(out: PrintStream) {
-        out.println("%memory")
-        if (memory.isNotEmpty())
-            TODO("add support for writing/reading initial memory values")
-        out.println("%end_memory")
-    }
-}

DeprecatedStackVm/src/compiler/intermediate/Opcode.kt

@@ -1,291 +0,0 @@
-package compiler.intermediate
-
-enum class Opcode {
-
-    // pushing values on the (evaluation) stack
-    PUSH_BYTE,       // push byte value
-    PUSH_WORD,       // push word value   (or 'address' of string / array)
-    PUSH_FLOAT,      // push float value
-    PUSH_MEM_B,      // push byte value from memory to stack
-    PUSH_MEM_UB,     // push unsigned byte value from memory to stack
-    PUSH_MEM_W,      // push word value from memory to stack
-    PUSH_MEM_UW,     // push unsigned word value from memory to stack
-    PUSH_MEM_FLOAT,  // push float value from memory to stack
-    PUSH_MEMREAD,    // push memory value from address that's on the stack
-    PUSH_VAR_BYTE,   // push byte variable (ubyte, byte)
-    PUSH_VAR_WORD,   // push word variable (uword, word)
-    PUSH_VAR_FLOAT,  // push float variable
-    PUSH_REGAX_WORD, // push registers A/X as a 16-bit word
-    PUSH_REGAY_WORD, // push registers A/Y as a 16-bit word
-    PUSH_REGXY_WORD, // push registers X/Y as a 16-bit word
-    PUSH_ADDR_HEAPVAR,  // push the address of the variable that's on the heap (string or array)
-    DUP_B,          // duplicate the top byte on the stack
-    DUP_W,          // duplicate the top word on the stack
-
-    // popping values off the (evaluation) stack, possibly storing them in another location
-    DISCARD_BYTE,    // discard top byte value
-    DISCARD_WORD,    // discard top word value
-    DISCARD_FLOAT,   // discard top float value
-    POP_MEM_BYTE,    // pop (u)byte value into destination memory address
-    POP_MEM_WORD,    // pop (u)word value into destination memory address
-    POP_MEM_FLOAT,   // pop float value into destination memory address
-    POP_MEMWRITE,    // pop address and byte stack and write the byte to the memory address
-    POP_VAR_BYTE,    // pop (u)byte value into variable
-    POP_VAR_WORD,    // pop (u)word value into variable
-    POP_VAR_FLOAT,   // pop float value into variable
-    POP_REGAX_WORD,  // pop uword from stack into A/X registers
-    POP_REGAY_WORD,  // pop uword from stack into A/Y registers
-    POP_REGXY_WORD,  // pop uword from stack into X/Y registers
-
-    // numeric arithmetic
-    ADD_UB,
-    ADD_B,
-    ADD_UW,
-    ADD_W,
-    ADD_F,
-    SUB_UB,
-    SUB_B,
-    SUB_UW,
-    SUB_W,
-    SUB_F,
-    MUL_UB,
-    MUL_B,
-    MUL_UW,
-    MUL_W,
-    MUL_F,
-    IDIV_UB,
-    IDIV_B,
-    IDIV_UW,
-    IDIV_W,
-    DIV_F,
-    REMAINDER_UB,   // signed remainder is undefined/unimplemented
-    REMAINDER_UW,   // signed remainder is undefined/unimplemented
-    POW_F,
-    NEG_B,
-    NEG_W,
-    NEG_F,
-    ABS_B,
-    ABS_W,
-    ABS_F,
-
-    // bit shifts and bitwise arithmetic
-    SHIFTEDL_BYTE,      // shifts stack value rather than in-place mem/var
-    SHIFTEDL_WORD,      // shifts stack value rather than in-place mem/var
-    SHIFTEDR_UBYTE,     // shifts stack value rather than in-place mem/var
-    SHIFTEDR_SBYTE,     // shifts stack value rather than in-place mem/var
-    SHIFTEDR_UWORD,     // shifts stack value rather than in-place mem/var
-    SHIFTEDR_SWORD,     // shifts stack value rather than in-place mem/var
-    SHL_BYTE,
-    SHL_WORD,
-    SHL_MEM_BYTE,
-    SHL_MEM_WORD,
-    SHL_VAR_BYTE,
-    SHL_VAR_WORD,
-    SHR_UBYTE,
-    SHR_SBYTE,
-    SHR_UWORD,
-    SHR_SWORD,
-    SHR_MEM_UBYTE,
-    SHR_MEM_SBYTE,
-    SHR_MEM_UWORD,
-    SHR_MEM_SWORD,
-    SHR_VAR_UBYTE,
-    SHR_VAR_SBYTE,
-    SHR_VAR_UWORD,
-    SHR_VAR_SWORD,
-    ROL_BYTE,
-    ROL_WORD,
-    ROL_MEM_BYTE,
-    ROL_MEM_WORD,
-    ROL_VAR_BYTE,
-    ROL_VAR_WORD,
-    ROR_BYTE,
-    ROR_WORD,
-    ROR_MEM_BYTE,
-    ROR_MEM_WORD,
-    ROR_VAR_BYTE,
-    ROR_VAR_WORD,
-    ROL2_BYTE,
-    ROL2_WORD,
-    ROL2_MEM_BYTE,
-    ROL2_MEM_WORD,
-    ROL2_VAR_BYTE,
-    ROL2_VAR_WORD,
-    ROR2_BYTE,
-    ROR2_WORD,
-    ROR2_MEM_BYTE,
-    ROR2_MEM_WORD,
-    ROR2_VAR_BYTE,
-    ROR2_VAR_WORD,
-    BITAND_BYTE,
-    BITAND_WORD,
-    BITOR_BYTE,
-    BITOR_WORD,
-    BITXOR_BYTE,
-    BITXOR_WORD,
-    INV_BYTE,
-    INV_WORD,
-
-    // numeric type conversions
-    MSB,        // note: lsb is equivalent to  CAST_UW_TO_UB  or CAST_W_TO_UB
-    MKWORD,        // create a word from lsb + msb
-    CAST_UB_TO_B,
-    CAST_UB_TO_UW,
-    CAST_UB_TO_W,
-    CAST_UB_TO_F,
-    CAST_B_TO_UB,
-    CAST_B_TO_UW,
-    CAST_B_TO_W,
-    CAST_B_TO_F,
-    CAST_W_TO_UB,
-    CAST_W_TO_B,
-    CAST_W_TO_UW,
-    CAST_W_TO_F,
-    CAST_UW_TO_UB,
-    CAST_UW_TO_B,
-    CAST_UW_TO_W,
-    CAST_UW_TO_F,
-    CAST_F_TO_UB,
-    CAST_F_TO_B,
-    CAST_F_TO_UW,
-    CAST_F_TO_W,
-
-    // logical operations
-    AND_BYTE,
-    AND_WORD,
-    OR_BYTE,
-    OR_WORD,
-    XOR_BYTE,
-    XOR_WORD,
-    NOT_BYTE,
-    NOT_WORD,
-
-    // increment, decrement
-    INC_VAR_B,
-    INC_VAR_UB,
-    INC_VAR_W,
-    INC_VAR_UW,
-    INC_VAR_F,
-    DEC_VAR_B,
-    DEC_VAR_UB,
-    DEC_VAR_W,
-    DEC_VAR_UW,
-    DEC_VAR_F,
-    INC_MEMORY,             // increment direct address
-    DEC_MEMORY,             // decrement direct address
-    POP_INC_MEMORY,         // increment address from stack
-    POP_DEC_MEMORY,         // decrement address from address
-
-    // comparisons
-    LESS_B,
-    LESS_UB,
-    LESS_W,
-    LESS_UW,
-    LESS_F,
-    GREATER_B,
-    GREATER_UB,
-    GREATER_W,
-    GREATER_UW,
-    GREATER_F,
-    LESSEQ_B,
-    LESSEQ_UB,
-    LESSEQ_W,
-    LESSEQ_UW,
-    LESSEQ_F,
-    GREATEREQ_B,
-    GREATEREQ_UB,
-    GREATEREQ_W,
-    GREATEREQ_UW,
-    GREATEREQ_F,
-    EQUAL_BYTE,
-    EQUAL_WORD,
-    EQUAL_F,
-    NOTEQUAL_BYTE,
-    NOTEQUAL_WORD,
-    NOTEQUAL_F,
-    CMP_B,          // sets processor status flags based on comparison, instead of pushing a result value
-    CMP_UB,         // sets processor status flags based on comparison, instead of pushing a result value
-    CMP_W,          // sets processor status flags based on comparison, instead of pushing a result value
-    CMP_UW,         // sets processor status flags based on comparison, instead of pushing a result value
-
-    // array access and simple manipulations
-    READ_INDEXED_VAR_BYTE,
-    READ_INDEXED_VAR_WORD,
-    READ_INDEXED_VAR_FLOAT,
-    WRITE_INDEXED_VAR_BYTE,
-    WRITE_INDEXED_VAR_WORD,
-    WRITE_INDEXED_VAR_FLOAT,
-    INC_INDEXED_VAR_B,
-    INC_INDEXED_VAR_UB,
-    INC_INDEXED_VAR_W,
-    INC_INDEXED_VAR_UW,
-    INC_INDEXED_VAR_FLOAT,
-    DEC_INDEXED_VAR_B,
-    DEC_INDEXED_VAR_UB,
-    DEC_INDEXED_VAR_W,
-    DEC_INDEXED_VAR_UW,
-    DEC_INDEXED_VAR_FLOAT,
-
-    // branching, without consuming a value from the stack
-    JUMP,
-    BCS,       // branch if carry set
-    BCC,       // branch if carry clear
-    BZ,        // branch if zero flag
-    BNZ,       // branch if not zero flag
-    BNEG,      // branch if negative flag
-    BPOS,      // branch if not negative flag
-    BVS,       // branch if overflow flag
-    BVC,       // branch if not overflow flag
-    // branching, based on value on the stack (which is consumed)
-    JZ,         // branch if value is zero (byte)
-    JNZ,        // branch if value is not zero (byte)
-    JZW,         // branch if value is zero (word)
-    JNZW,        // branch if value is not zero (word)
-
-    // subroutines
-    CALL,
-    RETURN,
-    SYSCALL,
-    START_PROCDEF,
-    END_PROCDEF,
-
-    // misc
-    SEC,        // set carry status flag  NOTE: is mostly fake, carry flag is not affected by any numeric operations
-    CLC,        // clear carry status flag  NOTE: is mostly fake, carry flag is not affected by any numeric operations
-    SEI,        // set irq-disable status flag
-    CLI,        // clear irq-disable status flag
-    CARRY_TO_A, // load var/register A with carry status bit
-    RSAVE,      // save all internal registers and status flags
-    RSAVEX,     // save just X (the evaluation stack pointer)
-    RRESTORE,   // restore all internal registers and status flags
-    RRESTOREX,  // restore just X (the evaluation stack pointer)
-
-    NOP,        // do nothing
-    BREAKPOINT, // breakpoint
-    TERMINATE,  // end the program
-    LINE,       // track source file line number
-    INLINE_ASSEMBLY,        // container to hold inline raw assembly code
-    INCLUDE_FILE            // directive to include a file at this position in the memory of the program
-}
-
-val opcodesWithVarArgument = setOf(
-        Opcode.INC_VAR_B, Opcode.INC_VAR_W, Opcode.DEC_VAR_B, Opcode.DEC_VAR_W,
-        Opcode.INC_VAR_UB, Opcode.INC_VAR_UW, Opcode.DEC_VAR_UB, Opcode.DEC_VAR_UW,
-        Opcode.SHR_VAR_SBYTE, Opcode.SHR_VAR_UBYTE, Opcode.SHR_VAR_SWORD, Opcode.SHR_VAR_UWORD,
-        Opcode.SHL_VAR_BYTE, Opcode.SHL_VAR_WORD,
-        Opcode.ROL_VAR_BYTE, Opcode.ROL_VAR_WORD, Opcode.ROR_VAR_BYTE, Opcode.ROR_VAR_WORD,
-        Opcode.ROL2_VAR_BYTE, Opcode.ROL2_VAR_WORD, Opcode.ROR2_VAR_BYTE, Opcode.ROR2_VAR_WORD,
-        Opcode.POP_VAR_BYTE, Opcode.POP_VAR_WORD, Opcode.POP_VAR_FLOAT,
-        Opcode.PUSH_VAR_BYTE, Opcode.PUSH_VAR_WORD, Opcode.PUSH_VAR_FLOAT, Opcode.PUSH_ADDR_HEAPVAR,
-        Opcode.READ_INDEXED_VAR_BYTE, Opcode.READ_INDEXED_VAR_WORD, Opcode.READ_INDEXED_VAR_FLOAT,
-        Opcode.WRITE_INDEXED_VAR_BYTE, Opcode.WRITE_INDEXED_VAR_WORD, Opcode.WRITE_INDEXED_VAR_FLOAT,
-        Opcode.INC_INDEXED_VAR_UB, Opcode.INC_INDEXED_VAR_B, Opcode.INC_INDEXED_VAR_UW,
-        Opcode.INC_INDEXED_VAR_W, Opcode.INC_INDEXED_VAR_FLOAT,
-        Opcode.DEC_INDEXED_VAR_UB, Opcode.DEC_INDEXED_VAR_B, Opcode.DEC_INDEXED_VAR_UW,
-        Opcode.DEC_INDEXED_VAR_W, Opcode.DEC_INDEXED_VAR_FLOAT
-)
-
-val branchOpcodes = setOf(
-        Opcode.BCS, Opcode.BCC, Opcode.BZ, Opcode.BNZ,
-        Opcode.BNEG, Opcode.BPOS, Opcode.BVS, Opcode.BVC
-)

DeprecatedStackVm/src/compiler/target/c64/codegen/AsmGen.kt

@@ -1,761 +0,0 @@
-package compiler.target.c64.codegen
-
-// note: to put stuff on the stack, we use Absolute,X  addressing mode which is 3 bytes / 4 cycles
-// possible space optimization is to use zeropage (indirect),Y  which is 2 bytes, but 5 cycles
-
-import prog8.ast.antlr.escape
-import prog8.ast.base.DataType
-import prog8.ast.base.initvarsSubName
-import prog8.ast.statements.ZeropageWish
-import prog8.compiler.*
-import prog8.compiler.intermediate.Instruction
-import prog8.compiler.intermediate.IntermediateProgram
-import prog8.compiler.intermediate.LabelInstr
-import prog8.compiler.intermediate.Opcode
-import prog8.compiler.target.c64.AssemblyProgram
-import prog8.compiler.target.c64.MachineDefinition
-import prog8.compiler.target.c64.Petscii
-import prog8.vm.RuntimeValue
-import java.io.File
-import java.util.*
-import kotlin.math.abs
-
-
-class AssemblyError(msg: String) : RuntimeException(msg)
-
-
-
-internal fun intVal(valueInstr: Instruction) = valueInstr.arg!!.integerValue()
-internal fun hexVal(valueInstr: Instruction) = valueInstr.arg!!.integerValue().toHex()
-internal fun hexValPlusOne(valueInstr: Instruction) = (valueInstr.arg!!.integerValue()+1).toHex()
-internal fun getFloatConst(value: RuntimeValue): String =
-        globalFloatConsts[value.numericValue().toDouble()]
-                ?: throw AssemblyError("should have a global float const for number $value")
-
-internal val globalFloatConsts = mutableMapOf<Double, String>()
-
-internal fun signExtendA(into: String) =
-        """
-        ora  #$7f
-        bmi  +
-        lda  #0
-+       sta  $into
-        """
-
-class AsmGen(private val options: CompilationOptions, private val program: IntermediateProgram,
-             private val heap: HeapValues, private val zeropage: Zeropage) {
-    private val assemblyLines = mutableListOf<String>()
-    private lateinit var block: IntermediateProgram.ProgramBlock
-
-    init {
-        // Convert invalid label names (such as "<anon-1>") to something that's allowed.
-        val newblocks = mutableListOf<IntermediateProgram.ProgramBlock>()
-        for(block in program.blocks) {
-            val newvars = block.variables.map { IntermediateProgram.Variable(symname(it.scopedname, block), it.value, it.params) }.toMutableList()
-            val newlabels = block.labels.map { symname(it.key, block) to it.value}.toMap().toMutableMap()
-            val newinstructions = block.instructions.asSequence().map {
-                when {
-                    it is LabelInstr -> LabelInstr(symname(it.name, block), it.asmProc)
-                    it.opcode == Opcode.INLINE_ASSEMBLY -> it
-                    else ->
-                        Instruction(it.opcode, it.arg, it.arg2,
-                            callLabel = if (it.callLabel != null) symname(it.callLabel, block) else null,
-                            callLabel2 = if (it.callLabel2 != null) symname(it.callLabel2, block) else null)
-                }
-            }.toMutableList()
-            val newMempointers = block.memoryPointers.map { symname(it.key, block) to it.value }.toMap().toMutableMap()
-            val newblock = IntermediateProgram.ProgramBlock(
-                    block.name,
-                    block.address,
-                    newinstructions,
-                    newvars,
-                    newMempointers,
-                    newlabels,
-                    force_output = block.force_output)
-            newblocks.add(newblock)
-        }
-        program.blocks.clear()
-        program.blocks.addAll(newblocks)
-
-        val newAllocatedZp = program.allocatedZeropageVariables.map { symname(it.key, null) to it.value}
-        program.allocatedZeropageVariables.clear()
-        program.allocatedZeropageVariables.putAll(newAllocatedZp)
-
-        // make a list of all const floats that are used
-        for(block in program.blocks) {
-            for(ins in block.instructions.filter{it.arg?.type== DataType.FLOAT}) {
-                val float = ins.arg!!.numericValue().toDouble()
-                if(float !in globalFloatConsts)
-                    globalFloatConsts[float] = "prog8_const_float_${globalFloatConsts.size}"
-            }
-        }
-    }
-
-    fun compileToAssembly(optimize: Boolean): AssemblyProgram {
-        println("Generating assembly code from intermediate code... ")
-
-        assemblyLines.clear()
-        header()
-        for(b in program.blocks)
-            block2asm(b)
-
-        if(optimize) {
-            var optimizationsDone = 1
-            while (optimizationsDone > 0) {
-                optimizationsDone = optimizeAssembly(assemblyLines)
-            }
-        }
-
-        File("${program.name}.asm").printWriter().use {
-            for (line in assemblyLines) { it.println(line) }
-        }
-
-        return AssemblyProgram(program.name)
-    }
-
-    private fun out(str: String, splitlines: Boolean=true) {
-        if(splitlines) {
-            for (line in str.split('\n')) {
-                val trimmed = if (line.startsWith(' ')) "\t" + line.trim() else line.trim()
-                // trimmed = trimmed.replace(Regex("^\\+\\s+"), "+\t")  // sanitize local label indentation
-                assemblyLines.add(trimmed)
-            }
-        } else assemblyLines.add(str)
-    }
-
-
-    // convert a fully scoped name (defined in the given block) to a valid assembly symbol name
-    private fun symname(scoped: String, block: IntermediateProgram.ProgramBlock?): String {
-        if(' ' in scoped)
-            return scoped
-        val blockLocal: Boolean
-        var name = if (block!=null && scoped.startsWith("${block.name}.")) {
-            blockLocal = true
-            scoped.substring(block.name.length+1)
-        }
-        else {
-            blockLocal = false
-            scoped
-        }
-        name = name.replace("<", "prog8_").replace(">", "")     // take care of the autogenerated invalid (anon) label names
-        if(name=="-")
-            return "-"
-        if(blockLocal)
-            name = name.replace(".", "_")
-        else {
-            val parts = name.split(".", limit=2)
-            if(parts.size>1)
-                name = "${parts[0]}.${parts[1].replace(".", "_")}"
-        }
-        return name.replace("-", "")
-    }
-
-    private fun makeFloatFill(flt: MachineDefinition.Mflpt5): String {
-        val b0 = "$"+flt.b0.toString(16).padStart(2, '0')
-        val b1 = "$"+flt.b1.toString(16).padStart(2, '0')
-        val b2 = "$"+flt.b2.toString(16).padStart(2, '0')
-        val b3 = "$"+flt.b3.toString(16).padStart(2, '0')
-        val b4 = "$"+flt.b4.toString(16).padStart(2, '0')
-        return "$b0, $b1, $b2, $b3, $b4"
-    }
-
-    private fun header() {
-        val ourName = this.javaClass.name
-        out("; 6502 assembly code for '${program.name}'")
-        out("; generated by $ourName on ${Date()}")
-        out("; assembler syntax is for the 64tasm cross-assembler")
-        out("; output options: output=${options.output} launcher=${options.launcher} zp=${options.zeropage}")
-        out("\n.cpu  '6502'\n.enc  'none'\n")
-
-        if(program.loadAddress==0)   // fix load address
-            program.loadAddress = if(options.launcher==LauncherType.BASIC)
-                MachineDefinition.BASIC_LOAD_ADDRESS else MachineDefinition.RAW_LOAD_ADDRESS
-
-        when {
-            options.launcher == LauncherType.BASIC -> {
-                if (program.loadAddress != 0x0801)
-                    throw AssemblyError("BASIC output must have load address $0801")
-                out("; ---- basic program with sys call ----")
-                out("* = ${program.loadAddress.toHex()}")
-                val year = Calendar.getInstance().get(Calendar.YEAR)
-                out("  .word  (+), $year")
-                out("  .null  $9e, format(' %d ', _prog8_entrypoint), $3a, $8f, ' prog8 by idj'")
-                out("+\t.word  0")
-                out("_prog8_entrypoint\t; assembly code starts here\n")
-                out("  jsr  prog8_lib.init_system")
-            }
-            options.output == OutputType.PRG -> {
-                out("; ---- program without basic sys call ----")
-                out("* = ${program.loadAddress.toHex()}\n")
-                out("  jsr  prog8_lib.init_system")
-            }
-            options.output == OutputType.RAW -> {
-                out("; ---- raw assembler program ----")
-                out("* = ${program.loadAddress.toHex()}\n")
-            }
-        }
-
-        if(zeropage.exitProgramStrategy!=Zeropage.ExitProgramStrategy.CLEAN_EXIT) {
-            // disable shift-commodore charset switching and run/stop key
-            out("  lda  #$80")
-            out("  lda  #$80")
-            out("  sta  657\t; disable charset switching")
-            out("  lda  #239")
-            out("  sta  808\t; disable run/stop key")
-        }
-
-        out("  ldx  #\$ff\t; init estack pointer")
-        out("  ; initialize the variables in each block")
-        for(block in program.blocks) {
-            val initVarsLabel = block.instructions.firstOrNull { it is LabelInstr && it.name== initvarsSubName } as? LabelInstr
-            if(initVarsLabel!=null)
-                out("  jsr  ${block.name}.${initVarsLabel.name}")
-        }
-        out("  clc")
-        when(zeropage.exitProgramStrategy) {
-            Zeropage.ExitProgramStrategy.CLEAN_EXIT -> {
-                out("  jmp  main.start\t; jump to program entrypoint")
-            }
-            Zeropage.ExitProgramStrategy.SYSTEM_RESET -> {
-                out("  jsr  main.start\t; call program entrypoint")
-                out("  jmp  (c64.RESET_VEC)\t; cold reset")
-            }
-        }
-        out("")
-
-        // the global list of all floating point constants for the whole program
-        for(flt in globalFloatConsts) {
-            val floatFill = makeFloatFill(MachineDefinition.Mflpt5.fromNumber(flt.key))
-            out("${flt.value}\t.byte  $floatFill  ; float ${flt.key}")
-        }
-    }
-
-    private fun block2asm(blk: IntermediateProgram.ProgramBlock) {
-        block = blk
-        out("\n; ---- block: '${block.name}' ----")
-        if(!blk.force_output)
-            out("${block.name}\t.proc\n")
-        if(block.address!=null) {
-            out(".cerror * > ${block.address?.toHex()}, 'block address overlaps by ', *-${block.address?.toHex()},' bytes'")
-            out("* = ${block.address?.toHex()}")
-        }
-
-        // deal with zeropage variables
-        for(variable in blk.variables) {
-            val sym = symname(blk.name+"."+variable.scopedname, null)
-            val zpVar = program.allocatedZeropageVariables[sym]
-            if(zpVar==null) {
-                // This var is not on the ZP yet. Attempt to move it there (if it's not a float, those take up too much space)
-                if(variable.params.zp != ZeropageWish.NOT_IN_ZEROPAGE &&
-                        variable.value.type in zeropage.allowedDatatypes
-                        && variable.value.type != DataType.FLOAT) {
-                    try {
-                        val address = zeropage.allocate(sym, variable.value.type, null)
-                        out("${variable.scopedname} = $address\t; auto zp ${variable.value.type}")
-                        // make sure we add the var to the set of zpvars for this block
-                        program.allocatedZeropageVariables[sym] = Pair(address, variable.value.type)
-                    } catch (x: ZeropageDepletedError) {
-                        // leave it as it is.
-                    }
-                }
-            }
-            else {
-                // it was already allocated on the zp
-                out("${variable.scopedname} = ${zpVar.first}\t; zp ${zpVar.second}")
-            }
-        }
-
-        out("\n; memdefs and kernel subroutines")
-        memdefs2asm(block)
-        out("\n; non-zeropage variables")
-        vardecls2asm(block)
-        out("")
-
-        val instructionPatternWindowSize = 8        // increase once patterns occur longer than this.
-        var processed = 0
-
-        for (ins in block.instructions.windowed(instructionPatternWindowSize, partialWindows = true)) {
-            if (processed == 0) {
-                processed = instr2asm(ins)
-                if (processed == 0) {
-                    // the instructions are not recognised yet and can't be translated into assembly
-                    throw CompilerException("no asm translation found for instruction pattern: $ins")
-                }
-            }
-            processed--
-        }
-        if(!blk.force_output)
-            out("\n\t.pend\n")
-    }
-
-    private fun memdefs2asm(block: IntermediateProgram.ProgramBlock) {
-        for(m in block.memoryPointers) {
-            out("  ${m.key} = ${m.value.first.toHex()}")
-        }
-    }
-
-    private fun vardecls2asm(block: IntermediateProgram.ProgramBlock) {
-        val uniqueNames = block.variables.map { it.scopedname }.toSet()
-        if (uniqueNames.size != block.variables.size)
-            throw AssemblyError("not all variables have unique names")
-
-        // these are the non-zeropage variables.
-        // first get all the flattened struct members, they MUST remain in order
-        out(";  flattened struct members")
-        val (structMembers, normalVars) = block.variables.partition { it.params.memberOfStruct!=null }
-        structMembers.forEach { vardecl2asm(it.scopedname, it.value, it.params) }
-
-        // sort the other variables by type
-        out(";  other variables sorted by type")
-        val sortedVars = normalVars.sortedBy { it.value.type }
-        for (variable in sortedVars) {
-            val sym = symname(block.name + "." + variable.scopedname, null)
-            if(sym in program.allocatedZeropageVariables)
-                continue  // skip the ones that already belong in the zero page
-            vardecl2asm(variable.scopedname, variable.value, variable.params)
-        }
-    }
-
-    private fun vardecl2asm(varname: String, value: RuntimeValue, parameters: IntermediateProgram.VariableParameters) {
-        when (value.type) {
-            DataType.UBYTE -> out("$varname\t.byte  0")
-            DataType.BYTE -> out("$varname\t.char  0")
-            DataType.UWORD -> out("$varname\t.word  0")
-            DataType.WORD -> out("$varname\t.sint  0")
-            DataType.FLOAT -> out("$varname\t.byte  0,0,0,0,0  ; float")
-            DataType.STR, DataType.STR_S -> {
-                val rawStr = heap.get(value.heapId!!).str!!
-                val bytes = encodeStr(rawStr, value.type).map { "$" + it.toString(16).padStart(2, '0') }
-                out("$varname\t; ${value.type} \"${escape(rawStr).replace("\u0000", "<NULL>")}\"")
-                for (chunk in bytes.chunked(16))
-                    out("  .byte  " + chunk.joinToString())
-            }
-            DataType.ARRAY_UB -> {
-                // unsigned integer byte arraysize
-                val data = makeArrayFillDataUnsigned(value)
-                if (data.size <= 16)
-                    out("$varname\t.byte  ${data.joinToString()}")
-                else {
-                    out(varname)
-                    for (chunk in data.chunked(16))
-                        out("  .byte  " + chunk.joinToString())
-                }
-            }
-            DataType.ARRAY_B -> {
-                // signed integer byte arraysize
-                val data = makeArrayFillDataSigned(value)
-                if (data.size <= 16)
-                    out("$varname\t.char  ${data.joinToString()}")
-                else {
-                    out(varname)
-                    for (chunk in data.chunked(16))
-                        out("  .char  " + chunk.joinToString())
-                }
-            }
-            DataType.ARRAY_UW -> {
-                // unsigned word arraysize
-                val data = makeArrayFillDataUnsigned(value)
-                if (data.size <= 16)
-                    out("$varname\t.word  ${data.joinToString()}")
-                else {
-                    out(varname)
-                    for (chunk in data.chunked(16))
-                        out("  .word  " + chunk.joinToString())
-                }
-            }
-            DataType.ARRAY_W -> {
-                // signed word arraysize
-                val data = makeArrayFillDataSigned(value)
-                if (data.size <= 16)
-                    out("$varname\t.sint  ${data.joinToString()}")
-                else {
-                    out(varname)
-                    for (chunk in data.chunked(16))
-                        out("  .sint  " + chunk.joinToString())
-                }
-            }
-            DataType.ARRAY_F -> {
-                // float arraysize
-                val array = heap.get(value.heapId!!).doubleArray!!
-                val floatFills = array.map { makeFloatFill(MachineDefinition.Mflpt5.fromNumber(it)) }
-                out(varname)
-                for (f in array.zip(floatFills))
-                    out("  .byte  ${f.second}  ; float ${f.first}")
-            }
-            DataType.STRUCT -> throw AssemblyError("vars of type STRUCT should have been removed because flattened")
-        }
-    }
-
-
-    private fun encodeStr(str: String, dt: DataType): List<Short> {
-        return when(dt) {
-            DataType.STR -> {
-                val bytes = Petscii.encodePetscii(str, true)
-                bytes.plus(0)
-            }
-            DataType.STR_S -> {
-                val bytes = Petscii.encodeScreencode(str, true)
-                bytes.plus(0)
-            }
-            else -> throw AssemblyError("invalid str type")
-        }
-    }
-
-    private fun makeArrayFillDataUnsigned(value: RuntimeValue): List<String> {
-        val array = heap.get(value.heapId!!).array!!
-        return when {
-            value.type== DataType.ARRAY_UB ->
-                // byte array can never contain pointer-to types, so treat values as all integers
-                array.map { "$"+it.integer!!.toString(16).padStart(2, '0') }
-            value.type== DataType.ARRAY_UW -> array.map {
-                when {
-                    it.integer!=null -> "$"+it.integer.toString(16).padStart(2, '0')
-                    it.addressOf!=null -> symname(it.addressOf.scopedname!!, block)
-                    else -> throw AssemblyError("weird type in array")
-                }
-            }
-            else -> throw AssemblyError("invalid arraysize type")
-        }
-    }
-
-    private fun makeArrayFillDataSigned(value: RuntimeValue): List<String> {
-        val array = heap.get(value.heapId!!).array!!
-        // note: array of signed value can never contain pointer-to type, so simply accept values as being all integers
-        return if (value.type == DataType.ARRAY_B || value.type == DataType.ARRAY_W) {
-            array.map {
-                if(it.integer!!>=0)
-                    "$"+it.integer.toString(16).padStart(2, '0')
-                else
-                    "-$"+abs(it.integer).toString(16).padStart(2, '0')
-            }
-        }
-        else throw AssemblyError("invalid arraysize type")
-    }
-
-    private fun instr2asm(ins: List<Instruction>): Int {
-        // find best patterns (matching the most of the lines, then with the smallest weight)
-        val fragments = findPatterns(ins).sortedByDescending { it.segmentSize }
-        if(fragments.isEmpty()) {
-            // we didn't find any matching patterns (complex multi-instruction fragments), try simple ones
-            val firstIns = ins[0]
-            val singleAsm = simpleInstr2Asm(firstIns, block)
-            if(singleAsm != null) {
-                outputAsmFragment(singleAsm)
-                return 1
-            }
-            return 0
-        }
-        val best = fragments[0]
-        outputAsmFragment(best.asm)
-        return best.segmentSize
-    }
-
-    private fun outputAsmFragment(singleAsm: String) {
-        if (singleAsm.isNotEmpty()) {
-            if(singleAsm.startsWith("@inline@"))
-                out(singleAsm.substring(8), false)
-            else {
-                val withNewlines = singleAsm.replace('|', '\n')
-                out(withNewlines)
-            }
-        }
-    }
-
-    private fun findPatterns(segment: List<Instruction>): List<AsmFragment> {
-        val opcodes = segment.map { it.opcode }
-        val result = mutableListOf<AsmFragment>()
-
-        // check for operations that modify a single value, by putting it on the stack (and popping it afterwards)
-        if((opcodes[0]==Opcode.PUSH_VAR_BYTE && opcodes[2]==Opcode.POP_VAR_BYTE) ||
-                (opcodes[0]==Opcode.PUSH_VAR_WORD && opcodes[2]==Opcode.POP_VAR_WORD) ||
-                (opcodes[0]==Opcode.PUSH_VAR_FLOAT && opcodes[2]==Opcode.POP_VAR_FLOAT)) {
-            if (segment[0].callLabel == segment[2].callLabel) {
-                val fragment = sameVarOperation(segment[0].callLabel!!, segment[1])
-                if (fragment != null) {
-                    fragment.segmentSize = 3
-                    result.add(fragment)
-                }
-            }
-        }
-        else if((opcodes[0]==Opcode.PUSH_BYTE && opcodes[1] in setOf(Opcode.INC_INDEXED_VAR_B, Opcode.INC_INDEXED_VAR_UB,
-                        Opcode.INC_INDEXED_VAR_UW, Opcode.INC_INDEXED_VAR_W, Opcode.INC_INDEXED_VAR_FLOAT,
-                        Opcode.DEC_INDEXED_VAR_B, Opcode.DEC_INDEXED_VAR_UB, Opcode.DEC_INDEXED_VAR_W,
-                        Opcode.DEC_INDEXED_VAR_UW, Opcode.DEC_INDEXED_VAR_FLOAT))) {
-            val fragment = sameConstantIndexedVarOperation(segment[1].callLabel!!, segment[0].arg!!.integerValue(), segment[1])
-            if(fragment!=null) {
-                fragment.segmentSize=2
-                result.add(fragment)
-            }
-        }
-        else if((opcodes[0]==Opcode.PUSH_VAR_BYTE && opcodes[1] in setOf(Opcode.INC_INDEXED_VAR_B, Opcode.INC_INDEXED_VAR_UB,
-                        Opcode.INC_INDEXED_VAR_UW, Opcode.INC_INDEXED_VAR_W, Opcode.INC_INDEXED_VAR_FLOAT,
-                        Opcode.DEC_INDEXED_VAR_B, Opcode.DEC_INDEXED_VAR_UB, Opcode.DEC_INDEXED_VAR_W,
-                        Opcode.DEC_INDEXED_VAR_UW, Opcode.DEC_INDEXED_VAR_FLOAT))) {
-            val fragment = sameIndexedVarOperation(segment[1].callLabel!!, segment[0].callLabel!!, segment[1])
-            if(fragment!=null) {
-                fragment.segmentSize=2
-                result.add(fragment)
-            }
-        }
-        else if((opcodes[0]==Opcode.PUSH_MEM_UB && opcodes[2]==Opcode.POP_MEM_BYTE) ||
-                (opcodes[0]==Opcode.PUSH_MEM_B && opcodes[2]==Opcode.POP_MEM_BYTE) ||
-                (opcodes[0]==Opcode.PUSH_MEM_UW && opcodes[2]==Opcode.POP_MEM_WORD) ||
-                (opcodes[0]==Opcode.PUSH_MEM_W && opcodes[2]==Opcode.POP_MEM_WORD) ||
-                (opcodes[0]==Opcode.PUSH_MEM_FLOAT && opcodes[2]==Opcode.POP_MEM_FLOAT)) {
-            if(segment[0].arg==segment[2].arg) {
-                val fragment = sameMemOperation(segment[0].arg!!.integerValue(), segment[1])
-                if(fragment!=null) {
-                    fragment.segmentSize = 3
-                    result.add(fragment)
-                }
-            }
-        }
-        else if((opcodes[0]==Opcode.PUSH_BYTE && opcodes[1]==Opcode.READ_INDEXED_VAR_BYTE &&
-                        opcodes[3]==Opcode.PUSH_BYTE && opcodes[4]==Opcode.WRITE_INDEXED_VAR_BYTE) ||
-                (opcodes[0]==Opcode.PUSH_BYTE && opcodes[1]==Opcode.READ_INDEXED_VAR_WORD &&
-                        opcodes[3]==Opcode.PUSH_BYTE && opcodes[4]==Opcode.WRITE_INDEXED_VAR_WORD)) {
-            if(segment[0].arg==segment[3].arg && segment[1].callLabel==segment[4].callLabel) {
-                val fragment = sameConstantIndexedVarOperation(segment[1].callLabel!!, segment[0].arg!!.integerValue(), segment[2])
-                if(fragment!=null){
-                    fragment.segmentSize = 5
-                    result.add(fragment)
-                }
-            }
-        }
-        else if((opcodes[0]==Opcode.PUSH_VAR_BYTE && opcodes[1]==Opcode.READ_INDEXED_VAR_BYTE &&
-                        opcodes[3]==Opcode.PUSH_VAR_BYTE && opcodes[4]==Opcode.WRITE_INDEXED_VAR_BYTE) ||
-                (opcodes[0]==Opcode.PUSH_VAR_BYTE && opcodes[1]==Opcode.READ_INDEXED_VAR_WORD &&
-                        opcodes[3]==Opcode.PUSH_VAR_BYTE && opcodes[4]==Opcode.WRITE_INDEXED_VAR_WORD)) {
-            if(segment[0].callLabel==segment[3].callLabel && segment[1].callLabel==segment[4].callLabel) {
-                val fragment = sameIndexedVarOperation(segment[1].callLabel!!, segment[0].callLabel!!, segment[2])
-                if(fragment!=null){
-                    fragment.segmentSize = 5
-                    result.add(fragment)
-                }
-            }
-        }
-
-        // add any matching patterns from the big list
-        for(pattern in Patterns.patterns) {
-            if(pattern.sequence.size > segment.size || (pattern.altSequence!=null && pattern.altSequence.size > segment.size))
-                continue        //  don't accept patterns that don't fit
-            val opcodesList = opcodes.subList(0, pattern.sequence.size)
-            if(pattern.sequence == opcodesList) {
-                val asm = pattern.asm(segment)
-                if(asm!=null)
-                    result.add(AsmFragment(asm, pattern.sequence.size))
-            } else if(pattern.altSequence!=null) {
-                val opcodesListAlt = opcodes.subList(0, pattern.altSequence.size)
-                if(pattern.altSequence == opcodesListAlt) {
-                    val asm = pattern.asm(segment)
-                    if (asm != null)
-                        result.add(AsmFragment(asm, pattern.sequence.size))
-                }
-            }
-        }
-
-        return result
-    }
-
-    private fun sameConstantIndexedVarOperation(variable: String, index: Int, ins: Instruction): AsmFragment? {
-        // an in place operation that consists of a push-value / op / push-index-value / pop-into-indexed-var
-        return when(ins.opcode) {
-            Opcode.SHL_BYTE -> AsmFragment(" asl  $variable+$index", 8)
-            Opcode.SHR_UBYTE -> AsmFragment(" lsr  $variable+$index", 8)
-            Opcode.SHR_SBYTE -> AsmFragment(" lda  $variable+$index |  asl  a |  ror  $variable+$index")
-            Opcode.SHL_WORD -> AsmFragment(" asl  $variable+${index * 2 + 1} |  rol  $variable+${index * 2}", 8)
-            Opcode.SHR_UWORD -> AsmFragment(" lsr  $variable+${index * 2 + 1} |  ror  $variable+${index * 2}", 8)
-            Opcode.SHR_SWORD -> AsmFragment(" lda  $variable+${index * 2 + 1} |  asl  a |  ror  $variable+${index * 2 + 1} |  ror  $variable+${index * 2}", 8)
-            Opcode.ROL_BYTE -> AsmFragment(" rol  $variable+$index", 8)
-            Opcode.ROR_BYTE -> AsmFragment(" ror  $variable+$index", 8)
-            Opcode.ROL_WORD -> AsmFragment(" rol  $variable+${index * 2 + 1} |  rol  $variable+${index * 2}", 8)
-            Opcode.ROR_WORD -> AsmFragment(" ror  $variable+${index * 2 + 1} |  ror  $variable+${index * 2}", 8)
-            Opcode.ROL2_BYTE -> AsmFragment(" lda  $variable+$index |  cmp  #\$80 |  rol  $variable+$index", 8)
-            Opcode.ROR2_BYTE -> AsmFragment(" lda  $variable+$index |  lsr  a |  bcc  + |  ora  #\$80 |+ |  sta  $variable+$index", 10)
-            Opcode.ROL2_WORD -> AsmFragment(" asl  $variable+${index * 2 + 1} |  rol  $variable+${index * 2} |  bcc  + |  inc  $variable+${index * 2 + 1} |+", 20)
-            Opcode.ROR2_WORD -> AsmFragment(" lsr  $variable+${index * 2 + 1} |  ror  $variable+${index * 2} |  bcc  + |  lda  $variable+${index * 2 + 1} |  ora  #\$80 |  sta  $variable+${index * 2 + 1} |+", 30)
-            Opcode.INC_INDEXED_VAR_B, Opcode.INC_INDEXED_VAR_UB -> AsmFragment(" inc  $variable+$index", 2)
-            Opcode.DEC_INDEXED_VAR_B, Opcode.DEC_INDEXED_VAR_UB -> AsmFragment(" dec  $variable+$index", 5)
-            Opcode.INC_INDEXED_VAR_W, Opcode.INC_INDEXED_VAR_UW -> AsmFragment(" inc  $variable+${index * 2} |  bne  + |  inc  $variable+${index * 2 + 1} |+")
-            Opcode.DEC_INDEXED_VAR_W, Opcode.DEC_INDEXED_VAR_UW -> AsmFragment(" lda  $variable+${index * 2} |  bne  + |  dec  $variable+${index * 2 + 1} |+ |  dec  $variable+${index * 2}")
-            Opcode.INC_INDEXED_VAR_FLOAT -> AsmFragment(
-                    """
-                lda  #<($variable+${index * MachineDefinition.Mflpt5.MemorySize})
-                ldy  #>($variable+${index * MachineDefinition.Mflpt5.MemorySize})
-                jsr  c64flt.inc_var_f
-                """)
-            Opcode.DEC_INDEXED_VAR_FLOAT -> AsmFragment(
-                    """
-                lda  #<($variable+${index * MachineDefinition.Mflpt5.MemorySize})
-                ldy  #>($variable+${index * MachineDefinition.Mflpt5.MemorySize})
-                jsr  c64flt.dec_var_f
-                """)
-
-            else -> null
-        }
-    }
-
-    private fun sameIndexedVarOperation(variable: String, indexVar: String, ins: Instruction): AsmFragment? {
-        // an in place operation that consists of a push-value / op / push-index-var / pop-into-indexed-var
-        val saveX = " stx  ${MachineDefinition.C64Zeropage.SCRATCH_B1} |"
-        val restoreX = " | ldx  ${MachineDefinition.C64Zeropage.SCRATCH_B1}"
-        val loadXWord: String
-        val loadX: String
-
-        when(indexVar) {
-            "X" -> {
-                loadX = ""
-                loadXWord = " txa |  asl  a |  tax |"
-            }
-            "Y" -> {
-                loadX = " tya |  tax |"
-                loadXWord = " tya |  asl  a |  tax |"
-            }
-            "A" -> {
-                loadX = " tax |"
-                loadXWord = " asl  a |  tax |"
-            }
-            else -> {
-                // the indexvar is a real variable, not a register
-                loadX = " ldx  $indexVar |"
-                loadXWord = " lda  $indexVar |  asl  a |  tax |"
-            }
-        }
-
-        return when (ins.opcode) {
-            Opcode.SHL_BYTE -> AsmFragment(" txa |  $loadX  asl  $variable,x |  tax", 10)
-            Opcode.SHR_UBYTE -> AsmFragment(" txa |  $loadX  lsr  $variable,x |  tax", 10)
-            Opcode.SHR_SBYTE -> AsmFragment("$saveX  $loadX  lda  $variable,x |  asl a |  ror  $variable,x  $restoreX", 10)
-            Opcode.SHL_WORD -> AsmFragment("$saveX $loadXWord  asl  $variable,x |  rol  $variable+1,x  $restoreX", 10)
-            Opcode.SHR_UWORD -> AsmFragment("$saveX $loadXWord  lsr  $variable+1,x |  ror  $variable,x  $restoreX", 10)
-            Opcode.SHR_SWORD -> AsmFragment("$saveX $loadXWord  lda  $variable+1,x |  asl a |  ror  $variable+1,x |  ror  $variable,x  $restoreX", 10)
-            Opcode.ROL_BYTE -> AsmFragment(" txa |  $loadX  rol  $variable,x |  tax", 10)
-            Opcode.ROR_BYTE -> AsmFragment(" txa |  $loadX  ror  $variable,x |  tax", 10)
-            Opcode.ROL_WORD -> AsmFragment("$saveX $loadXWord  rol  $variable,x |  rol  $variable+1,x  $restoreX", 10)
-            Opcode.ROR_WORD -> AsmFragment("$saveX $loadXWord  ror  $variable+1,x |  ror  $variable,x  $restoreX", 10)
-            Opcode.ROL2_BYTE -> AsmFragment("$saveX $loadX  lda  $variable,x |  cmp  #\$80 |  rol  $variable,x  $restoreX", 10)
-            Opcode.ROR2_BYTE -> AsmFragment("$saveX $loadX  lda  $variable,x |  lsr  a |  bcc  + |  ora  #\$80 |+ |  sta  $variable,x  $restoreX", 10)
-            Opcode.ROL2_WORD -> AsmFragment(" txa |  $loadXWord  asl  $variable,x |  rol  $variable+1,x |  bcc  + |  inc  $variable,x  |+  |  tax", 30)
-            Opcode.ROR2_WORD -> AsmFragment("$saveX $loadXWord  lsr  $variable+1,x |  ror  $variable,x |  bcc  + |  lda  $variable+1,x |  ora  #\$80 |  sta  $variable+1,x |+  $restoreX", 30)
-            Opcode.INC_INDEXED_VAR_B, Opcode.INC_INDEXED_VAR_UB -> AsmFragment(" txa |  $loadX  inc  $variable,x |  tax", 10)
-            Opcode.DEC_INDEXED_VAR_B, Opcode.DEC_INDEXED_VAR_UB -> AsmFragment(" txa |  $loadX  dec  $variable,x |  tax", 10)
-            Opcode.INC_INDEXED_VAR_W, Opcode.INC_INDEXED_VAR_UW -> AsmFragment("$saveX $loadXWord  inc  $variable,x |  bne  + |  inc  $variable+1,x  |+  $restoreX", 10)
-            Opcode.DEC_INDEXED_VAR_W, Opcode.DEC_INDEXED_VAR_UW -> AsmFragment("$saveX $loadXWord  lda  $variable,x |  bne  + |  dec  $variable+1,x |+ |  dec  $variable,x  $restoreX", 10)
-            Opcode.INC_INDEXED_VAR_FLOAT -> AsmFragment(" lda  #<$variable |  ldy  #>$variable |  $saveX   $loadX   jsr  c64flt.inc_indexed_var_f  $restoreX")
-            Opcode.DEC_INDEXED_VAR_FLOAT -> AsmFragment(" lda  #<$variable |  ldy  #>$variable |  $saveX   $loadX   jsr  c64flt.dec_indexed_var_f  $restoreX")
-
-            else -> null
-        }
-    }
-
-    private fun sameMemOperation(address: Int, ins: Instruction): AsmFragment? {
-        // an in place operation that consists of  push-mem / op / pop-mem
-        val addr = address.toHex()
-        val addrHi = (address+1).toHex()
-        return when(ins.opcode) {
-            Opcode.SHL_BYTE -> AsmFragment(" asl  $addr", 10)
-            Opcode.SHR_UBYTE -> AsmFragment(" lsr  $addr", 10)
-            Opcode.SHR_SBYTE -> AsmFragment(" lda  $addr |  asl  a |  ror  $addr", 10)
-            Opcode.SHL_WORD -> AsmFragment(" asl  $addr |  rol  $addrHi", 10)
-            Opcode.SHR_UWORD -> AsmFragment(" lsr  $addrHi |  ror  $addr", 10)
-            Opcode.SHR_SWORD -> AsmFragment(" lda  $addrHi |  asl a |  ror  $addrHi |  ror  $addr", 10)
-            Opcode.ROL_BYTE -> AsmFragment(" rol  $addr", 10)
-            Opcode.ROR_BYTE -> AsmFragment(" ror  $addr", 10)
-            Opcode.ROL_WORD -> AsmFragment(" rol  $addr |  rol  $addrHi", 10)
-            Opcode.ROR_WORD -> AsmFragment(" ror  $addrHi |  ror  $addr", 10)
-            Opcode.ROL2_BYTE -> AsmFragment(" lda  $addr |  cmp  #\$80 |  rol  $addr", 10)
-            Opcode.ROR2_BYTE -> AsmFragment(" lda  $addr |  lsr  a |  bcc  + |  ora  #\$80 |+ |  sta  $addr", 10)
-            Opcode.ROL2_WORD -> AsmFragment(" lda  $addr |  cmp #\$80 |  rol  $addr |  rol  $addrHi", 10)
-            Opcode.ROR2_WORD -> AsmFragment(" lsr  $addrHi |  ror  $addr |  bcc  + |  lda  $addrHi |  ora  #$80 |  sta  $addrHi |+", 20)
-            else -> null
-        }
-    }
-
-    private fun sameVarOperation(variable: String, ins: Instruction): AsmFragment? {
-        // an in place operation that consists of a push-var / op / pop-var
-        return when(ins.opcode) {
-            Opcode.SHL_BYTE -> {
-                when (variable) {
-                    "A" -> AsmFragment(" asl  a", 10)
-                    "X" -> AsmFragment(" txa |  asl  a |  tax", 10)
-                    "Y" -> AsmFragment(" tya |  asl  a |  tay", 10)
-                    else -> AsmFragment(" asl  $variable", 10)
-                }
-            }
-            Opcode.SHR_UBYTE -> {
-                when (variable) {
-                    "A" -> AsmFragment(" lsr  a", 10)
-                    "X" -> AsmFragment(" txa |  lsr  a |  tax", 10)
-                    "Y" -> AsmFragment(" tya |  lsr  a |  tay", 10)
-                    else -> AsmFragment(" lsr  $variable", 10)
-                }
-            }
-            Opcode.SHR_SBYTE -> {
-                // arithmetic shift right (keep sign bit)
-                when (variable) {
-                    "A" -> AsmFragment(" cmp  #$80 |  ror  a", 10)
-                    "X" -> AsmFragment(" txa |  cmp  #$80 |  ror  a |  tax", 10)
-                    "Y" -> AsmFragment(" tya |  cmp  #$80 |  ror  a |  tay", 10)
-                    else -> AsmFragment(" lda  $variable |  asl  a  | ror  $variable", 10)
-                }
-            }
-            Opcode.SHL_WORD -> {
-                AsmFragment(" asl  $variable |  rol  $variable+1", 10)
-            }
-            Opcode.SHR_UWORD -> {
-                AsmFragment(" lsr  $variable+1 |  ror  $variable", 10)
-            }
-            Opcode.SHR_SWORD -> {
-                // arithmetic shift right (keep sign bit)
-                AsmFragment(" lda  $variable+1 |  asl  a |  ror  $variable+1 |  ror  $variable", 10)
-            }
-            Opcode.ROL_BYTE -> {
-                when (variable) {
-                    "A" -> AsmFragment(" rol  a", 10)
-                    "X" -> AsmFragment(" txa |  rol  a |  tax", 10)
-                    "Y" -> AsmFragment(" tya |  rol  a |  tay", 10)
-                    else -> AsmFragment(" rol  $variable", 10)
-                }
-            }
-            Opcode.ROR_BYTE -> {
-                when (variable) {
-                    "A" -> AsmFragment(" ror  a", 10)
-                    "X" -> AsmFragment(" txa |  ror  a |  tax", 10)
-                    "Y" -> AsmFragment(" tya |  ror  a |  tay", 10)
-                    else -> AsmFragment(" ror  $variable", 10)
-                }
-            }
-            Opcode.ROL_WORD -> {
-                AsmFragment(" rol  $variable |  rol  $variable+1", 10)
-            }
-            Opcode.ROR_WORD -> {
-                AsmFragment(" ror  $variable+1 |  ror  $variable", 10)
-            }
-            Opcode.ROL2_BYTE -> {       // 8-bit rol
-                when (variable) {
-                    "A" -> AsmFragment(" cmp  #\$80 |  rol  a", 10)
-                    "X" -> AsmFragment(" txa |  cmp  #\$80 |  rol  a |  tax", 10)
-                    "Y" -> AsmFragment(" tya |  cmp  #\$80 |  rol  a |  tay", 10)
-                    else -> AsmFragment(" lda  $variable |  cmp  #\$80  | rol  $variable", 10)
-                }
-            }
-            Opcode.ROR2_BYTE -> {       // 8-bit ror
-                when (variable) {
-                    "A" -> AsmFragment(" lsr  a | bcc  + |  ora  #\$80  |+", 10)
-                    "X" -> AsmFragment(" txa |  lsr  a |  bcc  + |  ora  #\$80  |+ |  tax", 10)
-                    "Y" -> AsmFragment(" tya |  lsr  a |  bcc  + |  ora  #\$80  |+ |  tay", 10)
-                    else -> AsmFragment(" lda  $variable |  lsr  a |  bcc  + |  ora  #\$80 |+ |  sta  $variable", 10)
-                }
-            }
-            Opcode.ROL2_WORD -> {
-                AsmFragment(" lda  $variable |  cmp #\$80 |  rol  $variable |  rol  $variable+1", 10)
-            }
-            Opcode.ROR2_WORD -> {
-                AsmFragment(" lsr  $variable+1 |  ror  $variable |  bcc  + |  lda  $variable+1 |  ora  #\$80 |  sta  $variable+1 |+", 30)
-            }
-            else -> null
-        }
-    }
-
-    private class AsmFragment(val asm: String, var segmentSize: Int=0)
-}

DeprecatedStackVm/src/compiler/target/c64/codegen/SimpleAsm.kt

@@ -1,559 +0,0 @@
-package compiler.target.c64.codegen
-
-import prog8.compiler.CompilerException
-import prog8.compiler.intermediate.Instruction
-import prog8.compiler.intermediate.IntermediateProgram
-import prog8.compiler.intermediate.LabelInstr
-import prog8.compiler.intermediate.Opcode
-import prog8.compiler.target.c64.MachineDefinition.C64Zeropage
-import prog8.compiler.target.c64.MachineDefinition.ESTACK_HI_HEX
-import prog8.compiler.target.c64.MachineDefinition.ESTACK_HI_PLUS1_HEX
-import prog8.compiler.target.c64.MachineDefinition.ESTACK_LO_HEX
-import prog8.compiler.target.c64.MachineDefinition.ESTACK_LO_PLUS1_HEX
-import prog8.compiler.target.c64.MachineDefinition.ESTACK_LO_PLUS2_HEX
-import prog8.compiler.toHex
-import prog8.vm.stackvm.Syscall
-import prog8.vm.stackvm.syscallsForStackVm
-
-
-// note: see https://wiki.nesdev.com/w/index.php/6502_assembly_optimisations
-
-
-private var breakpointCounter = 0
-
-internal fun simpleInstr2Asm(ins: Instruction, block: IntermediateProgram.ProgramBlock): String? {
-    // a label 'instruction' is simply translated into a asm label
-    if(ins is LabelInstr) {
-        val labelresult =
-                if(ins.name.startsWith("${block.name}."))
-                    ins.name.substring(block.name.length+1)
-                else
-                    ins.name
-        return if(ins.asmProc) labelresult+"\t\t.proc" else labelresult
-    }
-
-    // simple opcodes that are translated directly into one or a few asm instructions
-    return when(ins.opcode) {
-        Opcode.LINE -> " ;\tsrc line: ${ins.callLabel}"
-        Opcode.NOP -> " nop"      // shouldn't be present anymore though
-        Opcode.START_PROCDEF -> ""  // is done as part of a label
-        Opcode.END_PROCDEF -> " .pend"
-        Opcode.TERMINATE -> " brk"
-        Opcode.SEC -> " sec"
-        Opcode.CLC -> " clc"
-        Opcode.SEI -> " sei"
-        Opcode.CLI -> " cli"
-        Opcode.CARRY_TO_A -> " lda  #0 |  adc  #0"
-        Opcode.JUMP -> {
-            if(ins.callLabel!=null)
-                " jmp  ${ins.callLabel}"
-            else
-                " jmp  ${hexVal(ins)}"
-        }
-        Opcode.CALL -> {
-            if(ins.callLabel!=null)
-                " jsr  ${ins.callLabel}"
-            else
-                " jsr  ${hexVal(ins)}"
-        }
-        Opcode.RETURN -> " rts"
-        Opcode.RSAVE -> {
-            // save cpu status flag and all registers A, X, Y.
-            // see http://6502.org/tutorials/register_preservation.html
-            " php |  sta  ${C64Zeropage.SCRATCH_REG} | pha  | txa  | pha  | tya  | pha  | lda  ${C64Zeropage.SCRATCH_REG}"
-        }
-        Opcode.RRESTORE -> {
-            // restore all registers and cpu status flag
-            " pla |  tay |  pla |  tax |  pla |  plp"
-        }
-        Opcode.RSAVEX -> " sta  ${C64Zeropage.SCRATCH_REG} |  txa |  pha |  lda  ${C64Zeropage.SCRATCH_REG}"
-        Opcode.RRESTOREX -> " sta  ${C64Zeropage.SCRATCH_REG} |  pla |  tax |  lda  ${C64Zeropage.SCRATCH_REG}"
-        Opcode.DISCARD_BYTE -> " inx"
-        Opcode.DISCARD_WORD -> " inx"
-        Opcode.DISCARD_FLOAT -> " inx |  inx |  inx"
-        Opcode.DUP_B -> {
-            " lda $ESTACK_LO_PLUS1_HEX,x | sta $ESTACK_LO_HEX,x | dex | ;DUP_B "
-        }
-        Opcode.DUP_W -> {
-            " lda $ESTACK_LO_PLUS1_HEX,x | sta $ESTACK_LO_HEX,x | lda $ESTACK_HI_PLUS1_HEX,x | sta $ESTACK_HI_HEX,x | dex "
-        }
-
-        Opcode.CMP_B, Opcode.CMP_UB -> {
-            " inx | lda $ESTACK_LO_HEX,x | cmp #${ins.arg!!.integerValue().toHex()} | ;CMP_B "
-        }
-
-        Opcode.CMP_W, Opcode.CMP_UW -> {
-            """
-            inx
-            lda   $ESTACK_HI_HEX,x
-            cmp   #>${ins.arg!!.integerValue().toHex()}
-            bne   +
-            lda   $ESTACK_LO_HEX,x
-            cmp   #<${ins.arg.integerValue().toHex()}
-            ; bne   +    not necessary?
-            ; lda   #0   not necessary?
-+                           
-            """
-        }
-
-        Opcode.INLINE_ASSEMBLY ->  "@inline@" + (ins.callLabel2 ?: "")      // All of the inline assembly is stored in the calllabel2 property. the '@inline@' is a special marker to accept it.
-        Opcode.INCLUDE_FILE -> {
-            val offset = if(ins.arg==null) "" else ", ${ins.arg.integerValue()}"
-            val length = if(ins.arg2==null) "" else ", ${ins.arg2.integerValue()}"
-            " .binary  \"${ins.callLabel}\" $offset $length"
-        }
-        Opcode.SYSCALL -> {
-            if (ins.arg!!.numericValue() in syscallsForStackVm.map { it.callNr })
-                throw CompilerException("cannot translate vm syscalls to real assembly calls - use *real* subroutine calls instead. Syscall ${ins.arg.numericValue()}")
-            val call = Syscall.values().find { it.callNr==ins.arg.numericValue() }
-            when(call) {
-                Syscall.FUNC_SIN,
-                Syscall.FUNC_COS,
-                Syscall.FUNC_ABS,
-                Syscall.FUNC_TAN,
-                Syscall.FUNC_ATAN,
-                Syscall.FUNC_LN,
-                Syscall.FUNC_LOG2,
-                Syscall.FUNC_SQRT,
-                Syscall.FUNC_RAD,
-                Syscall.FUNC_DEG,
-                Syscall.FUNC_ROUND,
-                Syscall.FUNC_FLOOR,
-                Syscall.FUNC_CEIL,
-                Syscall.FUNC_RNDF,
-                Syscall.FUNC_ANY_F,
-                Syscall.FUNC_ALL_F,
-                Syscall.FUNC_MAX_F,
-                Syscall.FUNC_MIN_F,
-                Syscall.FUNC_SUM_F -> " jsr  c64flt.${call.name.toLowerCase()}"
-                null -> ""
-                else -> " jsr  prog8_lib.${call.name.toLowerCase()}"
-            }
-        }
-        Opcode.BREAKPOINT -> {
-            breakpointCounter++
-            "_prog8_breakpoint_$breakpointCounter\tnop"
-        }
-
-        Opcode.PUSH_BYTE -> {
-            " lda  #${hexVal(ins)} |  sta  $ESTACK_LO_HEX,x |  dex"
-        }
-        Opcode.PUSH_WORD -> {
-            val value = hexVal(ins)
-            " lda  #<$value |  sta  $ESTACK_LO_HEX,x |  lda  #>$value |  sta  $ESTACK_HI_HEX,x |  dex"
-        }
-        Opcode.PUSH_FLOAT -> {
-            val floatConst = getFloatConst(ins.arg!!)
-            " lda  #<$floatConst |  ldy  #>$floatConst |  jsr  c64flt.push_float"
-        }
-        Opcode.PUSH_VAR_BYTE -> {
-            when(ins.callLabel) {
-                "X" -> throw CompilerException("makes no sense to push X, it's used as a stack pointer itself. You should probably not use the X register (or only in trivial assignments)")
-                "A" -> " sta  $ESTACK_LO_HEX,x |  dex"
-                "Y" -> " tya |  sta  $ESTACK_LO_HEX,x |  dex"
-                else -> " lda  ${ins.callLabel} |  sta  $ESTACK_LO_HEX,x |  dex"
-            }
-        }
-        Opcode.PUSH_VAR_WORD -> {
-            " lda  ${ins.callLabel} |  sta  $ESTACK_LO_HEX,x |  lda  ${ins.callLabel}+1 |    sta  $ESTACK_HI_HEX,x |  dex"
-        }
-        Opcode.PUSH_VAR_FLOAT -> " lda  #<${ins.callLabel} |  ldy  #>${ins.callLabel}|  jsr  c64flt.push_float"
-        Opcode.PUSH_MEM_B, Opcode.PUSH_MEM_UB -> {
-            """
-                lda  ${hexVal(ins)}
-                sta  $ESTACK_LO_HEX,x
-                dex
-                """
-        }
-        Opcode.PUSH_MEM_W, Opcode.PUSH_MEM_UW -> {
-            """
-                lda  ${hexVal(ins)}
-                sta  $ESTACK_LO_HEX,x
-                lda  ${hexValPlusOne(ins)}
-                sta  $ESTACK_HI_HEX,x
-                dex
-                """
-        }
-        Opcode.PUSH_MEM_FLOAT -> {
-            " lda  #<${hexVal(ins)} |  ldy  #>${hexVal(ins)}|  jsr  c64flt.push_float"
-        }
-        Opcode.PUSH_MEMREAD -> {
-            """
-                lda  $ESTACK_LO_PLUS1_HEX,x
-                sta  (+) +1
-                lda  $ESTACK_HI_PLUS1_HEX,x
-                sta  (+) +2
-+               lda  65535    ; modified
-                sta  $ESTACK_LO_PLUS1_HEX,x
-                """
-        }
-
-        Opcode.PUSH_REGAY_WORD -> {
-            " sta  $ESTACK_LO_HEX,x |  tya |  sta  $ESTACK_HI_HEX,x |  dex "
-        }
-        Opcode.PUSH_ADDR_HEAPVAR -> {
-            " lda  #<${ins.callLabel} |  sta  $ESTACK_LO_HEX,x |  lda  #>${ins.callLabel}  |  sta  $ESTACK_HI_HEX,x |  dex"
-        }
-        Opcode.POP_REGAX_WORD -> throw AssemblyError("cannot load X register from stack because it's used as the stack pointer itself")
-        Opcode.POP_REGXY_WORD -> throw AssemblyError("cannot load X register from stack because it's used as the stack pointer itself")
-        Opcode.POP_REGAY_WORD -> {
-            " inx |  lda  $ESTACK_LO_HEX,x |  ldy  $ESTACK_HI_HEX,x "
-        }
-
-        Opcode.READ_INDEXED_VAR_BYTE -> {
-            """
-                ldy  $ESTACK_LO_PLUS1_HEX,x
-                lda  ${ins.callLabel},y
-                sta  $ESTACK_LO_PLUS1_HEX,x
-                """
-        }
-        Opcode.READ_INDEXED_VAR_WORD -> {
-            """
-                lda  $ESTACK_LO_PLUS1_HEX,x
-                asl  a
-                tay
-                lda  ${ins.callLabel},y
-                sta  $ESTACK_LO_PLUS1_HEX,x
-                lda  ${ins.callLabel}+1,y
-                sta  $ESTACK_HI_PLUS1_HEX,x
-                """
-        }
-        Opcode.READ_INDEXED_VAR_FLOAT -> {
-            """
-                lda  #<${ins.callLabel}
-                ldy  #>${ins.callLabel}
-                jsr  c64flt.push_float_from_indexed_var
-                """
-        }
-        Opcode.WRITE_INDEXED_VAR_BYTE -> {
-            """
-                inx
-                ldy  $ESTACK_LO_HEX,x
-                inx
-                lda  $ESTACK_LO_HEX,x
-                sta  ${ins.callLabel},y
-                """
-        }
-        Opcode.WRITE_INDEXED_VAR_WORD -> {
-            """
-                inx
-                lda  $ESTACK_LO_HEX,x
-                asl  a
-                tay
-                inx
-                lda  $ESTACK_LO_HEX,x
-                sta  ${ins.callLabel},y
-                lda  $ESTACK_HI_HEX,x
-                sta  ${ins.callLabel}+1,y
-                """
-        }
-        Opcode.WRITE_INDEXED_VAR_FLOAT -> {
-            """
-                lda  #<${ins.callLabel}
-                ldy  #>${ins.callLabel}
-                jsr  c64flt.pop_float_to_indexed_var
-                """
-        }
-        Opcode.POP_MEM_BYTE -> {
-            """
-                inx
-                lda  $ESTACK_LO_HEX,x
-                sta  ${hexVal(ins)}
-                """
-        }
-        Opcode.POP_MEM_WORD -> {
-            """
-                inx
-                lda  $ESTACK_LO_HEX,x
-                sta  ${hexVal(ins)}
-                lda  $ESTACK_HI_HEX,x
-                sta  ${hexValPlusOne(ins)}
-                """
-        }
-        Opcode.POP_MEM_FLOAT -> {
-            " lda  ${hexVal(ins)} |  ldy  ${hexValPlusOne(ins)} |  jsr  c64flt.pop_float"
-        }
-        Opcode.POP_MEMWRITE -> {
-            """
-                inx
-                lda  $ESTACK_LO_HEX,x
-                sta  (+) +1
-                lda  $ESTACK_HI_HEX,x
-                sta  (+) +2
-                inx
-                lda  $ESTACK_LO_HEX,x
-+               sta  65535       ; modified
-                """
-        }
-
-        Opcode.POP_VAR_BYTE -> {
-            when (ins.callLabel) {
-                "X" -> throw CompilerException("makes no sense to pop X, it's used as a stack pointer itself")
-                "A" -> " inx |  lda  $ESTACK_LO_HEX,x"
-                "Y" -> " inx |  ldy  $ESTACK_LO_HEX,x"
-                else -> " inx |  lda  $ESTACK_LO_HEX,x |  sta  ${ins.callLabel}"
-            }
-        }
-        Opcode.POP_VAR_WORD -> {
-            " inx |  lda  $ESTACK_LO_HEX,x |  ldy  $ESTACK_HI_HEX,x |  sta  ${ins.callLabel} |  sty  ${ins.callLabel}+1"
-        }
-        Opcode.POP_VAR_FLOAT -> {
-            " lda  #<${ins.callLabel} |  ldy  #>${ins.callLabel} |  jsr  c64flt.pop_float"
-        }
-
-        Opcode.INC_VAR_UB, Opcode.INC_VAR_B -> {
-            when (ins.callLabel) {
-                "A" -> " clc |  adc  #1"
-                "X" -> " inx"
-                "Y" -> " iny"
-                else -> " inc  ${ins.callLabel}"
-            }
-        }
-        Opcode.INC_VAR_UW, Opcode.INC_VAR_W -> {
-            " inc  ${ins.callLabel} |  bne  + |  inc  ${ins.callLabel}+1 |+"
-        }
-        Opcode.INC_VAR_F -> {
-            """
-                lda  #<${ins.callLabel}
-                ldy  #>${ins.callLabel}
-                jsr  c64flt.inc_var_f
-                """
-        }
-        Opcode.POP_INC_MEMORY -> {
-            """
-                inx
-                lda  $ESTACK_LO_HEX,x
-                sta  (+) +1
-                lda  $ESTACK_HI_HEX,x
-                sta  (+) +2
-+               inc  65535     ; modified
-                """
-        }
-        Opcode.POP_DEC_MEMORY -> {
-            """
-                inx
-                lda  $ESTACK_LO_HEX,x
-                sta  (+) +1
-                lda  $ESTACK_HI_HEX,x
-                sta  (+) +2
-+               dec  65535     ; modified
-                """
-        }
-        Opcode.DEC_VAR_UB, Opcode.DEC_VAR_B -> {
-            when (ins.callLabel) {
-                "A" -> " sec |  sbc  #1"
-                "X" -> " dex"
-                "Y" -> " dey"
-                else -> " dec  ${ins.callLabel}"
-            }
-        }
-        Opcode.DEC_VAR_UW, Opcode.DEC_VAR_W -> {
-            " lda  ${ins.callLabel} |  bne  + |  dec  ${ins.callLabel}+1 |+ |  dec  ${ins.callLabel}"
-        }
-        Opcode.DEC_VAR_F -> {
-            """
-                lda  #<${ins.callLabel}
-                ldy  #>${ins.callLabel}
-                jsr  c64flt.dec_var_f
-                """
-        }
-        Opcode.INC_MEMORY -> " inc  ${hexVal(ins)}"
-        Opcode.DEC_MEMORY -> " dec  ${hexVal(ins)}"
-        Opcode.INC_INDEXED_VAR_B, Opcode.INC_INDEXED_VAR_UB -> " inx |  txa |  pha |  lda  $ESTACK_LO_HEX,x |  tax |  inc  ${ins.callLabel},x |  pla |  tax"
-        Opcode.DEC_INDEXED_VAR_B, Opcode.DEC_INDEXED_VAR_UB -> " inx |  txa |  pha |  lda  $ESTACK_LO_HEX,x |  tax |  dec  ${ins.callLabel},x |  pla |  tax"
-
-        Opcode.NEG_B -> " jsr  prog8_lib.neg_b"
-        Opcode.NEG_W -> " jsr  prog8_lib.neg_w"
-        Opcode.NEG_F -> " jsr  c64flt.neg_f"
-        Opcode.ABS_B -> " jsr  prog8_lib.abs_b"
-        Opcode.ABS_W -> " jsr  prog8_lib.abs_w"
-        Opcode.ABS_F -> " jsr  c64flt.abs_f"
-        Opcode.POW_F -> " jsr  c64flt.pow_f"
-        Opcode.INV_BYTE -> {
-            """
-                lda  $ESTACK_LO_PLUS1_HEX,x
-                eor  #255
-                sta  $ESTACK_LO_PLUS1_HEX,x
-                """
-        }
-        Opcode.INV_WORD -> " jsr  prog8_lib.inv_word"
-        Opcode.NOT_BYTE -> " jsr  prog8_lib.not_byte"
-        Opcode.NOT_WORD -> " jsr  prog8_lib.not_word"
-        Opcode.BCS -> {
-            val label = ins.callLabel ?: hexVal(ins)
-            " bcs  $label"
-        }
-        Opcode.BCC -> {
-            val label = ins.callLabel ?: hexVal(ins)
-            " bcc  $label"
-        }
-        Opcode.BNEG -> {
-            val label = ins.callLabel ?: hexVal(ins)
-            " bmi  $label"
-        }
-        Opcode.BPOS -> {
-            val label = ins.callLabel ?: hexVal(ins)
-            " bpl  $label"
-        }
-        Opcode.BVC -> {
-            val label = ins.callLabel ?: hexVal(ins)
-            " bvc  $label"
-        }
-        Opcode.BVS -> {
-            val label = ins.callLabel ?: hexVal(ins)
-            " bvs  $label"
-        }
-        Opcode.BZ -> {
-            val label = ins.callLabel ?: hexVal(ins)
-            " beq  $label"
-        }
-        Opcode.BNZ -> {
-            val label = ins.callLabel ?: hexVal(ins)
-            " bne  $label"
-        }
-        Opcode.JZ -> {
-            val label = ins.callLabel ?: hexVal(ins)
-            """
-                inx
-                lda  $ESTACK_LO_HEX,x
-                beq  $label
-                """
-        }
-        Opcode.JZW -> {
-            val label = ins.callLabel ?: hexVal(ins)
-            """
-                inx
-                lda  $ESTACK_LO_HEX,x
-                beq  $label
-                lda  $ESTACK_HI_HEX,x
-                beq  $label
-                """
-        }
-        Opcode.JNZ -> {
-            val label = ins.callLabel ?: hexVal(ins)
-            """
-                inx
-                lda  $ESTACK_LO_HEX,x
-                bne  $label
-                """
-        }
-        Opcode.JNZW -> {
-            val label = ins.callLabel ?: hexVal(ins)
-            """
-                inx
-                lda  $ESTACK_LO_HEX,x
-                bne  $label
-                lda  $ESTACK_HI_HEX,x
-                bne  $label
-                """
-        }
-        Opcode.CAST_B_TO_UB -> ""  // is a no-op, just carry on with the byte as-is
-        Opcode.CAST_UB_TO_B -> ""  // is a no-op, just carry on with the byte as-is
-        Opcode.CAST_W_TO_UW -> ""  // is a no-op, just carry on with the word as-is
-        Opcode.CAST_UW_TO_W -> ""  // is a no-op, just carry on with the word as-is
-        Opcode.CAST_W_TO_UB -> ""  // is a no-op, just carry on with the lsb of the word as-is
-        Opcode.CAST_W_TO_B -> ""  // is a no-op, just carry on with the lsb of the word as-is
-        Opcode.CAST_UW_TO_UB -> ""  // is a no-op, just carry on with the lsb of the uword as-is
-        Opcode.CAST_UW_TO_B -> ""  // is a no-op, just carry on with the lsb of the uword as-is
-        Opcode.CAST_UB_TO_F -> " jsr  c64flt.stack_ub2float"
-        Opcode.CAST_B_TO_F -> " jsr  c64flt.stack_b2float"
-        Opcode.CAST_UW_TO_F -> " jsr  c64flt.stack_uw2float"
-        Opcode.CAST_W_TO_F -> " jsr  c64flt.stack_w2float"
-        Opcode.CAST_F_TO_UB -> " jsr  c64flt.stack_float2ub"
-        Opcode.CAST_F_TO_B -> " jsr  c64flt.stack_float2b"
-        Opcode.CAST_F_TO_UW -> " jsr  c64flt.stack_float2uw"
-        Opcode.CAST_F_TO_W -> " jsr  c64flt.stack_float2w"
-        Opcode.CAST_UB_TO_UW, Opcode.CAST_UB_TO_W -> " lda  #0 |  sta  $ESTACK_HI_PLUS1_HEX,x"     // clear the msb
-        Opcode.CAST_B_TO_UW, Opcode.CAST_B_TO_W -> " lda  $ESTACK_LO_PLUS1_HEX,x |  ${signExtendA("$ESTACK_HI_PLUS1_HEX,x")}"     // sign extend the lsb
-        Opcode.MSB -> " lda  $ESTACK_HI_PLUS1_HEX,x |  sta  $ESTACK_LO_PLUS1_HEX,x"
-        Opcode.MKWORD -> " inx |  lda  $ESTACK_LO_HEX,x |  sta  $ESTACK_HI_PLUS1_HEX,x "
-
-        Opcode.ADD_UB, Opcode.ADD_B -> {        // TODO inline better (pattern with more opcodes)
-            """
-                lda  $ESTACK_LO_PLUS2_HEX,x
-                clc
-                adc  $ESTACK_LO_PLUS1_HEX,x
-                inx
-                sta  $ESTACK_LO_PLUS1_HEX,x
-                """
-        }
-        Opcode.SUB_UB, Opcode.SUB_B -> {        // TODO inline better (pattern with more opcodes)
-            """
-                lda  $ESTACK_LO_PLUS2_HEX,x
-                sec
-                sbc  $ESTACK_LO_PLUS1_HEX,x
-                inx
-                sta  $ESTACK_LO_PLUS1_HEX,x
-                """
-        }
-        Opcode.ADD_W, Opcode.ADD_UW -> "  jsr  prog8_lib.add_w"
-        Opcode.SUB_W, Opcode.SUB_UW -> "  jsr  prog8_lib.sub_w"
-        Opcode.MUL_B, Opcode.MUL_UB -> "  jsr  prog8_lib.mul_byte"
-        Opcode.MUL_W, Opcode.MUL_UW -> "  jsr  prog8_lib.mul_word"
-        Opcode.MUL_F -> "  jsr  c64flt.mul_f"
-        Opcode.ADD_F -> "  jsr  c64flt.add_f"
-        Opcode.SUB_F -> "  jsr  c64flt.sub_f"
-        Opcode.DIV_F -> "  jsr  c64flt.div_f"
-        Opcode.IDIV_UB -> "  jsr  prog8_lib.idiv_ub"
-        Opcode.IDIV_B -> "  jsr  prog8_lib.idiv_b"
-        Opcode.IDIV_W -> "  jsr  prog8_lib.idiv_w"
-        Opcode.IDIV_UW -> "  jsr  prog8_lib.idiv_uw"
-
-        Opcode.AND_BYTE -> "  jsr  prog8_lib.and_b"
-        Opcode.OR_BYTE -> "  jsr  prog8_lib.or_b"
-        Opcode.XOR_BYTE -> "  jsr  prog8_lib.xor_b"
-        Opcode.AND_WORD -> "  jsr  prog8_lib.and_w"
-        Opcode.OR_WORD -> "  jsr  prog8_lib.or_w"
-        Opcode.XOR_WORD -> "  jsr  prog8_lib.xor_w"
-
-        Opcode.BITAND_BYTE -> "  jsr  prog8_lib.bitand_b"
-        Opcode.BITOR_BYTE -> "  jsr  prog8_lib.bitor_b"
-        Opcode.BITXOR_BYTE -> "  jsr  prog8_lib.bitxor_b"
-        Opcode.BITAND_WORD -> "  jsr  prog8_lib.bitand_w"
-        Opcode.BITOR_WORD -> "  jsr  prog8_lib.bitor_w"
-        Opcode.BITXOR_WORD -> "  jsr  prog8_lib.bitxor_w"
-
-        Opcode.REMAINDER_UB -> "  jsr  prog8_lib.remainder_ub"
-        Opcode.REMAINDER_UW -> "  jsr  prog8_lib.remainder_uw"
-
-        Opcode.GREATER_B -> "  jsr  prog8_lib.greater_b"
-        Opcode.GREATER_UB -> "  jsr  prog8_lib.greater_ub"
-        Opcode.GREATER_W -> "  jsr  prog8_lib.greater_w"
-        Opcode.GREATER_UW -> "  jsr  prog8_lib.greater_uw"
-        Opcode.GREATER_F -> "  jsr  c64flt.greater_f"
-
-        Opcode.GREATEREQ_B -> "  jsr  prog8_lib.greatereq_b"
-        Opcode.GREATEREQ_UB -> "  jsr  prog8_lib.greatereq_ub"
-        Opcode.GREATEREQ_W -> "  jsr  prog8_lib.greatereq_w"
-        Opcode.GREATEREQ_UW -> "  jsr  prog8_lib.greatereq_uw"
-        Opcode.GREATEREQ_F -> "  jsr  c64flt.greatereq_f"
-
-        Opcode.EQUAL_BYTE -> "  jsr  prog8_lib.equal_b"
-        Opcode.EQUAL_WORD -> "  jsr  prog8_lib.equal_w"
-        Opcode.EQUAL_F -> "  jsr  c64flt.equal_f"
-        Opcode.NOTEQUAL_BYTE -> "  jsr prog8_lib.notequal_b"
-        Opcode.NOTEQUAL_WORD -> "  jsr prog8_lib.notequal_w"
-        Opcode.NOTEQUAL_F -> "  jsr  c64flt.notequal_f"
-
-        Opcode.LESS_UB -> "  jsr  prog8_lib.less_ub"
-        Opcode.LESS_B -> "  jsr  prog8_lib.less_b"
-        Opcode.LESS_UW -> "  jsr  prog8_lib.less_uw"
-        Opcode.LESS_W -> "  jsr  prog8_lib.less_w"
-        Opcode.LESS_F -> "  jsr  c64flt.less_f"
-
-        Opcode.LESSEQ_UB -> "  jsr  prog8_lib.lesseq_ub"
-        Opcode.LESSEQ_B -> "  jsr  prog8_lib.lesseq_b"
-        Opcode.LESSEQ_UW -> "  jsr  prog8_lib.lesseq_uw"
-        Opcode.LESSEQ_W -> "  jsr  prog8_lib.lesseq_w"
-        Opcode.LESSEQ_F -> "  jsr  c64flt.lesseq_f"
-
-        Opcode.SHIFTEDL_BYTE -> "  asl  $ESTACK_LO_PLUS1_HEX,x"
-        Opcode.SHIFTEDL_WORD -> "  asl  $ESTACK_LO_PLUS1_HEX,x |  rol  $ESTACK_HI_PLUS1_HEX,x"
-        Opcode.SHIFTEDR_SBYTE -> "  lda  $ESTACK_LO_PLUS1_HEX,x |  asl  a |  ror  $ESTACK_LO_PLUS1_HEX,x"
-        Opcode.SHIFTEDR_UBYTE -> "  lsr  $ESTACK_LO_PLUS1_HEX,x"
-        Opcode.SHIFTEDR_SWORD -> "  lda  $ESTACK_HI_PLUS1_HEX,x |  asl a  |  ror  $ESTACK_HI_PLUS1_HEX,x |  ror  $ESTACK_LO_PLUS1_HEX,x"
-        Opcode.SHIFTEDR_UWORD -> "  lsr  $ESTACK_HI_PLUS1_HEX,x |  ror  $ESTACK_LO_PLUS1_HEX,x"
-
-        else -> null
-    }
-}

DeprecatedStackVm/src/prog8/vm/stackvm/Main.kt

@@ -1,47 +0,0 @@
-package prog8.vm.stackvm
-
-import prog8.printSoftwareHeader
-import prog8.vm.astvm.ScreenDialog
-import java.awt.EventQueue
-import javax.swing.Timer
-import kotlin.system.exitProcess
-
-fun main(args: Array<String>) {
-    stackVmMain(args)
-}
-
-fun stackVmMain(args: Array<String>) {
-    printSoftwareHeader("StackVM")
-
-    if(args.size != 1) {
-        System.err.println("requires one argument: name of stackvm sourcecode file")
-        exitProcess(1)
-    }
-
-    val program = Program.load(args.first())
-    val vm = StackVm(traceOutputFile = null)
-    val dialog = ScreenDialog("StackVM")
-    vm.load(program, dialog.canvas)
-    EventQueue.invokeLater {
-        dialog.pack()
-        dialog.isVisible = true
-        dialog.start()
-
-        val programTimer = Timer(10) { a ->
-            try {
-                vm.step()
-            } catch(bp: VmBreakpointException) {
-                println("Breakpoint: execution halted. Press enter to resume.")
-                readLine()
-            } catch (tx: VmTerminationException) {
-                println("Execution halted: ${tx.message}")
-                (a.source as Timer).stop()
-            }
-        }
-
-        val irqTimer = Timer(1000/60) { a -> vm.irq(a.`when`) }
-
-        programTimer.start()
-        irqTimer.start()
-    }
-}

DeprecatedStackVm/src/prog8/vm/stackvm/Program.kt

@@ -1,302 +0,0 @@
-package prog8.vm.stackvm
-
-import prog8.ast.antlr.unescape
-import prog8.ast.base.*
-import prog8.ast.expressions.AddressOf
-import prog8.ast.expressions.IdentifierReference
-import prog8.compiler.HeapValues
-import prog8.compiler.IntegerOrAddressOf
-import prog8.compiler.intermediate.Instruction
-import prog8.compiler.intermediate.LabelInstr
-import prog8.compiler.intermediate.Opcode
-import prog8.compiler.intermediate.opcodesWithVarArgument
-import prog8.vm.RuntimeValue
-import java.io.File
-import java.util.*
-import java.util.regex.Pattern
-
-class Program (val name: String,
-               val program: MutableList<Instruction>,
-               val variables: Map<String, RuntimeValue>,
-               val memoryPointers: Map<String, Pair<Int, DataType>>,
-               val labels: Map<String, Int>,
-               val memory: Map<Int, List<RuntimeValue>>,
-               val heap: HeapValues)
-{
-    init {
-        // add end of program marker and some sentinel instructions, to correctly connect all others
-        program.add(LabelInstr("____program_end", false))
-        program.add(Instruction(Opcode.TERMINATE))
-        program.add(Instruction(Opcode.NOP))
-    }
-
-    companion object {
-        fun load(filename: String): Program {
-            val lines = File(filename).readLines().withIndex().iterator()
-            val memory = mutableMapOf<Int, List<RuntimeValue>>()
-            val heap = HeapValues()
-            val program = mutableListOf<Instruction>()
-            val variables = mutableMapOf<String, RuntimeValue>()
-            val memoryPointers = mutableMapOf<String, Pair<Int, DataType>>()
-            val labels = mutableMapOf<String, Int>()
-
-            while(lines.hasNext()) {
-                val (lineNr, line) = lines.next()
-                if(line.startsWith(';') || line.isEmpty())
-                    continue
-                else if(line=="%memory")
-                    loadMemory(lines, memory)
-                else if(line=="%heap")
-                    loadHeap(lines, heap)
-                else if(line.startsWith("%block "))
-                    loadBlock(lines, heap, program, variables, memoryPointers, labels)
-                else throw VmExecutionException("syntax error at line ${lineNr + 1}")
-            }
-            return Program(filename, program, variables, memoryPointers, labels, memory, heap)
-        }
-
-        private fun loadBlock(lines: Iterator<IndexedValue<String>>,
-                              heap: HeapValues,
-                              program: MutableList<Instruction>,
-                              variables: MutableMap<String, RuntimeValue>,
-                              memoryPointers: MutableMap<String, Pair<Int, DataType>>,
-                              labels: MutableMap<String, Int>)
-        {
-            while(true) {
-                val (_, line) = lines.next()
-                if(line.isEmpty())
-                    continue
-                else if(line=="%end_block")
-                    return
-                else if(line=="%variables")
-                    loadVars(lines, variables)
-                else if(line=="%memorypointers")
-                    loadMemoryPointers(lines, memoryPointers, heap)
-                else if(line=="%instructions") {
-                    val (blockInstructions, blockLabels) = loadInstructions(lines, heap)
-                    val baseIndex = program.size
-                    program.addAll(blockInstructions)
-                    val labelsWithIndex = blockLabels.mapValues { baseIndex+blockInstructions.indexOf(it.value) }
-                    labels.putAll(labelsWithIndex)
-                }
-            }
-        }
-
-        private fun loadHeap(lines: Iterator<IndexedValue<String>>, heap: HeapValues) {
-            val splitpattern = Pattern.compile("\\s+")
-            val heapvalues = mutableListOf<Triple<Int, DataType, String>>()
-            while(true) {
-                val (_, line) = lines.next()
-                if (line == "%end_heap")
-                    break
-                val parts = line.split(splitpattern, limit=3)
-                val value = Triple(parts[0].toInt(), DataType.valueOf(parts[1].toUpperCase()), parts[2])
-                heapvalues.add(value)
-            }
-            heapvalues.sortedBy { it.first }.forEach {
-                when(it.second) {
-                    DataType.STR, DataType.STR_S -> heap.addString(it.second, unescape(it.third.substring(1, it.third.length - 1), Position("<stackvmsource>", 0, 0, 0)))
-                    DataType.ARRAY_UB, DataType.ARRAY_B,
-                    DataType.ARRAY_UW, DataType.ARRAY_W -> {
-                        val numbers = it.third.substring(1, it.third.length-1).split(',')
-                        val intarray = numbers.map{number->
-                            val num=number.trim()
-                            if(num.startsWith("&")) {
-                                // it's AddressOf
-                                val scopedname = num.substring(1)
-                                val iref = IdentifierReference(scopedname.split('.'), Position("<intermediate>", 0, 0, 0))
-                                val addrOf = AddressOf(iref, Position("<intermediate>", 0, 0, 0))
-                                addrOf.scopedname=scopedname
-                                IntegerOrAddressOf(null, addrOf)
-                            } else {
-                                IntegerOrAddressOf(num.toInt(), null)
-                            }
-                        }.toTypedArray()
-                        heap.addIntegerArray(it.second, intarray)
-                    }
-                    DataType.ARRAY_F -> {
-                        val numbers = it.third.substring(1, it.third.length-1).split(',')
-                        val doublearray = numbers.map{number->number.trim().toDouble()}.toDoubleArray()
-                        heap.addDoublesArray(doublearray)
-                    }
-                    in NumericDatatypes -> throw VmExecutionException("invalid heap value type ${it.second}")
-                    else -> throw VmExecutionException("weird datatype")
-                }
-            }
-        }
-
-        private fun loadInstructions(lines: Iterator<IndexedValue<String>>, heap: HeapValues): Pair<MutableList<Instruction>, Map<String, Instruction>> {
-            val instructions = mutableListOf<Instruction>()
-            val labels = mutableMapOf<String, Instruction>()
-            val splitpattern = Pattern.compile("\\s+")
-            val nextInstructionLabels = Stack<String>()     // more than one label can occur on the isSameAs line
-
-            while(true) {
-                val (lineNr, line) = lines.next()
-                if(line.isEmpty())
-                    continue
-                if(line=="%end_instructions")
-                    return Pair(instructions, labels)
-                if(!line.startsWith(' ') && line.endsWith(':')) {
-                    nextInstructionLabels.push(line.substring(0, line.length-1))
-                } else if(line.startsWith(' ')) {
-                    val parts = line.trimStart().split(splitpattern, limit = 2)
-                    val opcodeStr = parts[0].toUpperCase()
-                    val opcode= Opcode.valueOf(if(opcodeStr.startsWith('_')) opcodeStr.substring(1) else opcodeStr)
-                    val args = if(parts.size==2) parts[1] else null
-                    val instruction = when(opcode) {
-                        Opcode.LINE -> Instruction(opcode, null, callLabel = args)
-                        Opcode.JUMP, Opcode.CALL, Opcode.BNEG, Opcode.BPOS,
-                        Opcode.BZ, Opcode.BNZ, Opcode.BCS, Opcode.BCC,
-                        Opcode.JZ, Opcode.JNZ, Opcode.JZW, Opcode.JNZW -> {
-                            if(args!!.startsWith('$')) {
-                                Instruction(opcode, RuntimeValue(DataType.UWORD, args.substring(1).toInt(16)))
-                            } else {
-                                Instruction(opcode, callLabel = args)
-                            }
-                        }
-                        in opcodesWithVarArgument -> {
-                            val withoutQuotes =
-                                    if(args!!.startsWith('"') && args.endsWith('"'))
-                                        args.substring(1, args.length-1) else args
-
-                            Instruction(opcode, callLabel = withoutQuotes)
-                        }
-                        Opcode.SYSCALL -> {
-                            if(args!! in syscallNames) {
-                                val call = Syscall.valueOf(args)
-                                Instruction(opcode, RuntimeValue(DataType.UBYTE, call.callNr))
-                            } else {
-                                val args2 = args.replace('.', '_')
-                                if(args2 in syscallNames) {
-                                    val call = Syscall.valueOf(args2)
-                                    Instruction(opcode, RuntimeValue(DataType.UBYTE, call.callNr))
-                                } else {
-                                    // the syscall is not yet implemented. emit a stub.
-                                    Instruction(Opcode.SYSCALL, RuntimeValue(DataType.UBYTE, Syscall.SYSCALLSTUB.callNr), callLabel = args2)
-                                }
-                            }
-                        }
-                        Opcode.INCLUDE_FILE -> {
-                            val argparts = args!!.split(' ')
-                            val filename = argparts[0]
-                            val offset = if(argparts.size>=2 && argparts[1]!="null") getArgValue(argparts[1], heap) else null
-                            val length = if(argparts.size>=3 && argparts[2]!="null") getArgValue(argparts[2], heap) else null
-                            Instruction(opcode, offset, length, filename)
-                        }
-                        else -> {
-                            Instruction(opcode, getArgValue(args, heap))
-                        }
-                    }
-                    instructions.add(instruction)
-                    while(nextInstructionLabels.isNotEmpty()) {
-                        val label = nextInstructionLabels.pop()
-                        labels[label] = instruction
-                    }
-                } else throw VmExecutionException("syntax error at line ${lineNr + 1}")
-            }
-        }
-
-        private fun getArgValue(args: String?, heap: HeapValues): RuntimeValue? {
-            if(args==null)
-                return null
-            if(args[0]=='"' && args[args.length-1]=='"') {
-                throw VmExecutionException("encountered a string arg value, but all strings should already have been moved into the heap")
-            }
-            val (type, valueStr) = args.split(':')
-            return when(type) {
-                "b" -> RuntimeValue(DataType.BYTE, valueStr.toShort(16))
-                "ub" -> RuntimeValue(DataType.UBYTE, valueStr.toShort(16))
-                "w" -> RuntimeValue(DataType.WORD, valueStr.toInt(16))
-                "uw" -> RuntimeValue(DataType.UWORD, valueStr.toInt(16))
-                "f" -> RuntimeValue(DataType.FLOAT, valueStr.toDouble())
-                "heap" -> {
-                    val heapId = valueStr.toInt()
-                    RuntimeValue(heap.get(heapId).type, heapId = heapId)
-                }
-                else -> throw VmExecutionException("invalid datatype $type")
-            }
-        }
-
-        private fun loadVars(lines: Iterator<IndexedValue<String>>,
-                             vars: MutableMap<String, RuntimeValue>) {
-            val splitpattern = Pattern.compile("\\s+")
-            while(true) {
-                val (_, line) = lines.next()
-                if(line=="%end_variables")
-                    return
-                val (name, typeStr, valueStr) = line.split(splitpattern, limit = 3)
-                if(valueStr[0] !='"' && ':' !in valueStr)
-                    throw VmExecutionException("missing value type character")
-                val value = when(val type = DataType.valueOf(typeStr.toUpperCase())) {
-                    DataType.UBYTE -> RuntimeValue(DataType.UBYTE, valueStr.substring(3).substringBefore(' ').toShort(16))// TODO process ZP and struct info?
-                    DataType.BYTE -> RuntimeValue(DataType.BYTE, valueStr.substring(2).substringBefore(' ').toShort(16))// TODO process ZP and struct info?
-                    DataType.UWORD -> RuntimeValue(DataType.UWORD, valueStr.substring(3).substringBefore(' ').toInt(16))// TODO process ZP and struct info?
-                    DataType.WORD -> RuntimeValue(DataType.WORD, valueStr.substring(2).substringBefore(' ').toInt(16))// TODO process ZP and struct info?
-                    DataType.FLOAT -> RuntimeValue(DataType.FLOAT, valueStr.substring(2).substringBefore(' ').toDouble())// TODO process ZP and struct info?
-                    in StringDatatypes -> {
-                        if(valueStr.startsWith('"') && valueStr.endsWith('"'))
-                            throw VmExecutionException("encountered a var with a string value, but all string values should already have been moved into the heap")
-                        else if(!valueStr.startsWith("heap:"))
-                            throw VmExecutionException("invalid string value, should be a heap reference")
-                        else {
-                            val heapId = valueStr.substring(5).substringBefore(' ').toInt()     // TODO process ZP and struct info?
-                            RuntimeValue(type, heapId = heapId)
-                        }
-                    }
-                    in ArrayDatatypes -> {
-                        if(!valueStr.startsWith("heap:"))
-                            throw VmExecutionException("invalid array value, should be a heap reference")
-                        else {
-                            val heapId = valueStr.substring(5).substringBefore(' ').toInt()     // TODO process ZP and struct info?
-                            RuntimeValue(type, heapId = heapId)
-                        }
-                    }
-                    else -> throw VmExecutionException("weird datatype")
-                }
-                vars[name] = value
-            }
-        }
-
-        private fun loadMemoryPointers(lines: Iterator<IndexedValue<String>>,
-                                       pointers: MutableMap<String, Pair<Int, DataType>>,
-                                       heap: HeapValues) {
-            val splitpattern = Pattern.compile("\\s+")
-            while(true) {
-                val (_, line) = lines.next()
-                if(line=="%end_memorypointers")
-                    return
-                val (name, typeStr, valueStr) = line.split(splitpattern, limit = 3)
-                if(valueStr[0] !='"' && ':' !in valueStr)
-                    throw VmExecutionException("missing value type character")
-                val type = DataType.valueOf(typeStr.toUpperCase())
-                val value = getArgValue(valueStr, heap)!!.integerValue()
-                pointers[name] = Pair(value, type)
-            }
-        }
-
-        private fun loadMemory(lines: Iterator<IndexedValue<String>>, memory: MutableMap<Int, List<RuntimeValue>>): Map<Int, List<RuntimeValue>> {
-            while(true) {
-                val (lineNr, line) = lines.next()
-                if(line=="%end_memory")
-                    return memory
-                val address = line.substringBefore(' ').toInt(16)
-                val rest = line.substringAfter(' ').trim()
-                if(rest.startsWith('"')) {
-                    TODO("memory init with char/string")
-                } else {
-                    val valueStrings = rest.split(' ')
-                    val values = mutableListOf<RuntimeValue>()
-                    valueStrings.forEach {
-                        when(it.length) {
-                            2 -> values.add(RuntimeValue(DataType.UBYTE, it.toShort(16)))
-                            4 -> values.add(RuntimeValue(DataType.UWORD, it.toInt(16)))
-                            else -> throw VmExecutionException("invalid value at line $lineNr+1")
-                        }
-                    }
-                    memory[address] = values
-                }
-            }
-        }
-    }
-}

README.md

@@ -26,25 +26,24 @@ which aims to provide many conveniences over raw assembly code (even when using
 - abstracting away low level aspects such as ZeroPage handling, program startup, explicit memory addresses
 - various code optimizations (code structure, logical and numerical expressions, unused code removal...)
 - inline assembly allows you to have full control when every cycle or byte matters
-- many built-in functions such as ``sin``, ``cos``, ``rnd``, ``abs``, ``min``, ``max``, ``sqrt``, ``msb``, ``rol``, ``ror``, ``swap``, ``memset``, ``memcopy``
+- many built-in functions such as ``sin``, ``cos``, ``rnd``, ``abs``, ``min``, ``max``, ``sqrt``, ``msb``, ``rol``, ``ror``, ``swap``, ``memset``, ``memcopy``, ``sort`` and ``reverse``
 
 Rapid edit-compile-run-debug cycle:
 
-- use modern PC to work on 
+- use modern PC to work on
 - quick compilation times (seconds)
-- option to automatically run the program in the Vice emulator  
+- option to automatically run the program in the Vice emulator
 - breakpoints, that let the Vice emulator drop into the monitor if execution hits them
 - source code labels automatically loaded in Vice emulator so it can show them in disassembly
 - virtual machine that can execute compiled code directy on the host system,
-  without having to actually convert it to assembly to run on a real 6502 
+  without having to actually convert it to assembly to run on a real 6502
 
 It is mainly targeted at the Commodore-64 machine at this time.
 Contributions to add support for other 8-bit (or other?!) machines are welcome.
 
 Documentation/manual
 --------------------
-See https://prog8.readthedocs.io/
+This describes the language, but also how to build and run the compiler. See https://prog8.readthedocs.io/
-
 
 Required tools
 --------------

compiler/build.gradle

@@ -1,48 +1,51 @@
 buildscript {
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61"
     }
 }
 
 plugins {
-    // id "org.jetbrains.kotlin.jvm" version $kotlinVersion
+    // id "org.jetbrains.kotlin.jvm" version "1.3.61"
     id 'application'
     id 'org.jetbrains.dokka' version "0.9.18"
-    id 'com.github.johnrengelman.shadow' version '5.1.0'
+    id 'com.github.johnrengelman.shadow' version '5.2.0'
     id 'java'
 }
 
 apply plugin: "kotlin"
 apply plugin: "java"
 
+targetCompatibility = 1.8
+sourceCompatibility = 1.8
 
 repositories {
     mavenLocal()
     mavenCentral()
     jcenter()
+    maven { url "https://dl.bintray.com/orangy/maven/" }
 }
 
 def prog8version = rootProject.file('compiler/res/version.txt').text.trim()
 
 dependencies {
     implementation project(':parser')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    // implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
+    // implementation "org.jetbrains.kotlin:kotlin-reflect"
-    // runtime "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
+    implementation 'org.antlr:antlr4-runtime:4.8'
-    runtime 'org.antlr:antlr4-runtime:4.7.2'
+    implementation 'org.jetbrains.kotlinx:kotlinx-cli-jvm:0.1.0-dev-5'
-    runtime project(':parser')
+    // implementation 'net.razorvine:ksim65:1.6'
+    implementation project(':parser')
 
-    testImplementation "org.jetbrains.kotlin:kotlin-test-junit5:$kotlinVersion"
+    testImplementation "org.jetbrains.kotlin:kotlin-test-junit5"
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.2'
     testImplementation 'org.hamcrest:hamcrest-junit:2.0.0.0'
-
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.2'
 }
 
 compileKotlin {
     kotlinOptions {
         jvmTarget = "1.8"
-        verbose = true
+        // verbose = true
         // freeCompilerArgs += "-XXLanguage:+NewInference"
     }
 }
@@ -81,12 +84,9 @@ artifacts {
 }
 
 
-// To create a fat-jar use the 'create_compiler_jar' script for now
-// @todo investigate https://imperceptiblethoughts.com/shadow/introduction/
-
 shadowJar {
-    baseName = 'prog8compiler'
+    archiveBaseName = 'prog8compiler'
-    version = prog8version
+    archiveVersion = prog8version
     // minimize()
 }
 

compiler/compiler.iml

@@ -11,8 +11,9 @@
     <orderEntry type="jdk" jdkName="openjdk-11" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="library" name="antlr-runtime-4.7.2" level="project" />
     <orderEntry type="module" module-name="parser" />
     <orderEntry type="library" name="unittest-libs" level="project" />
+    <orderEntry type="library" name="kotlinx-cli-jvm-0.1.0-dev-5" level="project" />
+    <orderEntry type="library" name="antlr-runtime-4.8" level="project" />
   </component>
 </module>

compiler/res/prog8lib/c64utils.p8

@@ -15,28 +15,199 @@ c64utils {
 		const   uword  ESTACK_HI	= $cf00
 
 
-; ----- utility functions ----
+; ----- number conversions to decimal strings
 
-asmsub  ubyte2decimal  (ubyte value @ A) -> ubyte @ Y, ubyte @ X, ubyte @ A  {
+asmsub  ubyte2decimal  (ubyte value @ A) -> ubyte @ Y, ubyte @ A, ubyte @ X  {
-	; ---- A to decimal string in Y/X/A  (100s in Y, 10s in X, 1s in A)
+	; ---- A to decimal string in Y/A/X  (100s in Y, 10s in A, 1s in X)
-	%asm {{
+    %asm {{
-		ldy  #$2f
+        ldy  #uword2decimal.ASCII_0_OFFSET
-		ldx  #$3a
+        bne  uword2decimal.hex_try200
-		sec
+        rts
--               iny
-		sbc  #100
-		bcs  -
--               dex
-		adc  #10
-		bmi  -
-		adc  #$2f
-		rts
 	}}
 }
 
-asmsub  byte2decimal  (ubyte value @ A) -> ubyte @ Y, ubyte @ X, ubyte @ A  {
+asmsub  uword2decimal  (uword value @ AY) -> ubyte @Y, ubyte @A, ubyte @X  {
-	; ---- A (signed byte) to decimal string in Y/X/A  (100s in Y, 10s in X, 1s in A)
+    ;  ---- convert 16 bit uword in A/Y to decimal
-	;      note: the '-' is not part of the conversion here if it's a negative number
+    ;  output in uword2decimal.decTenThousands, decThousands, decHundreds, decTens, decOnes
+    ;  (these are terminated by a zero byte so they can be easily printed)
+    ;  also returns Y = 100's, A = 10's, X = 1's
+
+    %asm {{
+
+;Convert 16 bit Hex to Decimal (0-65535) Rev 2
+;By Omegamatrix    Further optimizations by tepples
+; routine from http://forums.nesdev.com/viewtopic.php?f=2&t=11341&start=15
+
+;HexToDec99
+; start in A
+; end with A = 10's, decOnes (also in X)
+
+;HexToDec255
+; start in A
+; end with Y = 100's, A = 10's, decOnes (also in X)
+
+;HexToDec999
+; start with A = high byte, Y = low byte
+; end with Y = 100's, A = 10's, decOnes (also in X)
+; requires 1 extra temp register on top of decOnes, could combine
+; these two if HexToDec65535 was eliminated...
+
+;HexToDec65535
+; start with A/Y (low/high) as 16 bit value
+; end with decTenThousand, decThousand, Y = 100's, A = 10's, decOnes (also in X)
+; (irmen: I store Y and A in decHundreds and decTens too, so all of it can be easily printed)
+
+
+ASCII_0_OFFSET 	= $30
+temp       	    = c64.SCRATCH_ZPB1	; byte in zeropage
+hexHigh      	= c64.SCRATCH_ZPWORD1	; byte in zeropage
+hexLow       	= c64.SCRATCH_ZPWORD1+1	; byte in zeropage
+
+
+HexToDec65535; SUBROUTINE
+    sty    hexHigh               ;3  @9
+    sta    hexLow                ;3  @12
+    tya
+    tax                          ;2  @14
+    lsr    a                     ;2  @16
+    lsr    a                     ;2  @18   integer divide 1024 (result 0-63)
+
+    cpx    #$A7                  ;2  @20   account for overflow of multiplying 24 from 43,000 ($A7F8) onward,
+    adc    #1                    ;2  @22   we can just round it to $A700, and the divide by 1024 is fine...
+
+    ;at this point we have a number 1-65 that we have to times by 24,
+    ;add to original sum, and Mod 1024 to get a remainder 0-999
+
+
+    sta    temp                  ;3  @25
+    asl    a                     ;2  @27
+    adc    temp                  ;3  @30  x3
+    tay                          ;2  @32
+    lsr    a                     ;2  @34
+    lsr    a                     ;2  @36
+    lsr    a                     ;2  @38
+    lsr    a                     ;2  @40
+    lsr    a                     ;2  @42
+    tax                          ;2  @44
+    tya                          ;2  @46
+    asl    a                     ;2  @48
+    asl    a                     ;2  @50
+    asl    a                     ;2  @52
+    clc                          ;2  @54
+    adc    hexLow                ;3  @57
+    sta    hexLow                ;3  @60
+    txa                          ;2  @62
+    adc    hexHigh               ;3  @65
+    sta    hexHigh               ;3  @68
+    ror    a                     ;2  @70
+    lsr    a                     ;2  @72
+    tay                          ;2  @74    integer divide 1,000 (result 0-65)
+
+    lsr    a                     ;2  @76    split the 1,000 and 10,000 digit
+    tax                          ;2  @78
+    lda    ShiftedBcdTab,x       ;4  @82
+    tax                          ;2  @84
+    rol    a                     ;2  @86
+    and    #$0F                  ;2  @88
+    ora    #ASCII_0_OFFSET
+    sta    decThousands          ;3  @91
+    txa                          ;2  @93
+    lsr    a                     ;2  @95
+    lsr    a                     ;2  @97
+    lsr    a                     ;2  @99
+    ora    #ASCII_0_OFFSET
+    sta    decTenThousands       ;3  @102
+
+    lda    hexLow                ;3  @105
+    cpy    temp                  ;3  @108
+    bmi    _doSubtract           ;2³ @110/111
+    beq    _useZero               ;2³ @112/113
+    adc    #23 + 24              ;2  @114
+_doSubtract
+    sbc    #23                   ;2  @116
+    sta    hexLow                ;3  @119
+_useZero
+    lda    hexHigh               ;3  @122
+    sbc    #0                    ;2  @124
+
+Start100s
+    and    #$03                  ;2  @126
+    tax                          ;2  @128   0,1,2,3
+    cmp    #2                    ;2  @130
+    rol    a                     ;2  @132   0,2,5,7
+    ora    #ASCII_0_OFFSET
+    tay                          ;2  @134   Y = Hundreds digit
+
+    lda    hexLow                ;3  @137
+    adc    Mod100Tab,x           ;4  @141    adding remainder of 256, 512, and 256+512 (all mod 100)
+    bcs    hex_doSub200             ;2³ @143/144
+
+hex_try200
+    cmp    #200                  ;2  @145
+    bcc    hex_try100               ;2³ @147/148
+hex_doSub200
+    iny                          ;2  @149
+    iny                          ;2  @151
+    sbc    #200                  ;2  @153
+hex_try100
+    cmp    #100                  ;2  @155
+    bcc    HexToDec99            ;2³ @157/158
+    iny                          ;2  @159
+    sbc    #100                  ;2  @161
+
+HexToDec99; SUBROUTINE
+    lsr    a                     ;2  @163
+    tax                          ;2  @165
+    lda    ShiftedBcdTab,x       ;4  @169
+    tax                          ;2  @171
+    rol    a                     ;2  @173
+    and    #$0F                  ;2  @175
+    ora    #ASCII_0_OFFSET
+    sta    decOnes               ;3  @178
+    txa                          ;2  @180
+    lsr    a                     ;2  @182
+    lsr    a                     ;2  @184
+    lsr    a                     ;2  @186
+    ora    #ASCII_0_OFFSET
+
+    ; irmen: load X with ones, and store Y and A too, for easy printing afterwards
+    sty  decHundreds
+    sta  decTens
+    ldx  decOnes
+    rts                          ;6  @192   Y=hundreds, A = tens digit, X=ones digit
+
+
+HexToDec999; SUBROUTINE
+    sty    hexLow                ;3  @9
+    jmp    Start100s             ;3  @12
+
+Mod100Tab
+    .byte 0,56,12,56+12
+
+ShiftedBcdTab
+    .byte $00,$01,$02,$03,$04,$08,$09,$0A,$0B,$0C
+    .byte $10,$11,$12,$13,$14,$18,$19,$1A,$1B,$1C
+    .byte $20,$21,$22,$23,$24,$28,$29,$2A,$2B,$2C
+    .byte $30,$31,$32,$33,$34,$38,$39,$3A,$3B,$3C
+    .byte $40,$41,$42,$43,$44,$48,$49,$4A,$4B,$4C
+
+decTenThousands   	.byte  0
+decThousands    	.byte  0
+decHundreds		.byte  0
+decTens			.byte  0
+decOnes   		.byte  0
+			.byte  0		; zero-terminate the decimal output string
+
+    }}
+}
+
+
+; ----- utility functions ----
+
+
+asmsub  byte2decimal  (byte value @ A) -> ubyte @ Y, ubyte @ A, ubyte @ X  {
+	; ---- A (signed byte) to decimal string in Y/A/X  (100s in Y, 10s in A, 1s in X)
+	;      note: if the number is negative, you have to deal with the '-' yourself!
 	%asm {{
 		cmp  #0
 		bpl  +
@@ -48,7 +219,7 @@ asmsub  byte2decimal  (ubyte value @ A) -> ubyte @ Y, ubyte @ X, ubyte @ A  {
 }
 
 asmsub  ubyte2hex  (ubyte value @ A) -> ubyte @ A, ubyte @ Y  {
-	; ---- A to hex string in AY (first hex char in A, second hex char in Y)
+	; ---- A to hex petscii string in AY (first hex char in A, second hex char in Y)
 	%asm {{
 		stx  c64.SCRATCH_ZPREGX
 		pha
@@ -69,7 +240,6 @@ _hex_digits	.text "0123456789abcdef"	; can probably be reused for other stuff as
 	}}
 }
 
-
 asmsub  uword2hex  (uword value @ AY) clobbers(A,Y)  {
 	; ---- convert 16 bit uword in A/Y into 4-character hexadecimal string 'uword2hex.output' (0-terminated)
 	%asm {{
@@ -87,92 +257,6 @@ output	.text  "0000", $00      ; 0-terminated output buffer (to make printing ea
 	}}
 }
 
-asmsub  uword2bcd  (uword value @ AY) clobbers(A,Y)  {
-	; Convert an 16 bit binary value to BCD
-	;
-	; This function converts a 16 bit binary value in A/Y into a 24 bit BCD. It
-	; works by transferring one bit a time from the source and adding it
-	; into a BCD value that is being doubled on each iteration. As all the
-	; arithmetic is being done in BCD the result is a binary to decimal
-	; conversion.
-	%asm {{
-		sta  c64.SCRATCH_ZPB1
-		sty  c64.SCRATCH_ZPREG
-		php
-		pla             ; read status register
-		and  #%00000100
-		sta  _had_irqd
-		sei				; disable interrupts because of bcd math
-		sed				; switch to decimal mode
-		lda  #0				; ensure the result is clear
-		sta  bcdbuff+0
-		sta  bcdbuff+1
-		sta  bcdbuff+2
-		ldy  #16			; the number of source bits
-
--		asl  c64.SCRATCH_ZPB1		; shift out one bit
-		rol  c64.SCRATCH_ZPREG
-		lda  bcdbuff+0		; and add into result
-		adc  bcdbuff+0
-		sta  bcdbuff+0
-		lda  bcdbuff+1		; propagating any carry
-		adc  bcdbuff+1
-		sta  bcdbuff+1
-		lda  bcdbuff+2		; ... thru whole result
-		adc  bcdbuff+2
-		sta  bcdbuff+2
-		dey				; and repeat for next bit
-		bne  -
-		cld				; back to binary
-		lda  _had_irqd
-		bne  +
-		cli				; enable interrupts again (only if they were enabled before)
-+		rts
-_had_irqd  .byte  0
-bcdbuff  .byte  0,0,0
-	}}
-}
-
-
-asmsub  uword2decimal  (uword value @ AY) clobbers(A) -> ubyte @ Y  {
-	; ---- convert 16 bit uword in A/Y into 0-terminated decimal string into memory  'uword2decimal.output'
-	;      returns length of resulting string in Y
-	%asm {{
-		jsr  uword2bcd
-		lda  uword2bcd.bcdbuff+2
-		clc
-		adc  #'0'
-		sta  output
-		ldy  #1
-		lda  uword2bcd.bcdbuff+1
-		jsr  +
-		lda  uword2bcd.bcdbuff+0
-
-+		pha
-		lsr  a
-		lsr  a
-		lsr  a
-		lsr  a
-		clc
-		adc  #'0'
-		sta  output,y
-		iny
-		pla
-		and  #$0f
-		adc  #'0'
-		sta  output,y
-		iny
-		lda  #0
-		sta  output,y
-		rts
-
-output  .text  "00000", $00     ; 0 terminated
-
-	}}
-
-}
-
-
 asmsub str2uword(str string @ AY) -> uword @ AY {
 	; -- returns the unsigned word value of the string number argument in AY
 	;    the number may NOT be preceded by a + sign and may NOT contain spaces
@@ -227,7 +311,6 @@ _result_times_10     ; (W*4 + W)*2
 	}}
 }
 
-
 asmsub str2word(str string @ AY) -> word @ AY {
 	; -- returns the signed word value of the string number argument in AY
 	;    the number may be preceded by a + or - sign but may NOT contain spaces
@@ -283,7 +366,6 @@ _negative	.byte  0
 	}}
 }
 
-
 asmsub  set_irqvec_excl() clobbers(A)  {
 	%asm {{
 		sei
@@ -341,6 +423,7 @@ _irq_handler_init
 		dex
 		dex
 		dex
+		cld
 		rts
 
 _irq_handler_end
@@ -372,7 +455,6 @@ IRQ_SCRATCH_ZPWORD2	.word  0
 		}}
 }
 
-
 asmsub  restore_irqvec() {
 	%asm {{
 		sei
@@ -389,7 +471,6 @@ asmsub  restore_irqvec() {
 	}}
 }
 
-
 asmsub  set_rasterirq(uword rasterpos @ AY) clobbers(A) {
 	%asm {{
 		sei
@@ -454,13 +535,11 @@ _raster_irq_handler
 }
 
 
-
 }  ; ------ end of block c64utils
 
 
 
 
-
 c64scr {
 	; ---- this block contains (character) Screen and text I/O related functions ----
 
@@ -480,7 +559,6 @@ asmsub  clear_screen (ubyte char @ A, ubyte color @ Y) clobbers(A)  {
 
 }
 
-
 asmsub  clear_screenchars (ubyte char @ A) clobbers(Y)  {
 	; ---- clear the character screen with the given fill character (leaves colors)
 	;      (assumes screen matrix is at the default address)
@@ -521,7 +599,6 @@ _loop		sta  c64.Colors,y
         }}
 }
 
-
 asmsub  scroll_left_full  (ubyte alsocolors @ Pc) clobbers(A, Y)  {
 	; ---- scroll the whole screen 1 character to the left
 	;      contents of the rightmost column are unchanged, you should clear/refill this yourself
@@ -582,7 +659,6 @@ _scroll_screen  ; scroll the screen memory
 	}}
 }
 
-
 asmsub  scroll_right_full  (ubyte alsocolors @ Pc) clobbers(A)  {
 	; ---- scroll the whole screen 1 character to the right
 	;      contents of the leftmost column are unchanged, you should clear/refill this yourself
@@ -635,7 +711,6 @@ _scroll_screen  ; scroll the screen memory
 	}}
 }
 
-
 asmsub  scroll_up_full  (ubyte alsocolors @ Pc) clobbers(A)  {
 	; ---- scroll the whole screen 1 character up
 	;      contents of the bottom row are unchanged, you should refill/clear this yourself
@@ -688,7 +763,6 @@ _scroll_screen  ; scroll the screen memory
 	}}
 }
 
-
 asmsub  scroll_down_full  (ubyte alsocolors @ Pc) clobbers(A)  {
 	; ---- scroll the whole screen 1 character down
 	;      contents of the top row are unchanged, you should refill/clear this yourself
@@ -742,7 +816,6 @@ _scroll_screen  ; scroll the screen memory
 }
 
 
-
 asmsub  print (str text @ AY) clobbers(A,Y)  {
 	; ---- print null terminated string from A/Y
 	; note: the compiler contains an optimization that will replace
@@ -761,7 +834,6 @@ asmsub  print (str text @ AY) clobbers(A,Y)  {
 	}}
 }
 
-
 asmsub  print_ub0  (ubyte value @ A) clobbers(A,Y)  {
 	; ---- print the ubyte in A in decimal form, with left padding 0s (3 positions total)
 	%asm {{
@@ -770,16 +842,15 @@ asmsub  print_ub0  (ubyte value @ A) clobbers(A,Y)  {
 		pha
 		tya
 		jsr  c64.CHROUT
-		txa
-		jsr  c64.CHROUT
 		pla
 		jsr  c64.CHROUT
+		txa
+		jsr  c64.CHROUT
 		ldx  c64.SCRATCH_ZPREGX
 		rts
 	}}
 }
 
-
 asmsub  print_ub  (ubyte value @ A) clobbers(A,Y)  {
 	; ---- print the ubyte in A in decimal form, without left padding 0s
 	%asm {{
@@ -788,15 +859,14 @@ asmsub  print_ub  (ubyte value @ A) clobbers(A,Y)  {
 _print_byte_digits
 		pha
 		cpy  #'0'
-		bne  _print_hundreds
+		beq  +
-		cpx  #'0'
+		tya
-		bne  _print_tens
-		jmp  _end
-_print_hundreds	tya
 		jsr  c64.CHROUT
-_print_tens	txa
++       pla
-		jsr  c64.CHROUT
+        cmp  #'0'
-_end		pla
+        beq  +
+        jsr  c64.CHROUT
++       txa
 		jsr  c64.CHROUT
 		ldx  c64.SCRATCH_ZPREGX
 		rts
@@ -820,7 +890,6 @@ asmsub  print_b  (byte value @ A) clobbers(A,Y)  {
 	}}
 }
 
-
 asmsub  print_ubhex  (ubyte value @ A, ubyte prefix @ Pc) clobbers(A,Y)  {
 	; ---- print the ubyte in A in hex form (if Carry is set, a radix prefix '$' is printed as well)
 	%asm {{
@@ -839,7 +908,6 @@ asmsub  print_ubhex  (ubyte value @ A, ubyte prefix @ Pc) clobbers(A,Y)  {
 	}}
 }
 
-
 asmsub  print_ubbin  (ubyte value @ A, ubyte prefix @ Pc) clobbers(A,Y)  {
 	; ---- print the ubyte in A in binary form (if Carry is set, a radix prefix '%' is printed as well)
 	%asm {{
@@ -861,7 +929,6 @@ asmsub  print_ubbin  (ubyte value @ A, ubyte prefix @ Pc) clobbers(A,Y)  {
 	}}
 }
 
-
 asmsub  print_uwbin  (uword value @ AY, ubyte prefix @ Pc) clobbers(A,Y)  {
 	; ---- print the uword in A/Y in binary form (if Carry is set, a radix prefix '%' is printed as well)
 	%asm {{
@@ -874,7 +941,6 @@ asmsub  print_uwbin  (uword value @ AY, ubyte prefix @ Pc) clobbers(A,Y)  {
 	}}
 }
 
-
 asmsub print_uwhex  (uword value @ AY, ubyte prefix @ Pc) clobbers(A,Y)  {
 	; ---- print the uword in A/Y in hexadecimal form (4 digits)
 	;      (if Carry is set, a radix prefix '$' is printed as well)
@@ -888,51 +954,44 @@ asmsub print_uwhex  (uword value @ AY, ubyte prefix @ Pc) clobbers(A,Y)  {
 	}}
 }
 
-
 asmsub  print_uw0  (uword value @ AY) clobbers(A,Y)  {
 	; ---- print the uword in A/Y in decimal form, with left padding 0s (5 positions total)
 	%asm {{
+	    stx  c64.SCRATCH_ZPREGX
 		jsr  c64utils.uword2decimal
 		ldy  #0
--		lda  c64utils.uword2decimal.output,y
+-		lda  c64utils.uword2decimal.decTenThousands,y
+        beq  +
 		jsr  c64.CHROUT
 		iny
-		cpy  #5
 		bne  -
++		ldx  c64.SCRATCH_ZPREGX
 		rts
 	}}
 }
 
-
 asmsub  print_uw  (uword value @ AY) clobbers(A,Y)  {
 	; ---- print the uword in A/Y in decimal form, without left padding 0s
 	%asm {{
+	    stx  c64.SCRATCH_ZPREGX
 		jsr  c64utils.uword2decimal
 		ldy  #0
-		lda  c64utils.uword2decimal.output
+-		lda  c64utils.uword2decimal.decTenThousands,y
+		beq  _allzero
 		cmp  #'0'
-		bne  _pr_decimal
+		bne  _gotdigit
-		iny
-		lda  c64utils.uword2decimal.output+1
-		cmp  #'0'
-		bne  _pr_decimal
-		iny
-		lda  c64utils.uword2decimal.output+2
-		cmp  #'0'
-		bne  _pr_decimal
-		iny
-		lda  c64utils.uword2decimal.output+3
-		cmp  #'0'
-		bne  _pr_decimal
 		iny
+		bne  -
 
-_pr_decimal
+_gotdigit
-		lda  c64utils.uword2decimal.output,y
 		jsr  c64.CHROUT
 		iny
-		cpy  #5
+		lda  c64utils.uword2decimal.decTenThousands,y
-		bcc  _pr_decimal
+		bne  _gotdigit
 		rts
+_allzero
+        lda  #'0'
+        jmp  c64.CHROUT
 	}}
 }
 

compiler/res/prog8lib/prog8lib.asm

@@ -716,7 +716,7 @@ func_sin8	.proc
 		lda  _sinecos8,y
 		sta  c64.ESTACK_LO+1,x
 		rts
-_sinecos8	.char  127 * sin(range(256+64) * rad(360.0/256.0))
+_sinecos8	.char  trunc(127.0 * sin(range(256+64) * rad(360.0/256.0)))
 		.pend
 
 func_sin8u	.proc
@@ -724,7 +724,7 @@ func_sin8u	.proc
 		lda  _sinecos8u,y
 		sta  c64.ESTACK_LO+1,x
 		rts
-_sinecos8u	.byte  128 + 127.5 * sin(range(256+64) * rad(360.0/256.0))
+_sinecos8u	.byte  trunc(128.0 + 127.5 * sin(range(256+64) * rad(360.0/256.0)))
 		.pend
 
 func_sin16	.proc
@@ -735,7 +735,7 @@ func_sin16	.proc
 		sta  c64.ESTACK_HI+1,x
 		rts
 
-_  :=  32767 * sin(range(256+64) * rad(360.0/256.0))
+_  :=  trunc(32767.0 * sin(range(256+64) * rad(360.0/256.0)))
 _sinecos8lo     .byte  <_
 _sinecos8hi     .byte  >_
 		.pend
@@ -748,7 +748,7 @@ func_sin16u	.proc
 		sta  c64.ESTACK_HI+1,x
 		rts
 
-_  :=  32768 + 32767.5 * sin(range(256+64) * rad(360.0/256.0))
+_  :=  trunc(32768.0 + 32767.5 * sin(range(256+64) * rad(360.0/256.0)))
 _sinecos8ulo     .byte  <_
 _sinecos8uhi     .byte  >_
 		.pend
@@ -1384,3 +1384,378 @@ _mod2b          lda  #0                         ; self-modified
 _done		rts
 		.pend
 
+
+sort_ub		.proc
+		; 8bit unsigned sort
+		; sorting subroutine coded by mats rosengren (mats.rosengren@esa.int)
+		; input:  address of array to sort in c64.SCRATCH_ZPWORD1, length in c64.SCRATCH_ZPB1
+		; first, put pointer BEFORE array
+		lda  c64.SCRATCH_ZPWORD1
+		bne  +
+		dec  c64.SCRATCH_ZPWORD1+1
++		dec  c64.SCRATCH_ZPWORD1
+_sortloop	ldy  c64.SCRATCH_ZPB1		;start of subroutine sort
+		lda  (c64.SCRATCH_ZPWORD1),y	;last value in (what is left of) sequence to be sorted
+		sta  c64.SCRATCH_ZPREG		;save value. will be over-written by largest number
+		jmp  _l2
+_l1		dey
+		beq  _l3
+		lda  (c64.SCRATCH_ZPWORD1),y
+		cmp  c64.SCRATCH_ZPWORD2+1
+		bcc  _l1
+_l2		sty  c64.SCRATCH_ZPWORD2	;index of potentially largest value
+		sta  c64.SCRATCH_ZPWORD2+1	;potentially largest value
+		jmp  _l1
+_l3		ldy  c64.SCRATCH_ZPB1		;where the largest value shall be put
+		lda  c64.SCRATCH_ZPWORD2+1	;the largest value
+		sta  (c64.SCRATCH_ZPWORD1),y	;put largest value in place
+		ldy  c64.SCRATCH_ZPWORD2	;index of free space
+		lda  c64.SCRATCH_ZPREG		;the over-written value
+		sta  (c64.SCRATCH_ZPWORD1),y	;put the over-written value in the free space
+		dec  c64.SCRATCH_ZPB1		;end of the shorter sequence still left
+		bne  _sortloop			;start working with the shorter sequence
+		rts
+		.pend
+
+
+sort_b		.proc
+		; 8bit signed sort
+		; sorting subroutine coded by mats rosengren (mats.rosengren@esa.int)
+		; input:  address of array to sort in c64.SCRATCH_ZPWORD1, length in c64.SCRATCH_ZPB1
+		; first, put pointer BEFORE array
+		lda  c64.SCRATCH_ZPWORD1
+		bne  +
+		dec  c64.SCRATCH_ZPWORD1+1
++		dec  c64.SCRATCH_ZPWORD1
+_sortloop	ldy  c64.SCRATCH_ZPB1		;start of subroutine sort
+		lda  (c64.SCRATCH_ZPWORD1),y	;last value in (what is left of) sequence to be sorted
+		sta  c64.SCRATCH_ZPREG		;save value. will be over-written by largest number
+		jmp  _l2
+_l1		dey
+		beq  _l3
+		lda  (c64.SCRATCH_ZPWORD1),y
+		cmp  c64.SCRATCH_ZPWORD2+1
+		bmi  _l1
+_l2		sty  c64.SCRATCH_ZPWORD2	;index of potentially largest value
+		sta  c64.SCRATCH_ZPWORD2+1	;potentially largest value
+		jmp  _l1
+_l3		ldy  c64.SCRATCH_ZPB1		;where the largest value shall be put
+		lda  c64.SCRATCH_ZPWORD2+1	;the largest value
+		sta  (c64.SCRATCH_ZPWORD1),y	;put largest value in place
+		ldy  c64.SCRATCH_ZPWORD2	;index of free space
+		lda  c64.SCRATCH_ZPREG		;the over-written value
+		sta  (c64.SCRATCH_ZPWORD1),y	;put the over-written value in the free space
+		dec  c64.SCRATCH_ZPB1		;end of the shorter sequence still left
+		bne  _sortloop			;start working with the shorter sequence
+		rts
+		.pend
+
+
+sort_uw		.proc
+		; 16bit unsigned sort
+		; sorting subroutine coded by mats rosengren (mats.rosengren@esa.int)
+		; input:  address of array to sort in c64.SCRATCH_ZPWORD1, length in c64.SCRATCH_ZPB1
+		; first: subtract 2 of the pointer
+		asl  c64.SCRATCH_ZPB1		; *2 because words
+		lda  c64.SCRATCH_ZPWORD1
+		sec
+		sbc  #2
+		sta  c64.SCRATCH_ZPWORD1
+		bcs  _sort_loop
+		dec  c64.SCRATCH_ZPWORD1+1
+_sort_loop	ldy  c64.SCRATCH_ZPB1    	;start of subroutine sort
+		lda  (c64.SCRATCH_ZPWORD1),y    ;last value in (what is left of) sequence to be sorted
+		sta  _work3          		;save value. will be over-written by largest number
+		iny
+		lda  (c64.SCRATCH_ZPWORD1),y
+		sta  _work3+1
+		dey
+		jmp  _l2
+_l1		dey
+		dey
+		beq  _l3
+		iny
+		lda  (c64.SCRATCH_ZPWORD1),y
+		dey
+		cmp  c64.SCRATCH_ZPWORD2+1
+		bne  +
+		lda  (c64.SCRATCH_ZPWORD1),y
+		cmp  c64.SCRATCH_ZPWORD2
++		bcc  _l1
+_l2		sty  _work1          		;index of potentially largest value
+		lda  (c64.SCRATCH_ZPWORD1),y
+		sta  c64.SCRATCH_ZPWORD2          ;potentially largest value
+		iny
+		lda  (c64.SCRATCH_ZPWORD1),y
+		sta  c64.SCRATCH_ZPWORD2+1
+		dey
+		jmp  _l1
+_l3		ldy  c64.SCRATCH_ZPB1           ;where the largest value shall be put
+		lda  c64.SCRATCH_ZPWORD2          ;the largest value
+		sta  (c64.SCRATCH_ZPWORD1),y      ;put largest value in place
+		iny
+		lda  c64.SCRATCH_ZPWORD2+1
+		sta  (c64.SCRATCH_ZPWORD1),y
+		ldy  _work1         		 ;index of free space
+		lda  _work3          		;the over-written value
+		sta  (c64.SCRATCH_ZPWORD1),y      ;put the over-written value in the free space
+		iny
+		lda  _work3+1
+		sta  (c64.SCRATCH_ZPWORD1),y
+		dey
+		dec  c64.SCRATCH_ZPB1           ;end of the shorter sequence still left
+		dec  c64.SCRATCH_ZPB1
+		bne  _sort_loop           ;start working with the shorter sequence
+		rts
+_work1	.byte  0
+_work3	.word  0
+		.pend
+
+
+sort_w		.proc
+		; 16bit signed sort
+		; sorting subroutine coded by mats rosengren (mats.rosengren@esa.int)
+		; input:  address of array to sort in c64.SCRATCH_ZPWORD1, length in c64.SCRATCH_ZPB1
+		; first: subtract 2 of the pointer
+		asl  c64.SCRATCH_ZPB1		; *2 because words
+		lda  c64.SCRATCH_ZPWORD1
+		sec
+		sbc  #2
+		sta  c64.SCRATCH_ZPWORD1
+		bcs  _sort_loop
+		dec  c64.SCRATCH_ZPWORD1+1
+_sort_loop	ldy  c64.SCRATCH_ZPB1    	;start of subroutine sort
+		lda  (c64.SCRATCH_ZPWORD1),y    ;last value in (what is left of) sequence to be sorted
+		sta  _work3          		;save value. will be over-written by largest number
+		iny
+		lda  (c64.SCRATCH_ZPWORD1),y
+		sta  _work3+1
+		dey
+		jmp  _l2
+_l1		dey
+		dey
+		beq  _l3
+		lda  (c64.SCRATCH_ZPWORD1),y
+		cmp  c64.SCRATCH_ZPWORD2
+		iny
+		lda  (c64.SCRATCH_ZPWORD1),y
+		dey
+		sbc  c64.SCRATCH_ZPWORD2+1
+		bvc  +
+		eor  #$80
++		bmi  _l1
+_l2		sty  _work1          		;index of potentially largest value
+		lda  (c64.SCRATCH_ZPWORD1),y
+		sta  c64.SCRATCH_ZPWORD2          ;potentially largest value
+		iny
+		lda  (c64.SCRATCH_ZPWORD1),y
+		sta  c64.SCRATCH_ZPWORD2+1
+		dey
+		jmp  _l1
+_l3		ldy  c64.SCRATCH_ZPB1           ;where the largest value shall be put
+		lda  c64.SCRATCH_ZPWORD2          ;the largest value
+		sta  (c64.SCRATCH_ZPWORD1),y      ;put largest value in place
+		iny
+		lda  c64.SCRATCH_ZPWORD2+1
+		sta  (c64.SCRATCH_ZPWORD1),y
+		ldy  _work1         		 ;index of free space
+		lda  _work3          		;the over-written value
+		sta  (c64.SCRATCH_ZPWORD1),y      ;put the over-written value in the free space
+		iny
+		lda  _work3+1
+		sta  (c64.SCRATCH_ZPWORD1),y
+		dey
+		dec  c64.SCRATCH_ZPB1           ;end of the shorter sequence still left
+		dec  c64.SCRATCH_ZPB1
+		bne  _sort_loop           ;start working with the shorter sequence
+		rts
+_work1	.byte  0
+_work3	.word  0
+		.pend
+
+
+reverse_b	.proc
+		; --- reverse an array of bytes (in-place)
+		; inputs:  pointer to array in c64.SCRATCH_ZPWORD1, length in A
+_left_index = c64.SCRATCH_ZPWORD2
+_right_index = c64.SCRATCH_ZPWORD2+1
+		pha
+		sec
+		sbc  #1
+		sta  _left_index
+		lda  #0
+		sta  _right_index
+		pla
+		lsr  a
+		tay
+_loop		sty  c64.SCRATCH_ZPREG
+		ldy  _left_index
+		lda  (c64.SCRATCH_ZPWORD1),y
+		pha
+		ldy  _right_index
+		lda  (c64.SCRATCH_ZPWORD1),y
+		ldy  _left_index
+		sta  (c64.SCRATCH_ZPWORD1),y
+		pla
+		ldy  _right_index
+		sta  (c64.SCRATCH_ZPWORD1),y
+		inc  _right_index
+		dec  _left_index
+		ldy  c64.SCRATCH_ZPREG
+		dey
+		bne  _loop
+		rts
+		.pend
+
+
+reverse_w	.proc
+		; --- reverse an array of words (in-place)
+		; inputs:  pointer to array in c64.SCRATCH_ZPWORD1, length in A
+_left_index = c64.SCRATCH_ZPWORD2
+_right_index = c64.SCRATCH_ZPWORD2+1
+		pha
+		asl  a     ; *2 because words
+		sec
+		sbc  #2
+		sta  _left_index
+		lda  #0
+		sta  _right_index
+		pla
+		lsr  a
+		pha
+		tay
+		; first reverse the lsbs
+_loop_lo	sty  c64.SCRATCH_ZPREG
+		ldy  _left_index
+		lda  (c64.SCRATCH_ZPWORD1),y
+		pha
+		ldy  _right_index
+		lda  (c64.SCRATCH_ZPWORD1),y
+		ldy  _left_index
+		sta  (c64.SCRATCH_ZPWORD1),y
+		pla
+		ldy  _right_index
+		sta  (c64.SCRATCH_ZPWORD1),y
+		inc  _right_index
+		inc  _right_index
+		dec  _left_index
+		dec  _left_index
+		ldy  c64.SCRATCH_ZPREG
+		dey
+		bne  _loop_lo
+		; now reverse the msbs
+		dec  _right_index
+		inc  _left_index
+		inc  _left_index
+		inc  _left_index
+		pla
+		tay
+_loop_hi	sty  c64.SCRATCH_ZPREG
+		ldy  _left_index
+		lda  (c64.SCRATCH_ZPWORD1),y
+		pha
+		ldy  _right_index
+		lda  (c64.SCRATCH_ZPWORD1),y
+		ldy  _left_index
+		sta  (c64.SCRATCH_ZPWORD1),y
+		pla
+		ldy  _right_index
+		sta  (c64.SCRATCH_ZPWORD1),y
+		dec  _right_index
+		dec  _right_index
+		inc  _left_index
+		inc  _left_index
+		ldy  c64.SCRATCH_ZPREG
+		dey
+		bne  _loop_hi
+
+		rts
+		.pend
+
+ror2_mem_ub	.proc
+		; -- in-place 8-bit ror of byte at memory location on stack
+		inx
+		lda  c64.ESTACK_LO,x
+		sta  c64.SCRATCH_ZPWORD1
+		lda  c64.ESTACK_HI,x
+		sta  c64.SCRATCH_ZPWORD1+1
+		ldy  #0
+		lda  (c64.SCRATCH_ZPWORD1),y
+		lsr  a
+		bcc  +
+		ora  #$80
++		sta  (c64.SCRATCH_ZPWORD1),y
+		rts
+		.pend
+
+rol2_mem_ub	.proc
+		; -- in-place 8-bit rol of byte at memory location on stack
+		;"  lda  ${number.toHex()} |  cmp  #\$80 |  rol  a |  sta  ${number.toHex()}"
+		inx
+		lda  c64.ESTACK_LO,x
+		sta  c64.SCRATCH_ZPWORD1
+		lda  c64.ESTACK_HI,x
+		sta  c64.SCRATCH_ZPWORD1+1
+		ldy  #0
+		lda  (c64.SCRATCH_ZPWORD1),y
+		cmp  #$80
+		rol  a
+		sta  (c64.SCRATCH_ZPWORD1),y
+		rts
+		.pend
+
+lsl_array_b	.proc
+		.warn "lsl_array_b"		; TODO
+		.pend
+
+lsl_array_w	.proc
+		.warn "lsl_array_w"		; TODO
+		.pend
+
+lsr_array_ub	.proc
+		.warn "lsr_array_ub"		; TODO
+		.pend
+
+lsr_array_b	.proc
+		.warn "lsr_array_b"		; TODO
+		.pend
+
+lsr_array_uw	.proc
+		.warn "lsr_array_uw"		; TODO
+		.pend
+
+lsr_array_w	.proc
+		.warn "lsr_array_w"		; TODO
+		.pend
+
+rol_array_ub	.proc
+		.warn "rol_array_ub"		; TODO
+		.pend
+
+rol_array_uw	.proc
+		.warn "rol_array_uw"		; TODO
+		.pend
+
+rol2_array_ub	.proc
+		.warn "rol2_array_ub"		; TODO
+		.pend
+
+rol2_array_uw	.proc
+		.warn "rol2_array_uw"		; TODO
+		.pend
+
+ror_array_ub	.proc
+		.warn "ror_array_ub"		; TODO
+		.pend
+
+ror_array_uw	.proc
+		.warn "ror_array_uw"		; TODO
+		.pend
+
+ror2_array_ub	.proc
+		.warn "ror2_array_ub"		; TODO
+		.pend
+
+ror2_array_uw	.proc
+		.warn "ror2_array_uw"		; TODO
+		.pend

compiler/res/version.txt

@@ -1 +1 @@
-1.52
+1.70

compiler/src/prog8/CompilerMain.kt

@@ -1,24 +1,25 @@
 package prog8
 
+import kotlinx.cli.*
 import prog8.ast.base.AstException
-import prog8.compiler.CompilationResult
+import prog8.compiler.*
-import prog8.compiler.compileProgram
+import prog8.compiler.target.CompilationTarget
+import prog8.compiler.target.c64.C64MachineDefinition
+import prog8.compiler.target.c64.Petscii
+import prog8.compiler.target.c64.codegen.AsmGen
 import prog8.parser.ParsingFailedError
 import prog8.vm.astvm.AstVm
+import java.io.IOException
 import java.nio.file.FileSystems
 import java.nio.file.Path
-import java.nio.file.Paths
 import java.nio.file.StandardWatchEventKinds
-import java.util.*
+import java.time.LocalDateTime
 import kotlin.system.exitProcess
 
 
 fun main(args: Array<String>) {
-
     printSoftwareHeader("compiler")
 
-    if (args.isEmpty())
-        usage()
     compileMain(args)
 }
 
@@ -29,51 +30,64 @@ internal fun printSoftwareHeader(what: String) {
 }
 
 
+fun pathFrom(stringPath: String, vararg rest: String): Path  = FileSystems.getDefault().getPath(stringPath, *rest)
+
+
 private fun compileMain(args: Array<String>) {
-    var emulatorToStart = ""
+    val cli = CommandLineInterface("prog8compiler")
-    var moduleFile = ""
+    val startEmulator by cli.flagArgument("-emu", "auto-start the Vice C-64 emulator after successful compilation")
-    var writeAssembly = true
+    val outputDir by cli.flagValueArgument("-out", "directory", "directory for output files instead of current directory", ".")
-    var optimize = true
+    val dontWriteAssembly by cli.flagArgument("-noasm", "don't create assembly code")
-    var launchAstVm = false
+    val dontOptimize by cli.flagArgument("-noopt", "don't perform any optimizations")
-    var watchMode = false
+    val launchSimulator by cli.flagArgument("-sim", "launch the builtin execution simulator after compilation")
-    for (arg in args) {
+    val watchMode by cli.flagArgument("-watch", "continuous compilation mode (watches for file changes), greatly increases compilation speed")
-        if(arg=="-emu")
+    val compilationTarget by cli.flagValueArgument("-target", "compilertarget", "target output of the compiler, currently only 'c64' (C64 6502 assembly) available", "c64")
-            emulatorToStart = "x64"
+    val moduleFiles by cli.positionalArgumentsList("modules", "main module file(s) to compile", minArgs = 1)
-        else if(arg=="-emu2")
+
-            emulatorToStart = "x64sc"
+    try {
-        else if(arg=="-noasm")
+        cli.parse(args)
-            writeAssembly = false
+    } catch (e: Exception) {
-        else if(arg=="-noopt")
+        exitProcess(1)
-            optimize = false
-        else if(arg=="-avm")
-            launchAstVm = true
-        else if(arg=="-watch")
-            watchMode = true
-        else if(!arg.startsWith("-"))
-            moduleFile = arg
-        else
-            usage()
     }
 
-    if(watchMode) {
+    when(compilationTarget) {
-        if(moduleFile.isBlank())
+        "c64" -> {
-            usage()
+            with(CompilationTarget) {
+                name = "c64"
+                machine = C64MachineDefinition
+                encodeString = { str -> Petscii.encodePetscii(str, true) }
+                decodeString = { bytes -> Petscii.decodePetscii(bytes, true) }
+                asmGenerator = ::AsmGen
+            }
+        }
+        else -> {
+            System.err.println("invalid compilation target")
+            exitProcess(1)
+        }
+    }
 
+    val outputPath = pathFrom(outputDir)
+    if(!outputPath.toFile().isDirectory) {
+        System.err.println("Output path doesn't exist")
+        exitProcess(1)
+    }
+
+    if(watchMode && moduleFiles.size<=1) {
         val watchservice = FileSystems.getDefault().newWatchService()
 
         while(true) {
-            val filepath = Paths.get(moduleFile).normalize()
+            val filepath = pathFrom(moduleFiles.single()).normalize()
             println("Continuous watch mode active. Main module: $filepath")
 
             try {
-                val compilationResult = compileProgram(filepath, optimize, writeAssembly)
+                val compilationResult = compileProgram(filepath, !dontOptimize, !dontWriteAssembly, outputDir=outputPath)
                 println("Imported files (now watching:)")
                 for (importedFile in compilationResult.importedFiles) {
                     print("  ")
                     println(importedFile)
                     importedFile.parent.register(watchservice, StandardWatchEventKinds.ENTRY_MODIFY)
                 }
-                println("${Date()}: Waiting for file changes.")
+                println("[${LocalDateTime.now().withNano(0)}]  Waiting for file changes.")
                 val event = watchservice.take()
                 for(changed in event.pollEvents()) {
                     val changedPath = changed.context() as Path
@@ -87,51 +101,51 @@ private fun compileMain(args: Array<String>) {
         }
 
     } else {
-        if(moduleFile.isBlank())
+        for(filepathRaw in moduleFiles) {
-            usage()
+            val filepath = pathFrom(filepathRaw).normalize()
-
+            val compilationResult: CompilationResult
-        val filepath = Paths.get(moduleFile).normalize()
+            try {
-        val compilationResult: CompilationResult
+                compilationResult = compileProgram(filepath, !dontOptimize, !dontWriteAssembly, outputDir=outputPath)
-
+                if(!compilationResult.success)
-        try {
+                    exitProcess(1)
-            compilationResult = compileProgram(filepath, optimize, writeAssembly)
+            } catch (x: ParsingFailedError) {
-            if(!compilationResult.success)
                 exitProcess(1)
-        } catch (x: ParsingFailedError) {
+            } catch (x: AstException) {
-            exitProcess(1)
+                exitProcess(1)
-        } catch (x: AstException) {
+            }
-            exitProcess(1)
-        }
 
-        if (launchAstVm) {
+            if (launchSimulator) {
-            println("\nLaunching AST-based vm...")
+//                val c64 = razorvine.c64emu.C64Machine("C64 emulator launched from Prog8 compiler")
-            val vm = AstVm(compilationResult.programAst)
+//                c64.cpu.addBreakpoint(0xea31) { cpu, address ->
-            vm.run()
+//                    println("zz")
-        }
+//                    Cpu6502.BreakpointResultAction()
+//                }
+//                c64.start()
+                println("\nLaunching AST-based simulator...")
+                val vm = AstVm(compilationResult.programAst, compilationTarget)
+                vm.run()
+            }
 
-        if (emulatorToStart.isNotEmpty()) {
+            if (startEmulator) {
-            if (compilationResult.programName.isEmpty())
+                if (compilationResult.programName.isEmpty())
-                println("\nCan't start emulator because no program was assembled.")
+                    println("\nCan't start emulator because no program was assembled.")
-            else {
+                else if(startEmulator) {
-                println("\nStarting C-64 emulator $emulatorToStart...")
+                    for(emulator in listOf("x64sc", "x64")) {
-                val cmdline = listOf(emulatorToStart, "-silent", "-moncommands", "${compilationResult.programName}.vice-mon-list",
+                        println("\nStarting C-64 emulator $emulator...")
-                        "-autostartprgmode", "1", "-autostart-warp", "-autostart", compilationResult.programName + ".prg")
+                        val cmdline = listOf(emulator, "-silent", "-moncommands", "${compilationResult.programName}.vice-mon-list",
-                val process = ProcessBuilder(cmdline).inheritIO().start()
+                                "-autostartprgmode", "1", "-autostart-warp", "-autostart", compilationResult.programName + ".prg")
-                process.waitFor()
+                        val processb = ProcessBuilder(cmdline).inheritIO()
+                        val process: Process
+                        try {
+                            process=processb.start()
+                        } catch(x: IOException) {
+                            continue  // try the next emulator executable
+                        }
+                        process.waitFor()
+                        break
+                    }
+                }
             }
         }
     }
 }
-
-
-private fun usage() {
-    System.err.println("Missing argument(s):")
-    System.err.println("    [-noasm]        don't create assembly code")
-    System.err.println("    [-noopt]        don't perform any optimizations")
-    System.err.println("    [-emu]          auto-start the 'x64' C-64 emulator after successful compilation")
-    System.err.println("    [-emu2]         auto-start the 'x64sc' C-64 emulator after successful compilation")
-    System.err.println("    [-avm]          launch the prog8 ast-based virtual machine after compilation")
-    System.err.println("    [-watch]        continuous compilation mode (watches for file changes)")
-    System.err.println("    modulefile      main module file to compile")
-    exitProcess(1)
-}

compiler/src/prog8/ast/AstToSourceCode.kt

@@ -3,7 +3,6 @@ package prog8.ast
 import prog8.ast.antlr.escape
 import prog8.ast.base.DataType
 import prog8.ast.base.NumericDatatypes
-import prog8.ast.base.StringDatatypes
 import prog8.ast.base.VarDeclType
 import prog8.ast.expressions.*
 import prog8.ast.processing.IAstVisitor
@@ -79,7 +78,7 @@ class AstToSourceCode(val output: (text: String) -> Unit, val program: Program):
     private fun datatypeString(dt: DataType): String {
         return when(dt) {
             in NumericDatatypes -> dt.toString().toLowerCase()
-            in StringDatatypes -> dt.toString().toLowerCase()
+            DataType.STR -> dt.toString().toLowerCase()
             DataType.ARRAY_UB -> "ubyte["
             DataType.ARRAY_B -> "byte["
             DataType.ARRAY_UW -> "uword["
@@ -197,9 +196,9 @@ class AstToSourceCode(val output: (text: String) -> Unit, val program: Program):
     private fun printout(call: IFunctionCall) {
         call.target.accept(this)
         output("(")
-        for(arg in call.arglist) {
+        for(arg in call.args) {
             arg.accept(this)
-            if(arg!==call.arglist.last())
+            if(arg!==call.args.last())
                 output(", ")
         }
         output(")")
@@ -315,13 +314,6 @@ class AstToSourceCode(val output: (text: String) -> Unit, val program: Program):
 
     override fun visit(forLoop: ForLoop) {
         output("for ")
-        if(forLoop.decltype!=null) {
-            output(datatypeString(forLoop.decltype))
-            if (forLoop.zeropage==ZeropageWish.REQUIRE_ZEROPAGE || forLoop.zeropage==ZeropageWish.PREFER_ZEROPAGE)
-                output(" @zp ")
-            else
-                output(" ")
-        }
         if(forLoop.loopRegister!=null)
             output(forLoop.loopRegister.toString())
         else

compiler/src/prog8/ast/AstToplevel.kt

@@ -4,7 +4,6 @@ import prog8.ast.base.*
 import prog8.ast.expressions.Expression
 import prog8.ast.expressions.IdentifierReference
 import prog8.ast.statements.*
-import prog8.compiler.HeapValues
 import prog8.functions.BuiltinFunctions
 import java.nio.file.Path
 
@@ -38,7 +37,7 @@ interface Node {
 
 interface IFunctionCall {
     var target: IdentifierReference
-    var arglist: MutableList<Expression>
+    var args: MutableList<Expression>
 }
 
 interface INameScope {
@@ -161,12 +160,15 @@ interface INameScope {
     }
 }
 
+interface IAssignable {
+    // just a tag for now
+}
+
 
 /*********** Everything starts from here, the Program; zero or more modules *************/
 
 class Program(val name: String, val modules: MutableList<Module>) {
     val namespace = GlobalNamespace(modules)
-    val heap = HeapValues()
 
     val definedLoadAddress: Int
         get() = modules.first().loadAddress
@@ -174,7 +176,7 @@ class Program(val name: String, val modules: MutableList<Module>) {
     var actualLoadAddress: Int = 0
 
     fun entrypoint(): Subroutine? {
-        val mainBlocks = modules.flatMap { it.statements }.filter { b -> b is Block && b.name=="main" }.map { it as Block }
+        val mainBlocks = allBlocks().filter { it.name=="main" }
         if(mainBlocks.size > 1)
             throw FatalAstException("more than one 'main' block")
         return if(mainBlocks.isEmpty()) {
@@ -241,8 +243,7 @@ class GlobalNamespace(val modules: List<Module>): Node, INameScope {
             }
         }
         // lookup something from the module.
-        val stmt = localContext.definingModule().lookup(scopedName, localContext)
+        return when (val stmt = localContext.definingModule().lookup(scopedName, localContext)) {
-        return when (stmt) {
             is Label, is VarDecl, is Block, is Subroutine -> stmt
             null -> null
             else -> throw NameError("wrong identifier target: $stmt", stmt.position)

compiler/src/prog8/ast/antlr/Antr2Kotlin.kt

@@ -7,7 +7,7 @@ import prog8.ast.Module
 import prog8.ast.base.*
 import prog8.ast.expressions.*
 import prog8.ast.statements.*
-import prog8.compiler.target.c64.Petscii
+import prog8.compiler.target.CompilationTarget
 import prog8.parser.CustomLexer
 import prog8.parser.prog8Parser
 import java.io.CharConversionException
@@ -264,11 +264,12 @@ private fun prog8Parser.StatusregisterContext.toAst() = Statusflag.valueOf(text)
 
 
 private fun prog8Parser.Functioncall_stmtContext.toAst(): Statement {
+    val void = this.VOID() != null
     val location = scoped_identifier().toAst()
     return if(expression_list() == null)
-        FunctionCallStatement(location, mutableListOf(), toPosition())
+        FunctionCallStatement(location, mutableListOf(), void, toPosition())
     else
-        FunctionCallStatement(location, expression_list().toAst().toMutableList(), toPosition())
+        FunctionCallStatement(location, expression_list().toAst().toMutableList(), void, toPosition())
 }
 
 
@@ -429,10 +430,11 @@ private fun prog8Parser.ExpressionContext.toAst() : Expression {
                     else -> throw FatalAstException("invalid datatype for numeric literal")
                 }
                 litval.floatliteral()!=null -> NumericLiteralValue(DataType.FLOAT, litval.floatliteral().toAst(), litval.toPosition())
-                litval.stringliteral()!=null -> StringLiteralValue(DataType.STR, unescape(litval.stringliteral().text, litval.toPosition()), position = litval.toPosition())
+                litval.stringliteral()!=null -> StringLiteralValue(unescape(litval.stringliteral().text, litval.toPosition()), litval.toPosition())
                 litval.charliteral()!=null -> {
                     try {
-                        NumericLiteralValue(DataType.UBYTE, Petscii.encodePetscii(unescape(litval.charliteral().text, litval.toPosition()), true)[0], litval.toPosition())
+                        NumericLiteralValue(DataType.UBYTE, CompilationTarget.encodeString(
+                                unescape(litval.charliteral().text, litval.toPosition()))[0], litval.toPosition())
                     } catch (ce: CharConversionException) {
                         throw SyntaxError(ce.message ?: ce.toString(), litval.toPosition())
                     }
@@ -552,8 +554,6 @@ private fun prog8Parser.BranchconditionContext.toAst() = BranchCondition.valueOf
 
 private fun prog8Parser.ForloopContext.toAst(): ForLoop {
     val loopregister = register()?.toAst()
-    val datatype = datatype()?.toAst()
-    val zeropage = if(ZEROPAGE() != null) ZeropageWish.PREFER_ZEROPAGE else ZeropageWish.DONTCARE
     val loopvar = identifier()?.toAst()
     val iterable = expression()!!.toAst()
     val scope =
@@ -561,7 +561,7 @@ private fun prog8Parser.ForloopContext.toAst(): ForLoop {
                 AnonymousScope(mutableListOf(statement().toAst()), statement().toPosition())
             else
                 AnonymousScope(statement_block().toAst(), statement_block().toPosition())
-    return ForLoop(loopregister, datatype, zeropage, loopvar, iterable, scope, toPosition())
+    return ForLoop(loopregister, loopvar, iterable, scope, toPosition())
 }
 
 

compiler/src/prog8/ast/base/Base.kt

@@ -1,7 +1,8 @@
 package prog8.ast.base
 
 import prog8.ast.Node
-import prog8.compiler.target.c64.MachineDefinition
+import prog8.compiler.target.CompilationTarget
+
 
 /**************************** AST Data classes ****************************/
 
@@ -12,7 +13,6 @@ enum class DataType {
     WORD,               // pass by value
     FLOAT,              // pass by value
     STR,                // pass by reference
-    STR_S,              // pass by reference
     ARRAY_UB,           // pass by reference
     ARRAY_B,            // pass by reference
     ARRAY_UW,           // pass by reference
@@ -31,8 +31,7 @@ enum class DataType {
                 UWORD -> targetType in setOf(UWORD, FLOAT)
                 WORD -> targetType in setOf(WORD, FLOAT)
                 FLOAT -> targetType == FLOAT
-                STR -> targetType == STR || targetType==STR_S
+                STR -> targetType == STR
-                STR_S -> targetType == STR || targetType==STR_S
                 in ArrayDatatypes -> targetType == this
                 else -> false
             }
@@ -58,7 +57,7 @@ enum class DataType {
         return when(this) {
             in ByteDatatypes -> 1
             in WordDatatypes -> 2
-            FLOAT -> MachineDefinition.Mflpt5.MemorySize
+            FLOAT -> CompilationTarget.machine.FLOAT_MEM_SIZE
             in PassByReferenceDatatypes -> 2
             else -> -9999999
         }
@@ -112,10 +111,9 @@ val ByteDatatypes = setOf(DataType.UBYTE, DataType.BYTE)
 val WordDatatypes = setOf(DataType.UWORD, DataType.WORD)
 val IntegerDatatypes = setOf(DataType.UBYTE, DataType.BYTE, DataType.UWORD, DataType.WORD)
 val NumericDatatypes = setOf(DataType.UBYTE, DataType.BYTE, DataType.UWORD, DataType.WORD, DataType.FLOAT)
-val StringDatatypes = setOf(DataType.STR, DataType.STR_S)
 val ArrayDatatypes = setOf(DataType.ARRAY_UB, DataType.ARRAY_B, DataType.ARRAY_UW, DataType.ARRAY_W, DataType.ARRAY_F)
 val IterableDatatypes = setOf(
-        DataType.STR, DataType.STR_S,
+        DataType.STR,
         DataType.ARRAY_UB, DataType.ARRAY_B,
         DataType.ARRAY_UW, DataType.ARRAY_W,
         DataType.ARRAY_F)
@@ -123,7 +121,6 @@ val PassByValueDatatypes = NumericDatatypes
 val PassByReferenceDatatypes = IterableDatatypes.plus(DataType.STRUCT)
 val ArrayElementTypes = mapOf(
         DataType.STR to DataType.UBYTE,
-        DataType.STR_S to DataType.UBYTE,
         DataType.ARRAY_B to DataType.BYTE,
         DataType.ARRAY_UB to DataType.UBYTE,
         DataType.ARRAY_W to DataType.WORD,

compiler/src/prog8/ast/base/ErrorReporting.kt

@@ -5,7 +5,7 @@ import prog8.parser.ParsingFailedError
 
 fun printErrors(errors: List<Any>, moduleName: String) {
     val reportedMessages = mutableSetOf<String>()
-    print("\u001b[91m")  // bright red
+    System.err.print("\u001b[91m")  // bright red
     errors.forEach {
         val msg = it.toString()
         if(msg !in reportedMessages) {
@@ -13,7 +13,7 @@ fun printErrors(errors: List<Any>, moduleName: String) {
             reportedMessages.add(msg)
         }
     }
-    print("\u001b[0m")  // reset color
+    System.err.print("\u001b[0m")  // reset color
     if(reportedMessages.isNotEmpty())
         throw ParsingFailedError("There are ${reportedMessages.size} errors in module '$moduleName'.")
 }

compiler/src/prog8/ast/base/Extensions.kt

@@ -4,7 +4,6 @@ import prog8.ast.Module
 import prog8.ast.Program
 import prog8.ast.processing.*
 import prog8.compiler.CompilationOptions
-import prog8.compiler.target.c64.codegen.AnonymousScopeVarsCleanup
 import prog8.optimizer.FlattenAnonymousScopesAndRemoveNops
 
 

compiler/src/prog8/ast/expressions/AstExpressions.kt

@@ -1,9 +1,6 @@
 package prog8.ast.expressions
 
-import prog8.ast.IFunctionCall
+import prog8.ast.*
-import prog8.ast.INameScope
-import prog8.ast.Node
-import prog8.ast.Program
 import prog8.ast.antlr.escape
 import prog8.ast.base.*
 import prog8.ast.processing.IAstModifyingVisitor
@@ -12,13 +9,11 @@ import prog8.ast.statements.ArrayIndex
 import prog8.ast.statements.BuiltinFunctionStatementPlaceholder
 import prog8.ast.statements.Subroutine
 import prog8.ast.statements.VarDecl
-import prog8.compiler.HeapValues
+import prog8.compiler.target.CompilationTarget
-import prog8.compiler.IntegerOrAddressOf
-import prog8.compiler.target.c64.Petscii
 import prog8.functions.BuiltinFunctions
 import prog8.functions.NotConstArgumentException
 import prog8.functions.builtinFunctionReturnType
-import java.util.*
+import java.util.Objects
 import kotlin.math.abs
 
 
@@ -68,7 +63,27 @@ class PrefixExpression(val operator: String, var expression: Expression, overrid
     override fun accept(visitor: IAstModifyingVisitor) = visitor.visit(this)
     override fun accept(visitor: IAstVisitor) = visitor.visit(this)
     override fun referencesIdentifiers(vararg name: String) = expression.referencesIdentifiers(*name)
-    override fun inferType(program: Program): InferredTypes.InferredType = expression.inferType(program)
+    override fun inferType(program: Program): InferredTypes.InferredType {
+        val inferred = expression.inferType(program)
+        return when(operator) {
+            "+" -> inferred
+            "~", "not" -> {
+                when(inferred.typeOrElse(DataType.STRUCT)) {
+                    in ByteDatatypes -> InferredTypes.knownFor(DataType.UBYTE)
+                    in WordDatatypes -> InferredTypes.knownFor(DataType.UWORD)
+                    else -> inferred
+                }
+            }
+            "-" -> {
+                when(inferred.typeOrElse(DataType.STRUCT)) {
+                    in ByteDatatypes -> InferredTypes.knownFor(DataType.BYTE)
+                    in WordDatatypes -> InferredTypes.knownFor(DataType.WORD)
+                    else -> inferred
+                }
+            }
+            else -> throw FatalAstException("weird prefix expression operator")
+        }
+    }
 
     override fun toString(): String {
         return "Prefix($operator $expression)"
@@ -185,7 +200,7 @@ class BinaryExpression(var left: Expression, var operator: String, var right: Ex
 
 class ArrayIndexedExpression(var identifier: IdentifierReference,
                              val arrayspec: ArrayIndex,
-                             override val position: Position) : Expression() {
+                             override val position: Position) : Expression(), IAssignable {
     override lateinit var parent: Node
     override fun linkParents(parent: Node) {
         this.parent = parent
@@ -202,7 +217,7 @@ class ArrayIndexedExpression(var identifier: IdentifierReference,
         val target = identifier.targetStatement(program.namespace)
         if (target is VarDecl) {
             return when (target.datatype) {
-                in StringDatatypes -> InferredTypes.knownFor(DataType.UBYTE)
+                DataType.STR -> InferredTypes.knownFor(DataType.UBYTE)
                 in ArrayDatatypes -> InferredTypes.knownFor(ArrayElementTypes.getValue(target.datatype))
                 else -> InferredTypes.unknown()
             }
@@ -254,7 +269,7 @@ data class AddressOf(var identifier: IdentifierReference, override val position:
     override fun accept(visitor: IAstVisitor) = visitor.visit(this)
 }
 
-class DirectMemoryRead(var addressExpression: Expression, override val position: Position) : Expression() {
+class DirectMemoryRead(var addressExpression: Expression, override val position: Position) : Expression(), IAssignable {
     override lateinit var parent: Node
 
     override fun linkParents(parent: Node) {
@@ -307,7 +322,7 @@ class NumericLiteralValue(val type: DataType,    // only numerical types allowed
         }
     }
 
-    val asBooleanValue: Boolean = number!=0
+    val asBooleanValue: Boolean = number.toDouble() != 0.0
 
     override fun linkParents(parent: Node) {
         this.parent = parent
@@ -412,14 +427,13 @@ class StructLiteralValue(var values: List<Expression>,
     }
 }
 
-class StringLiteralValue(val type: DataType,     // only string types
+private var heapIdSequence = 0   // unique ids for strings and arrays "on the heap"
-                         val value: String,
+
-                         initHeapId: Int? =null,
+class StringLiteralValue(val value: String,
                          override val position: Position) : Expression() {
     override lateinit var parent: Node
 
-    var heapId = initHeapId
+    val heapId = ++heapIdSequence
-        private set
 
     override fun linkParents(parent: Node) {
         this.parent = parent
@@ -429,31 +443,22 @@ class StringLiteralValue(val type: DataType,     // only string types
     override fun accept(visitor: IAstModifyingVisitor) = visitor.visit(this)
     override fun accept(visitor: IAstVisitor) = visitor.visit(this)
     override fun toString(): String = "'${escape(value)}'"
-    override fun inferType(program: Program): InferredTypes.InferredType = InferredTypes.knownFor(type)
+    override fun inferType(program: Program): InferredTypes.InferredType = InferredTypes.knownFor(DataType.STR)
     operator fun compareTo(other: StringLiteralValue): Int = value.compareTo(other.value)
-    override fun hashCode(): Int = Objects.hash(value, type)
+    override fun hashCode(): Int = value.hashCode()
     override fun equals(other: Any?): Boolean {
         if(other==null || other !is StringLiteralValue)
             return false
-        return value==other.value && type==other.type
+        return value==other.value
-    }
-
-    fun addToHeap(heap: HeapValues) {
-        if (heapId != null)
-            return
-        else
-            heapId = heap.addString(type, value)
     }
 }
 
 class ArrayLiteralValue(val type: DataType,     // only array types
                         val value: Array<Expression>,
-                        initHeapId: Int? =null,
                         override val position: Position) : Expression() {
     override lateinit var parent: Node
 
-    var heapId = initHeapId
+    val heapId = ++heapIdSequence
-        private set
 
     override fun linkParents(parent: Node) {
         this.parent = parent
@@ -481,9 +486,9 @@ class ArrayLiteralValue(val type: DataType,     // only array types
             val castArray = value.map{
                 val num = it as? NumericLiteralValue
                 if(num==null) {
-                    // an array of UWORDs could possibly also contain AddressOfs
+                    // an array of UWORDs could possibly also contain AddressOfs, other stuff can't be casted
                     if (elementType != DataType.UWORD || it !is AddressOf)
-                        throw FatalAstException("weird array element $it")
+                        return null
                     it
                 } else {
                     try {
@@ -497,34 +502,6 @@ class ArrayLiteralValue(val type: DataType,     // only array types
         }
         return null    // invalid type conversion from $this to $targettype
     }
-
-    fun addToHeap(heap: HeapValues) {
-        if (heapId != null)
-            return
-        else {
-            if(value.any {it is AddressOf }) {
-                val intArrayWithAddressOfs = value.map {
-                    when (it) {
-                        is AddressOf -> IntegerOrAddressOf(null, it)
-                        is NumericLiteralValue -> IntegerOrAddressOf(it.number.toInt(), null)
-                        else -> throw FatalAstException("invalid datatype in array")
-                    }
-                }
-                heapId = heap.addIntegerArray(type, intArrayWithAddressOfs.toTypedArray())
-            } else {
-                val valuesInArray = value.map { (it as? NumericLiteralValue)?.number }
-                if(null !in valuesInArray) {
-                    heapId = if (type == DataType.ARRAY_F) {
-                        val doubleArray = valuesInArray.map { it!!.toDouble() }.toDoubleArray()
-                        heap.addDoublesArray(doubleArray)
-                    } else {
-                        val integerArray = valuesInArray.map { it!!.toInt() }
-                        heap.addIntegerArray(type, integerArray.map { IntegerOrAddressOf(it, null) }.toTypedArray())
-                    }
-                }
-            }
-        }
-    }
 }
 
 class RangeExpr(var from: Expression,
@@ -552,7 +529,6 @@ class RangeExpr(var from: Expression,
             fromDt istype DataType.UBYTE && toDt istype DataType.UBYTE -> InferredTypes.knownFor(DataType.ARRAY_UB)
             fromDt istype DataType.UWORD && toDt istype DataType.UWORD -> InferredTypes.knownFor(DataType.ARRAY_UW)
             fromDt istype DataType.STR && toDt istype DataType.STR -> InferredTypes.knownFor(DataType.STR)
-            fromDt istype DataType.STR_S && toDt istype DataType.STR_S -> InferredTypes.knownFor(DataType.STR_S)
             fromDt istype DataType.WORD || toDt istype DataType.WORD -> InferredTypes.knownFor(DataType.ARRAY_W)
             fromDt istype DataType.BYTE || toDt istype DataType.BYTE -> InferredTypes.knownFor(DataType.ARRAY_B)
             else -> InferredTypes.knownFor(DataType.ARRAY_UB)
@@ -577,8 +553,8 @@ class RangeExpr(var from: Expression,
         val toString = to as? StringLiteralValue
         if(fromString!=null && toString!=null ) {
             // string range -> int range over petscii values
-            fromVal = Petscii.encodePetscii(fromString.value, true)[0].toInt()
+            fromVal = CompilationTarget.encodeString(fromString.value)[0].toInt()
-            toVal = Petscii.encodePetscii(toString.value, true)[0].toInt()
+            toVal = CompilationTarget.encodeString(toString.value)[0].toInt()
         } else {
             val fromLv = from as? NumericLiteralValue
             val toLv = to as? NumericLiteralValue
@@ -608,7 +584,7 @@ internal fun makeRange(fromVal: Int, toVal: Int, stepVal: Int): IntProgression {
     }
 }
 
-class RegisterExpr(val register: Register, override val position: Position) : Expression() {
+class RegisterExpr(val register: Register, override val position: Position) : Expression(), IAssignable {
     override lateinit var parent: Node
 
     override fun linkParents(parent: Node) {
@@ -626,7 +602,7 @@ class RegisterExpr(val register: Register, override val position: Position) : Ex
     override fun inferType(program: Program): InferredTypes.InferredType = InferredTypes.knownFor(DataType.UBYTE)
 }
 
-data class IdentifierReference(val nameInSource: List<String>, override val position: Position) : Expression() {
+data class IdentifierReference(val nameInSource: List<String>, override val position: Position) : Expression(), IAssignable {
     override lateinit var parent: Node
 
     fun targetStatement(namespace: INameScope) =
@@ -678,22 +654,22 @@ data class IdentifierReference(val nameInSource: List<String>, override val posi
         val value = (node as? VarDecl)?.value ?: throw FatalAstException("requires a reference value")
         return when (value) {
             is IdentifierReference -> value.heapId(namespace)
-            is StringLiteralValue -> value.heapId ?: throw FatalAstException("string is not on the heap: $value")
+            is StringLiteralValue -> value.heapId
-            is ArrayLiteralValue -> value.heapId ?: throw FatalAstException("array is not on the heap: $value")
+            is ArrayLiteralValue -> value.heapId
             else -> throw FatalAstException("requires a reference value")
         }
     }
 }
 
 class FunctionCall(override var target: IdentifierReference,
-                   override var arglist: MutableList<Expression>,
+                   override var args: MutableList<Expression>,
                    override val position: Position) : Expression(), IFunctionCall {
     override lateinit var parent: Node
 
     override fun linkParents(parent: Node) {
         this.parent = parent
         target.linkParents(this)
-        arglist.forEach { it.linkParents(this) }
+        args.forEach { it.linkParents(this) }
     }
 
     override fun constValue(program: Program) = constValue(program, true)
@@ -708,7 +684,7 @@ class FunctionCall(override var target: IdentifierReference,
             if(func!=null) {
                 val exprfunc = func.constExpressionFunc
                 if(exprfunc!=null)
-                    resultValue = exprfunc(arglist, position, program)
+                    resultValue = exprfunc(args, position, program)
                 else if(func.returntype==null)
                     throw ExpressionError("builtin function ${target.nameInSource[0]} can't be used here because it doesn't return a value", position)
             }
@@ -734,7 +710,7 @@ class FunctionCall(override var target: IdentifierReference,
 
     override fun accept(visitor: IAstModifyingVisitor) = visitor.visit(this)
     override fun accept(visitor: IAstVisitor) = visitor.visit(this)
-    override fun referencesIdentifiers(vararg name: String): Boolean = target.referencesIdentifiers(*name) || arglist.any{it.referencesIdentifiers(*name)}
+    override fun referencesIdentifiers(vararg name: String): Boolean = target.referencesIdentifiers(*name) || args.any{it.referencesIdentifiers(*name)}
 
     override fun inferType(program: Program): InferredTypes.InferredType {
         val constVal = constValue(program ,false)
@@ -747,7 +723,7 @@ class FunctionCall(override var target: IdentifierReference,
                         target.nameInSource[0] == "clear_carry" || target.nameInSource[0]=="clear_irqd") {
                     return InferredTypes.void() // these have no return value
                 }
-                return builtinFunctionReturnType(target.nameInSource[0], this.arglist, program)
+                return builtinFunctionReturnType(target.nameInSource[0], this.args, program)
             }
             is Subroutine -> {
                 if(stmt.returntypes.isEmpty())

compiler/src/prog8/ast/expressions/InferredTypes.kt

@@ -1,12 +1,13 @@
 package prog8.ast.expressions
 
+import java.util.Objects
 import prog8.ast.base.DataType
 
+
 object InferredTypes {
     class InferredType private constructor(val isUnknown: Boolean, val isVoid: Boolean, private var datatype: DataType?) {
         init {
-            if(datatype!=null && (isUnknown || isVoid))
+            require(!(datatype!=null && (isUnknown || isVoid))) { "invalid combination of args" }
-                throw IllegalArgumentException("invalid combination of args")
         }
 
         val isKnown = datatype!=null
@@ -24,6 +25,16 @@ object InferredTypes {
                 return false
             return isVoid==other.isVoid && datatype==other.datatype
         }
+
+        override fun toString(): String {
+            return when {
+                datatype!=null -> datatype.toString()
+                isVoid -> "<void>"
+                else -> "<unknown>"
+            }
+        }
+
+        override fun hashCode(): Int = Objects.hash(isVoid, datatype)
     }
 
     private val unknownInstance = InferredType.unknown()
@@ -35,7 +46,6 @@ object InferredTypes {
             DataType.WORD to InferredType.known(DataType.WORD),
             DataType.FLOAT to InferredType.known(DataType.FLOAT),
             DataType.STR to InferredType.known(DataType.STR),
-            DataType.STR_S to InferredType.known(DataType.STR_S),
             DataType.ARRAY_UB to InferredType.known(DataType.ARRAY_UB),
             DataType.ARRAY_B to InferredType.known(DataType.ARRAY_B),
             DataType.ARRAY_UW to InferredType.known(DataType.ARRAY_UW),

compiler/src/prog8/ast/processing/AnonymousScopeVarsCleanup.kt

@@ -1,9 +1,8 @@
-package prog8.compiler.target.c64.codegen
+package prog8.ast.processing
 
 import prog8.ast.Program
 import prog8.ast.base.AstException
 import prog8.ast.base.NameError
-import prog8.ast.processing.IAstModifyingVisitor
 import prog8.ast.statements.AnonymousScope
 import prog8.ast.statements.Statement
 import prog8.ast.statements.VarDecl

compiler/src/prog8/ast/processing/AstChecker.kt

@@ -1,5 +1,6 @@
 package prog8.ast.processing
 
+import prog8.ast.IFunctionCall
 import prog8.ast.INameScope
 import prog8.ast.Module
 import prog8.ast.Program
@@ -7,8 +8,7 @@ import prog8.ast.base.*
 import prog8.ast.expressions.*
 import prog8.ast.statements.*
 import prog8.compiler.CompilationOptions
-import prog8.compiler.target.c64.MachineDefinition.FLOAT_MAX_NEGATIVE
+import prog8.compiler.target.CompilationTarget
-import prog8.compiler.target.c64.MachineDefinition.FLOAT_MAX_POSITIVE
 import prog8.functions.BuiltinFunctions
 import java.io.File
 
@@ -123,7 +123,7 @@ internal class AstChecker(private val program: Program,
         } else {
             if (forLoop.loopRegister != null) {
                 // loop register
-                if (iterableDt != DataType.ARRAY_UB && iterableDt != DataType.ARRAY_B && iterableDt !in StringDatatypes)
+                if (iterableDt != DataType.ARRAY_UB && iterableDt != DataType.ARRAY_B && iterableDt != DataType.STR)
                     checkResult.add(ExpressionError("register can only loop over bytes", forLoop.position))
                 if(forLoop.loopRegister!=Register.A)
                     checkResult.add(ExpressionError("it's only possible to use A as a loop register", forLoop.position))
@@ -135,11 +135,11 @@ internal class AstChecker(private val program: Program,
                 } else {
                     when (loopvar.datatype) {
                         DataType.UBYTE -> {
-                            if(iterableDt!= DataType.UBYTE && iterableDt!= DataType.ARRAY_UB && iterableDt !in StringDatatypes)
+                            if(iterableDt!= DataType.UBYTE && iterableDt!= DataType.ARRAY_UB && iterableDt != DataType.STR)
                                 checkResult.add(ExpressionError("ubyte loop variable can only loop over unsigned bytes or strings", forLoop.position))
                         }
                         DataType.UWORD -> {
-                            if(iterableDt!= DataType.UBYTE && iterableDt!= DataType.UWORD && iterableDt !in StringDatatypes &&
+                            if(iterableDt!= DataType.UBYTE && iterableDt!= DataType.UWORD && iterableDt != DataType.STR &&
                                     iterableDt != DataType.ARRAY_UB && iterableDt!= DataType.ARRAY_UW)
                                 checkResult.add(ExpressionError("uword loop variable can only loop over unsigned bytes, words or strings", forLoop.position))
                         }
@@ -242,7 +242,7 @@ internal class AstChecker(private val program: Program,
                 }
                 else if(param.second.registerOrPair in setOf(RegisterOrPair.AX, RegisterOrPair.AY, RegisterOrPair.XY)) {
                     if (param.first.type != DataType.UWORD && param.first.type != DataType.WORD
-                            && param.first.type !in StringDatatypes && param.first.type !in ArrayDatatypes && param.first.type != DataType.FLOAT)
+                            && param.first.type != DataType.STR && param.first.type !in ArrayDatatypes && param.first.type != DataType.FLOAT)
                         err("parameter '${param.first.name}' should be (u)word/address")
                 }
                 else if(param.second.statusflag!=null) {
@@ -257,7 +257,7 @@ internal class AstChecker(private val program: Program,
                 }
                 else if(ret.second.registerOrPair in setOf(RegisterOrPair.AX, RegisterOrPair.AY, RegisterOrPair.XY)) {
                     if (ret.first.value != DataType.UWORD && ret.first.value != DataType.WORD
-                            && ret.first.value !in StringDatatypes && ret.first.value !in ArrayDatatypes && ret.first.value != DataType.FLOAT)
+                            && ret.first.value != DataType.STR && ret.first.value !in ArrayDatatypes && ret.first.value != DataType.FLOAT)
                         err("return value #${ret.first.index + 1} should be (u)word/address")
                 }
                 else if(ret.second.statusflag!=null) {
@@ -408,7 +408,7 @@ internal class AstChecker(private val program: Program,
             }
         }
         val targetDt = assignTarget.inferType(program, assignment).typeOrElse(DataType.STR)
-        if(targetDt in StringDatatypes || targetDt in ArrayDatatypes)
+        if(targetDt in IterableDatatypes)
             checkResult.add(SyntaxError("cannot assign to a string or array type", assignTarget.position))
 
         if (assignment is Assignment) {
@@ -444,7 +444,7 @@ internal class AstChecker(private val program: Program,
         if(variable==null)
             checkResult.add(ExpressionError("pointer-of operand must be the name of a heap variable", addressOf.position))
         else {
-            if(variable.datatype !in ArrayDatatypes && variable.datatype !in StringDatatypes && variable.datatype!=DataType.STRUCT)
+            if(variable.datatype !in ArrayDatatypes && variable.datatype != DataType.STR && variable.datatype!=DataType.STRUCT)
                 checkResult.add(ExpressionError("invalid pointer-of operand type", addressOf.position))
         }
         super.visit(addressOf)
@@ -504,9 +504,9 @@ internal class AstChecker(private val program: Program,
                         decl.datatype in NumericDatatypes -> {
                             // initialize numeric var with value zero by default.
                             val litVal =
-                                    when {
+                                    when (decl.datatype) {
-                                        decl.datatype in ByteDatatypes -> NumericLiteralValue(decl.datatype, 0, decl.position)
+                                        in ByteDatatypes -> NumericLiteralValue(decl.datatype, 0, decl.position)
-                                        decl.datatype in WordDatatypes -> NumericLiteralValue(decl.datatype, 0, decl.position)
+                                        in WordDatatypes -> NumericLiteralValue(decl.datatype, 0, decl.position)
                                         else -> NumericLiteralValue(decl.datatype, 0.0, decl.position)
                                     }
                             litVal.parent = decl
@@ -693,16 +693,11 @@ internal class AstChecker(private val program: Program,
         checkValueTypeAndRangeArray(array.type, null, arrayspec, array)
 
         super.visit(array)
-
-        if(array.heapId==null)
-            throw FatalAstException("array should have been moved to heap at ${array.position}")
     }
 
     override fun visit(string: StringLiteralValue) {
-        checkValueTypeAndRangeString(string.type, string)
+        checkValueTypeAndRangeString(DataType.STR, string)
         super.visit(string)
-        if(string.heapId==null)
-            throw FatalAstException("string should have been moved to heap at ${string.position}")
     }
 
     override fun visit(expr: PrefixExpression) {
@@ -816,24 +811,24 @@ internal class AstChecker(private val program: Program,
 
         val targetStatement = checkFunctionOrLabelExists(functionCall.target, stmtOfExpression)
         if(targetStatement!=null)
-            checkFunctionCall(targetStatement, functionCall.arglist, functionCall.position)
+            checkFunctionCall(targetStatement, functionCall.args, functionCall.position)
         super.visit(functionCall)
     }
 
     override fun visit(functionCallStatement: FunctionCallStatement) {
         val targetStatement = checkFunctionOrLabelExists(functionCallStatement.target, functionCallStatement)
         if(targetStatement!=null)
-            checkFunctionCall(targetStatement, functionCallStatement.arglist, functionCallStatement.position)
+            checkFunctionCall(targetStatement, functionCallStatement.args, functionCallStatement.position)
-        if(targetStatement is Subroutine && targetStatement.returntypes.isNotEmpty()) {
+        if(!functionCallStatement.void && targetStatement is Subroutine && targetStatement.returntypes.isNotEmpty()) {
             if(targetStatement.returntypes.size==1)
-                printWarning("result value of subroutine call is discarded", functionCallStatement.position)
+                printWarning("result value of subroutine call is discarded (use void?)", functionCallStatement.position)
             else
-                printWarning("result values of subroutine call are discarded", functionCallStatement.position)
+                printWarning("result values of subroutine call are discarded (use void?)", functionCallStatement.position)
         }
 
-        if(functionCallStatement.target.nameInSource.last() in setOf("lsl", "lsr", "rol", "ror", "rol2", "ror2", "swap")) {
+        if(functionCallStatement.target.nameInSource.last() in setOf("lsl", "lsr", "rol", "ror", "rol2", "ror2", "swap", "sort", "reverse")) {
             // in-place modification, can't be done on literals
-            if(functionCallStatement.arglist.any { it !is IdentifierReference && it !is RegisterExpr && it !is ArrayIndexedExpression && it !is DirectMemoryRead }) {
+            if(functionCallStatement.args.any { it !is IdentifierReference && it !is RegisterExpr && it !is ArrayIndexedExpression && it !is DirectMemoryRead }) {
                 checkResult.add(ExpressionError("can't use that as argument to a in-place modifying function", functionCallStatement.position))
             }
         }
@@ -873,10 +868,10 @@ internal class AstChecker(private val program: Program,
                         checkResult.add(ExpressionError("swap requires args of numerical type", position))
                 }
                 else if(target.name=="all" || target.name=="any") {
-                    if((args[0] as? AddressOf)?.identifier?.targetVarDecl(program.namespace)?.datatype in StringDatatypes) {
+                    if((args[0] as? AddressOf)?.identifier?.targetVarDecl(program.namespace)?.datatype == DataType.STR) {
                         checkResult.add(ExpressionError("any/all on a string is useless (is always true unless the string is empty)", position))
                     }
-                    if(args[0].inferType(program).typeOrElse(DataType.STR) in StringDatatypes) {
+                    if(args[0].inferType(program).typeOrElse(DataType.STR) == DataType.STR) {
                         checkResult.add(ExpressionError("any/all on a string is useless (is always true unless the string is empty)", position))
                     }
                 }
@@ -888,12 +883,12 @@ internal class AstChecker(private val program: Program,
                 for (arg in args.withIndex().zip(target.parameters)) {
                     val argIDt = arg.first.value.inferType(program)
                     if(!argIDt.isKnown) {
-                        throw FatalAstException("can't determine arg dt ${arg.first.value}")
+                        return
                     }
                     val argDt=argIDt.typeOrElse(DataType.STRUCT)
                     if(!(argDt isAssignableTo arg.second.type)) {
                         // for asm subroutines having STR param it's okay to provide a UWORD (address value)
-                        if(!(target.isAsmSubroutine && arg.second.type in StringDatatypes && argDt == DataType.UWORD))
+                        if(!(target.isAsmSubroutine && arg.second.type == DataType.STR && argDt == DataType.UWORD))
                             checkResult.add(ExpressionError("subroutine '${target.name}' argument ${arg.first.index + 1} has invalid type $argDt, expected ${arg.second.type}", position))
                     }
 
@@ -944,9 +939,8 @@ internal class AstChecker(private val program: Program,
                 if(dt !in NumericDatatypes && dt !in ArrayDatatypes)
                     checkResult.add(SyntaxError("can only increment or decrement a byte/float/word", postIncrDecr.position))
             }
-        } else if(postIncrDecr.target.memoryAddress != null) {
-            // a memory location can always be ++/--
         }
+        // else if(postIncrDecr.target.memoryAddress != null) { } // a memory location can always be ++/--
         super.visit(postIncrDecr)
     }
 
@@ -961,11 +955,10 @@ internal class AstChecker(private val program: Program,
                 val index = (arrayIndexedExpression.arrayspec.index as? NumericLiteralValue)?.number?.toInt()
                 if(index!=null && (index<0 || index>=arraysize))
                     checkResult.add(ExpressionError("array index out of bounds", arrayIndexedExpression.arrayspec.position))
-            } else if(target.datatype in StringDatatypes) {
+            } else if(target.datatype == DataType.STR) {
                 if(target.value is StringLiteralValue) {
                     // check string lengths for non-memory mapped strings
-                    val heapId = (target.value as StringLiteralValue).heapId!!
+                    val stringLen = (target.value as StringLiteralValue).value.length
-                    val stringLen = program.heap.get(heapId).str!!.length
                     val index = (arrayIndexedExpression.arrayspec.index as? NumericLiteralValue)?.number?.toInt()
                     if (index != null && (index < 0 || index >= stringLen))
                         checkResult.add(ExpressionError("index out of bounds", arrayIndexedExpression.arrayspec.position))
@@ -1046,19 +1039,15 @@ internal class AstChecker(private val program: Program,
     }
 
     private fun checkValueTypeAndRangeString(targetDt: DataType, value: StringLiteralValue) : Boolean {
-        fun err(msg: String): Boolean {
+        return if (targetDt == DataType.STR) {
-            checkResult.add(ExpressionError(msg, value.position))
+            if (value.value.length > 255) {
-            return false
+                checkResult.add(ExpressionError("string length must be 0-255", value.position))
-        }
+                false
-        return when (targetDt) {
-            in StringDatatypes -> {
-                return if (value.value.length > 255)
-                    err("string length must be 0-255")
-                else
-                    true
             }
-            else -> false
+            else
+                true
         }
+        else false
     }
 
     private fun checkValueTypeAndRangeArray(targetDt: DataType, struct: StructDecl?,
@@ -1068,7 +1057,7 @@ internal class AstChecker(private val program: Program,
             return false
         }
         when (targetDt) {
-            in StringDatatypes -> return err("string value expected")
+            DataType.STR -> return err("string value expected")
             DataType.ARRAY_UB, DataType.ARRAY_B -> {
                 // value may be either a single byte, or a byte arraysize (of all constant values), or a range
                 if(value.type==targetDt) {
@@ -1134,7 +1123,7 @@ internal class AstChecker(private val program: Program,
 
                     // check if the floating point values are all within range
                     val doubles = value.value.map {it.constValue(program)?.number!!.toDouble()}.toDoubleArray()
-                    if(doubles.any { it < FLOAT_MAX_NEGATIVE || it> FLOAT_MAX_POSITIVE })
+                    if(doubles.any { it < CompilationTarget.machine.FLOAT_MAX_NEGATIVE || it > CompilationTarget.machine.FLOAT_MAX_POSITIVE })
                         return err("floating point value overflow")
                     return true
                 }
@@ -1205,53 +1194,35 @@ internal class AstChecker(private val program: Program,
     }
 
     private fun checkArrayValues(value: ArrayLiteralValue, type: DataType): Boolean {
-        if(value.heapId==null) {
+        val array = value.value.map {
-            // hmm weird, array literal that hasn't been moved to the heap yet?
+            when (it) {
-            val array = value.value.map { it.constValue(program)!! }
+                is NumericLiteralValue -> it.number.toInt()
-            val correct: Boolean
+                is AddressOf -> it.identifier.heapId(program.namespace)
-            when(type) {
+                is TypecastExpression -> {
-                DataType.ARRAY_UB -> {
+                    val constVal = it.expression.constValue(program)
-                    correct=array.all { it.type==DataType.UBYTE && it.number.toInt() in 0..255 }
+                    constVal?.cast(it.type)?.number?.toInt() ?: -9999999
                 }
-                DataType.ARRAY_B -> {
+                else -> -9999999
-                    correct=array.all { it.type==DataType.BYTE && it.number.toInt() in -128..127 }
-                }
-                DataType.ARRAY_UW -> {
-                    correct=array.all { it.type==DataType.UWORD && it.number.toInt() in 0..65535 }
-                }
-                DataType.ARRAY_W -> {
-                    correct=array.all { it.type==DataType.WORD && it.number.toInt() in -32768..32767}
-                }
-                DataType.ARRAY_F -> correct = true
-                else -> throw AstException("invalid array type $type")
             }
-            if(!correct)
-                checkResult.add(ExpressionError("array value out of range for type $type", value.position))
-            return correct
         }
-
-        val array = program.heap.get(value.heapId!!)
-        if(array.type !in ArrayDatatypes || (array.array==null && array.doubleArray==null))
-            throw FatalAstException("should have an array in the heapvar $array")
-
         val correct: Boolean
-        when(type) {
+        when (type) {
             DataType.ARRAY_UB -> {
-                correct= array.array?.all { it.integer!=null && it.integer in 0..255 } ?: false
+                correct = array.all { it in 0..255 }
             }
             DataType.ARRAY_B -> {
-                correct=array.array?.all { it.integer!=null && it.integer in -128..127 } ?: false
+                correct = array.all { it in -128..127 }
             }
             DataType.ARRAY_UW -> {
-                correct=array.array?.all { (it.integer!=null && it.integer in 0..65535)  || it.addressOf!=null} ?: false
+                correct = array.all { (it in 0..65535) }
             }
             DataType.ARRAY_W -> {
-                correct=array.array?.all { it.integer!=null && it.integer in -32768..32767 } ?: false
+                correct = array.all { it in -32768..32767 }
             }
-            DataType.ARRAY_F -> correct = array.doubleArray!=null
+            DataType.ARRAY_F -> correct = true
             else -> throw AstException("invalid array type $type")
         }
-        if(!correct)
+        if (!correct)
             checkResult.add(ExpressionError("array value out of range for type $type", value.position))
         return correct
     }
@@ -1272,7 +1243,6 @@ internal class AstChecker(private val program: Program,
             DataType.UWORD -> sourceDatatype== DataType.UBYTE || sourceDatatype== DataType.UWORD
             DataType.FLOAT -> sourceDatatype in NumericDatatypes
             DataType.STR -> sourceDatatype== DataType.STR
-            DataType.STR_S -> sourceDatatype== DataType.STR_S
             DataType.STRUCT -> {
                 if(sourceDatatype==DataType.STRUCT) {
                     val structLv = sourceValue as StructLiteralValue

compiler/src/prog8/ast/processing/AstIdentifiersChecker.kt

@@ -7,8 +7,7 @@ import prog8.ast.Program
 import prog8.ast.base.*
 import prog8.ast.expressions.*
 import prog8.ast.statements.*
-import prog8.compiler.HeapValues
+import prog8.compiler.target.CompilationTarget
-import prog8.compiler.target.c64.AssemblyProgram
 import prog8.functions.BuiltinFunctions
 
 
@@ -51,7 +50,7 @@ internal class AstIdentifiersChecker(private val program: Program) : IAstModifyi
     override fun visit(functionCall: FunctionCall): Expression {
         if(functionCall.target.nameInSource.size==1 && functionCall.target.nameInSource[0]=="lsb") {
             // lsb(...) is just an alias for type cast to ubyte, so replace with "... as ubyte"
-            val typecast = TypecastExpression(functionCall.arglist.single(), DataType.UBYTE, false, functionCall.position)
+            val typecast = TypecastExpression(functionCall.args.single(), DataType.UBYTE, false, functionCall.position)
             typecast.linkParents(functionCall.parent)
             return super.visit(typecast)
         }
@@ -67,8 +66,8 @@ internal class AstIdentifiersChecker(private val program: Program) : IAstModifyi
             // the builtin functions can't be redefined
             checkResult.add(NameError("builtin function cannot be redefined", decl.position))
 
-        if(decl.name in AssemblyProgram.opcodeNames)
+        if(decl.name in CompilationTarget.machine.opcodeNames)
-            checkResult.add(NameError("can't use a cpu opcode name as a symbol", decl.position))
+            checkResult.add(NameError("can't use a cpu opcode name as a symbol: '${decl.name}'", decl.position))
 
         // is it a struct variable? then define all its struct members as mangled names,
         //    and include the original decl as well.
@@ -104,8 +103,8 @@ internal class AstIdentifiersChecker(private val program: Program) : IAstModifyi
     }
 
     override fun visit(subroutine: Subroutine): Statement {
-        if(subroutine.name in AssemblyProgram.opcodeNames) {
+        if(subroutine.name in CompilationTarget.machine.opcodeNames) {
-            checkResult.add(NameError("can't use a cpu opcode name as a symbol", subroutine.position))
+            checkResult.add(NameError("can't use a cpu opcode name as a symbol: '${subroutine.name}'", subroutine.position))
         } else if(subroutine.name in BuiltinFunctions) {
             // the builtin functions can't be redefined
             checkResult.add(NameError("builtin function cannot be redefined", subroutine.position))
@@ -165,8 +164,8 @@ internal class AstIdentifiersChecker(private val program: Program) : IAstModifyi
     }
 
     override fun visit(label: Label): Statement {
-        if(label.name in AssemblyProgram.opcodeNames)
+        if(label.name in CompilationTarget.machine.opcodeNames)
-            checkResult.add(NameError("can't use a cpu opcode name as a symbol", label.position))
+            checkResult.add(NameError("can't use a cpu opcode name as a symbol: '${label.name}'", label.position))
 
         if(label.name in BuiltinFunctions) {
             // the builtin functions can't be redefined
@@ -185,28 +184,11 @@ internal class AstIdentifiersChecker(private val program: Program) : IAstModifyi
         // For loops that loop over an interable variable (instead of a range of numbers) get an
         // additional interation count variable in their scope.
         if(forLoop.loopRegister!=null) {
-            if(forLoop.decltype!=null)
-                checkResult.add(SyntaxError("register loop variables have a fixed implicit datatype", forLoop.position))
             if(forLoop.loopRegister == Register.X)
                 printWarning("writing to the X register is dangerous, because it's used as an internal pointer", forLoop.position)
         } else {
             val loopVar = forLoop.loopVar
             if (loopVar != null) {
-                val varName = loopVar.nameInSource.last()
-                if (forLoop.decltype != null) {
-                    val existing = if (forLoop.body.containsNoCodeNorVars()) null else forLoop.body.lookup(loopVar.nameInSource, forLoop.body.statements.first())
-                    if (existing == null) {
-                        // create the local scoped for loop variable itself
-                        val vardecl = VarDecl(VarDeclType.VAR, forLoop.decltype, forLoop.zeropage, null, varName, null, null,
-                                isArray = false, autogeneratedDontRemove = true, position = loopVar.position)
-                        vardecl.linkParents(forLoop.body)
-                        forLoop.body.statements.add(0, vardecl)
-                        loopVar.parent = forLoop.body   // loopvar 'is defined in the body'
-                    } else if(existing.parent!==forLoop && existing.parent.parent!==forLoop) {
-                        checkResult.add(NameError("for loop var was already defined at ${existing.position}", loopVar.position))
-                    }
-                }
-
                 val validName = forLoop.body.name.replace("<", "").replace(">", "").replace("-", "")
                 val loopvarName = "prog8_loopvar_$validName"
                 if (forLoop.iterable !is RangeExpr) {
@@ -237,15 +219,8 @@ internal class AstIdentifiersChecker(private val program: Program) : IAstModifyi
             val subroutine = returnStmt.definingSubroutine()!!
             if(subroutine.returntypes.size!=1)
                 return returnStmt  // mismatch in number of return values, error will be printed later.
-            val newValue: Expression
             val lval = returnStmt.value as? NumericLiteralValue
-            if(lval!=null) {
+            returnStmt.value = lval?.cast(subroutine.returntypes.single()) ?: returnStmt.value!!
-                newValue = lval.cast(subroutine.returntypes.single())
-            } else {
-                newValue = returnStmt.value!!
-            }
-
-            returnStmt.value = newValue
         }
         return super.visit(returnStmt)
     }
@@ -254,16 +229,18 @@ internal class AstIdentifiersChecker(private val program: Program) : IAstModifyi
         val array = super.visit(arrayLiteral)
         if(array is ArrayLiteralValue) {
             val vardecl = array.parent as? VarDecl
-            return if (vardecl!=null) {
+            return if(vardecl!=null)
-                fixupArrayDatatype(array, vardecl, program.heap)
+                fixupArrayEltDatatypesFromVardecl(array, vardecl)
-            } else {
+            else {
                 // fix the datatype of the array (also on the heap) to the 'biggest' datatype in the array
                 // (we don't know the desired datatype here exactly so we guess)
                 val datatype = determineArrayDt(array.value)
-                val litval2 = array.cast(datatype)!!
+                val litval2 = array.cast(datatype)
-                litval2.parent = array.parent
+                if(litval2!=null) {
-                // finally, replace the literal array by a identifier reference.
+                    litval2.parent = array.parent
-                makeIdentifierFromRefLv(litval2)
+                    // finally, replace the literal array by a identifier reference.
+                    makeIdentifierFromRefLv(litval2)
+                } else array
             }
         }
         return array
@@ -276,9 +253,6 @@ internal class AstIdentifiersChecker(private val program: Program) : IAstModifyi
             // intern the string; move it into the heap
             if (string.value.length !in 1..255)
                 checkResult.add(ExpressionError("string literal length must be between 1 and 255", string.position))
-            else {
-                string.addToHeap(program.heap)
-            }
             return if (vardecl != null)
                 string
             else
@@ -289,8 +263,7 @@ internal class AstIdentifiersChecker(private val program: Program) : IAstModifyi
 
     private fun determineArrayDt(array: Array<Expression>): DataType {
         val datatypesInArray = array.map { it.inferType(program) }
-        if(datatypesInArray.isEmpty() || datatypesInArray.any { !it.isKnown })
+        require(datatypesInArray.isNotEmpty() && datatypesInArray.all { it.isKnown }) { "can't determine type of empty array" }
-            throw IllegalArgumentException("can't determine type of empty array")
         val dts = datatypesInArray.map { it.typeOrElse(DataType.STRUCT) }
         return when {
             DataType.FLOAT in dts -> DataType.ARRAY_F
@@ -306,7 +279,6 @@ internal class AstIdentifiersChecker(private val program: Program) : IAstModifyi
         // a referencetype literal value that's not declared as a variable
         // we need to introduce an auto-generated variable for this to be able to refer to the value
         // note: if the var references the same literal value, it is not yet de-duplicated here.
-        array.addToHeap(program.heap)
         val scope = array.definingScope()
         val variable = VarDecl.createAuto(array)
         return replaceWithIdentifier(variable, scope, array.parent)
@@ -316,7 +288,6 @@ internal class AstIdentifiersChecker(private val program: Program) : IAstModifyi
         // a referencetype literal value that's not declared as a variable
         // we need to introduce an auto-generated variable for this to be able to refer to the value
         // note: if the var references the same literal value, it is not yet de-duplicated here.
-        string.addToHeap(program.heap)
         val scope = string.definingScope()
         val variable = VarDecl.createAuto(string)
         return replaceWithIdentifier(variable, scope, string.parent)
@@ -355,16 +326,12 @@ internal class AstIdentifiersChecker(private val program: Program) : IAstModifyi
         if(constvalue!=null) {
             if (expr.operator == "*") {
                 // repeat a string a number of times
-                val idt = string.inferType(program)
+                return StringLiteralValue(string.value.repeat(constvalue.number.toInt()), expr.position)
-                return StringLiteralValue(idt.typeOrElse(DataType.STR),
-                        string.value.repeat(constvalue.number.toInt()), null, expr.position)
             }
         }
         if(expr.operator == "+" && operand is StringLiteralValue) {
             // concatenate two strings
-            val idt = string.inferType(program)
+            return StringLiteralValue("${string.value}${operand.value}", expr.position)
-            return StringLiteralValue(idt.typeOrElse(DataType.STR),
-                    "${string.value}${operand.value}", null, expr.position)
         }
         return expr
     }
@@ -384,26 +351,45 @@ internal class AstIdentifiersChecker(private val program: Program) : IAstModifyi
 
 }
 
-internal fun fixupArrayDatatype(array: ArrayLiteralValue, vardecl: VarDecl, heap: HeapValues): ArrayLiteralValue {
+internal fun fixupArrayEltDatatypes(array: ArrayLiteralValue, program: Program): ArrayLiteralValue {
-    if(array.heapId!=null) {
+    val dts = array.value.map {it.inferType(program).typeOrElse(DataType.STRUCT)}.toSet()
-        val arrayDt = array.type
+    if(dts.any { it !in NumericDatatypes }) {
-        if(arrayDt!=vardecl.datatype) {
+        return array
-            // fix the datatype of the array (also on the heap) to match the vardecl
+    }
-            val litval2 =
+    val dt = when {
-                    try {
+        DataType.FLOAT in dts -> DataType.ARRAY_F
-                        array.cast(vardecl.datatype)!!
+        DataType.WORD in dts -> DataType.ARRAY_W
-                    } catch(x: ExpressionError) {
+        DataType.UWORD in dts -> DataType.ARRAY_UW
-                        // couldn't cast permanently.
+        DataType.BYTE in dts -> DataType.ARRAY_B
-                        // instead, simply adjust the array type and trust the AstChecker to report the exact error
+        else -> DataType.ARRAY_UB
-                        ArrayLiteralValue(vardecl.datatype, array.value, array.heapId, array.position)
+    }
-                    }
+    if(dt==array.type)
-            vardecl.value = litval2
+        return array
-            litval2.linkParents(vardecl)
+
-            litval2.addToHeap(heap)
+    // convert values and array type
-            return litval2
+    val elementType = ArrayElementTypes.getValue(dt)
+    val allNumerics = array.value.all { it is NumericLiteralValue }
+    if(allNumerics) {
+        val values = array.value.map { (it as NumericLiteralValue).cast(elementType) as Expression }.toTypedArray()
+        val array2 = ArrayLiteralValue(dt, values, array.position)
+        array2.linkParents(array.parent)
+        return array2
+    }
+
+    return array
+}
+
+internal fun fixupArrayEltDatatypesFromVardecl(array: ArrayLiteralValue, vardecl: VarDecl): ArrayLiteralValue {
+    val arrayDt = array.type
+    if(arrayDt!=vardecl.datatype) {
+        // fix the datatype of the array (also on the heap) to match the vardecl
+        val cast = array.cast(vardecl.datatype)
+        if (cast != null) {
+            vardecl.value = cast
+            cast.linkParents(vardecl)
+            return cast
         }
-    } else {
+        // can't be casted yet, attempt again later
-        array.addToHeap(heap)
     }
     return array
 }

compiler/src/prog8/ast/processing/IAstModifyingVisitor.kt

@@ -52,7 +52,7 @@ interface IAstModifyingVisitor {
             functionCall.target = newtarget
         else
             throw FatalAstException("cannot change class of function call target")
-        functionCall.arglist = functionCall.arglist.map { it.accept(this) }.toMutableList()
+        functionCall.args = functionCall.args.map { it.accept(this) }.toMutableList()
         return functionCall
     }
 
@@ -62,7 +62,7 @@ interface IAstModifyingVisitor {
             functionCallStatement.target = newtarget
         else
             throw FatalAstException("cannot change class of function call target")
-        functionCallStatement.arglist = functionCallStatement.arglist.map { it.accept(this) }.toMutableList()
+        functionCallStatement.args = functionCallStatement.args.map { it.accept(this) }.toMutableList()
         return functionCallStatement
     }
 
@@ -142,8 +142,7 @@ interface IAstModifyingVisitor {
     }
 
     fun visit(forLoop: ForLoop): Statement {
-        val newloopvar = forLoop.loopVar?.accept(this)
+        when(val newloopvar = forLoop.loopVar?.accept(this)) {
-        when(newloopvar) {
             is IdentifierReference -> forLoop.loopVar = newloopvar
             null -> forLoop.loopVar = null
             else -> throw FatalAstException("can't change class of loopvar")
@@ -179,8 +178,7 @@ interface IAstModifyingVisitor {
     }
 
     fun visit(assignTarget: AssignTarget): AssignTarget {
-        val ident = assignTarget.identifier?.accept(this)
+        when (val ident = assignTarget.identifier?.accept(this)) {
-        when (ident) {
             is IdentifierReference -> assignTarget.identifier = ident
             null -> assignTarget.identifier = null
             else -> throw FatalAstException("can't change class of assign target identifier")

compiler/src/prog8/ast/processing/IAstVisitor.kt

@@ -41,12 +41,12 @@ interface IAstVisitor {
 
     fun visit(functionCall: FunctionCall) {
         functionCall.target.accept(this)
-        functionCall.arglist.forEach { it.accept(this) }
+        functionCall.args.forEach { it.accept(this) }
     }
 
     fun visit(functionCallStatement: FunctionCallStatement) {
         functionCallStatement.target.accept(this)
-        functionCallStatement.arglist.forEach { it.accept(this) }
+        functionCallStatement.args.forEach { it.accept(this) }
     }
 
     fun visit(identifier: IdentifierReference) {

compiler/src/prog8/ast/processing/StatementReorderer.kt

@@ -1,12 +1,10 @@
 package prog8.ast.processing
 
-import prog8.ast.Module
+import prog8.ast.*
-import prog8.ast.Program
 import prog8.ast.base.DataType
 import prog8.ast.base.FatalAstException
 import prog8.ast.base.initvarsSubName
 import prog8.ast.expressions.*
-import prog8.ast.mangledStructMemberName
 import prog8.ast.statements.*
 
 
@@ -15,8 +13,8 @@ private fun flattenStructAssignmentFromIdentifier(structAssignment: Assignment,
     val identifierName = identifier.nameInSource.single()
     val targetVar = identifier.targetVarDecl(program.namespace)!!
     val struct = targetVar.struct!!
-    when {
+    when (structAssignment.value) {
-        structAssignment.value is IdentifierReference -> {
+        is IdentifierReference -> {
             val sourceVar = (structAssignment.value as IdentifierReference).targetVarDecl(program.namespace)!!
             if (sourceVar.struct == null)
                 throw FatalAstException("can only assign arrays or structs to structs")
@@ -41,7 +39,7 @@ private fun flattenStructAssignmentFromIdentifier(structAssignment: Assignment,
                 assign
             }
         }
-        structAssignment.value is StructLiteralValue -> {
+        is StructLiteralValue -> {
             throw IllegalArgumentException("not going to flatten a structLv assignment here")
         }
         else -> throw FatalAstException("strange struct value")
@@ -64,7 +62,10 @@ internal class StatementReorderer(private val program: Program): IAstModifyingVi
 
     private val directivesToMove = setOf("%output", "%launcher", "%zeropage", "%zpreserved", "%address", "%option")
 
+    private val addReturns = mutableListOf<Pair<INameScope, Int>>()
+
     override fun visit(module: Module) {
+        addReturns.clear()
         super.visit(module)
 
         val (blocks, other) = module.statements.partition { it is Block }
@@ -92,6 +93,13 @@ internal class StatementReorderer(private val program: Program): IAstModifyingVi
         val directives = module.statements.filter {it is Directive && it.directive in directivesToMove}
         module.statements.removeAll(directives)
         module.statements.addAll(0, directives)
+
+        for(pos in addReturns) {
+            println(pos)
+            val returnStmt = Return(null, pos.first.position)
+            returnStmt.linkParents(pos.first as Node)
+            pos.first.statements.add(pos.second, returnStmt)
+        }
     }
 
     override fun visit(block: Block): Statement {
@@ -161,6 +169,19 @@ internal class StatementReorderer(private val program: Program): IAstModifyingVi
     override fun visit(subroutine: Subroutine): Statement {
         super.visit(subroutine)
 
+        val scope = subroutine.definingScope()
+        if(scope is Subroutine) {
+            for(stmt in scope.statements.withIndex()) {
+                if(stmt.index>0 && stmt.value===subroutine) {
+                    val precedingStmt = scope.statements[stmt.index-1]
+                    if(precedingStmt !is Jump && precedingStmt !is Subroutine) {
+                        // insert a return statement before a nested subroutine, to avoid falling trough inside the subroutine
+                        addReturns.add(Pair(scope, stmt.index))
+                    }
+                }
+            }
+        }
+
         val varDecls = subroutine.statements.filterIsInstance<VarDecl>()
         subroutine.statements.removeAll(varDecls)
         subroutine.statements.addAll(0, varDecls)

compiler/src/prog8/ast/processing/TypecastsAdder.kt

@@ -78,7 +78,7 @@ internal class TypecastsAdder(private val program: Program): IAstModifyingVisito
         // see if a typecast is needed to convert the arguments into the required parameter's type
         when(val sub = call.target.targetStatement(scope)) {
             is Subroutine -> {
-                for(arg in sub.parameters.zip(call.arglist.withIndex())) {
+                for(arg in sub.parameters.zip(call.args.withIndex())) {
                     val argItype = arg.second.value.inferType(program)
                     if(argItype.isKnown) {
                         val argtype = argItype.typeOrElse(DataType.STRUCT)
@@ -87,7 +87,7 @@ internal class TypecastsAdder(private val program: Program): IAstModifyingVisito
                             if (argtype isAssignableTo requiredType) {
                                 val typecasted = TypecastExpression(arg.second.value, requiredType, true, arg.second.value.position)
                                 typecasted.linkParents(arg.second.value.parent)
-                                call.arglist[arg.second.index] = typecasted
+                                call.args[arg.second.index] = typecasted
                             }
                             // if they're not assignable, we'll get a proper error later from the AstChecker
                         }
@@ -98,7 +98,7 @@ internal class TypecastsAdder(private val program: Program): IAstModifyingVisito
                 val func = BuiltinFunctions.getValue(sub.name)
                 if(func.pure) {
                     // non-pure functions don't get automatic typecasts because sometimes they act directly on their parameters
-                    for (arg in func.parameters.zip(call.arglist.withIndex())) {
+                    for (arg in func.parameters.zip(call.args.withIndex())) {
                         val argItype = arg.second.value.inferType(program)
                         if (argItype.isKnown) {
                             val argtype = argItype.typeOrElse(DataType.STRUCT)
@@ -108,7 +108,7 @@ internal class TypecastsAdder(private val program: Program): IAstModifyingVisito
                                 if (argtype isAssignableTo possibleType) {
                                     val typecasted = TypecastExpression(arg.second.value, possibleType, true, arg.second.value.position)
                                     typecasted.linkParents(arg.second.value.parent)
-                                    call.arglist[arg.second.index] = typecasted
+                                    call.args[arg.second.index] = typecasted
                                     break
                                 }
                             }

compiler/src/prog8/ast/processing/VarInitValueAndAddressOfCreator.kt

@@ -44,8 +44,7 @@ internal class VarInitValueAndAddressOfCreator(private val program: Program): IA
             val arraysize = decl.arraysize!!.size()!!
             val array = ArrayLiteralValue(decl.datatype,
                     Array(arraysize) { NumericLiteralValue.optimalInteger(0, decl.position) },
-                    null, decl.position)
+                    decl.position)
-            array.addToHeap(program.heap)
             decl.value = array
         }
 
@@ -79,11 +78,11 @@ internal class VarInitValueAndAddressOfCreator(private val program: Program): IA
             parentStatement = parentStatement.parent
         val targetStatement = functionCall.target.targetSubroutine(program.namespace)
         if(targetStatement!=null) {
-            addAddressOfExprIfNeeded(targetStatement, functionCall.arglist, parentStatement)
+            addAddressOfExprIfNeeded(targetStatement, functionCall.args, parentStatement)
         } else {
             val builtinFunc = BuiltinFunctions[functionCall.target.nameInSource.joinToString (".")]
             if(builtinFunc!=null)
-                addAddressOfExprIfNeededForBuiltinFuncs(builtinFunc, functionCall.arglist, parentStatement)
+                addAddressOfExprIfNeededForBuiltinFuncs(builtinFunc, functionCall.args, parentStatement)
         }
         return functionCall
     }
@@ -91,11 +90,11 @@ internal class VarInitValueAndAddressOfCreator(private val program: Program): IA
     override fun visit(functionCallStatement: FunctionCallStatement): Statement {
         val targetStatement = functionCallStatement.target.targetSubroutine(program.namespace)
         if(targetStatement!=null) {
-            addAddressOfExprIfNeeded(targetStatement, functionCallStatement.arglist, functionCallStatement)
+            addAddressOfExprIfNeeded(targetStatement, functionCallStatement.args, functionCallStatement)
         } else {
             val builtinFunc = BuiltinFunctions[functionCallStatement.target.nameInSource.joinToString (".")]
             if(builtinFunc!=null)
-                addAddressOfExprIfNeededForBuiltinFuncs(builtinFunc, functionCallStatement.arglist, functionCallStatement)
+                addAddressOfExprIfNeededForBuiltinFuncs(builtinFunc, functionCallStatement.args, functionCallStatement)
         }
         return functionCallStatement
     }
@@ -103,14 +102,14 @@ internal class VarInitValueAndAddressOfCreator(private val program: Program): IA
     private fun addAddressOfExprIfNeeded(subroutine: Subroutine, arglist: MutableList<Expression>, parent: Statement) {
         // functions that accept UWORD and are given an array type, or string, will receive the AddressOf (memory location) of that value instead.
         for(argparam in subroutine.parameters.withIndex().zip(arglist)) {
-            if(argparam.first.value.type==DataType.UWORD || argparam.first.value.type in StringDatatypes) {
+            if(argparam.first.value.type==DataType.UWORD || argparam.first.value.type == DataType.STR) {
                 if(argparam.second is AddressOf)
                     continue
                 val idref = argparam.second as? IdentifierReference
                 val strvalue = argparam.second as? StringLiteralValue
                 if(idref!=null) {
                     val variable = idref.targetVarDecl(program.namespace)
-                    if(variable!=null && (variable.datatype in StringDatatypes || variable.datatype in ArrayDatatypes)) {
+                    if(variable!=null && variable.datatype in IterableDatatypes) {
                         val pointerExpr = AddressOf(idref, idref.position)
                         pointerExpr.linkParents(arglist[argparam.first.index].parent)
                         arglist[argparam.first.index] = pointerExpr

compiler/src/prog8/ast/statements/AstStatements.kt

@@ -37,7 +37,6 @@ sealed class Statement : Node {
     }
 }
 
-
 class BuiltinFunctionStatementPlaceholder(val name: String, override val position: Position) : Statement() {
     override var parent: Node = ParentSentinel
     override fun linkParents(parent: Node) {}
@@ -47,10 +46,8 @@ class BuiltinFunctionStatementPlaceholder(val name: String, override val positio
     override val expensiveToInline = false
 }
 
-
 data class RegisterOrStatusflag(val registerOrPair: RegisterOrPair?, val statusflag: Statusflag?, val stack: Boolean)
 
-
 class Block(override val name: String,
             val address: Int?,
             override var statements: MutableList<Statement>,
@@ -195,17 +192,12 @@ class VarDecl(val type: VarDeclType,
         private var autoHeapValueSequenceNumber = 0
 
         fun createAuto(string: StringLiteralValue): VarDecl {
-            if(string.heapId==null)
-                throw FatalAstException("can only create autovar for a string that has a heapid  $string")
             val autoVarName = "auto_heap_value_${++autoHeapValueSequenceNumber}"
-            return VarDecl(VarDeclType.VAR, string.type, ZeropageWish.NOT_IN_ZEROPAGE, null, autoVarName, null, string,
+            return VarDecl(VarDeclType.VAR, DataType.STR, ZeropageWish.NOT_IN_ZEROPAGE, null, autoVarName, null, string,
                         isArray = false, autogeneratedDontRemove = true, position = string.position)
         }
 
         fun createAuto(array: ArrayLiteralValue): VarDecl {
-            if(array.heapId==null)
-                throw FatalAstException("can only create autovar for an array that has a heapid  $array")
-
             val autoVarName = "auto_heap_value_${++autoHeapValueSequenceNumber}"
             val declaredType = ArrayElementTypes.getValue(array.type)
             val arraysize = ArrayIndex.forArray(array)
@@ -480,16 +472,17 @@ class Jump(val address: Int?,
 }
 
 class FunctionCallStatement(override var target: IdentifierReference,
-                            override var arglist: MutableList<Expression>,
+                            override var args: MutableList<Expression>,
+                            val void: Boolean,
                             override val position: Position) : Statement(), IFunctionCall {
     override lateinit var parent: Node
     override val expensiveToInline
-            get() = arglist.any { it !is NumericLiteralValue }
+            get() = args.any { it !is NumericLiteralValue }
 
     override fun linkParents(parent: Node) {
         this.parent = parent
         target.linkParents(this)
-        arglist.forEach { it.linkParents(this) }
+        args.forEach { it.linkParents(this) }
     }
 
     override fun accept(visitor: IAstModifyingVisitor) = visitor.visit(this)
@@ -649,8 +642,6 @@ class BranchStatement(var condition: BranchCondition,
 }
 
 class ForLoop(val loopRegister: Register?,
-              val decltype: DataType?,
-              val zeropage: ZeropageWish,
               var loopVar: IdentifierReference?,
               var iterable: Expression,
               var body: AnonymousScope,
@@ -660,7 +651,7 @@ class ForLoop(val loopRegister: Register?,
 
     override fun linkParents(parent: Node) {
         this.parent=parent
-        loopVar?.linkParents(if(decltype==null) this else body)
+        loopVar?.linkParents(this)
         iterable.linkParents(this)
         body.linkParents(this)
     }
@@ -794,4 +785,3 @@ class DirectMemoryWrite(var addressExpression: Expression, override val position
     fun accept(visitor: IAstVisitor) = visitor.visit(this)
     fun accept(visitor: IAstModifyingVisitor) = visitor.visit(this)
 }
-

compiler/src/prog8/compiler/AssemblyError.kt

@@ -0,0 +1,3 @@
+package prog8.compiler
+
+internal class AssemblyError(msg: String) : RuntimeException(msg)

compiler/src/prog8/compiler/Compiler.kt

@@ -1,13 +1,8 @@
 package prog8.compiler
 
-import prog8.ast.base.ArrayDatatypes
-import prog8.ast.base.DataType
-import prog8.ast.base.StringDatatypes
-import prog8.ast.expressions.AddressOf
 import java.io.File
 import java.io.InputStream
 import java.nio.file.Path
-import java.util.*
 import kotlin.math.abs
 
 enum class OutputType {
@@ -28,8 +23,6 @@ enum class ZeropageType {
     DONTUSE
 }
 
-data class IntegerOrAddressOf(val integer: Int?, val addressOf: AddressOf?)
-
 data class CompilationOptions(val output: OutputType,
                               val launcher: LauncherType,
                               val zeropage: ZeropageType,
@@ -73,77 +66,3 @@ fun loadAsmIncludeFile(filename: String, source: Path): String {
 internal fun tryGetEmbeddedResource(name: String): InputStream? {
     return object{}.javaClass.getResourceAsStream("/prog8lib/$name")
 }
-
-class HeapValues {
-    data class HeapValue(val type: DataType, val str: String?, val array: Array<IntegerOrAddressOf>?, val doubleArray: DoubleArray?) {
-        override fun equals(other: Any?): Boolean {
-            if (this === other) return true
-            if (javaClass != other?.javaClass) return false
-            other as HeapValue
-            return type==other.type && str==other.str && Arrays.equals(array, other.array) && Arrays.equals(doubleArray, other.doubleArray)
-        }
-
-        override fun hashCode(): Int = Objects.hash(str, array, doubleArray)
-
-        val arraysize: Int = array?.size ?: doubleArray?.size ?: 0
-    }
-
-    private val heap = mutableMapOf<Int, HeapValue>()
-    private var heapId = 1
-
-    fun size(): Int = heap.size
-
-    fun addString(type: DataType, str: String): Int {
-        if (str.length > 255)
-            throw IllegalArgumentException("string length must be 0-255")
-
-        // strings are 'interned' and shared if they're the isSameAs
-        val value = HeapValue(type, str, null, null)
-
-        val existing = heap.filter { it.value==value }.map { it.key }.firstOrNull()
-        if(existing!=null)
-            return existing
-        val newId = heapId++
-        heap[newId] = value
-        return newId
-    }
-
-    fun addIntegerArray(type: DataType, array: Array<IntegerOrAddressOf>): Int {
-        // arrays are never shared, don't check for existing
-        if(type !in ArrayDatatypes)
-            throw CompilerException("wrong array type")
-        val newId = heapId++
-        heap[newId] = HeapValue(type, null, array, null)
-        return newId
-    }
-
-    fun addDoublesArray(darray: DoubleArray): Int {
-        // arrays are never shared, don't check for existing
-        val newId = heapId++
-        heap[newId] = HeapValue(DataType.ARRAY_F, null, null, darray)
-        return newId
-    }
-
-    fun update(heapId: Int, str: String) {
-        val oldVal = heap[heapId] ?: throw IllegalArgumentException("heapId not found in heap")
-        if(oldVal.type in StringDatatypes) {
-            if (oldVal.str!!.length != str.length)
-                throw IllegalArgumentException("heap string length mismatch")
-            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 {
-        return heap[heapId] ?:
-        throw IllegalArgumentException("heapId $heapId not found in heap")
-    }
-
-    fun allEntries() = heap.entries
-}

compiler/src/prog8/compiler/Main.kt

@@ -4,8 +4,7 @@ import prog8.ast.AstToSourceCode
 import prog8.ast.Program
 import prog8.ast.base.*
 import prog8.ast.statements.Directive
-import prog8.compiler.target.c64.MachineDefinition
+import prog8.compiler.target.CompilationTarget
-import prog8.compiler.target.c64.codegen.AsmGen
 import prog8.optimizer.constantFold
 import prog8.optimizer.optimizeStatements
 import prog8.optimizer.simplifyExpressions
@@ -25,7 +24,8 @@ class CompilationResult(val success: Boolean,
 
 fun compileProgram(filepath: Path,
                    optimize: Boolean,
-                   writeAssembly: Boolean): CompilationResult {
+                   writeAssembly: Boolean,
+                   outputDir: Path): CompilationResult {
     lateinit var programAst: Program
     var programName: String? = null
 
@@ -100,9 +100,9 @@ fun compileProgram(filepath: Path,
 
             if(writeAssembly) {
                 // asm generation directly from the Ast, no need for intermediate code
-                val zeropage = MachineDefinition.C64Zeropage(compilerOptions)
+                val zeropage = CompilationTarget.machine.getZeropage(compilerOptions)
                 programAst.anonscopeVarsCleanup()
-                val assembly = AsmGen(programAst, compilerOptions, zeropage).compileToAssembly(optimize)
+                val assembly = CompilationTarget.asmGenerator(programAst, zeropage, compilerOptions, outputDir).compileToAssembly(optimize)
                 assembly.assemble(compilerOptions)
                 programName = assembly.name
             }

compiler/src/prog8/compiler/target/CompilationTarget.kt

@@ -0,0 +1,16 @@
+package prog8.compiler.target
+
+import prog8.ast.Program
+import prog8.compiler.CompilationOptions
+import prog8.compiler.Zeropage
+import java.nio.file.Path
+
+internal interface CompilationTarget {
+    companion object {
+        lateinit var name: String
+        lateinit var machine: IMachineDefinition
+        lateinit var encodeString: (str: String) -> List<Short>
+        lateinit var decodeString: (bytes: List<Short>) -> String
+        lateinit var asmGenerator: (Program, Zeropage, CompilationOptions, Path) -> IAssemblyGenerator
+    }
+}

compiler/src/prog8/compiler/target/IAssemblyGenerator.kt

@@ -0,0 +1,12 @@
+package prog8.compiler.target
+
+import prog8.compiler.CompilationOptions
+
+internal interface IAssemblyGenerator {
+    fun compileToAssembly(optimize: Boolean): IAssemblyProgram
+}
+
+internal interface IAssemblyProgram {
+    val name: String
+    fun assemble(options: CompilationOptions)
+}

compiler/src/prog8/compiler/target/IMachineDefinition.kt

@@ -0,0 +1,15 @@
+package prog8.compiler.target
+
+import prog8.compiler.CompilationOptions
+import prog8.compiler.Zeropage
+
+
+interface IMachineDefinition {
+    val FLOAT_MAX_NEGATIVE: Double
+    val FLOAT_MAX_POSITIVE: Double
+    val FLOAT_MEM_SIZE: Int
+
+    val opcodeNames: Set<String>
+
+    fun getZeropage(compilerOptions: CompilationOptions): Zeropage
+}

compiler/src/prog8/compiler/target/c64/AssemblyProgram.kt

@@ -2,46 +2,35 @@ package prog8.compiler.target.c64
 
 import prog8.compiler.CompilationOptions
 import prog8.compiler.OutputType
-import java.io.File
+import prog8.compiler.target.IAssemblyProgram
+import java.nio.file.Path
 import kotlin.system.exitProcess
 
-class AssemblyProgram(val name: String) {
+class AssemblyProgram(override val name: String, outputDir: Path): IAssemblyProgram {
-    private val assemblyFile = "$name.asm"
+    private val assemblyFile = outputDir.resolve("$name.asm")
-    private val viceMonListFile = "$name.vice-mon-list"
+    private val prgFile = outputDir.resolve("$name.prg")
+    private val binFile = outputDir.resolve("$name.bin")
+    private val viceMonListFile = outputDir.resolve("$name.vice-mon-list")
 
-    companion object {
+    override fun assemble(options: CompilationOptions) {
-        // 6502 opcodes (including aliases and illegal opcodes), these cannot be used as variable or label names
-        val opcodeNames = setOf("adc", "ahx", "alr", "anc", "and", "ane", "arr", "asl", "asr", "axs", "bcc", "bcs",
-                "beq", "bge", "bit", "blt", "bmi", "bne", "bpl", "brk", "bvc", "bvs", "clc",
-                "cld", "cli", "clv", "cmp", "cpx", "cpy", "dcm", "dcp", "dec", "dex", "dey",
-                "eor", "gcc", "gcs", "geq", "gge", "glt", "gmi", "gne", "gpl", "gvc", "gvs",
-                "inc", "ins", "inx", "iny", "isb", "isc", "jam", "jmp", "jsr", "lae", "las",
-                "lax", "lda", "lds", "ldx", "ldy", "lsr", "lxa", "nop", "ora", "pha", "php",
-                "pla", "plp", "rla", "rol", "ror", "rra", "rti", "rts", "sax", "sbc", "sbx",
-                "sec", "sed", "sei", "sha", "shl", "shr", "shs", "shx", "shy", "slo", "sre",
-                "sta", "stx", "sty", "tas", "tax", "tay", "tsx", "txa", "txs", "tya", "xaa")
-    }
-
-
-    fun assemble(options: CompilationOptions) {
         // add "-Wlong-branch"  to see warnings about conversion of branch instructions to jumps
         val command = mutableListOf("64tass", "--ascii", "--case-sensitive", "--long-branch",
                 "-Wall", "-Wno-strict-bool", "-Wno-shadow", "-Werror", "-Wno-error=long-branch",
-                "--dump-labels", "--vice-labels", "-l", viceMonListFile, "--no-monitor")
+                "--dump-labels", "--vice-labels", "-l", viceMonListFile.toString(), "--no-monitor")
 
         val outFile = when(options.output) {
             OutputType.PRG -> {
                 command.add("--cbm-prg")
                 println("\nCreating C-64 prg.")
-                "$name.prg"
+                prgFile
             }
             OutputType.RAW -> {
                 command.add("--nostart")
                 println("\nCreating raw binary.")
-                "$name.bin"
+                binFile
             }
         }
-        command.addAll(listOf("--output", outFile, assemblyFile))
+        command.addAll(listOf("--output", outFile.toString(), assemblyFile.toString()))
 
         val proc = ProcessBuilder(command).inheritIO().start()
         val result = proc.waitFor()
@@ -57,7 +46,7 @@ class AssemblyProgram(val name: String) {
         // builds list of breakpoints, appends to monitor list file
         val breakpoints = mutableListOf<String>()
         val pattern = Regex("""al (\w+) \S+_prog8_breakpoint_\d+.?""")      // gather breakpoints by the source label that"s generated for them
-        for(line in File(viceMonListFile).readLines()) {
+        for(line in viceMonListFile.toFile().readLines()) {
             val match = pattern.matchEntire(line)
             if(match!=null)
             breakpoints.add("break \$" + match.groupValues[1])
@@ -66,6 +55,6 @@ class AssemblyProgram(val name: String) {
         breakpoints.add(0, "; vice monitor breakpoint list now follows")
         breakpoints.add(1, "; $num breakpoints have been defined")
         breakpoints.add(2, "del")
-        File(viceMonListFile).appendText(breakpoints.joinToString("\n")+"\n")
+        viceMonListFile.toFile().appendText(breakpoints.joinToString("\n")+"\n")
     }
 }

compiler/src/prog8/compiler/target/c64/C64MachineDefinition.kt

@@ -4,18 +4,19 @@ import prog8.compiler.CompilationOptions
 import prog8.compiler.CompilerException
 import prog8.compiler.Zeropage
 import prog8.compiler.ZeropageType
+import prog8.compiler.target.IMachineDefinition
 import java.awt.Color
 import java.awt.image.BufferedImage
 import javax.imageio.ImageIO
 import kotlin.math.absoluteValue
 import kotlin.math.pow
 
-object MachineDefinition {
+object C64MachineDefinition: IMachineDefinition {
 
     // 5-byte cbm MFLPT format limitations:
-    const val FLOAT_MAX_POSITIVE = 1.7014118345e+38         // bytes: 255,127,255,255,255
+    override val FLOAT_MAX_POSITIVE = 1.7014118345e+38         // bytes: 255,127,255,255,255
-    const val FLOAT_MAX_NEGATIVE = -1.7014118345e+38        // bytes: 255,255,255,255,255
+    override val FLOAT_MAX_NEGATIVE = -1.7014118345e+38        // bytes: 255,255,255,255,255
-
+    override val FLOAT_MEM_SIZE = 5
     const val BASIC_LOAD_ADDRESS = 0x0801
     const val RAW_LOAD_ADDRESS = 0xc000
 
@@ -30,6 +31,19 @@ object MachineDefinition {
     const val ESTACK_HI_PLUS1_HEX   = "\$cf01"
     const val ESTACK_HI_PLUS2_HEX   = "\$cf02"
 
+    override fun getZeropage(compilerOptions: CompilationOptions) = C64Zeropage(compilerOptions)
+
+    // 6502 opcodes (including aliases and illegal opcodes), these cannot be used as variable or label names
+    override val opcodeNames = setOf("adc", "ahx", "alr", "anc", "and", "ane", "arr", "asl", "asr", "axs", "bcc", "bcs",
+            "beq", "bge", "bit", "blt", "bmi", "bne", "bpl", "brk", "bvc", "bvs", "clc",
+            "cld", "cli", "clv", "cmp", "cpx", "cpy", "dcm", "dcp", "dec", "dex", "dey",
+            "eor", "gcc", "gcs", "geq", "gge", "glt", "gmi", "gne", "gpl", "gvc", "gvs",
+            "inc", "ins", "inx", "iny", "isb", "isc", "jam", "jmp", "jsr", "lae", "las",
+            "lax", "lda", "lds", "ldx", "ldy", "lsr", "lxa", "nop", "ora", "pha", "php",
+            "pla", "plp", "rla", "rol", "ror", "rra", "rti", "rts", "sax", "sbc", "sbx",
+            "sec", "sed", "sei", "sha", "shl", "shr", "shs", "shx", "shy", "slo", "sre",
+            "sta", "stx", "sty", "tas", "tax", "tay", "tsx", "txa", "txs", "tya", "xaa")
+
 
     class C64Zeropage(options: CompilationOptions) : Zeropage(options) {
 
@@ -110,8 +124,6 @@ object MachineDefinition {
     data class Mflpt5(val b0: Short, val b1: Short, val b2: Short, val b3: Short, val b4: Short) {
 
         companion object {
-            const val MemorySize = 5
-
             val zero = Mflpt5(0, 0, 0, 0, 0)
             fun fromNumber(num: Number): Mflpt5 {
                 // see https://en.wikipedia.org/wiki/Microsoft_Binary_Format
@@ -232,7 +244,6 @@ object MachineDefinition {
         return bcopy
     }
 
-
     val colorPalette = listOf(         // this is Pepto's Commodore-64 palette  http://www.pepto.de/projects/colorvic/
             Color(0x000000),  // 0 = black
             Color(0xFFFFFF),  // 1 = white

compiler/src/prog8/compiler/target/c64/Petscii.kt

@@ -1058,7 +1058,7 @@ object Petscii {
                 0.toShort()
             else {
                 val case = if (lowercase) "lower" else "upper"
-                throw CharConversionException("no ${case}case Petscii character for '$it'")
+                throw CharConversionException("no ${case}case Petscii character for '$it' (${it.toShort()})")
             }
         }
     }
@@ -1076,7 +1076,7 @@ object Petscii {
                 0.toShort()
             else {
                 val case = if (lowercase) "lower" else "upper"
-                throw CharConversionException("no ${case}Screencode character for '$it'")
+                throw CharConversionException("no ${case}Screencode character for '$it' (${it.toShort()})")
             }
         }
     }

compiler/src/prog8/compiler/target/c64/codegen/AsmGen.kt

@@ -7,25 +7,27 @@ import prog8.ast.base.*
 import prog8.ast.expressions.*
 import prog8.ast.statements.*
 import prog8.compiler.*
+import prog8.compiler.target.IAssemblyGenerator
+import prog8.compiler.target.IAssemblyProgram
 import prog8.compiler.target.c64.AssemblyProgram
-import prog8.compiler.target.c64.MachineDefinition
+import prog8.compiler.target.c64.C64MachineDefinition
-import prog8.compiler.target.c64.MachineDefinition.ESTACK_HI_HEX
+import prog8.compiler.target.c64.C64MachineDefinition.ESTACK_LO_HEX
-import prog8.compiler.target.c64.MachineDefinition.ESTACK_LO_HEX
+import prog8.compiler.target.c64.C64MachineDefinition.ESTACK_HI_HEX
 import prog8.compiler.target.c64.Petscii
 import prog8.functions.BuiltinFunctions
 import prog8.functions.FunctionSignature
-import java.io.File
 import java.math.RoundingMode
-import java.util.*
+import java.nio.file.Path
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.util.ArrayDeque
 import kotlin.math.absoluteValue
 
 
-internal class AssemblyError(msg: String) : RuntimeException(msg)
+internal class AsmGen(private val program: Program,
-
+             private val zeropage: Zeropage,
-
+             private val options: CompilationOptions,
-internal class AsmGen(val program: Program,
+             private val outputDir: Path): IAssemblyGenerator {
-                      val options: CompilationOptions,
-                      val zeropage: Zeropage) {
 
     private val assemblyLines = mutableListOf<String>()
     private val globalFloatConsts = mutableMapOf<Double, String>()     // all float values in the entire program (value -> varname)
@@ -37,10 +39,10 @@ internal class AsmGen(val program: Program,
     private val functioncallAsmGen = FunctionCallAsmGen(program, this)
     private val assignmentAsmGen = AssignmentAsmGen(program, this)
     private val expressionsAsmGen = ExpressionsAsmGen(program, this)
-    internal val loopEndLabels = Stack<String>()
+    internal val loopEndLabels = ArrayDeque<String>()
-    internal val loopContinueLabels = Stack<String>()
+    internal val loopContinueLabels = ArrayDeque<String>()
 
-    internal fun compileToAssembly(optimize: Boolean): AssemblyProgram {
+    override fun compileToAssembly(optimize: Boolean): IAssemblyProgram {
         assemblyLines.clear()
         loopEndLabels.clear()
         loopContinueLabels.clear()
@@ -62,17 +64,18 @@ internal class AsmGen(val program: Program,
             }
         }
 
-        File("${program.name}.asm").printWriter().use {
+        val outputFile = outputDir.resolve("${program.name}.asm").toFile()
+        outputFile.printWriter().use {
             for (line in assemblyLines) { it.println(line) }
         }
 
-        return AssemblyProgram(program.name)
+        return AssemblyProgram(program.name, outputDir)
     }
 
     private fun header() {
         val ourName = this.javaClass.name
         out("; 6502 assembly code for '${program.name}'")
-        out("; generated by $ourName on ${Date()}")
+        out("; generated by $ourName on ${LocalDateTime.now().withNano(0)}")
         out("; assembler syntax is for the 64tasm cross-assembler")
         out("; output options: output=${options.output} launcher=${options.launcher} zp=${options.zeropage}")
         out("\n.cpu  '6502'\n.enc  'none'\n")
@@ -80,7 +83,7 @@ internal class AsmGen(val program: Program,
         program.actualLoadAddress = program.definedLoadAddress
         if (program.actualLoadAddress == 0)   // fix load address
             program.actualLoadAddress = if (options.launcher == LauncherType.BASIC)
-                MachineDefinition.BASIC_LOAD_ADDRESS else MachineDefinition.RAW_LOAD_ADDRESS
+                C64MachineDefinition.BASIC_LOAD_ADDRESS else C64MachineDefinition.RAW_LOAD_ADDRESS
 
         when {
             options.launcher == LauncherType.BASIC -> {
@@ -88,7 +91,7 @@ internal class AsmGen(val program: Program,
                     throw AssemblyError("BASIC output must have load address $0801")
                 out("; ---- basic program with sys call ----")
                 out("* = ${program.actualLoadAddress.toHex()}")
-                val year = Calendar.getInstance().get(Calendar.YEAR)
+                val year = LocalDate.now().year
                 out("  .word  (+), $year")
                 out("  .null  $9e, format(' %d ', _prog8_entrypoint), $3a, $8f, ' prog8 by idj'")
                 out("+\t.word  0")
@@ -141,7 +144,7 @@ internal class AsmGen(val program: Program,
         // the global list of all floating point constants for the whole program
         out("; global float constants")
         for (flt in globalFloatConsts) {
-            val mflpt5 = MachineDefinition.Mflpt5.fromNumber(flt.key)
+            val mflpt5 = C64MachineDefinition.Mflpt5.fromNumber(flt.key)
             val floatFill = makeFloatFill(mflpt5)
             val floatvalue = flt.key
             out("${flt.value}\t.byte  $floatFill  ; float $floatvalue")
@@ -149,7 +152,7 @@ internal class AsmGen(val program: Program,
     }
 
     private fun block2asm(block: Block) {
-        out("\n; ---- block: '${block.name}' ----")
+        out("\n\n; ---- block: '${block.name}' ----")
         out("${block.name}\t" + (if("force_output" in block.options()) ".block\n" else ".proc\n"))
 
         if(block.address!=null) {
@@ -194,7 +197,7 @@ internal class AsmGen(val program: Program,
         } else assemblyLines.add(fragment)
     }
 
-    private fun makeFloatFill(flt: MachineDefinition.Mflpt5): String {
+    private fun makeFloatFill(flt: C64MachineDefinition.Mflpt5): String {
         val b0 = "$" + flt.b0.toString(16).padStart(2, '0')
         val b1 = "$" + flt.b1.toString(16).padStart(2, '0')
         val b2 = "$" + flt.b2.toString(16).padStart(2, '0')
@@ -203,18 +206,9 @@ internal class AsmGen(val program: Program,
         return "$b0, $b1, $b2, $b3, $b4"
     }
 
-    private fun encodeStr(str: String, dt: DataType): List<Short> {
+    private fun petscii(str: String): List<Short> {
-        return when(dt) {
+         val bytes = Petscii.encodePetscii(str, true)
-            DataType.STR -> {
+         return bytes.plus(0)
-                val bytes = Petscii.encodePetscii(str, true)
-                bytes.plus(0)
-            }
-            DataType.STR_S -> {
-                val bytes = Petscii.encodeScreencode(str, true)
-                bytes.plus(0)
-            }
-            else -> throw AssemblyError("invalid str type")
-        }
     }
 
     private fun zeropagevars2asm(statements: List<Statement>) {
@@ -251,10 +245,9 @@ internal class AsmGen(val program: Program,
             DataType.WORD -> out("${decl.name}\t.sint  0")
             DataType.FLOAT -> out("${decl.name}\t.byte  0,0,0,0,0  ; float")
             DataType.STRUCT -> {}       // is flattened
-            DataType.STR, DataType.STR_S -> {
+            DataType.STR -> {
                 val string = (decl.value as StringLiteralValue).value
-                val encoded = encodeStr(string, decl.datatype)
+                outputStringvar(decl, petscii(string))
-                outputStringvar(decl, encoded)
             }
             DataType.ARRAY_UB -> {
                 val data = makeArrayFillDataUnsigned(decl)
@@ -300,7 +293,7 @@ internal class AsmGen(val program: Program,
                 val array = (decl.value as ArrayLiteralValue).value
                 val floatFills = array.map {
                     val number = (it as NumericLiteralValue).number
-                    makeFloatFill(MachineDefinition.Mflpt5.fromNumber(number))
+                    makeFloatFill(C64MachineDefinition.Mflpt5.fromNumber(number))
                 }
                 out(decl.name)
                 for (f in array.zip(floatFills))
@@ -337,8 +330,8 @@ internal class AsmGen(val program: Program,
 
         // special treatment for string types: merge strings that are identical
         val encodedstringVars = normalVars
-                .filter {it.datatype in StringDatatypes }
+                .filter {it.datatype == DataType.STR }
-                .map { it to encodeStr((it.value as StringLiteralValue).value, it.datatype) }
+                .map { it to petscii((it.value as StringLiteralValue).value) }
                 .groupBy({it.second}, {it.first})
         for((encoded, variables) in encodedstringVars) {
             variables.dropLast(1).forEach { out(it.name) }
@@ -347,7 +340,7 @@ internal class AsmGen(val program: Program,
         }
 
         // non-string variables
-        normalVars.filter{ it.datatype !in StringDatatypes}.sortedBy { it.datatype }.forEach {
+        normalVars.filter{ it.datatype != DataType.STR }.sortedBy { it.datatype }.forEach {
             if(it.scopedname !in allocatedZeropageVariables)
                 vardecl2asm(it)
         }
@@ -363,14 +356,14 @@ internal class AsmGen(val program: Program,
 
     private fun makeArrayFillDataUnsigned(decl: VarDecl): List<String> {
         val array = (decl.value as ArrayLiteralValue).value
-        return when {
+        return when (decl.datatype) {
-            decl.datatype == DataType.ARRAY_UB ->
+            DataType.ARRAY_UB ->
                 // byte array can never contain pointer-to types, so treat values as all integers
                 array.map {
                     val number = (it as NumericLiteralValue).number.toInt()
                     "$"+number.toString(16).padStart(2, '0')
                 }
-            decl.datatype== DataType.ARRAY_UW -> array.map {
+            DataType.ARRAY_UW -> array.map {
                 if(it is NumericLiteralValue) {
                     "$" + it.number.toInt().toString(16).padStart(4, '0')
                 } else {
@@ -421,7 +414,7 @@ internal class AsmGen(val program: Program,
 
     internal fun getFloatConst(number: Double): String {
         // try to match the ROM float constants to save memory
-        val mflpt5 = MachineDefinition.Mflpt5.fromNumber(number)
+        val mflpt5 = C64MachineDefinition.Mflpt5.fromNumber(number)
         val floatbytes = shortArrayOf(mflpt5.b0, mflpt5.b1, mflpt5.b2, mflpt5.b3, mflpt5.b4)
         when {
             floatbytes.contentEquals(shortArrayOf(0x00, 0x00, 0x00, 0x00, 0x00)) -> return "c64flt.FL_ZERO"
@@ -507,7 +500,7 @@ internal class AsmGen(val program: Program,
     internal fun readAndPushArrayvalueWithIndexA(arrayDt: DataType, variable: IdentifierReference) {
         val variablename = asmIdentifierName(variable)
         when (arrayDt) {
-            DataType.STR, DataType.STR_S, DataType.ARRAY_UB, DataType.ARRAY_B ->
+            DataType.STR, DataType.ARRAY_UB, DataType.ARRAY_B ->
                 out("  tay |  lda  $variablename,y |  sta  $ESTACK_LO_HEX,x |  dex")
             DataType.ARRAY_UW, DataType.ARRAY_W ->
                 out("  asl  a |  tay |  lda  $variablename,y |  sta  $ESTACK_LO_HEX,x |  lda  $variablename+1,y |  sta  $ESTACK_HI_HEX,x | dex")
@@ -820,8 +813,7 @@ internal class AsmGen(val program: Program,
     }
 
     internal fun translateArrayIndexIntoA(expr: ArrayIndexedExpression) {
-        val index = expr.arrayspec.index
+        when (val index = expr.arrayspec.index) {
-        when (index) {
             is NumericLiteralValue -> throw AssemblyError("this should be optimized directly")
             is RegisterExpr -> {
                 when (index.register) {

compiler/src/prog8/compiler/target/c64/codegen/AsmOptimizer.kt

@@ -1,7 +1,7 @@
 package prog8.compiler.target.c64.codegen
 
-import prog8.compiler.target.c64.MachineDefinition.ESTACK_LO_HEX
+import prog8.compiler.target.c64.C64MachineDefinition.ESTACK_LO_HEX
-import prog8.compiler.target.c64.MachineDefinition.ESTACK_LO_PLUS1_HEX
+import prog8.compiler.target.c64.C64MachineDefinition.ESTACK_LO_PLUS1_HEX
 
 
 // note: see https://wiki.nesdev.com/w/index.php/6502_assembly_optimisations
@@ -101,7 +101,7 @@ fun optimizeSameAssignments(linesByFourteen: List<List<IndexedValue<String>>>):
 
     // optimize sequential assignments of the isSameAs value to various targets (bytes, words, floats)
     // the float one is the one that requires 2*7=14 lines of code to check...
-    // @todo a better place to do this is in the Compiler instead and transform the Ast, and never even create the inefficient asm in the first place...
+    // @todo a better place to do this is in the Compiler instead and transform the Ast, or the AsmGen, and never even create the inefficient asm in the first place...
 
     val removeLines = mutableListOf<Int>()
     for (pair in linesByFourteen) {

compiler/src/prog8/compiler/target/c64/codegen/AssignmentAsmGen.kt

@@ -7,8 +7,13 @@ import prog8.ast.statements.AssignTarget
 import prog8.ast.statements.Assignment
 import prog8.ast.statements.DirectMemoryWrite
 import prog8.ast.statements.VarDecl
-import prog8.compiler.target.c64.MachineDefinition
 import prog8.compiler.toHex
+import prog8.compiler.AssemblyError
+import prog8.compiler.target.c64.C64MachineDefinition
+import prog8.compiler.target.c64.C64MachineDefinition.C64Zeropage
+import prog8.compiler.target.c64.C64MachineDefinition.ESTACK_HI_HEX
+import prog8.compiler.target.c64.C64MachineDefinition.ESTACK_LO_HEX
+
 
 internal class AssignmentAsmGen(private val program: Program, private val asmgen: AsmGen) {
 
@@ -78,10 +83,10 @@ internal class AssignmentAsmGen(private val program: Program, private val asmgen
                     val arrayVarName = asmgen.asmIdentifierName(arrayExpr.identifier)
                     val indexValue = index.number.toInt() * ArrayElementTypes.getValue(arrayDt).memorySize()
                     when (arrayDt) {
-                        DataType.STR, DataType.STR_S, DataType.ARRAY_UB, DataType.ARRAY_B ->
+                        DataType.STR, DataType.ARRAY_UB, DataType.ARRAY_B ->
-                            asmgen.out("  lda  $arrayVarName+$indexValue |  sta  ${MachineDefinition.ESTACK_LO_HEX},x |  dex")
+                            asmgen.out("  lda  $arrayVarName+$indexValue |  sta  $ESTACK_LO_HEX,x |  dex")
                         DataType.ARRAY_UW, DataType.ARRAY_W ->
-                            asmgen.out("  lda  $arrayVarName+$indexValue |  sta  ${MachineDefinition.ESTACK_LO_HEX},x |  lda  $arrayVarName+$indexValue+1 |  sta  ${MachineDefinition.ESTACK_HI_HEX},x | dex")
+                            asmgen.out("  lda  $arrayVarName+$indexValue |  sta  $ESTACK_LO_HEX,x |  lda  $arrayVarName+$indexValue+1 |  sta  $ESTACK_HI_HEX,x | dex")
                         DataType.ARRAY_F ->
                             asmgen.out("  lda  #<$arrayVarName+$indexValue |  ldy  #>$arrayVarName+$indexValue |  jsr  c64flt.push_float")
                         else ->
@@ -124,21 +129,21 @@ internal class AssignmentAsmGen(private val program: Program, private val asmgen
             target.register!=null -> {
                 if(target.register== Register.X)
                     throw AssemblyError("can't pop into X register - use variable instead")
-                asmgen.out(" inx | ld${target.register.name.toLowerCase()}  ${MachineDefinition.ESTACK_LO_HEX},x ")
+                asmgen.out(" inx | ld${target.register.name.toLowerCase()}  $ESTACK_LO_HEX,x ")
             }
             targetIdent!=null -> {
                 val targetName = asmgen.asmIdentifierName(targetIdent)
                 val targetDt = targetIdent.inferType(program).typeOrElse(DataType.STRUCT)
                 when(targetDt) {
                     DataType.UBYTE, DataType.BYTE -> {
-                        asmgen.out(" inx | lda  ${MachineDefinition.ESTACK_LO_HEX},x  | sta  $targetName")
+                        asmgen.out(" inx | lda  $ESTACK_LO_HEX,x  | sta  $targetName")
                     }
                     DataType.UWORD, DataType.WORD -> {
                         asmgen.out("""
                             inx
-                            lda  ${MachineDefinition.ESTACK_LO_HEX},x
+                            lda  $ESTACK_LO_HEX,x
                             sta  $targetName
-                            lda  ${MachineDefinition.ESTACK_HI_HEX},x
+                            lda  $ESTACK_HI_HEX,x
                             sta  $targetName+1
                         """)
                     }
@@ -153,14 +158,14 @@ internal class AssignmentAsmGen(private val program: Program, private val asmgen
                 }
             }
             target.memoryAddress!=null -> {
-                asmgen.out("  inx  | ldy  ${MachineDefinition.ESTACK_LO_HEX},x")
+                asmgen.out("  inx  | ldy  $ESTACK_LO_HEX,x")
                 storeRegisterInMemoryAddress(Register.Y, target.memoryAddress)
             }
             target.arrayindexed!=null -> {
                 val arrayDt = target.arrayindexed!!.identifier.targetVarDecl(program.namespace)!!.datatype
                 val arrayVarName = asmgen.asmIdentifierName(target.arrayindexed!!.identifier)
                 asmgen.translateExpression(target.arrayindexed!!.arrayspec.index)
-                asmgen.out("  inx |  lda  ${MachineDefinition.ESTACK_LO_HEX},x")
+                asmgen.out("  inx |  lda  $ESTACK_LO_HEX,x")
                 popAndWriteArrayvalueWithIndexA(arrayDt, arrayVarName)
             }
             else -> throw AssemblyError("weird assignment target $target")
@@ -225,9 +230,9 @@ internal class AssignmentAsmGen(private val program: Program, private val asmgen
             targetArrayIdx!=null -> {
                 val index = targetArrayIdx.arrayspec.index
                 val targetName = asmgen.asmIdentifierName(targetArrayIdx.identifier)
-                asmgen.out("  lda  $sourceName |  sta  ${MachineDefinition.ESTACK_LO_HEX},x |  lda  $sourceName+1 |  sta  ${MachineDefinition.ESTACK_HI_HEX},x |  dex")
+                asmgen.out("  lda  $sourceName |  sta  $ESTACK_LO_HEX,x |  lda  $sourceName+1 |  sta  $ESTACK_HI_HEX,x |  dex")
                 asmgen.translateExpression(index)
-                asmgen.out("  inx |  lda  ${MachineDefinition.ESTACK_LO_HEX},x")
+                asmgen.out("  inx |  lda  $ESTACK_LO_HEX,x")
                 val arrayDt = targetArrayIdx.identifier.inferType(program).typeOrElse(DataType.STRUCT)
                 popAndWriteArrayvalueWithIndexA(arrayDt, targetName)
             }
@@ -285,9 +290,9 @@ internal class AssignmentAsmGen(private val program: Program, private val asmgen
                 val index = targetArrayIdx.arrayspec.index
                 val targetName = asmgen.asmIdentifierName(targetArrayIdx.identifier)
                 val arrayDt = targetArrayIdx.identifier.inferType(program).typeOrElse(DataType.STRUCT)
-                asmgen.out("  lda  $sourceName |  sta  ${MachineDefinition.ESTACK_LO_HEX},x |  dex")
+                asmgen.out("  lda  $sourceName |  sta  $ESTACK_LO_HEX,x |  dex")
                 asmgen.translateExpression(index)
-                asmgen.out("  inx |  lda  ${MachineDefinition.ESTACK_LO_HEX},x")
+                asmgen.out("  inx |  lda  $ESTACK_LO_HEX,x")
                 popAndWriteArrayvalueWithIndexA(arrayDt, targetName)
             }
             target.memoryAddress != null -> {
@@ -303,8 +308,8 @@ internal class AssignmentAsmGen(private val program: Program, private val asmgen
                         asmgen.translateExpression(addressExpr)
                         asmgen.out("""
      inx
-     lda  ${MachineDefinition.ESTACK_LO_HEX},x
+     lda  $ESTACK_LO_HEX,x
-     ldy  ${MachineDefinition.ESTACK_HI_HEX},x
+     ldy  $ESTACK_HI_HEX,x
      sta  (+) +1
      sty  (+) +2
      lda  $sourceName
@@ -361,9 +366,9 @@ internal class AssignmentAsmGen(private val program: Program, private val asmgen
                     }
                     is RegisterExpr -> {
                         when(register) {
-                            Register.A -> asmgen.out("  sta  ${MachineDefinition.C64Zeropage.SCRATCH_B1}")
+                            Register.A -> asmgen.out("  sta  ${C64Zeropage.SCRATCH_B1}")
-                            Register.X -> asmgen.out("  stx  ${MachineDefinition.C64Zeropage.SCRATCH_B1}")
+                            Register.X -> asmgen.out("  stx  ${C64Zeropage.SCRATCH_B1}")
-                            Register.Y -> asmgen.out("  sty  ${MachineDefinition.C64Zeropage.SCRATCH_B1}")
+                            Register.Y -> asmgen.out("  sty  ${C64Zeropage.SCRATCH_B1}")
                         }
                         when(index.register) {
                             Register.A -> {}
@@ -372,20 +377,20 @@ internal class AssignmentAsmGen(private val program: Program, private val asmgen
                         }
                         asmgen.out("""
                             tay
-                            lda  ${MachineDefinition.C64Zeropage.SCRATCH_B1}
+                            lda  ${C64Zeropage.SCRATCH_B1}
                             sta  $targetName,y
                             """)
                     }
                     is IdentifierReference -> {
                         when(register) {
-                            Register.A -> asmgen.out("  sta  ${MachineDefinition.C64Zeropage.SCRATCH_B1}")
+                            Register.A -> asmgen.out("  sta  ${C64Zeropage.SCRATCH_B1}")
-                            Register.X -> asmgen.out("  stx  ${MachineDefinition.C64Zeropage.SCRATCH_B1}")
+                            Register.X -> asmgen.out("  stx  ${C64Zeropage.SCRATCH_B1}")
-                            Register.Y -> asmgen.out("  sty  ${MachineDefinition.C64Zeropage.SCRATCH_B1}")
+                            Register.Y -> asmgen.out("  sty  ${C64Zeropage.SCRATCH_B1}")
                         }
                         asmgen.out("""
                             lda  ${asmgen.asmIdentifierName(index)}
                             tay
-                            lda  ${MachineDefinition.C64Zeropage.SCRATCH_B1}
+                            lda  ${C64Zeropage.SCRATCH_B1}
                             sta  $targetName,y
                         """)
                     }
@@ -394,15 +399,15 @@ internal class AssignmentAsmGen(private val program: Program, private val asmgen
                         asmgen.translateExpression(index)
                         asmgen.restoreRegister(register)
                         when(register) {
-                            Register.A -> asmgen.out("  sta  ${MachineDefinition.C64Zeropage.SCRATCH_B1}")
+                            Register.A -> asmgen.out("  sta  ${C64Zeropage.SCRATCH_B1}")
-                            Register.X -> asmgen.out("  stx  ${MachineDefinition.C64Zeropage.SCRATCH_B1}")
+                            Register.X -> asmgen.out("  stx  ${C64Zeropage.SCRATCH_B1}")
-                            Register.Y -> asmgen.out("  sty  ${MachineDefinition.C64Zeropage.SCRATCH_B1}")
+                            Register.Y -> asmgen.out("  sty  ${C64Zeropage.SCRATCH_B1}")
                         }
                         asmgen.out("""
                             inx
-                            lda  ${MachineDefinition.ESTACK_LO_HEX},x
+                            lda  $ESTACK_LO_HEX,x
                             tay
-                            lda  ${MachineDefinition.C64Zeropage.SCRATCH_B1}
+                            lda  ${C64Zeropage.SCRATCH_B1}
                             sta  $targetName,y  
                         """)
                     }
@@ -423,29 +428,29 @@ internal class AssignmentAsmGen(private val program: Program, private val asmgen
                 when(register) {
                     Register.A -> asmgen.out("""
                         ldy  $targetName
-                        sty  ${MachineDefinition.C64Zeropage.SCRATCH_W1}
+                        sty  ${C64Zeropage.SCRATCH_W1}
                         ldy  $targetName+1
-                        sty  ${MachineDefinition.C64Zeropage.SCRATCH_W1+1}
+                        sty  ${C64Zeropage.SCRATCH_W1+1}
                         ldy  #0
-                        sta  (${MachineDefinition.C64Zeropage.SCRATCH_W1}),y
+                        sta  (${C64Zeropage.SCRATCH_W1}),y
                         """)
                     Register.X -> asmgen.out("""
                         txa
                         ldy  $targetName
-                        sty  ${MachineDefinition.C64Zeropage.SCRATCH_W1}
+                        sty  ${C64Zeropage.SCRATCH_W1}
                         ldy  $targetName+1
-                        sty  ${MachineDefinition.C64Zeropage.SCRATCH_W1+1}
+                        sty  ${C64Zeropage.SCRATCH_W1+1}
                         ldy  #0
-                        sta  (${MachineDefinition.C64Zeropage.SCRATCH_W1}),y
+                        sta  (${C64Zeropage.SCRATCH_W1}),y
                         """)
                     Register.Y -> asmgen.out("""
                         tya
                         ldy  $targetName
-                        sty  ${MachineDefinition.C64Zeropage.SCRATCH_W1}
+                        sty  ${C64Zeropage.SCRATCH_W1}
                         ldy  $targetName+1
-                        sty  ${MachineDefinition.C64Zeropage.SCRATCH_W1+1}
+                        sty  ${C64Zeropage.SCRATCH_W1+1}
                         ldy  #0
-                        sta  (${MachineDefinition.C64Zeropage.SCRATCH_W1}),y
+                        sta  (${C64Zeropage.SCRATCH_W1}),y
                         """)
                 }
             }
@@ -460,9 +465,9 @@ internal class AssignmentAsmGen(private val program: Program, private val asmgen
                 }
                 asmgen.out("""
      inx
-     lda  ${MachineDefinition.ESTACK_LO_HEX},x
+     lda  $ESTACK_LO_HEX,x
      sta  (+) +1
-     lda  ${MachineDefinition.ESTACK_HI_HEX},x
+     lda  $ESTACK_HI_HEX,x
      sta  (+) +2
 +    sty  ${65535.toHex()}      ; modified              
                             """)
@@ -502,7 +507,7 @@ internal class AssignmentAsmGen(private val program: Program, private val asmgen
                 asmgen.translateExpression(index)
                 asmgen.out("""
                     inx
-                    lda  ${MachineDefinition.ESTACK_LO_HEX},x
+                    lda  $ESTACK_LO_HEX,x
                     asl  a
                     tay
                     lda  #<${word.toHex()}
@@ -537,7 +542,7 @@ internal class AssignmentAsmGen(private val program: Program, private val asmgen
                 asmgen.translateExpression(index)
                 asmgen.out("""
                     inx
-                    ldy  ${MachineDefinition.ESTACK_LO_HEX},x
+                    ldy  $ESTACK_LO_HEX,x
                     lda  #${byte.toHex()}
                     sta  $targetName,y
                 """)
@@ -567,7 +572,7 @@ internal class AssignmentAsmGen(private val program: Program, private val asmgen
                     val index = targetArrayIdx.arrayspec.index
                     val targetName = asmgen.asmIdentifierName(targetArrayIdx.identifier)
                     if(index is NumericLiteralValue) {
-                        val indexValue = index.number.toInt() * MachineDefinition.Mflpt5.MemorySize
+                        val indexValue = index.number.toInt() * C64MachineDefinition.FLOAT_MEM_SIZE
                         asmgen.out("""
                             lda  #0
                             sta  $targetName+$indexValue
@@ -580,11 +585,11 @@ internal class AssignmentAsmGen(private val program: Program, private val asmgen
                         asmgen.translateExpression(index)
                         asmgen.out("""
                         inx
-                        lda  ${MachineDefinition.ESTACK_LO_HEX},x
+                        lda  $ESTACK_LO_HEX,x
                         asl  a
                         asl  a
                         clc
-                        adc  ${MachineDefinition.ESTACK_LO_HEX},x
+                        adc  $ESTACK_LO_HEX,x
                         tay
                         lda  #0
                         sta  $targetName,y
@@ -620,7 +625,7 @@ internal class AssignmentAsmGen(private val program: Program, private val asmgen
                     val index = targetArrayIdx.arrayspec.index
                     val arrayVarName = asmgen.asmIdentifierName(targetArrayIdx.identifier)
                     if(index is NumericLiteralValue) {
-                        val indexValue = index.number.toInt() * MachineDefinition.Mflpt5.MemorySize
+                        val indexValue = index.number.toInt() * C64MachineDefinition.FLOAT_MEM_SIZE
                         asmgen.out("""
                             lda  $constFloat
                             sta  $arrayVarName+$indexValue
@@ -636,11 +641,11 @@ internal class AssignmentAsmGen(private val program: Program, private val asmgen
                     } else {
                         asmgen.translateArrayIndexIntoA(targetArrayIdx)
                         asmgen.out("""
-                            sta  ${MachineDefinition.C64Zeropage.SCRATCH_REG}
+                            sta  ${C64Zeropage.SCRATCH_REG}
                             asl  a
                             asl  a
                             clc
-                            adc  ${MachineDefinition.C64Zeropage.SCRATCH_REG}
+                            adc  ${C64Zeropage.SCRATCH_REG}
                             tay
                             lda  $constFloat
                             sta  $arrayVarName,y
@@ -725,14 +730,14 @@ internal class AssignmentAsmGen(private val program: Program, private val asmgen
 
     private fun popAndWriteArrayvalueWithIndexA(arrayDt: DataType, variablename: String) {
         when (arrayDt) {
-            DataType.STR, DataType.STR_S, DataType.ARRAY_UB, DataType.ARRAY_B ->
+            DataType.STR, DataType.ARRAY_UB, DataType.ARRAY_B ->
-                asmgen.out("  tay |  inx |  lda  ${MachineDefinition.ESTACK_LO_HEX},x  | sta  $variablename,y")
+                asmgen.out("  tay |  inx |  lda  $ESTACK_LO_HEX,x  | sta  $variablename,y")
             DataType.ARRAY_UW, DataType.ARRAY_W ->
-                asmgen.out("  asl  a |  tay |  inx |  lda  ${MachineDefinition.ESTACK_LO_HEX},x |  sta  $variablename,y |  lda  ${MachineDefinition.ESTACK_HI_HEX},x |  sta $variablename+1,y")
+                asmgen.out("  asl  a |  tay |  inx |  lda  $ESTACK_LO_HEX,x |  sta  $variablename,y |  lda  $ESTACK_HI_HEX,x |  sta $variablename+1,y")
             DataType.ARRAY_F ->
                 // index * 5 is done in the subroutine that's called
                 asmgen.out("""
-                    sta  ${MachineDefinition.ESTACK_LO_HEX},x
+                    sta  $ESTACK_LO_HEX,x
                     dex
                     lda  #<$variablename
                     ldy  #>$variablename

compiler/src/prog8/compiler/target/c64/codegen/BuiltinFunctionsAsmGen.kt

@@ -9,11 +9,13 @@ import prog8.ast.base.WordDatatypes
 import prog8.ast.expressions.*
 import prog8.ast.statements.AssignTarget
 import prog8.ast.statements.FunctionCallStatement
-import prog8.compiler.target.c64.MachineDefinition.ESTACK_HI_HEX
+import prog8.compiler.target.c64.C64MachineDefinition.C64Zeropage
-import prog8.compiler.target.c64.MachineDefinition.ESTACK_HI_PLUS1_HEX
+import prog8.compiler.target.c64.C64MachineDefinition.ESTACK_HI_HEX
-import prog8.compiler.target.c64.MachineDefinition.ESTACK_LO_HEX
+import prog8.compiler.target.c64.C64MachineDefinition.ESTACK_HI_PLUS1_HEX
-import prog8.compiler.target.c64.MachineDefinition.ESTACK_LO_PLUS1_HEX
+import prog8.compiler.target.c64.C64MachineDefinition.ESTACK_LO_HEX
+import prog8.compiler.target.c64.C64MachineDefinition.ESTACK_LO_PLUS1_HEX
 import prog8.compiler.toHex
+import prog8.compiler.AssemblyError
 import prog8.functions.FunctionSignature
 
 internal class BuiltinFunctionsAsmGen(private val program: Program, private val asmgen: AsmGen) {
@@ -37,7 +39,7 @@ internal class BuiltinFunctionsAsmGen(private val program: Program, private val
 
         when (functionName) {
             "msb" -> {
-                val arg = fcall.arglist.single()
+                val arg = fcall.args.single()
                 if (arg.inferType(program).typeOrElse(DataType.STRUCT) !in WordDatatypes)
                     throw AssemblyError("msb required word argument")
                 if (arg is NumericLiteralValue)
@@ -51,12 +53,12 @@ internal class BuiltinFunctionsAsmGen(private val program: Program, private val
                 }
             }
             "mkword" -> {
-                translateFunctionArguments(fcall.arglist, func)
+                translateFunctionArguments(fcall.args, func)
                 asmgen.out("  inx | lda  $ESTACK_LO_HEX,x  | sta  $ESTACK_HI_PLUS1_HEX,x")
             }
             "abs" -> {
-                translateFunctionArguments(fcall.arglist, func)
+                translateFunctionArguments(fcall.args, func)
-                val dt = fcall.arglist.single().inferType(program)
+                val dt = fcall.args.single().inferType(program)
                 when (dt.typeOrElse(DataType.STRUCT)) {
                     in ByteDatatypes -> asmgen.out("  jsr  prog8_lib.abs_b")
                     in WordDatatypes -> asmgen.out("  jsr  prog8_lib.abs_w")
@@ -65,8 +67,8 @@ internal class BuiltinFunctionsAsmGen(private val program: Program, private val
                 }
             }
             "swap" -> {
-                val first = fcall.arglist[0]
+                val first = fcall.args[0]
-                val second = fcall.arglist[1]
+                val second = fcall.args[1]
                 asmgen.translateExpression(first)
                 asmgen.translateExpression(second)
                 // pop in reverse order
@@ -76,14 +78,14 @@ internal class BuiltinFunctionsAsmGen(private val program: Program, private val
                 asmgen.assignFromEvalResult(secondTarget)
             }
             "strlen" -> {
-                outputPushAddressOfIdentifier(fcall.arglist[0])
+                outputPushAddressOfIdentifier(fcall.args[0])
                 asmgen.out("  jsr  prog8_lib.func_strlen")
             }
             "min", "max", "sum" -> {
-                outputPushAddressAndLenghtOfArray(fcall.arglist[0])
+                outputPushAddressAndLenghtOfArray(fcall.args[0])
-                val dt = fcall.arglist.single().inferType(program)
+                val dt = fcall.args.single().inferType(program)
                 when (dt.typeOrElse(DataType.STRUCT)) {
-                    DataType.ARRAY_UB, DataType.STR_S, DataType.STR -> asmgen.out("  jsr  prog8_lib.func_${functionName}_ub")
+                    DataType.ARRAY_UB, DataType.STR -> asmgen.out("  jsr  prog8_lib.func_${functionName}_ub")
                     DataType.ARRAY_B -> asmgen.out("  jsr  prog8_lib.func_${functionName}_b")
                     DataType.ARRAY_UW -> asmgen.out("  jsr  prog8_lib.func_${functionName}_uw")
                     DataType.ARRAY_W -> asmgen.out("  jsr  prog8_lib.func_${functionName}_w")
@@ -92,18 +94,18 @@ internal class BuiltinFunctionsAsmGen(private val program: Program, private val
                 }
             }
             "any", "all" -> {
-                outputPushAddressAndLenghtOfArray(fcall.arglist[0])
+                outputPushAddressAndLenghtOfArray(fcall.args[0])
-                val dt = fcall.arglist.single().inferType(program)
+                val dt = fcall.args.single().inferType(program)
                 when (dt.typeOrElse(DataType.STRUCT)) {
-                    DataType.ARRAY_B, DataType.ARRAY_UB, DataType.STR_S, DataType.STR -> asmgen.out("  jsr  prog8_lib.func_${functionName}_b")
+                    DataType.ARRAY_B, DataType.ARRAY_UB, DataType.STR -> asmgen.out("  jsr  prog8_lib.func_${functionName}_b")
                     DataType.ARRAY_UW, DataType.ARRAY_W -> asmgen.out("  jsr  prog8_lib.func_${functionName}_w")
                     DataType.ARRAY_F -> asmgen.out("  jsr  c64flt.func_${functionName}_f")
                     else -> throw AssemblyError("weird type $dt")
                 }
             }
             "sgn" -> {
-                translateFunctionArguments(fcall.arglist, func)
+                translateFunctionArguments(fcall.args, func)
-                val dt = fcall.arglist.single().inferType(program)
+                val dt = fcall.args.single().inferType(program)
                 when(dt.typeOrElse(DataType.STRUCT)) {
                     DataType.UBYTE -> asmgen.out("  jsr  math.sign_ub")
                     DataType.BYTE -> asmgen.out("  jsr  math.sign_b")
@@ -117,30 +119,12 @@ internal class BuiltinFunctionsAsmGen(private val program: Program, private val
             "ln", "log2", "sqrt", "rad",
             "deg", "round", "floor", "ceil",
             "rdnf" -> {
-                translateFunctionArguments(fcall.arglist, func)
+                translateFunctionArguments(fcall.args, func)
                 asmgen.out("  jsr  c64flt.func_$functionName")
             }
-/*
-        TODO this was the old code for bit rotations:
-            Opcode.SHL_BYTE -> AsmFragment(" asl  $variable+$index", 8)
-            Opcode.SHR_UBYTE -> AsmFragment(" lsr  $variable+$index", 8)
-            Opcode.SHR_SBYTE -> AsmFragment(" lda  $variable+$index |  asl  a |  ror  $variable+$index")
-            Opcode.SHL_WORD -> AsmFragment(" asl  $variable+${index * 2 + 1} |  rol  $variable+${index * 2}", 8)
-            Opcode.SHR_UWORD -> AsmFragment(" lsr  $variable+${index * 2 + 1} |  ror  $variable+${index * 2}", 8)
-            Opcode.SHR_SWORD -> AsmFragment(" lda  $variable+${index * 2 + 1} |  asl  a |  ror  $variable+${index * 2 + 1} |  ror  $variable+${index * 2}", 8)
-            Opcode.ROL_BYTE -> AsmFragment(" rol  $variable+$index", 8)
-            Opcode.ROR_BYTE -> AsmFragment(" ror  $variable+$index", 8)
-            Opcode.ROL_WORD -> AsmFragment(" rol  $variable+${index * 2 + 1} |  rol  $variable+${index * 2}", 8)
-            Opcode.ROR_WORD -> AsmFragment(" ror  $variable+${index * 2 + 1} |  ror  $variable+${index * 2}", 8)
-            Opcode.ROL2_BYTE -> AsmFragment(" lda  $variable+$index |  cmp  #\$80 |  rol  $variable+$index", 8)
-            Opcode.ROR2_BYTE -> AsmFragment(" lda  $variable+$index |  lsr  a |  bcc  + |  ora  #\$80 |+ |  sta  $variable+$index", 10)
-            Opcode.ROL2_WORD -> AsmFragment(" asl  $variable+${index * 2 + 1} |  rol  $variable+${index * 2} |  bcc  + |  inc  $variable+${index * 2 + 1} |+", 20)
-            Opcode.ROR2_WORD -> AsmFragment(" lsr  $variable+${index * 2 + 1} |  ror  $variable+${index * 2} |  bcc  + |  lda  $variable+${index * 2 + 1} |  ora  #\$80 |  sta  $variable+${index * 2 + 1} |+", 30)
-
- */
             "lsl" -> {
                 // in-place
-                val what = fcall.arglist.single()
+                val what = fcall.args.single()
                 val dt = what.inferType(program)
                 when (dt.typeOrElse(DataType.STRUCT)) {
                     in ByteDatatypes -> {
@@ -155,20 +139,35 @@ internal class BuiltinFunctionsAsmGen(private val program: Program, private val
                             is IdentifierReference -> asmgen.out("  asl  ${asmgen.asmIdentifierName(what)}")
                             is DirectMemoryRead -> {
                                 if (what.addressExpression is NumericLiteralValue) {
-                                    asmgen.out("  asl  ${(what.addressExpression as NumericLiteralValue).number.toHex()}")
+                                    val number = (what.addressExpression as NumericLiteralValue).number
+                                    asmgen.out("  asl  ${number.toHex()}")
                                 } else {
-                                    TODO("lsl memory byte $what")
+                                    asmgen.translateExpression(what.addressExpression)
+                                    asmgen.out("""
+                    inx
+                    lda  $ESTACK_LO_HEX,x
+                    sta  (+) + 1
+                    lda  $ESTACK_HI_HEX,x
+                    sta  (+) + 2
++                   asl  0            ; modified                    
+                                    """)
                                 }
                             }
                             is ArrayIndexedExpression -> {
-                                TODO("lsl byte array $what")
+                                asmgen.translateExpression(what.identifier)
+                                asmgen.translateExpression(what.arrayspec.index)
+                                asmgen.out("  jsr  prog8_lib.lsl_array_b")
                             }
                             else -> throw AssemblyError("weird type")
                         }
                     }
                     in WordDatatypes -> {
                         when (what) {
-                            is ArrayIndexedExpression -> TODO("lsl sbyte $what")
+                            is ArrayIndexedExpression -> {
+                                asmgen.translateExpression(what.identifier)
+                                asmgen.translateExpression(what.arrayspec.index)
+                                asmgen.out("  jsr  prog8_lib.lsl_array_w")
+                            }
                             is IdentifierReference -> {
                                 val variable = asmgen.asmIdentifierName(what)
                                 asmgen.out(" asl  $variable |  rol  $variable+1")
@@ -181,7 +180,7 @@ internal class BuiltinFunctionsAsmGen(private val program: Program, private val
             }
             "lsr" -> {
                 // in-place
-                val what = fcall.arglist.single()
+                val what = fcall.args.single()
                 val dt = what.inferType(program)
                 when (dt.typeOrElse(DataType.STRUCT)) {
                     DataType.UBYTE -> {
@@ -196,22 +195,35 @@ internal class BuiltinFunctionsAsmGen(private val program: Program, private val
                             is IdentifierReference -> asmgen.out("  lsr  ${asmgen.asmIdentifierName(what)}")
                             is DirectMemoryRead -> {
                                 if (what.addressExpression is NumericLiteralValue) {
-                                    asmgen.out("  lsr  ${(what.addressExpression as NumericLiteralValue).number.toHex()}")
+                                    val number = (what.addressExpression as NumericLiteralValue).number
+                                    asmgen.out("  lsr  ${number.toHex()}")
                                 } else {
-                                    TODO("lsr memory byte $what")
+                                    asmgen.translateExpression(what.addressExpression)
+                                    asmgen.out("""
+                    inx
+                    lda  $ESTACK_LO_HEX,x
+                    sta  (+) + 1
+                    lda  $ESTACK_HI_HEX,x
+                    sta  (+) + 2
++                   lsr  0            ; modified                    
+                                    """)
                                 }
                             }
                             is ArrayIndexedExpression -> {
-                                TODO("lsr byte array $what")
+                                asmgen.translateExpression(what.identifier)
+                                asmgen.translateExpression(what.arrayspec.index)
+                                asmgen.out("  jsr  prog8_lib.lsr_array_ub")
                             }
                             else -> throw AssemblyError("weird type")
                         }
                     }
                     DataType.BYTE -> {
                         when (what) {
-                            is ArrayIndexedExpression -> TODO("lsr sbyte $what")
+                            is ArrayIndexedExpression -> {
-                            is DirectMemoryRead -> TODO("lsr sbyte $what")
+                                asmgen.translateExpression(what.identifier)
-                            is RegisterExpr -> TODO("lsr sbyte $what")
+                                asmgen.translateExpression(what.arrayspec.index)
+                                asmgen.out("  jsr  prog8_lib.lsr_array_b")
+                            }
                             is IdentifierReference -> {
                                 val variable = asmgen.asmIdentifierName(what)
                                 asmgen.out("  lda  $variable |  asl  a |  ror  $variable")
@@ -221,7 +233,11 @@ internal class BuiltinFunctionsAsmGen(private val program: Program, private val
                     }
                     DataType.UWORD -> {
                         when (what) {
-                            is ArrayIndexedExpression -> TODO("lsr uword $what")
+                            is ArrayIndexedExpression -> {
+                                asmgen.translateExpression(what.identifier)
+                                asmgen.translateExpression(what.arrayspec.index)
+                                asmgen.out("  jsr  prog8_lib.lsr_array_uw")
+                            }
                             is IdentifierReference -> {
                                 val variable = asmgen.asmIdentifierName(what)
                                 asmgen.out(" lsr  $variable+1 |  ror  $variable")
@@ -231,7 +247,11 @@ internal class BuiltinFunctionsAsmGen(private val program: Program, private val
                     }
                     DataType.WORD -> {
                         when (what) {
-                            is ArrayIndexedExpression -> TODO("lsr sword $what")
+                            is ArrayIndexedExpression -> {
+                                asmgen.translateExpression(what.identifier)
+                                asmgen.translateExpression(what.arrayspec.index)
+                                asmgen.out("  jsr  prog8_lib.lsr_array_w")
+                            }
                             is IdentifierReference -> {
                                 val variable = asmgen.asmIdentifierName(what)
                                 asmgen.out("  lda  $variable+1 |  asl a  |  ror  $variable+1 |  ror  $variable")
@@ -244,62 +264,304 @@ internal class BuiltinFunctionsAsmGen(private val program: Program, private val
             }
             "rol" -> {
                 // in-place
-                val what = fcall.arglist.single()
+                val what = fcall.args.single()
                 val dt = what.inferType(program)
                 when (dt.typeOrElse(DataType.STRUCT)) {
                     DataType.UBYTE -> {
-                        TODO("rol ubyte")
+                        when(what) {
+                            is ArrayIndexedExpression -> {
+                                asmgen.translateExpression(what.identifier)
+                                asmgen.translateExpression(what.arrayspec.index)
+                                asmgen.out("  jsr  prog8_lib.rol_array_ub")
+                            }
+                            is DirectMemoryRead -> {
+                                if (what.addressExpression is NumericLiteralValue) {
+                                    val number = (what.addressExpression as NumericLiteralValue).number
+                                    asmgen.out("  rol  ${number.toHex()}")
+                                } else {
+                                    asmgen.translateExpression(what.addressExpression)
+                                    asmgen.out("""
+                    inx
+                    lda  $ESTACK_LO_HEX,x
+                    sta  (+) + 1
+                    lda  $ESTACK_HI_HEX,x
+                    sta  (+) + 2
++                   rol  0            ; modified                    
+                                    """)
+                                }
+                            }
+                            is RegisterExpr -> {
+                                when(what.register) {
+                                    Register.A -> asmgen.out("  rol  a")
+                                    Register.X -> asmgen.out("  txa |  rol  a |  tax")
+                                    Register.Y -> asmgen.out("  tya |  rol  a |  tay")
+                                }
+                            }
+                            is IdentifierReference -> {
+                                val variable = asmgen.asmIdentifierName(what)
+                                asmgen.out("  rol  $variable")
+                            }
+                            else -> throw AssemblyError("weird type")
+                        }
                     }
                     DataType.UWORD -> {
-                        TODO("rol uword")
+                        when(what) {
+                            is ArrayIndexedExpression -> {
+                                asmgen.translateExpression(what.identifier)
+                                asmgen.translateExpression(what.arrayspec.index)
+                                asmgen.out("  jsr  prog8_lib.rol_array_uw")
+                            }
+                            is IdentifierReference -> {
+                                val variable = asmgen.asmIdentifierName(what)
+                                asmgen.out("  rol  $variable |  rol  $variable+1")
+                            }
+                            else -> throw AssemblyError("weird type")
+                        }
                     }
                     else -> throw AssemblyError("weird type")
                 }
             }
             "rol2" -> {
                 // in-place
-                val what = fcall.arglist.single()
+                val what = fcall.args.single()
                 val dt = what.inferType(program)
                 when (dt.typeOrElse(DataType.STRUCT)) {
                     DataType.UBYTE -> {
-                        TODO("rol2 ubyte")
+                        when(what) {
+                            is ArrayIndexedExpression -> {
+                                asmgen.translateExpression(what.identifier)
+                                asmgen.translateExpression(what.arrayspec.index)
+                                asmgen.out("  jsr  prog8_lib.rol2_array_ub")
+                            }
+                            is DirectMemoryRead -> {
+                                if (what.addressExpression is NumericLiteralValue) {
+                                    val number = (what.addressExpression as NumericLiteralValue).number
+                                    asmgen.out("  lda  ${number.toHex()} |  cmp  #\$80 |  rol  a |  sta  ${number.toHex()}")
+                                } else {
+                                    asmgen.translateExpression(what.addressExpression)
+                                    asmgen.out("  jsr  prog8_lib.rol2_mem_ub")
+                                }
+                            }
+                            is RegisterExpr -> {
+                                when(what.register) {
+                                    Register.A -> asmgen.out("  cmp  #\$80 |  rol  a  ")
+                                    Register.X -> asmgen.out("  txa  |  cmp  #\$80 |  rol  a  |  tax")
+                                    Register.Y -> asmgen.out("  tya  |  cmp  #\$80 |  rol  a  |  tay")
+                                }
+                            }
+                            is IdentifierReference -> {
+                                val variable = asmgen.asmIdentifierName(what)
+                                asmgen.out("  lda  $variable |  cmp  #\$80 |  rol  a |  sta  $variable")
+                            }
+                            else -> throw AssemblyError("weird type")
+                        }
                     }
                     DataType.UWORD -> {
-                        TODO("rol2 uword")
+                        when(what) {
+                            is ArrayIndexedExpression -> {
+                                asmgen.translateExpression(what.identifier)
+                                asmgen.translateExpression(what.arrayspec.index)
+                                asmgen.out("  jsr  prog8_lib.rol2_array_uw")
+                            }
+                            is IdentifierReference -> {
+                                val variable = asmgen.asmIdentifierName(what)
+                                asmgen.out("  asl  $variable |  rol  $variable+1 |  bcc  + |  inc  $variable |+  ")
+                            }
+                            else -> throw AssemblyError("weird type")
+                        }
                     }
                     else -> throw AssemblyError("weird type")
                 }
             }
             "ror" -> {
                 // in-place
-                val what = fcall.arglist.single()
+                val what = fcall.args.single()
                 val dt = what.inferType(program)
                 when (dt.typeOrElse(DataType.STRUCT)) {
                     DataType.UBYTE -> {
-                        TODO("ror ubyte")
+                        when(what) {
+                            is ArrayIndexedExpression -> {
+                                asmgen.translateExpression(what.identifier)
+                                asmgen.translateExpression(what.arrayspec.index)
+                                asmgen.out("  jsr  prog8_lib.ror_array_ub")
+                            }
+                            is DirectMemoryRead -> {
+                                if (what.addressExpression is NumericLiteralValue) {
+                                    val number = (what.addressExpression as NumericLiteralValue).number
+                                    asmgen.out("  ror  ${number.toHex()}")
+                                } else {
+                                    asmgen.translateExpression(what.addressExpression)
+                                    asmgen.out("""
+                    inx
+                    lda  $ESTACK_LO_HEX,x
+                    sta  (+) + 1
+                    lda  $ESTACK_HI_HEX,x
+                    sta  (+) + 2
++                   ror  0            ; modified                    
+                                    """)                                }
+                            }
+                            is RegisterExpr -> {
+                                when(what.register) {
+                                    Register.A -> asmgen.out("  ror  a")
+                                    Register.X -> asmgen.out("  txa |  ror  a |  tax")
+                                    Register.Y -> asmgen.out("  tya |  ror  a |  tay")
+                                }
+                            }
+                            is IdentifierReference -> {
+                                val variable = asmgen.asmIdentifierName(what)
+                                asmgen.out("  ror  $variable")
+                            }
+                            else -> throw AssemblyError("weird type")
+                        }
                     }
                     DataType.UWORD -> {
-                        TODO("ror uword")
+                        when(what) {
+                            is ArrayIndexedExpression -> {
+                                asmgen.translateExpression(what.identifier)
+                                asmgen.translateExpression(what.arrayspec.index)
+                                asmgen.out("  jsr  prog8_lib.ror_array_uw")
+                            }
+                            is IdentifierReference -> {
+                                val variable = asmgen.asmIdentifierName(what)
+                                asmgen.out("  ror  $variable+1 |  ror  $variable")
+                            }
+                            else -> throw AssemblyError("weird type")
+                        }
                     }
                     else -> throw AssemblyError("weird type")
                 }
             }
             "ror2" -> {
                 // in-place
-                val what = fcall.arglist.single()
+                val what = fcall.args.single()
                 val dt = what.inferType(program)
                 when (dt.typeOrElse(DataType.STRUCT)) {
                     DataType.UBYTE -> {
-                        TODO("ror2 ubyte")
+                        when(what) {
+                            is ArrayIndexedExpression -> {
+                                asmgen.translateExpression(what.identifier)
+                                asmgen.translateExpression(what.arrayspec.index)
+                                asmgen.out("  jsr  prog8_lib.ror2_array_ub")
+                            }
+                            is DirectMemoryRead -> {
+                                if (what.addressExpression is NumericLiteralValue) {
+                                    val number = (what.addressExpression as NumericLiteralValue).number
+                                    asmgen.out("  lda  ${number.toHex()} |  lsr  a |  bcc  + |  ora  #\$80 |+  |  sta  ${number.toHex()}")
+                                } else {
+                                    asmgen.translateExpression(what.addressExpression)
+                                    asmgen.out("  jsr  prog8_lib.ror2_mem_ub")
+                                }
+                            }
+                            is RegisterExpr -> {
+                                when(what.register) {
+                                    Register.A -> asmgen.out("  lsr  a |  bcc  + |  ora  #\$80 |+  ")
+                                    Register.X -> asmgen.out("  txa |  lsr  a |  bcc  + |  ora  #\$80 |+  tax ")
+                                    Register.Y -> asmgen.out("  tya |  lsr  a |  bcc  + |  ora  #\$80 |+  tay ")
+                                }
+                            }
+                            is IdentifierReference -> {
+                                val variable = asmgen.asmIdentifierName(what)
+                                asmgen.out("  lda  $variable |  lsr  a |  bcc  + |  ora  #\$80 |+  |  sta  $variable")
+                            }
+                            else -> throw AssemblyError("weird type")
+                        }
                     }
                     DataType.UWORD -> {
-                        TODO("ror2 uword")
+                        when(what) {
+                            is ArrayIndexedExpression -> {
+                                asmgen.translateExpression(what.identifier)
+                                asmgen.translateExpression(what.arrayspec.index)
+                                asmgen.out("  jsr  prog8_lib.ror2_array_uw")
+                            }
+                            is IdentifierReference -> {
+                                val variable = asmgen.asmIdentifierName(what)
+                                asmgen.out("  lsr  $variable+1 |  ror  $variable |  bcc  + |  lda  $variable+1 |  ora  #\$80 |  sta  $variable+1 |+  ")
+                            }
+                            else -> throw AssemblyError("weird type")
+                        }
                     }
                     else -> throw AssemblyError("weird type")
                 }
             }
+            "sort" -> {
+                val variable = fcall.args.single()
+                if(variable is IdentifierReference) {
+                    val decl = variable.targetVarDecl(program.namespace)!!
+                    val varName = asmgen.asmIdentifierName(variable)
+                    val numElements = decl.arraysize!!.size()
+                    when(decl.datatype) {
+                        DataType.ARRAY_UB, DataType.ARRAY_B -> {
+                            asmgen.out("""
+                                lda  #<$varName
+                                ldy  #>$varName
+                                sta  ${C64Zeropage.SCRATCH_W1}
+                                sty  ${C64Zeropage.SCRATCH_W1+1}
+                                lda  #$numElements
+                                sta  ${C64Zeropage.SCRATCH_B1}
+                            """)
+                            asmgen.out(if(decl.datatype==DataType.ARRAY_UB) "  jsr  prog8_lib.sort_ub" else "  jsr  prog8_lib.sort_b")
+                        }
+                        DataType.ARRAY_UW, DataType.ARRAY_W -> {
+                            asmgen.out("""
+                                lda  #<$varName
+                                ldy  #>$varName
+                                sta  ${C64Zeropage.SCRATCH_W1}
+                                sty  ${C64Zeropage.SCRATCH_W1+1}
+                                lda  #$numElements
+                                sta  ${C64Zeropage.SCRATCH_B1}
+                            """)
+                            asmgen.out(if(decl.datatype==DataType.ARRAY_UW) "  jsr  prog8_lib.sort_uw" else "  jsr  prog8_lib.sort_w")
+                        }
+                        DataType.ARRAY_F -> TODO("sort floats (consider another solution if possible - this will be very slow, if ever implemented)")
+                        else -> throw AssemblyError("weird type")
+                    }
+                }
+                else
+                    throw AssemblyError("weird type")
+            }
+            "reverse" -> {
+                val variable = fcall.args.single()
+                if (variable is IdentifierReference) {
+                    val decl = variable.targetVarDecl(program.namespace)!!
+                    val varName = asmgen.asmIdentifierName(variable)
+                    val numElements = decl.arraysize!!.size()
+                    when (decl.datatype) {
+                        DataType.ARRAY_UB, DataType.ARRAY_B -> {
+                            asmgen.out("""
+                                lda  #<$varName
+                                ldy  #>$varName
+                                sta  ${C64Zeropage.SCRATCH_W1}
+                                sty  ${C64Zeropage.SCRATCH_W1 + 1}
+                                lda  #$numElements
+                                jsr  prog8_lib.reverse_b
+                            """)
+                        }
+                        DataType.ARRAY_UW, DataType.ARRAY_W -> {
+                            asmgen.out("""
+                                lda  #<$varName
+                                ldy  #>$varName
+                                sta  ${C64Zeropage.SCRATCH_W1}
+                                sty  ${C64Zeropage.SCRATCH_W1 + 1}
+                                lda  #$numElements
+                                jsr  prog8_lib.reverse_w
+                            """)
+                        }
+                        DataType.ARRAY_F -> TODO("reverse floats (consider another solution if possible - this will be quite slow, if ever implemented)")
+                        else -> throw AssemblyError("weird type")
+                    }
+                }
+            }
+            "rsave" -> {
+                // save cpu status flag and all registers A, X, Y.
+                // see http://6502.org/tutorials/register_preservation.html
+                asmgen.out(" php |  sta  ${C64Zeropage.SCRATCH_REG} | pha  | txa  | pha  | tya  | pha  | lda  ${C64Zeropage.SCRATCH_REG}")
+            }
+            "rrestore" -> {
+                // restore all registers and cpu status flag
+                asmgen.out(" pla |  tay |  pla |  tax |  pla |  plp")
+            }
             else -> {
-                translateFunctionArguments(fcall.arglist, func)
+                translateFunctionArguments(fcall.args, func)
                 asmgen.out("  jsr  prog8_lib.func_$functionName")
             }
         }

compiler/src/prog8/compiler/target/c64/codegen/ExpressionsAsmGen.kt

@@ -3,8 +3,13 @@ package prog8.compiler.target.c64.codegen
 import prog8.ast.Program
 import prog8.ast.base.*
 import prog8.ast.expressions.*
-import prog8.compiler.target.c64.MachineDefinition
 import prog8.compiler.toHex
+import prog8.compiler.AssemblyError
+import prog8.compiler.target.c64.C64MachineDefinition.ESTACK_HI_HEX
+import prog8.compiler.target.c64.C64MachineDefinition.ESTACK_HI_PLUS1_HEX
+import prog8.compiler.target.c64.C64MachineDefinition.ESTACK_LO_HEX
+import prog8.compiler.target.c64.C64MachineDefinition.ESTACK_LO_PLUS1_HEX
+import prog8.compiler.target.c64.C64MachineDefinition.ESTACK_LO_PLUS2_HEX
 import prog8.functions.BuiltinFunctions
 import kotlin.math.absoluteValue
 
@@ -21,44 +26,46 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
             is NumericLiteralValue -> translateExpression(expression)
             is RegisterExpr -> translateExpression(expression)
             is IdentifierReference -> translateExpression(expression)
-            is FunctionCall -> {
+            is FunctionCall -> translateExpression(expression)
-                val functionName = expression.target.nameInSource.last()
-                val builtinFunc = BuiltinFunctions[functionName]
-                if(builtinFunc!=null) {
-                    asmgen.translateFunctioncallExpression(expression, builtinFunc)
-                } else {
-                    asmgen.translateFunctionCall(expression)
-                    val sub = expression.target.targetSubroutine(program.namespace)!!
-                    val returns = sub.returntypes.zip(sub.asmReturnvaluesRegisters)
-                    for((_, reg) in returns) {
-                        if(!reg.stack) {
-                            // result value in cpu or status registers, put it on the stack
-                            if(reg.registerOrPair!=null) {
-                                when(reg.registerOrPair) {
-                                    RegisterOrPair.A -> asmgen.out("  sta  ${MachineDefinition.ESTACK_LO_HEX},x |  dex")
-                                    RegisterOrPair.Y -> asmgen.out("  tya |  sta  ${MachineDefinition.ESTACK_LO_HEX},x |  dex")
-                                    RegisterOrPair.AY -> asmgen.out("  sta  ${MachineDefinition.ESTACK_LO_HEX},x |  tya |  sta  ${MachineDefinition.ESTACK_HI_HEX},x |  dex")
-                                    RegisterOrPair.X, RegisterOrPair.AX, RegisterOrPair.XY -> throw AssemblyError("can't push X register - use a variable")
-                                }
-                            }
-                            // return value from a statusregister is not put on the stack, it should be acted on via a conditional branch such as if_cc
-                        }
-                    }
-                }
-            }
             is ArrayLiteralValue, is StringLiteralValue -> TODO("string/array/struct assignment?")
             is StructLiteralValue -> throw AssemblyError("struct literal value assignment should have been flattened")
             is RangeExpr -> throw AssemblyError("range expression should have been changed into array values")
         }
     }
 
+    private fun translateExpression(expression: FunctionCall) {
+        val functionName = expression.target.nameInSource.last()
+        val builtinFunc = BuiltinFunctions[functionName]
+        if (builtinFunc != null) {
+            asmgen.translateFunctioncallExpression(expression, builtinFunc)
+        } else {
+            asmgen.translateFunctionCall(expression)
+            val sub = expression.target.targetSubroutine(program.namespace)!!
+            val returns = sub.returntypes.zip(sub.asmReturnvaluesRegisters)
+            for ((_, reg) in returns) {
+                if (!reg.stack) {
+                    // result value in cpu or status registers, put it on the stack
+                    if (reg.registerOrPair != null) {
+                        when (reg.registerOrPair) {
+                            RegisterOrPair.A -> asmgen.out("  sta  $ESTACK_LO_HEX,x |  dex")
+                            RegisterOrPair.Y -> asmgen.out("  tya |  sta  $ESTACK_LO_HEX,x |  dex")
+                            RegisterOrPair.AY -> asmgen.out("  sta  $ESTACK_LO_HEX,x |  tya |  sta  $ESTACK_HI_HEX,x |  dex")
+                            RegisterOrPair.X, RegisterOrPair.AX, RegisterOrPair.XY -> throw AssemblyError("can't push X register - use a variable")
+                        }
+                    }
+                    // return value from a statusregister is not put on the stack, it should be acted on via a conditional branch such as if_cc
+                }
+            }
+        }
+    }
+
     private fun translateExpression(expr: TypecastExpression) {
         translateExpression(expr.expression)
         when(expr.expression.inferType(program).typeOrElse(DataType.STRUCT)) {
             DataType.UBYTE -> {
                 when(expr.type) {
                     DataType.UBYTE, DataType.BYTE -> {}
-                    DataType.UWORD, DataType.WORD -> asmgen.out("  lda  #0  |  sta  ${MachineDefinition.ESTACK_HI_PLUS1_HEX},x")
+                    DataType.UWORD, DataType.WORD -> asmgen.out("  lda  #0  |  sta  $ESTACK_HI_PLUS1_HEX,x")
                     DataType.FLOAT -> asmgen.out(" jsr  c64flt.stack_ub2float")
                     in PassByReferenceDatatypes -> throw AssemblyError("cannot cast to a pass-by-reference datatype")
                     else -> throw AssemblyError("weird type")
@@ -67,7 +74,7 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
             DataType.BYTE -> {
                 when(expr.type) {
                     DataType.UBYTE, DataType.BYTE -> {}
-                    DataType.UWORD, DataType.WORD -> asmgen.out("  lda  ${MachineDefinition.ESTACK_LO_PLUS1_HEX},x  |  ${asmgen.signExtendAtoMsb("${MachineDefinition.ESTACK_HI_PLUS1_HEX},x")}")
+                    DataType.UWORD, DataType.WORD -> asmgen.out("  lda  $ESTACK_LO_PLUS1_HEX,x  |  ${asmgen.signExtendAtoMsb("$ESTACK_HI_PLUS1_HEX,x")}")
                     DataType.FLOAT -> asmgen.out(" jsr  c64flt.stack_b2float")
                     in PassByReferenceDatatypes -> throw AssemblyError("cannot cast to a pass-by-reference datatype")
                     else -> throw AssemblyError("weird type")
@@ -109,35 +116,35 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
 
     private fun translateExpression(expr: AddressOf) {
         val name = asmgen.asmIdentifierName(expr.identifier)
-        asmgen.out("  lda  #<$name |  sta  ${MachineDefinition.ESTACK_LO_HEX},x |  lda  #>$name  |  sta  ${MachineDefinition.ESTACK_HI_HEX},x  | dex")
+        asmgen.out("  lda  #<$name |  sta  $ESTACK_LO_HEX,x |  lda  #>$name  |  sta  $ESTACK_HI_HEX,x  | dex")
     }
 
     private fun translateExpression(expr: DirectMemoryRead) {
         when(expr.addressExpression) {
             is NumericLiteralValue -> {
                 val address = (expr.addressExpression as NumericLiteralValue).number.toInt()
-                asmgen.out("  lda  ${address.toHex()} |  sta  ${MachineDefinition.ESTACK_LO_HEX},x |  dex")
+                asmgen.out("  lda  ${address.toHex()} |  sta  $ESTACK_LO_HEX,x |  dex")
             }
             is IdentifierReference -> {
                 val sourceName = asmgen.asmIdentifierName(expr.addressExpression as IdentifierReference)
-                asmgen.out("  lda  $sourceName |  sta  ${MachineDefinition.ESTACK_LO_HEX},x |  dex")
+                asmgen.out("  lda  $sourceName |  sta  $ESTACK_LO_HEX,x |  dex")
             }
             else -> {
                 translateExpression(expr.addressExpression)
                 asmgen.out("  jsr  prog8_lib.read_byte_from_address")
-                asmgen.out("  sta  ${MachineDefinition.ESTACK_LO_PLUS1_HEX},x")
+                asmgen.out("  sta  $ESTACK_LO_PLUS1_HEX,x")
             }
         }
     }
 
     private fun translateExpression(expr: NumericLiteralValue) {
         when(expr.type) {
-            DataType.UBYTE, DataType.BYTE -> asmgen.out(" lda  #${expr.number.toHex()}  | sta  ${MachineDefinition.ESTACK_LO_HEX},x  | dex")
+            DataType.UBYTE, DataType.BYTE -> asmgen.out(" lda  #${expr.number.toHex()}  | sta  $ESTACK_LO_HEX,x  | dex")
             DataType.UWORD, DataType.WORD -> asmgen.out("""
                 lda  #<${expr.number.toHex()}
-                sta  ${MachineDefinition.ESTACK_LO_HEX},x
+                sta  $ESTACK_LO_HEX,x
                 lda  #>${expr.number.toHex()}
-                sta  ${MachineDefinition.ESTACK_HI_HEX},x
+                sta  $ESTACK_HI_HEX,x
                 dex
             """)
             DataType.FLOAT -> {
@@ -150,9 +157,9 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
 
     private fun translateExpression(expr: RegisterExpr) {
         when(expr.register) {
-            Register.A -> asmgen.out(" sta  ${MachineDefinition.ESTACK_LO_HEX},x | dex")
+            Register.A -> asmgen.out(" sta  $ESTACK_LO_HEX,x | dex")
             Register.X -> throw AssemblyError("cannot push X - use a variable instead of the X register")
-            Register.Y -> asmgen.out(" tya |  sta  ${MachineDefinition.ESTACK_LO_HEX},x | dex")
+            Register.Y -> asmgen.out(" tya |  sta  $ESTACK_LO_HEX,x | dex")
         }
     }
 
@@ -160,22 +167,24 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
         val varname = asmgen.asmIdentifierName(expr)
         when(expr.inferType(program).typeOrElse(DataType.STRUCT)) {
             DataType.UBYTE, DataType.BYTE -> {
-                asmgen.out("  lda  $varname  |  sta  ${MachineDefinition.ESTACK_LO_HEX},x  |  dex")
+                asmgen.out("  lda  $varname  |  sta  $ESTACK_LO_HEX,x  |  dex")
             }
-            DataType.UWORD, DataType.WORD, in ArrayDatatypes, in StringDatatypes -> {
+            DataType.UWORD, DataType.WORD -> {
-                // (for arrays and strings, push their address)
+                asmgen.out("  lda  $varname  |  sta  $ESTACK_LO_HEX,x  |  lda  $varname+1 |  sta  $ESTACK_HI_HEX,x |  dex")
-                asmgen.out("  lda  $varname  |  sta  ${MachineDefinition.ESTACK_LO_HEX},x  |  lda  $varname+1 |  sta  ${MachineDefinition.ESTACK_HI_HEX},x |  dex")
             }
             DataType.FLOAT -> {
                 asmgen.out(" lda  #<$varname |  ldy  #>$varname|  jsr  c64flt.push_float")
             }
+            in IterableDatatypes -> {
+                asmgen.out("  lda  #<$varname  |  sta  $ESTACK_LO_HEX,x  |  lda  #>$varname |  sta  $ESTACK_HI_HEX,x |  dex")
+            }
             else -> throw AssemblyError("stack push weird variable type $expr")
         }
     }
 
     private val optimizedByteMultiplications = setOf(3,5,6,7,9,10,11,12,13,14,15,20,25,40)
     private val optimizedWordMultiplications = setOf(3,5,6,7,9,10,12,15,20,25,40)
-    private val powerOfTwos = setOf(0,1,2,4,8,16,32,64,128,256)
+    private val powersOfTwo = setOf(0,1,2,4,8,16,32,64,128,256)
 
     private fun translateExpression(expr: BinaryExpression) {
         val leftIDt = expr.left.inferType(program)
@@ -192,10 +201,10 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
                 translateExpression(expr.left)
                 val amount = expr.right.constValue(program)!!.number.toInt()
                 when (leftDt) {
-                    DataType.UBYTE -> repeat(amount) { asmgen.out("  lsr  ${MachineDefinition.ESTACK_LO_PLUS1_HEX},x") }
+                    DataType.UBYTE -> repeat(amount) { asmgen.out("  lsr  $ESTACK_LO_PLUS1_HEX,x") }
-                    DataType.BYTE -> repeat(amount) { asmgen.out("  lda  ${MachineDefinition.ESTACK_LO_PLUS1_HEX},x |  asl  a |  ror  ${MachineDefinition.ESTACK_LO_PLUS1_HEX},x") }
+                    DataType.BYTE -> repeat(amount) { asmgen.out("  lda  $ESTACK_LO_PLUS1_HEX,x |  asl  a |  ror  $ESTACK_LO_PLUS1_HEX,x") }
-                    DataType.UWORD -> repeat(amount) { asmgen.out("  lsr  ${MachineDefinition.ESTACK_HI_PLUS1_HEX},x |  ror  ${MachineDefinition.ESTACK_LO_PLUS1_HEX},x") }
+                    DataType.UWORD -> repeat(amount) { asmgen.out("  lsr  $ESTACK_HI_PLUS1_HEX,x |  ror  $ESTACK_LO_PLUS1_HEX,x") }
-                    DataType.WORD -> repeat(amount) { asmgen.out("  lda  ${MachineDefinition.ESTACK_HI_PLUS1_HEX},x |  asl a  |  ror  ${MachineDefinition.ESTACK_HI_PLUS1_HEX},x |  ror  ${MachineDefinition.ESTACK_LO_PLUS1_HEX},x") }
+                    DataType.WORD -> repeat(amount) { asmgen.out("  lda  $ESTACK_HI_PLUS1_HEX,x |  asl a  |  ror  $ESTACK_HI_PLUS1_HEX,x |  ror  $ESTACK_LO_PLUS1_HEX,x") }
                     else -> throw AssemblyError("weird type")
                 }
                 return
@@ -205,9 +214,9 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
                 translateExpression(expr.left)
                 val amount = expr.right.constValue(program)!!.number.toInt()
                 if (leftDt in ByteDatatypes)
-                    repeat(amount) { asmgen.out("  asl  ${MachineDefinition.ESTACK_LO_PLUS1_HEX},x") }
+                    repeat(amount) { asmgen.out("  asl  $ESTACK_LO_PLUS1_HEX,x") }
                 else
-                    repeat(amount) { asmgen.out("  asl  ${MachineDefinition.ESTACK_LO_PLUS1_HEX},x |  rol  ${MachineDefinition.ESTACK_HI_PLUS1_HEX},x") }
+                    repeat(amount) { asmgen.out("  asl  $ESTACK_LO_PLUS1_HEX,x |  rol  $ESTACK_HI_PLUS1_HEX,x") }
                 return
             }
             "*" -> {
@@ -215,7 +224,7 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
                 if(value!=null) {
                     if(rightDt in IntegerDatatypes) {
                         val amount = value.number.toInt()
-                        if(amount in powerOfTwos)
+                        if(amount in powersOfTwo)
                             printWarning("${expr.right.position} multiplication by power of 2 should have been optimized into a left shift instruction: $amount")
                         when(rightDt) {
                             DataType.UBYTE -> {
@@ -293,9 +302,9 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
                 when(type) {
                     in ByteDatatypes ->
                         asmgen.out("""
-                            lda  ${MachineDefinition.ESTACK_LO_PLUS1_HEX},x
+                            lda  $ESTACK_LO_PLUS1_HEX,x
                             eor  #255
-                            sta  ${MachineDefinition.ESTACK_LO_PLUS1_HEX},x
+                            sta  $ESTACK_LO_PLUS1_HEX,x
                             """)
                     in WordDatatypes -> asmgen.out("  jsr  prog8_lib.inv_word")
                     else -> throw AssemblyError("weird type")
@@ -312,7 +321,6 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
         }
     }
 
-
     private fun translatePushFromArray(arrayExpr: ArrayIndexedExpression) {
         // assume *reading* from an array
         val index = arrayExpr.arrayspec.index
@@ -323,10 +331,10 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
             val indexValue = index.number.toInt() * elementDt.memorySize()
             when(elementDt) {
                 in ByteDatatypes -> {
-                    asmgen.out("  lda  $arrayVarName+$indexValue |  sta  ${MachineDefinition.ESTACK_LO_HEX},x |  dex")
+                    asmgen.out("  lda  $arrayVarName+$indexValue |  sta  $ESTACK_LO_HEX,x |  dex")
                 }
                 in WordDatatypes -> {
-                    asmgen.out("  lda  $arrayVarName+$indexValue |  sta  ${MachineDefinition.ESTACK_LO_HEX},x |  lda  $arrayVarName+$indexValue+1 |  sta  ${MachineDefinition.ESTACK_HI_HEX},x |  dex")
+                    asmgen.out("  lda  $arrayVarName+$indexValue |  sta  $ESTACK_LO_HEX,x |  lda  $arrayVarName+$indexValue+1 |  sta  $ESTACK_HI_HEX,x |  dex")
                 }
                 DataType.FLOAT -> {
                     asmgen.out("  lda  #<$arrayVarName+$indexValue |  ldy  #>$arrayVarName+$indexValue |  jsr  c64flt.push_float")
@@ -350,18 +358,18 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
                 asmgen.out("  jsr prog8_lib.remainder_ub")
             }
             "+" -> asmgen.out("""
-                lda  ${MachineDefinition.ESTACK_LO_PLUS2_HEX},x
+                lda  $ESTACK_LO_PLUS2_HEX,x
                 clc
-                adc  ${MachineDefinition.ESTACK_LO_PLUS1_HEX},x
+                adc  $ESTACK_LO_PLUS1_HEX,x
                 inx
-                sta  ${MachineDefinition.ESTACK_LO_PLUS1_HEX},x
+                sta  $ESTACK_LO_PLUS1_HEX,x
                 """)
             "-" -> asmgen.out("""
-                lda  ${MachineDefinition.ESTACK_LO_PLUS2_HEX},x
+                lda  $ESTACK_LO_PLUS2_HEX,x
                 sec
-                sbc  ${MachineDefinition.ESTACK_LO_PLUS1_HEX},x
+                sbc  $ESTACK_LO_PLUS1_HEX,x
                 inx
-                sta  ${MachineDefinition.ESTACK_LO_PLUS1_HEX},x
+                sta  $ESTACK_LO_PLUS1_HEX,x
                 """)
             "<<", ">>" -> throw AssemblyError("bit-shifts not via stack")
             "<" -> asmgen.out(if(types==DataType.UBYTE) "  jsr  prog8_lib.less_ub" else "  jsr  prog8_lib.less_b")

compiler/src/prog8/compiler/target/c64/codegen/ForLoopsAsmGen.kt

@@ -8,10 +8,16 @@ import prog8.ast.expressions.RangeExpr
 import prog8.ast.statements.AssignTarget
 import prog8.ast.statements.Assignment
 import prog8.ast.statements.ForLoop
-import prog8.compiler.target.c64.MachineDefinition
+import prog8.compiler.target.c64.C64MachineDefinition.ESTACK_LO_HEX
+import prog8.compiler.target.c64.C64MachineDefinition.ESTACK_LO_PLUS1_HEX
+import prog8.compiler.target.c64.C64MachineDefinition.ESTACK_HI_PLUS1_HEX
 import prog8.compiler.toHex
+import prog8.compiler.AssemblyError
 import kotlin.math.absoluteValue
 
+// todo choose more efficient comparisons to avoid needless lda's
+// todo optimize common case step == 2 / -2
+
 
 internal class ForLoopsAsmGen(private val program: Program, private val asmgen: AsmGen) {
 
@@ -25,8 +31,6 @@ internal class ForLoopsAsmGen(private val program: Program, private val asmgen:
                 if(range==null) {
                     translateForOverNonconstRange(stmt, iterableDt.typeOrElse(DataType.STRUCT), stmt.iterable as RangeExpr)
                 } else {
-                    if (range.isEmpty())
-                        throw AssemblyError("empty range")
                     translateForOverConstRange(stmt, iterableDt.typeOrElse(DataType.STRUCT), range)
                 }
             }
@@ -41,68 +45,132 @@ internal class ForLoopsAsmGen(private val program: Program, private val asmgen:
         val loopLabel = asmgen.makeLabel("for_loop")
         val endLabel = asmgen.makeLabel("for_end")
         val continueLabel = asmgen.makeLabel("for_continue")
-        val counterLabel = asmgen.makeLabel("for_counter")
         asmgen.loopEndLabels.push(endLabel)
         asmgen.loopContinueLabels.push(continueLabel)
-        val stepsize=range.step.constValue(program)?.number
+        val stepsize=range.step.constValue(program)!!.number.toInt()
-        when (stepsize) {
+        when(iterableDt) {
-            1 -> {
+            DataType.ARRAY_B, DataType.ARRAY_UB -> {
-                when(iterableDt) {
+                if (stepsize==1 || stepsize==-1) {
-                    DataType.ARRAY_B, DataType.ARRAY_UB -> {
+
-                        if (stmt.loopRegister != null) {
+                    // bytes, step 1 or -1
-                            // loop register over range
+
-                            if(stmt.loopRegister!= Register.A)
+                    val incdec = if(stepsize==1) "inc" else "dec"
-                                throw AssemblyError("can only use A")
+                    if (stmt.loopRegister != null) {
-                            asmgen.translateExpression(range.to)
+                        // loop register over range
-                            asmgen.translateExpression(range.from)
+                        if(stmt.loopRegister!= Register.A)
-                            asmgen.out("""
+                            throw AssemblyError("can only use A")
-                inx
+                        asmgen.translateExpression(range.to)
-                lda  ${MachineDefinition.ESTACK_LO_HEX},x
+                        asmgen.translateExpression(range.from)
-                sta  $loopLabel+1
+                        asmgen.out("""
-                inx
+                inx
-                lda  ${MachineDefinition.ESTACK_LO_HEX},x
+                lda  ${ESTACK_LO_HEX},x
-                sec
+                sta  $loopLabel+1
-                sbc  $loopLabel+1
+$loopLabel      lda  #0                 ; modified""")
-                adc  #0
+                        asmgen.translate(stmt.body)
-                sta  $counterLabel
+                        asmgen.out("""
-$loopLabel      lda  #0                 ; modified""")
+$continueLabel  lda  $loopLabel+1
-                            asmgen.translate(stmt.body)
+                cmp  $ESTACK_LO_PLUS1_HEX,x
-                            asmgen.out("""
+                beq  $endLabel
-$continueLabel  dec  $counterLabel
+                $incdec  $loopLabel+1
-                beq  $endLabel
+                jmp  $loopLabel
-                inc  $loopLabel+1
+$endLabel       inx""")
-                jmp  $loopLabel
+                    } else {
-$counterLabel   .byte  0                
+                        // loop over byte range via loopvar
-$endLabel""")
+                        val varname = asmgen.asmIdentifierName(stmt.loopVar!!)
-                        } else {
+                        asmgen.translateExpression(range.to)
-                            // loop over byte range via loopvar
+                        asmgen.translateExpression(range.from)
-                            val varname = asmgen.asmIdentifierName(stmt.loopVar!!)
+                        asmgen.out("""
-                            asmgen.translateExpression(range.to)
+                inx
-                            asmgen.translateExpression(range.from)
+                lda  ${ESTACK_LO_HEX},x
-                            asmgen.out("""
+                sta  $varname
-                inx
+$loopLabel""")
-                lda  ${MachineDefinition.ESTACK_LO_HEX},x
+                        asmgen.translate(stmt.body)
-                sta  $varname
+                        asmgen.out("""
-                inx
+$continueLabel  lda  $varname
-                lda  ${MachineDefinition.ESTACK_LO_HEX},x
+                cmp  $ESTACK_LO_PLUS1_HEX,x
-                sec
+                beq  $endLabel
-                sbc  $varname
+                $incdec  $varname
-                adc  #0
+                jmp  $loopLabel
-                sta  $counterLabel
+$endLabel       inx""")
-$loopLabel""")
+                    }
-                            asmgen.translate(stmt.body)
+                }
-                            asmgen.out("""
+                else {
-$continueLabel  dec  $counterLabel
+
-                beq  $endLabel
+                    // bytes, step >= 2 or <= -2
-                inc  $varname
+
-                jmp  $loopLabel
+                    if (stmt.loopRegister != null) {
-$counterLabel   .byte  0                
+                        // loop register over range
-$endLabel""")
+                        if(stmt.loopRegister!= Register.A)
-                        }
+                            throw AssemblyError("can only use A")
-                    }
+                        asmgen.translateExpression(range.to)
-                    DataType.ARRAY_UW, DataType.ARRAY_W -> {
+                        asmgen.translateExpression(range.from)
+                        asmgen.out("""
+                inx
+                lda  ${ESTACK_LO_HEX},x
+                sta  $loopLabel+1
+$loopLabel      lda  #0                 ; modified""")
+                        asmgen.translate(stmt.body)
+                        asmgen.out("""
+$continueLabel  lda  $loopLabel+1""")
+                        if(stepsize>0) {
+                            asmgen.out("""
+                clc
+                adc  #$stepsize
+                sta  $loopLabel+1
+                cmp  $ESTACK_LO_PLUS1_HEX,x
+                bcc  $loopLabel
+                beq  $loopLabel""")
+                        } else {
+                            asmgen.out("""
+                sec
+                sbc  #${stepsize.absoluteValue}
+                sta  $loopLabel+1
+                cmp  $ESTACK_LO_PLUS1_HEX,x
+                bcs  $loopLabel""")
+                        }
+                        asmgen.out("""
+$endLabel       inx""")
+                    } else {
+                        // loop over byte range via loopvar
+                        val varname = asmgen.asmIdentifierName(stmt.loopVar!!)
+                        asmgen.translateExpression(range.to)
+                        asmgen.translateExpression(range.from)
+                        asmgen.out("""
+                inx
+                lda  ${ESTACK_LO_HEX},x
+                sta  $varname
+$loopLabel""")
+                        asmgen.translate(stmt.body)
+                        asmgen.out("""
+$continueLabel  lda  $varname""")
+                        if(stepsize>0) {
+                            asmgen.out("""
+                clc
+                adc  #$stepsize
+                sta  $varname
+                cmp  $ESTACK_LO_PLUS1_HEX,x
+                bcc  $loopLabel
+                beq  $loopLabel""")
+                        } else {
+                            asmgen.out("""
+                sec
+                sbc  #${stepsize.absoluteValue}
+                sta  $varname
+                cmp  $ESTACK_LO_PLUS1_HEX,x
+                bcs  $loopLabel""")
+                        }
+                        asmgen.out("""
+$endLabel       inx""")
+                    }
+                }
+            }
+            DataType.ARRAY_W, DataType.ARRAY_UW -> {
+                when {
+
+                    // words, step 1 or -1
+
+                    stepsize == 1 || stepsize == -1 -> {
                         asmgen.translateExpression(range.to)
-                        asmgen.out("  inc  ${MachineDefinition.ESTACK_LO_HEX}+1,x |  bne  + |  inc  ${MachineDefinition.ESTACK_HI_HEX}+1,x |+  ")
                         val varname = asmgen.asmIdentifierName(stmt.loopVar!!)
                         val assignLoopvar = Assignment(AssignTarget(null, stmt.loopVar, null, null, stmt.loopVar!!.position),
                                 null, range.from, range.position)
@@ -111,81 +179,34 @@ $endLabel""")
                         asmgen.out(loopLabel)
                         asmgen.translate(stmt.body)
                         asmgen.out("""
-                inc  $varname
+                lda  $varname+1
+                cmp  $ESTACK_HI_PLUS1_HEX,x
+                bne  +
+                lda  $varname
+                cmp  $ESTACK_LO_PLUS1_HEX,x
+                beq  $endLabel""")
+                        if(stepsize==1) {
+                            asmgen.out("""
++               inc  $varname
                 bne  +
                 inc  $varname+1            
-+               lda  ${MachineDefinition.ESTACK_HI_HEX}+1,x
+                            """)
-                cmp  $varname+1
+                        } else {
+                            asmgen.out("""
++               lda  $varname
                 bne  +
-                lda  ${MachineDefinition.ESTACK_LO_HEX}+1,x
+                dec  $varname+1
-                cmp  $varname
++               dec  $varname""")
-                beq  $endLabel
+                        }
+                        asmgen.out("""
 +               jmp  $loopLabel
 $endLabel       inx""")
                     }
-                    else -> throw AssemblyError("range expression can only be byte or word")
+                    stepsize > 0 -> {
-                }
+
-            }
+                        // (u)words, step >= 2
-            -1 -> {
+
-                when(iterableDt){
-                    DataType.ARRAY_B, DataType.ARRAY_UB -> {
-                        if (stmt.loopRegister != null) {
-                            // loop register over range
-                            if(stmt.loopRegister!= Register.A)
-                                throw AssemblyError("can only use A")
-                            asmgen.translateExpression(range.from)
-                            asmgen.translateExpression(range.to)
-                            asmgen.out("""
-                inx
-                lda  ${MachineDefinition.ESTACK_LO_HEX}+1,x
-                sta  $loopLabel+1
-                sec
-                sbc  ${MachineDefinition.ESTACK_LO_HEX},x
-                adc  #0
-                sta  $counterLabel
-                inx
-$loopLabel      lda  #0                 ; modified""")
-                            asmgen.translate(stmt.body)
-                            asmgen.out("""
-$continueLabel  dec  $counterLabel
-                beq  $endLabel
-                dec  $loopLabel+1
-                jmp  $loopLabel
-$counterLabel   .byte  0                
-$endLabel""")
-                        } else {
-                            // loop over byte range via loopvar
-                            val varname = asmgen.asmIdentifierName(stmt.loopVar!!)
-                            asmgen.translateExpression(range.from)
-                            asmgen.translateExpression(range.to)
-                            asmgen.out("""
-                inx
-                lda  ${MachineDefinition.ESTACK_LO_HEX}+1,x
-                sta  $varname
-                sec
-                sbc  ${MachineDefinition.ESTACK_LO_HEX},x
-                adc  #0
-                sta  $counterLabel
-                inx
-$loopLabel""")
-                            asmgen.translate(stmt.body)
-                            asmgen.out("""
-$continueLabel  dec  $counterLabel
-                beq  $endLabel
-                dec  $varname
-                jmp  $loopLabel
-$counterLabel   .byte  0                
-$endLabel""")
-                        }
-                    }
-                    DataType.ARRAY_UW, DataType.ARRAY_W -> {
                         asmgen.translateExpression(range.to)
-                        asmgen.out("""
-                lda  ${MachineDefinition.ESTACK_LO_HEX}+1,x
-                bne  +
-                dec  ${MachineDefinition.ESTACK_HI_HEX}+1,x
-+               dec  ${MachineDefinition.ESTACK_LO_HEX}+1,x                            
-                        """)
                         val varname = asmgen.asmIdentifierName(stmt.loopVar!!)
                         val assignLoopvar = Assignment(AssignTarget(null, stmt.loopVar, null, null, stmt.loopVar!!.position),
                                 null, range.from, range.position)
@@ -193,29 +214,97 @@ $endLabel""")
                         asmgen.translate(assignLoopvar)
                         asmgen.out(loopLabel)
                         asmgen.translate(stmt.body)
-                        asmgen.out("""
+
+                        if (iterableDt == DataType.ARRAY_UW) {
+                            asmgen.out("""
                 lda  $varname
-                bne  +
+                clc
-                dec  $varname+1
+                adc  #<$stepsize
-+               dec  $varname                
+                sta  $varname
-                lda  ${MachineDefinition.ESTACK_HI_HEX}+1,x
+                lda  $varname+1
+                adc  #>$stepsize
+                sta  $varname+1
+                lda  $ESTACK_HI_PLUS1_HEX,x
                 cmp  $varname+1
-                bne  +
+                bcc  $endLabel
-                lda  ${MachineDefinition.ESTACK_LO_HEX}+1,x
+                bne  $loopLabel
-                cmp  $varname
+                lda  $varname
-                beq  $endLabel
+                cmp  $ESTACK_LO_PLUS1_HEX,x
-+               jmp  $loopLabel
+                bcc  $endLabel
+                bcs  $loopLabel
 $endLabel       inx""")
+                        } else {
+                            asmgen.out("""
+                lda  $varname
+                clc
+                adc  #<$stepsize
+                sta  $varname
+                lda  $varname+1
+                adc  #>$stepsize
+                sta  $varname+1
+                lda  $ESTACK_LO_PLUS1_HEX,x
+                cmp  $varname
+                lda  $ESTACK_HI_PLUS1_HEX,x
+                sbc  $varname+1
+                bvc  +
+                eor  #$80
++               bpl  $loopLabel                
+$endLabel       inx""")
+                        }
+                    }
+                    else -> {
+
+                        // (u)words, step <= -2
+                        asmgen.translateExpression(range.to)
+                        val varname = asmgen.asmIdentifierName(stmt.loopVar!!)
+                        val assignLoopvar = Assignment(AssignTarget(null, stmt.loopVar, null, null, stmt.loopVar!!.position),
+                                null, range.from, range.position)
+                        assignLoopvar.linkParents(stmt)
+                        asmgen.translate(assignLoopvar)
+                        asmgen.out(loopLabel)
+                        asmgen.translate(stmt.body)
+
+                        if(iterableDt==DataType.ARRAY_UW) {
+                            asmgen.out("""
+                lda  $varname
+                sec
+                sbc  #<${stepsize.absoluteValue}
+                sta  $varname
+                lda  $varname+1
+                sbc  #>${stepsize.absoluteValue}
+                sta  $varname+1
+                cmp  $ESTACK_HI_PLUS1_HEX,x
+                bcc  $endLabel
+                bne  $loopLabel
+                lda  $varname
+                cmp  $ESTACK_LO_PLUS1_HEX,x
+                bcs  $loopLabel
+$endLabel       inx""")
+                        } else {
+                            asmgen.out("""
+                lda  $varname
+                sec
+                sbc  #<${stepsize.absoluteValue}
+                sta  $varname
+                pha
+                lda  $varname+1
+                sbc  #>${stepsize.absoluteValue}
+                sta  $varname+1
+                pla
+                cmp  $ESTACK_LO_PLUS1_HEX,x
+                lda  $varname+1
+                sbc  $ESTACK_HI_PLUS1_HEX,x
+                bvc  +
+                eor  #$80
++               bpl  $loopLabel                
+$endLabel       inx""")
+                        }
                     }
-                    else -> throw AssemblyError("range expression can only be byte or word")
                 }
             }
-            else -> when (iterableDt) {
+            else -> throw AssemblyError("range expression can only be byte or word")
-                DataType.ARRAY_UB, DataType.ARRAY_B -> TODO("non-const forloop bytes, step >1: $stepsize")
-                DataType.ARRAY_UW, DataType.ARRAY_W -> TODO("non-const forloop words, step >1: $stepsize")
-                else -> throw AssemblyError("range expression can only be byte or word")
-            }
         }
+
         asmgen.loopEndLabels.pop()
         asmgen.loopContinueLabels.pop()
     }
@@ -229,7 +318,7 @@ $endLabel       inx""")
         val iterableName = asmgen.asmIdentifierName(ident)
         val decl = ident.targetVarDecl(program.namespace)!!
         when(iterableDt) {
-            DataType.STR, DataType.STR_S -> {
+            DataType.STR -> {
                 if(stmt.loopRegister!=null && stmt.loopRegister!= Register.A)
                     throw AssemblyError("can only use A")
                 asmgen.out("""
@@ -322,6 +411,8 @@ $endLabel""")
 
     private fun translateForOverConstRange(stmt: ForLoop, iterableDt: DataType, range: IntProgression) {
         // TODO: optimize loop code when the range is < 256 iterations, don't need a separate counter in such cases
+        if (range.isEmpty())
+            throw AssemblyError("empty range")
         val loopLabel = asmgen.makeLabel("for_loop")
         val endLabel = asmgen.makeLabel("for_end")
         val continueLabel = asmgen.makeLabel("for_continue")
@@ -544,11 +635,59 @@ $endLabel""")
                     }
                     range.step >= 2 -> {
                         // word, step >= 2
-                        TODO("for, word, step>=2")
+                        // note: range.last has already been adjusted by kotlin itself to actually be the last value of the sequence
+                        val lastValue = range.last+range.step
+                        asmgen.out("""
+                lda  #<${range.first}
+                ldy  #>${range.first}
+                sta  $varname
+                sty  $varname+1
+$loopLabel""")
+                        asmgen.translate(stmt.body)
+                        asmgen.out("""
+$continueLabel  clc
+                lda  $varname
+                adc  #<${range.step}
+                sta  $varname
+                lda  $varname+1
+                adc  #>${range.step}
+                sta  $varname+1
+                lda  $varname
+                cmp  #<$lastValue
+                bne  +
+                lda  $varname+1
+                cmp  #>$lastValue
+                beq  $endLabel
++               jmp  $loopLabel
+$endLabel""")
                     }
                     else -> {
                         // step <= -2
-                        TODO("for, word, step<=-2")
+                        // note: range.last has already been adjusted by kotlin itself to actually be the last value of the sequence
+                        val lastValue = range.last+range.step
+                        asmgen.out("""
+                lda  #<${range.first}
+                ldy  #>${range.first}
+                sta  $varname
+                sty  $varname+1
+$loopLabel""")
+                        asmgen.translate(stmt.body)
+                        asmgen.out("""
+$continueLabel  sec
+                lda  $varname
+                sbc  #<${range.step.absoluteValue}
+                sta  $varname
+                lda  $varname+1
+                sbc  #>${range.step.absoluteValue}
+                sta  $varname+1
+                lda  $varname
+                cmp  #<$lastValue
+                bne  +
+                lda  $varname+1
+                cmp  #>$lastValue
+                beq  $endLabel
++               jmp  $loopLabel
+$endLabel""")
                     }
                 }
             }

compiler/src/prog8/compiler/target/c64/codegen/FunctionCallAsmGen.kt

@@ -7,8 +7,11 @@ import prog8.ast.expressions.*
 import prog8.ast.statements.AssignTarget
 import prog8.ast.statements.Subroutine
 import prog8.ast.statements.SubroutineParameter
-import prog8.compiler.target.c64.MachineDefinition
 import prog8.compiler.toHex
+import prog8.compiler.AssemblyError
+import prog8.compiler.target.c64.C64MachineDefinition.ESTACK_HI_HEX
+import prog8.compiler.target.c64.C64MachineDefinition.ESTACK_LO_HEX
+
 
 internal class FunctionCallAsmGen(private val program: Program, private val asmgen: AsmGen) {
 
@@ -20,8 +23,8 @@ internal class FunctionCallAsmGen(private val program: Program, private val asmg
             asmgen.out("  stx  c64.SCRATCH_ZPREGX")        // we only save X for now (required! is the eval stack pointer), screw A and Y...
 
         val subName = asmgen.asmIdentifierName(stmt.target)
-        if(stmt.arglist.isNotEmpty()) {
+        if(stmt.args.isNotEmpty()) {
-            for(arg in sub.parameters.withIndex().zip(stmt.arglist)) {
+            for(arg in sub.parameters.withIndex().zip(stmt.args)) {
                 translateFuncArguments(arg.first, arg.second, sub)
             }
         }
@@ -139,7 +142,7 @@ internal class FunctionCallAsmGen(private val program: Program, private val asmg
                                 asmgen.translateExpression(value)
                                 asmgen.out("""
             inx                        
-            lda  ${MachineDefinition.ESTACK_LO_HEX},x
+            lda  $ESTACK_LO_HEX,x
             beq  +
             sec  
             bcs  ++
@@ -166,9 +169,9 @@ internal class FunctionCallAsmGen(private val program: Program, private val asmg
                         else -> {
                             asmgen.translateExpression(value)
                             when(register) {
-                                RegisterOrPair.A -> asmgen.out("  inx | lda  ${MachineDefinition.ESTACK_LO_HEX},x")
+                                RegisterOrPair.A -> asmgen.out("  inx | lda  $ESTACK_LO_HEX,x")
                                 RegisterOrPair.X -> throw AssemblyError("can't pop into X register - use a variable instead")
-                                RegisterOrPair.Y -> asmgen.out("  inx | ldy  ${MachineDefinition.ESTACK_LO_HEX},x")
+                                RegisterOrPair.Y -> asmgen.out("  inx | ldy  $ESTACK_LO_HEX,x")
                                 else -> throw AssemblyError("cannot assign to register pair")
                             }
                         }
@@ -211,7 +214,7 @@ internal class FunctionCallAsmGen(private val program: Program, private val asmg
                             if (register == RegisterOrPair.AX || register == RegisterOrPair.XY)
                                 throw AssemblyError("can't use X register here - use a variable")
                             else if (register == RegisterOrPair.AY)
-                                asmgen.out("  inx |  lda  ${MachineDefinition.ESTACK_LO_HEX},x  |  ldy  ${MachineDefinition.ESTACK_HI_HEX},x")
+                                asmgen.out("  inx |  lda  $ESTACK_LO_HEX,x  |  ldy  $ESTACK_HI_HEX,x")
                         }
                     }
                 }
@@ -225,9 +228,9 @@ internal class FunctionCallAsmGen(private val program: Program, private val asmg
 
         // we have a special rule for some types.
         // strings are assignable to UWORD, for example, and vice versa
-        if(argType in StringDatatypes && paramType==DataType.UWORD)
+        if(argType==DataType.STR && paramType==DataType.UWORD)
             return true
-        if(argType==DataType.UWORD && paramType in StringDatatypes)
+        if(argType==DataType.UWORD && paramType == DataType.STR)
             return true
 
         return false

compiler/src/prog8/compiler/target/c64/codegen/PostIncrDecrAsmGen.kt

@@ -6,8 +6,10 @@ import prog8.ast.expressions.IdentifierReference
 import prog8.ast.expressions.NumericLiteralValue
 import prog8.ast.expressions.RegisterExpr
 import prog8.ast.statements.PostIncrDecr
-import prog8.compiler.target.c64.MachineDefinition
 import prog8.compiler.toHex
+import prog8.compiler.AssemblyError
+import prog8.compiler.target.c64.C64MachineDefinition.C64Zeropage
+
 
 internal class PostIncrDecrAsmGen(private val program: Program, private val asmgen: AsmGen) {
     internal fun translate(stmt: PostIncrDecr) {
@@ -57,8 +59,7 @@ internal class PostIncrDecrAsmGen(private val program: Program, private val asmg
                 }
             }
             targetMemory!=null -> {
-                val addressExpr = targetMemory.addressExpression
+                when (val addressExpr = targetMemory.addressExpression) {
-                when (addressExpr) {
                     is NumericLiteralValue -> {
                         val what = addressExpr.number.toHex()
                         asmgen.out(if(incr) "  inc  $what" else "  dec  $what")
@@ -120,9 +121,9 @@ internal class PostIncrDecrAsmGen(private val program: Program, private val asmg
     }
 
     private fun incrDecrArrayvalueWithIndexA(incr: Boolean, arrayDt: DataType, arrayVarName: String) {
-        asmgen.out("  stx  ${MachineDefinition.C64Zeropage.SCRATCH_REG_X} |  tax")
+        asmgen.out("  stx  ${C64Zeropage.SCRATCH_REG_X} |  tax")
         when(arrayDt) {
-            DataType.STR, DataType.STR_S,
+            DataType.STR,
             DataType.ARRAY_UB, DataType.ARRAY_B -> {
                 asmgen.out(if(incr) "  inc  $arrayVarName,x" else "  dec  $arrayVarName,x")
             }
@@ -143,7 +144,7 @@ internal class PostIncrDecrAsmGen(private val program: Program, private val asmg
             }
             else -> throw AssemblyError("weird array dt")
         }
-        asmgen.out("  ldx  ${MachineDefinition.C64Zeropage.SCRATCH_REG_X}")
+        asmgen.out("  ldx  ${C64Zeropage.SCRATCH_REG_X}")
     }
 
 }

compiler/src/prog8/functions/BuiltinFunctions.kt

@@ -27,10 +27,12 @@ val BuiltinFunctions = mapOf(
     "ror2"        to FunctionSignature(false, listOf(BuiltinFunctionParam("item", setOf(DataType.UBYTE, DataType.UWORD))), null),
     "lsl"         to FunctionSignature(false, listOf(BuiltinFunctionParam("item", IntegerDatatypes)), null),
     "lsr"         to FunctionSignature(false, listOf(BuiltinFunctionParam("item", IntegerDatatypes)), null),
+    "sort"        to FunctionSignature(false, listOf(BuiltinFunctionParam("array", ArrayDatatypes)), null),
+    "reverse"     to FunctionSignature(false, listOf(BuiltinFunctionParam("array", ArrayDatatypes)), null),
         // these few have a return value depending on the argument(s):
-    "max"         to FunctionSignature(true, listOf(BuiltinFunctionParam("values", ArrayDatatypes)), null) { a, p, _ -> collectionArgNeverConst(a, p) },    // type depends on args
+    "max"         to FunctionSignature(true, listOf(BuiltinFunctionParam("values", ArrayDatatypes)), null) { a, p, prg -> collectionArg(a, p, prg, ::builtinMax) },    // type depends on args
-    "min"         to FunctionSignature(true, listOf(BuiltinFunctionParam("values", ArrayDatatypes)), null) { a, p, _ -> collectionArgNeverConst(a, p) },    // type depends on args
+    "min"         to FunctionSignature(true, listOf(BuiltinFunctionParam("values", ArrayDatatypes)), null) { a, p, prg -> collectionArg(a, p, prg, ::builtinMin) },    // type depends on args
-    "sum"         to FunctionSignature(true, listOf(BuiltinFunctionParam("values", ArrayDatatypes)), null) { a, p, _ -> collectionArgNeverConst(a, p) },      // type depends on args
+    "sum"         to FunctionSignature(true, listOf(BuiltinFunctionParam("values", ArrayDatatypes)), null) { a, p, prg -> collectionArg(a, p, prg, ::builtinSum) },      // type depends on args
     "abs"         to FunctionSignature(true, listOf(BuiltinFunctionParam("value", NumericDatatypes)), null, ::builtinAbs),      // type depends on argument
     "len"         to FunctionSignature(true, listOf(BuiltinFunctionParam("values", IterableDatatypes)), null, ::builtinLen),    // type is UBYTE or UWORD depending on actual length
         // normal functions follow:
@@ -56,8 +58,8 @@ val BuiltinFunctions = mapOf(
     "round"       to FunctionSignature(true, listOf(BuiltinFunctionParam("value", setOf(DataType.FLOAT))), DataType.FLOAT) { a, p, prg -> oneDoubleArgOutputWord(a, p, prg, Math::round) },
     "floor"       to FunctionSignature(true, listOf(BuiltinFunctionParam("value", setOf(DataType.FLOAT))), DataType.FLOAT) { a, p, prg -> oneDoubleArgOutputWord(a, p, prg, Math::floor) },
     "ceil"        to FunctionSignature(true, listOf(BuiltinFunctionParam("value", setOf(DataType.FLOAT))), DataType.FLOAT) { a, p, prg -> oneDoubleArgOutputWord(a, p, prg, Math::ceil) },
-    "any"         to FunctionSignature(true, listOf(BuiltinFunctionParam("values", ArrayDatatypes)), DataType.UBYTE) { a, p, _ -> collectionArgNeverConst(a, p) },
+    "any"         to FunctionSignature(true, listOf(BuiltinFunctionParam("values", ArrayDatatypes)), DataType.UBYTE) { a, p, prg -> collectionArg(a, p, prg, ::builtinAny) },
-    "all"         to FunctionSignature(true, listOf(BuiltinFunctionParam("values", ArrayDatatypes)), DataType.UBYTE) { a, p, _ -> collectionArgNeverConst(a, p) },
+    "all"         to FunctionSignature(true, listOf(BuiltinFunctionParam("values", ArrayDatatypes)), DataType.UBYTE) { a, p, prg -> collectionArg(a, p, prg, ::builtinAll) },
     "lsb"         to FunctionSignature(true, listOf(BuiltinFunctionParam("value", setOf(DataType.UWORD, DataType.WORD))), DataType.UBYTE) { a, p, prg -> oneIntArgOutputInt(a, p, prg) { x: Int -> x and 255 }},
     "msb"         to FunctionSignature(true, listOf(BuiltinFunctionParam("value", setOf(DataType.UWORD, DataType.WORD))), DataType.UBYTE) { a, p, prg -> oneIntArgOutputInt(a, p, prg) { x: Int -> x ushr 8 and 255}},
     "mkword"      to FunctionSignature(true, listOf(
@@ -75,66 +77,51 @@ val BuiltinFunctions = mapOf(
     "read_flags"  to FunctionSignature(false, emptyList(), DataType.UBYTE),
     "swap"        to FunctionSignature(false, listOf(BuiltinFunctionParam("first", NumericDatatypes), BuiltinFunctionParam("second", NumericDatatypes)), null),
     "memcopy"     to FunctionSignature(false, listOf(
-                                                        BuiltinFunctionParam("from", IterableDatatypes + setOf(DataType.UWORD)),
+                                                        BuiltinFunctionParam("from", IterableDatatypes + DataType.UWORD),
-                                                        BuiltinFunctionParam("to", IterableDatatypes + setOf(DataType.UWORD)),
+                                                        BuiltinFunctionParam("to", IterableDatatypes + DataType.UWORD),
                                                         BuiltinFunctionParam("numbytes", setOf(DataType.UBYTE))), null),
     "memset"      to FunctionSignature(false, listOf(
-                                                        BuiltinFunctionParam("address", IterableDatatypes + setOf(DataType.UWORD)),
+                                                        BuiltinFunctionParam("address", IterableDatatypes + DataType.UWORD),
                                                         BuiltinFunctionParam("numbytes", setOf(DataType.UWORD)),
                                                         BuiltinFunctionParam("bytevalue", ByteDatatypes)), null),
     "memsetw"     to FunctionSignature(false, listOf(
-                                                        BuiltinFunctionParam("address", IterableDatatypes + setOf(DataType.UWORD)),
+                                                        BuiltinFunctionParam("address", IterableDatatypes + DataType.UWORD),
                                                         BuiltinFunctionParam("numwords", setOf(DataType.UWORD)),
                                                         BuiltinFunctionParam("wordvalue", setOf(DataType.UWORD, DataType.WORD))), null),
-    "strlen"      to FunctionSignature(true, listOf(BuiltinFunctionParam("string", StringDatatypes)), DataType.UBYTE, ::builtinStrlen),
+    "strlen"      to FunctionSignature(true, listOf(BuiltinFunctionParam("string", setOf(DataType.STR))), DataType.UBYTE, ::builtinStrlen)
-    "vm_write_memchr"  to FunctionSignature(false, listOf(BuiltinFunctionParam("address", setOf(DataType.UWORD))), null),
-    "vm_write_memstr"  to FunctionSignature(false, listOf(BuiltinFunctionParam("address", setOf(DataType.UWORD))), null),
-    "vm_write_num"     to FunctionSignature(false, listOf(BuiltinFunctionParam("number", NumericDatatypes)), null),
-    "vm_write_char"    to FunctionSignature(false, listOf(BuiltinFunctionParam("char", setOf(DataType.UBYTE))), null),
-    "vm_write_str"     to FunctionSignature(false, listOf(BuiltinFunctionParam("string", StringDatatypes)), null),
-    "vm_input_str"     to FunctionSignature(false, listOf(BuiltinFunctionParam("intovar", StringDatatypes)), null),
-    "vm_gfx_clearscr"  to FunctionSignature(false, listOf(BuiltinFunctionParam("color", setOf(DataType.UBYTE))), null),
-    "vm_gfx_pixel"     to FunctionSignature(false, listOf(
-                                                        BuiltinFunctionParam("x", IntegerDatatypes),
-                                                        BuiltinFunctionParam("y", IntegerDatatypes),
-                                                        BuiltinFunctionParam("color", IntegerDatatypes)), null),
-    "vm_gfx_line"     to FunctionSignature(false, listOf(
-                                                        BuiltinFunctionParam("x1", IntegerDatatypes),
-                                                        BuiltinFunctionParam("y1", IntegerDatatypes),
-                                                        BuiltinFunctionParam("x2", IntegerDatatypes),
-                                                        BuiltinFunctionParam("y2", IntegerDatatypes),
-                                                        BuiltinFunctionParam("color", IntegerDatatypes)), null),
-    "vm_gfx_text"      to FunctionSignature(false, listOf(
-                                                        BuiltinFunctionParam("x", IntegerDatatypes),
-                                                        BuiltinFunctionParam("y", IntegerDatatypes),
-                                                        BuiltinFunctionParam("color", IntegerDatatypes),
-                                                        BuiltinFunctionParam("text", StringDatatypes)),
-                                                        null)
 )
 
+fun builtinMax(array: List<Number>): Number = array.maxBy { it.toDouble() }!!
+
+fun builtinMin(array: List<Number>): Number = array.minBy { it.toDouble() }!!
+
+fun builtinSum(array: List<Number>): Number = array.sumByDouble { it.toDouble() }
+
+fun builtinAny(array: List<Number>): Number = if(array.any { it.toDouble()!=0.0 }) 1 else 0
+
+fun builtinAll(array: List<Number>): Number = if(array.all { it.toDouble()!=0.0 }) 1 else 0
+
 
 fun builtinFunctionReturnType(function: String, args: List<Expression>, program: Program): InferredTypes.InferredType {
 
     fun datatypeFromIterableArg(arglist: Expression): DataType {
         if(arglist is ArrayLiteralValue) {
-            if(arglist.type== DataType.ARRAY_UB || arglist.type== DataType.ARRAY_UW || arglist.type== DataType.ARRAY_F) {
+            val dt = arglist.value.map {it.inferType(program).typeOrElse(DataType.STRUCT)}.toSet()
-                val dt = arglist.value.map {it.inferType(program)}
+            if(dt.any { it !in NumericDatatypes }) {
-                if(dt.any { !(it istype DataType.UBYTE) && !(it istype DataType.UWORD) && !(it istype DataType.FLOAT)}) {
+                throw FatalAstException("fuction $function only accepts array of numeric values")
-                    throw FatalAstException("fuction $function only accepts arraysize of numeric values")
-                }
-                if(dt.any { it istype DataType.FLOAT }) return DataType.FLOAT
-                if(dt.any { it istype DataType.UWORD }) return DataType.UWORD
-                return DataType.UBYTE
             }
+            if(DataType.FLOAT in dt) return DataType.FLOAT
+            if(DataType.UWORD in dt) return DataType.UWORD
+            if(DataType.WORD in dt) return DataType.WORD
+            if(DataType.BYTE in dt) return DataType.BYTE
+            return DataType.UBYTE
         }
         if(arglist is IdentifierReference) {
             val idt = arglist.inferType(program)
             if(!idt.isKnown)
                 throw FatalAstException("couldn't determine type of iterable $arglist")
-            val dt = idt.typeOrElse(DataType.STRUCT)
+            return when(val dt = idt.typeOrElse(DataType.STRUCT)) {
-            return when(dt) {
+                DataType.STR, in NumericDatatypes -> dt
-                in NumericDatatypes -> dt
-                in StringDatatypes -> dt
                 in ArrayDatatypes -> ArrayElementTypes.getValue(dt)
                 else -> throw FatalAstException("function '$function' requires one argument which is an iterable")
             }
@@ -157,8 +144,8 @@ fun builtinFunctionReturnType(function: String, args: List<Expression>, program:
         }
         "max", "min" -> {
             when(val dt = datatypeFromIterableArg(args.single())) {
+                DataType.STR -> InferredTypes.knownFor(DataType.UBYTE)
                 in NumericDatatypes -> InferredTypes.knownFor(dt)
-                in StringDatatypes -> InferredTypes.knownFor(DataType.UBYTE)
                 in ArrayDatatypes -> InferredTypes.knownFor(ArrayElementTypes.getValue(dt))
                 else -> InferredTypes.unknown()
             }
@@ -171,7 +158,7 @@ fun builtinFunctionReturnType(function: String, args: List<Expression>, program:
                 DataType.ARRAY_UB, DataType.ARRAY_UW -> InferredTypes.knownFor(DataType.UWORD)
                 DataType.ARRAY_B, DataType.ARRAY_W -> InferredTypes.knownFor(DataType.WORD)
                 DataType.ARRAY_F -> InferredTypes.knownFor(DataType.FLOAT)
-                in StringDatatypes -> InferredTypes.knownFor(DataType.UWORD)
+                DataType.STR -> InferredTypes.knownFor(DataType.UWORD)
                 else -> InferredTypes.unknown()
             }
         }
@@ -185,7 +172,7 @@ fun builtinFunctionReturnType(function: String, args: List<Expression>, program:
 }
 
 
-class NotConstArgumentException: AstException("not a const argument to a built-in function")        // TODO: ugly, remove throwing exceptions for control flow
+class NotConstArgumentException: AstException("not a const argument to a built-in function")
 
 
 private fun oneDoubleArg(args: List<Expression>, position: Position, program: Program, function: (arg: Double)->Number): NumericLiteralValue {
@@ -215,12 +202,16 @@ private fun oneIntArgOutputInt(args: List<Expression>, position: Position, progr
     return numericLiteral(function(integer).toInt(), args[0].position)
 }
 
-private fun collectionArgNeverConst(args: List<Expression>, position: Position): NumericLiteralValue {
+private fun collectionArg(args: List<Expression>, position: Position, program: Program, function: (arg: List<Number>)->Number): NumericLiteralValue {
     if(args.size!=1)
         throw SyntaxError("builtin function requires one non-scalar argument", position)
 
-    // max/min/sum etc only work on arrays and these are never considered to be const for these functions
+    val array= args[0] as? ArrayLiteralValue ?: throw NotConstArgumentException()
-    throw NotConstArgumentException()
+    val constElements = array.value.map{it.constValue(program)?.number}
+    if(constElements.contains(null))
+        throw NotConstArgumentException()
+
+    return NumericLiteralValue.optimalNumeric(function(constElements.mapNotNull { it }), args[0].position)
 }
 
 private fun builtinAbs(args: List<Expression>, position: Position, program: Program): NumericLiteralValue {
@@ -240,7 +231,7 @@ private fun builtinStrlen(args: List<Expression>, position: Position, program: P
     if (args.size != 1)
         throw SyntaxError("strlen requires one argument", position)
     val argument = args[0].constValue(program) ?: throw NotConstArgumentException()
-    if(argument.type !in StringDatatypes)
+    if(argument.type != DataType.STR)
         throw SyntaxError("strlen must have string argument", position)
 
     throw NotConstArgumentException()       // this function is not considering the string argument a constant
@@ -258,6 +249,8 @@ private fun builtinLen(args: List<Expression>, position: Position, program: Prog
     var arraySize = directMemVar?.arraysize?.size()
     if(arraySize != null)
         return NumericLiteralValue.optimalInteger(arraySize, position)
+    if(args[0] is ArrayLiteralValue)
+        return NumericLiteralValue.optimalInteger((args[0] as ArrayLiteralValue).value.size, position)
     if(args[0] !is IdentifierReference)
         throw SyntaxError("len argument should be an identifier, but is ${args[0]}", position)
     val target = (args[0] as IdentifierReference).targetVarDecl(program.namespace)!!
@@ -275,7 +268,7 @@ private fun builtinLen(args: List<Expression>, position: Position, program: Prog
                 throw CompilerException("array length exceeds byte limit ${target.position}")
             NumericLiteralValue.optimalInteger(arraySize, args[0].position)
         }
-        in StringDatatypes -> {
+        DataType.STR -> {
             val refLv = target.value as StringLiteralValue
             if(refLv.value.length>255)
                 throw CompilerException("string length exceeds byte limit ${refLv.position}")

compiler/src/prog8/optimizer/ConstExprEvaluator.kt

@@ -54,15 +54,15 @@ class ConstExprEvaluator {
 
     private fun logicalxor(left: NumericLiteralValue, right: NumericLiteralValue): NumericLiteralValue {
         val error = "cannot compute $left locical-bitxor $right"
-        return when {
+        return when (left.type) {
-            left.type in IntegerDatatypes -> when {
+            in IntegerDatatypes -> when (right.type) {
-                right.type in IntegerDatatypes -> NumericLiteralValue.fromBoolean((left.number.toInt() != 0) xor (right.number.toInt() != 0), left.position)
+                in IntegerDatatypes -> NumericLiteralValue.fromBoolean((left.number.toInt() != 0) xor (right.number.toInt() != 0), left.position)
-                right.type == DataType.FLOAT -> NumericLiteralValue.fromBoolean((left.number.toInt() != 0) xor (right.number.toDouble() != 0.0), left.position)
+                DataType.FLOAT -> NumericLiteralValue.fromBoolean((left.number.toInt() != 0) xor (right.number.toDouble() != 0.0), left.position)
                 else -> throw ExpressionError(error, left.position)
             }
-            left.type == DataType.FLOAT -> when {
+            DataType.FLOAT -> when (right.type) {
-                right.type in IntegerDatatypes -> NumericLiteralValue.fromBoolean((left.number.toDouble() != 0.0) xor (right.number.toInt() != 0), left.position)
+                in IntegerDatatypes -> NumericLiteralValue.fromBoolean((left.number.toDouble() != 0.0) xor (right.number.toInt() != 0), left.position)
-                right.type == DataType.FLOAT -> NumericLiteralValue.fromBoolean((left.number.toDouble() != 0.0) xor (right.number.toDouble() != 0.0), left.position)
+                DataType.FLOAT -> NumericLiteralValue.fromBoolean((left.number.toDouble() != 0.0) xor (right.number.toDouble() != 0.0), left.position)
                 else -> throw ExpressionError(error, left.position)
             }
             else -> throw ExpressionError(error, left.position)
@@ -71,15 +71,15 @@ class ConstExprEvaluator {
 
     private fun logicalor(left: NumericLiteralValue, right: NumericLiteralValue): NumericLiteralValue {
         val error = "cannot compute $left locical-or $right"
-        return when {
+        return when (left.type) {
-            left.type in IntegerDatatypes -> when {
+            in IntegerDatatypes -> when (right.type) {
-                right.type in IntegerDatatypes -> NumericLiteralValue.fromBoolean(left.number.toInt() != 0 || right.number.toInt() != 0, left.position)
+                in IntegerDatatypes -> NumericLiteralValue.fromBoolean(left.number.toInt() != 0 || right.number.toInt() != 0, left.position)
-                right.type == DataType.FLOAT -> NumericLiteralValue.fromBoolean(left.number.toInt() != 0 || right.number.toDouble() != 0.0, left.position)
+                DataType.FLOAT -> NumericLiteralValue.fromBoolean(left.number.toInt() != 0 || right.number.toDouble() != 0.0, left.position)
                 else -> throw ExpressionError(error, left.position)
             }
-            left.type == DataType.FLOAT -> when {
+            DataType.FLOAT -> when (right.type) {
-                right.type in IntegerDatatypes -> NumericLiteralValue.fromBoolean(left.number.toDouble() != 0.0 || right.number.toInt() != 0, left.position)
+                in IntegerDatatypes -> NumericLiteralValue.fromBoolean(left.number.toDouble() != 0.0 || right.number.toInt() != 0, left.position)
-                right.type == DataType.FLOAT -> NumericLiteralValue.fromBoolean(left.number.toDouble() != 0.0 || right.number.toDouble() != 0.0, left.position)
+                DataType.FLOAT -> NumericLiteralValue.fromBoolean(left.number.toDouble() != 0.0 || right.number.toDouble() != 0.0, left.position)
                 else -> throw ExpressionError(error, left.position)
             }
             else -> throw ExpressionError(error, left.position)
@@ -88,15 +88,15 @@ class ConstExprEvaluator {
 
     private fun logicaland(left: NumericLiteralValue, right: NumericLiteralValue): NumericLiteralValue {
         val error = "cannot compute $left locical-and $right"
-        return when {
+        return when (left.type) {
-            left.type in IntegerDatatypes -> when {
+            in IntegerDatatypes -> when (right.type) {
-                right.type in IntegerDatatypes -> NumericLiteralValue.fromBoolean(left.number.toInt() != 0 && right.number.toInt() != 0, left.position)
+                in IntegerDatatypes -> NumericLiteralValue.fromBoolean(left.number.toInt() != 0 && right.number.toInt() != 0, left.position)
-                right.type == DataType.FLOAT -> NumericLiteralValue.fromBoolean(left.number.toInt() != 0 && right.number.toDouble() != 0.0, left.position)
+                DataType.FLOAT -> NumericLiteralValue.fromBoolean(left.number.toInt() != 0 && right.number.toDouble() != 0.0, left.position)
                 else -> throw ExpressionError(error, left.position)
             }
-            left.type == DataType.FLOAT -> when {
+            DataType.FLOAT -> when (right.type) {
-                right.type in IntegerDatatypes -> NumericLiteralValue.fromBoolean(left.number.toDouble() != 0.0 && right.number.toInt() != 0, left.position)
+                in IntegerDatatypes -> NumericLiteralValue.fromBoolean(left.number.toDouble() != 0.0 && right.number.toInt() != 0, left.position)
-                right.type == DataType.FLOAT -> NumericLiteralValue.fromBoolean(left.number.toDouble() != 0.0 && right.number.toDouble() != 0.0, left.position)
+                DataType.FLOAT -> NumericLiteralValue.fromBoolean(left.number.toDouble() != 0.0 && right.number.toDouble() != 0.0, left.position)
                 else -> throw ExpressionError(error, left.position)
             }
             else -> throw ExpressionError(error, left.position)
@@ -144,15 +144,15 @@ class ConstExprEvaluator {
 
     private fun power(left: NumericLiteralValue, right: NumericLiteralValue): NumericLiteralValue {
         val error = "cannot calculate $left ** $right"
-        return when {
+        return when (left.type) {
-            left.type in IntegerDatatypes -> when {
+            in IntegerDatatypes -> when (right.type) {
-                right.type in IntegerDatatypes -> NumericLiteralValue.optimalNumeric(left.number.toInt().toDouble().pow(right.number.toInt()), left.position)
+                in IntegerDatatypes -> NumericLiteralValue.optimalNumeric(left.number.toInt().toDouble().pow(right.number.toInt()), left.position)
-                right.type == DataType.FLOAT -> NumericLiteralValue(DataType.FLOAT, left.number.toInt().toDouble().pow(right.number.toDouble()), left.position)
+                DataType.FLOAT -> NumericLiteralValue(DataType.FLOAT, left.number.toInt().toDouble().pow(right.number.toDouble()), left.position)
                 else -> throw ExpressionError(error, left.position)
             }
-            left.type == DataType.FLOAT -> when {
+            DataType.FLOAT -> when (right.type) {
-                right.type in IntegerDatatypes -> NumericLiteralValue(DataType.FLOAT, left.number.toDouble().pow(right.number.toInt()), left.position)
+                in IntegerDatatypes -> NumericLiteralValue(DataType.FLOAT, left.number.toDouble().pow(right.number.toInt()), left.position)
-                right.type == DataType.FLOAT -> NumericLiteralValue(DataType.FLOAT, left.number.toDouble().pow(right.number.toDouble()), left.position)
+                DataType.FLOAT -> NumericLiteralValue(DataType.FLOAT, left.number.toDouble().pow(right.number.toDouble()), left.position)
                 else -> throw ExpressionError(error, left.position)
             }
             else -> throw ExpressionError(error, left.position)
@@ -161,15 +161,15 @@ class ConstExprEvaluator {
 
     private fun plus(left: NumericLiteralValue, right: NumericLiteralValue): NumericLiteralValue {
         val error = "cannot add $left and $right"
-        return when {
+        return when (left.type) {
-            left.type in IntegerDatatypes -> when {
+            in IntegerDatatypes -> when (right.type) {
-                right.type in IntegerDatatypes -> NumericLiteralValue.optimalNumeric(left.number.toInt() + right.number.toInt(), left.position)
+                in IntegerDatatypes -> NumericLiteralValue.optimalNumeric(left.number.toInt() + right.number.toInt(), left.position)
-                right.type == DataType.FLOAT -> NumericLiteralValue(DataType.FLOAT, left.number.toInt() + right.number.toDouble(), left.position)
+                DataType.FLOAT -> NumericLiteralValue(DataType.FLOAT, left.number.toInt() + right.number.toDouble(), left.position)
                 else -> throw ExpressionError(error, left.position)
             }
-            left.type == DataType.FLOAT -> when {
+            DataType.FLOAT -> when (right.type) {
-                right.type in IntegerDatatypes -> NumericLiteralValue(DataType.FLOAT, left.number.toDouble() + right.number.toInt(), left.position)
+                in IntegerDatatypes -> NumericLiteralValue(DataType.FLOAT, left.number.toDouble() + right.number.toInt(), left.position)
-                right.type == DataType.FLOAT -> NumericLiteralValue(DataType.FLOAT, left.number.toDouble() + right.number.toDouble(), left.position)
+                DataType.FLOAT -> NumericLiteralValue(DataType.FLOAT, left.number.toDouble() + right.number.toDouble(), left.position)
                 else -> throw ExpressionError(error, left.position)
             }
             else -> throw ExpressionError(error, left.position)
@@ -178,15 +178,15 @@ class ConstExprEvaluator {
 
     private fun minus(left: NumericLiteralValue, right: NumericLiteralValue): NumericLiteralValue {
         val error = "cannot subtract $left and $right"
-        return when {
+        return when (left.type) {
-            left.type in IntegerDatatypes -> when {
+            in IntegerDatatypes -> when (right.type) {
-                right.type in IntegerDatatypes -> NumericLiteralValue.optimalNumeric(left.number.toInt() - right.number.toInt(), left.position)
+                in IntegerDatatypes -> NumericLiteralValue.optimalNumeric(left.number.toInt() - right.number.toInt(), left.position)
-                right.type == DataType.FLOAT -> NumericLiteralValue(DataType.FLOAT, left.number.toInt() - right.number.toDouble(), left.position)
+                DataType.FLOAT -> NumericLiteralValue(DataType.FLOAT, left.number.toInt() - right.number.toDouble(), left.position)
                 else -> throw ExpressionError(error, left.position)
             }
-            left.type == DataType.FLOAT -> when {
+            DataType.FLOAT -> when (right.type) {
-                right.type in IntegerDatatypes -> NumericLiteralValue(DataType.FLOAT, left.number.toDouble() - right.number.toInt(), left.position)
+                in IntegerDatatypes -> NumericLiteralValue(DataType.FLOAT, left.number.toDouble() - right.number.toInt(), left.position)
-                right.type == DataType.FLOAT -> NumericLiteralValue(DataType.FLOAT, left.number.toDouble() - right.number.toDouble(), left.position)
+                DataType.FLOAT -> NumericLiteralValue(DataType.FLOAT, left.number.toDouble() - right.number.toDouble(), left.position)
                 else -> throw ExpressionError(error, left.position)
             }
             else -> throw ExpressionError(error, left.position)
@@ -195,15 +195,15 @@ class ConstExprEvaluator {
 
     private fun multiply(left: NumericLiteralValue, right: NumericLiteralValue): NumericLiteralValue {
         val error = "cannot multiply ${left.type} and ${right.type}"
-        return when {
+        return when (left.type) {
-            left.type in IntegerDatatypes -> when {
+            in IntegerDatatypes -> when (right.type) {
-                right.type in IntegerDatatypes -> NumericLiteralValue.optimalNumeric(left.number.toInt() * right.number.toInt(), left.position)
+                in IntegerDatatypes -> NumericLiteralValue.optimalNumeric(left.number.toInt() * right.number.toInt(), left.position)
-                right.type == DataType.FLOAT -> NumericLiteralValue(DataType.FLOAT, left.number.toInt() * right.number.toDouble(), left.position)
+                DataType.FLOAT -> NumericLiteralValue(DataType.FLOAT, left.number.toInt() * right.number.toDouble(), left.position)
                 else -> throw ExpressionError(error, left.position)
             }
-            left.type == DataType.FLOAT -> when {
+            DataType.FLOAT -> when (right.type) {
-                right.type in IntegerDatatypes -> NumericLiteralValue(DataType.FLOAT, left.number.toDouble() * right.number.toInt(), left.position)
+                in IntegerDatatypes -> NumericLiteralValue(DataType.FLOAT, left.number.toDouble() * right.number.toInt(), left.position)
-                right.type == DataType.FLOAT -> NumericLiteralValue(DataType.FLOAT, left.number.toDouble() * right.number.toDouble(), left.position)
+                DataType.FLOAT -> NumericLiteralValue(DataType.FLOAT, left.number.toDouble() * right.number.toDouble(), left.position)
                 else -> throw ExpressionError(error, left.position)
             }
             else -> throw ExpressionError(error, left.position)
@@ -215,25 +215,25 @@ class ConstExprEvaluator {
 
     private fun divide(left: NumericLiteralValue, right: NumericLiteralValue): NumericLiteralValue {
         val error = "cannot divide $left by $right"
-        return when {
+        return when (left.type) {
-            left.type in IntegerDatatypes -> when {
+            in IntegerDatatypes -> when (right.type) {
-                right.type in IntegerDatatypes -> {
+                in IntegerDatatypes -> {
                     if(right.number.toInt()==0) divideByZeroError(right.position)
                     val result: Int = left.number.toInt() / right.number.toInt()
                     NumericLiteralValue.optimalNumeric(result, left.position)
                 }
-                right.type == DataType.FLOAT -> {
+                DataType.FLOAT -> {
                     if(right.number.toDouble()==0.0) divideByZeroError(right.position)
                     NumericLiteralValue(DataType.FLOAT, left.number.toInt() / right.number.toDouble(), left.position)
                 }
                 else -> throw ExpressionError(error, left.position)
             }
-            left.type == DataType.FLOAT -> when {
+            DataType.FLOAT -> when (right.type) {
-                right.type in IntegerDatatypes -> {
+                in IntegerDatatypes -> {
                     if(right.number.toInt()==0) divideByZeroError(right.position)
                     NumericLiteralValue(DataType.FLOAT, left.number.toDouble() / right.number.toInt(), left.position)
                 }
-                right.type == DataType.FLOAT -> {
+                DataType.FLOAT -> {
                     if(right.number.toDouble()==0.0) divideByZeroError(right.position)
                     NumericLiteralValue(DataType.FLOAT, left.number.toDouble() / right.number.toDouble(), left.position)
                 }
@@ -245,24 +245,24 @@ class ConstExprEvaluator {
 
     private fun remainder(left: NumericLiteralValue, right: NumericLiteralValue): NumericLiteralValue {
         val error = "cannot compute remainder of $left by $right"
-        return when {
+        return when (left.type) {
-            left.type in IntegerDatatypes -> when {
+            in IntegerDatatypes -> when (right.type) {
-                right.type in IntegerDatatypes -> {
+                in IntegerDatatypes -> {
                     if(right.number.toInt()==0) divideByZeroError(right.position)
                     NumericLiteralValue.optimalNumeric(left.number.toInt().toDouble() % right.number.toInt().toDouble(), left.position)
                 }
-                right.type == DataType.FLOAT -> {
+                DataType.FLOAT -> {
                     if(right.number.toDouble()==0.0) divideByZeroError(right.position)
                     NumericLiteralValue(DataType.FLOAT, left.number.toInt() % right.number.toDouble(), left.position)
                 }
                 else -> throw ExpressionError(error, left.position)
             }
-            left.type == DataType.FLOAT -> when {
+            DataType.FLOAT -> when (right.type) {
-                right.type in IntegerDatatypes -> {
+                in IntegerDatatypes -> {
                     if(right.number.toInt()==0) divideByZeroError(right.position)
                     NumericLiteralValue(DataType.FLOAT, left.number.toDouble() % right.number.toInt(), left.position)
                 }
-                right.type == DataType.FLOAT -> {
+                DataType.FLOAT -> {
                     if(right.number.toDouble()==0.0) divideByZeroError(right.position)
                     NumericLiteralValue(DataType.FLOAT, left.number.toDouble() % right.number.toDouble(), left.position)
                 }

compiler/src/prog8/optimizer/ConstantFolding.kt

@@ -5,11 +5,10 @@ import prog8.ast.Program
 import prog8.ast.base.*
 import prog8.ast.expressions.*
 import prog8.ast.processing.IAstModifyingVisitor
-import prog8.ast.processing.fixupArrayDatatype
+import prog8.ast.processing.fixupArrayEltDatatypesFromVardecl
+import prog8.ast.processing.fixupArrayEltDatatypes
 import prog8.ast.statements.*
-import prog8.compiler.target.c64.MachineDefinition.FLOAT_MAX_NEGATIVE
+import prog8.compiler.target.CompilationTarget
-import prog8.compiler.target.c64.MachineDefinition.FLOAT_MAX_POSITIVE
-import prog8.compiler.target.c64.codegen.AssemblyError
 import prog8.functions.BuiltinFunctions
 import kotlin.math.floor
 
@@ -39,9 +38,11 @@ class ConstantFolding(private val program: Program) : IAstModifyingVisitor {
             if(decl.isArray){
                 if(decl.arraysize==null) {
                     // for arrays that have no size specifier (or a non-constant one) attempt to deduce the size
-                    val arrayval = (decl.value as ArrayLiteralValue).value
+                    val arrayval = decl.value as? ArrayLiteralValue
-                    decl.arraysize = ArrayIndex(NumericLiteralValue.optimalInteger(arrayval.size, decl.position), decl.position)
+                    if(arrayval!=null) {
-                    optimizationsDone++
+                        decl.arraysize = ArrayIndex(NumericLiteralValue.optimalInteger(arrayval.value.size, decl.position), decl.position)
+                        optimizationsDone++
+                    }
                 }
                 else if(decl.arraysize?.size()==null) {
                     val size = decl.arraysize!!.index.accept(this)
@@ -63,12 +64,6 @@ class ConstantFolding(private val program: Program) : IAstModifyingVisitor {
                         return super.visit(decl)
                     }
                 }
-                in StringDatatypes -> {
-                    // nothing to do for strings
-                }
-                DataType.STRUCT -> {
-                    // struct defintions don't have anything else in them
-                }
                 DataType.ARRAY_UB, DataType.ARRAY_B, DataType.ARRAY_UW, DataType.ARRAY_W -> {
                     val numericLv = decl.value as? NumericLiteralValue
                     val rangeExpr = decl.value as? RangeExpr
@@ -122,7 +117,6 @@ class ConstantFolding(private val program: Program) : IAstModifyingVisitor {
                         // create the array itself, filled with the fillvalue.
                         val array = Array(size) {fillvalue}.map { NumericLiteralValue.optimalInteger(it, numericLv.position) as Expression}.toTypedArray()
                         val refValue = ArrayLiteralValue(decl.datatype, array, position = numericLv.position)
-                        refValue.addToHeap(program.heap)
                         decl.value = refValue
                         refValue.parent=decl
                         optimizationsDone++
@@ -138,13 +132,12 @@ class ConstantFolding(private val program: Program) : IAstModifyingVisitor {
                     } else {
                         // arraysize initializer is a single int, and we know the size.
                         val fillvalue = litval.number.toDouble()
-                        if (fillvalue < FLOAT_MAX_NEGATIVE || fillvalue > FLOAT_MAX_POSITIVE)
+                        if (fillvalue < CompilationTarget.machine.FLOAT_MAX_NEGATIVE || fillvalue > CompilationTarget.machine.FLOAT_MAX_POSITIVE)
                             errors.add(ExpressionError("float value overflow", litval.position))
                         else {
                             // create the array itself, filled with the fillvalue.
                             val array = Array(size) {fillvalue}.map { NumericLiteralValue(DataType.FLOAT, it, litval.position) as Expression}.toTypedArray()
                             val refValue = ArrayLiteralValue(DataType.ARRAY_F, array, position = litval.position)
-                            refValue.addToHeap(program.heap)
                             decl.value = refValue
                             refValue.parent=decl
                             optimizationsDone++
@@ -154,6 +147,7 @@ class ConstantFolding(private val program: Program) : IAstModifyingVisitor {
                 }
                 else -> {
                     // nothing to do for this type
+                    // this includes strings and structs
                 }
             }
         }
@@ -165,15 +159,24 @@ class ConstantFolding(private val program: Program) : IAstModifyingVisitor {
      * replace identifiers that refer to const value, with the value itself (if it's a simple type)
      */
     override fun visit(identifier: IdentifierReference): Expression {
+        // don't replace when it's an assignment target or loop variable
+        if(identifier.parent is AssignTarget)
+            return identifier
+        var forloop = identifier.parent as? ForLoop
+        if(forloop==null)
+            forloop = identifier.parent.parent as? ForLoop
+        if(forloop!=null && identifier===forloop.loopVar)
+            return identifier
+
         return try {
             val cval = identifier.constValue(program) ?: return identifier
-            return when {
+            return when (cval.type) {
-                cval.type in NumericDatatypes -> {
+                in NumericDatatypes -> {
                     val copy = NumericLiteralValue(cval.type, cval.number, identifier.position)
                     copy.parent = identifier.parent
                     copy
                 }
-                cval.type in PassByReferenceDatatypes -> throw AssemblyError("pass-by-reference type should not be considered a constant")
+                in PassByReferenceDatatypes -> throw FatalAstException("pass-by-reference type should not be considered a constant")
                 else -> identifier
             }
         } catch (ax: AstException) {
@@ -183,9 +186,9 @@ class ConstantFolding(private val program: Program) : IAstModifyingVisitor {
     }
 
     override fun visit(functionCall: FunctionCall): Expression {
+        super.visit(functionCall)
+        typeCastConstArguments(functionCall)
         return try {
-            super.visit(functionCall)
-            typeCastConstArguments(functionCall)
             functionCall.constValue(program) ?: functionCall
         } catch (ax: AstException) {
             addError(ax)
@@ -204,12 +207,12 @@ class ConstantFolding(private val program: Program) : IAstModifyingVisitor {
             val builtinFunction = BuiltinFunctions[functionCall.target.nameInSource.single()]
             if(builtinFunction!=null) {
                 // match the arguments of a builtin function signature.
-                for(arg in functionCall.arglist.withIndex().zip(builtinFunction.parameters)) {
+                for(arg in functionCall.args.withIndex().zip(builtinFunction.parameters)) {
                     val possibleDts = arg.second.possibleDatatypes
                     val argConst = arg.first.value.constValue(program)
                     if(argConst!=null && argConst.type !in possibleDts) {
                         val convertedValue = argConst.cast(possibleDts.first())
-                        functionCall.arglist[arg.first.index] = convertedValue
+                        functionCall.args[arg.first.index] = convertedValue
                         optimizationsDone++
                     }
                 }
@@ -220,12 +223,12 @@ class ConstantFolding(private val program: Program) : IAstModifyingVisitor {
         val subroutine = functionCall.target.targetSubroutine(program.namespace)
         if(subroutine!=null) {
             // if types differ, try to typecast constant arguments to the function call to the desired data type of the parameter
-            for(arg in functionCall.arglist.withIndex().zip(subroutine.parameters)) {
+            for(arg in functionCall.args.withIndex().zip(subroutine.parameters)) {
                 val expectedDt = arg.second.type
                 val argConst = arg.first.value.constValue(program)
                 if(argConst!=null && argConst.type!=expectedDt) {
                     val convertedValue = argConst.cast(expectedDt)
-                    functionCall.arglist[arg.first.index] = convertedValue
+                    functionCall.args[arg.first.index] = convertedValue
                     optimizationsDone++
                 }
             }
@@ -254,27 +257,27 @@ class ConstantFolding(private val program: Program) : IAstModifyingVisitor {
             val subexpr = prefixExpr.expression
             if (subexpr is NumericLiteralValue) {
                 // accept prefixed literal values (such as -3, not true)
-                return when {
+                return when (prefixExpr.operator) {
-                    prefixExpr.operator == "+" -> subexpr
+                    "+" -> subexpr
-                    prefixExpr.operator == "-" -> when {
+                    "-" -> when (subexpr.type) {
-                        subexpr.type in IntegerDatatypes -> {
+                        in IntegerDatatypes -> {
                             optimizationsDone++
                             NumericLiteralValue.optimalNumeric(-subexpr.number.toInt(), subexpr.position)
                         }
-                        subexpr.type == DataType.FLOAT -> {
+                        DataType.FLOAT -> {
                             optimizationsDone++
                             NumericLiteralValue(DataType.FLOAT, -subexpr.number.toDouble(), subexpr.position)
                         }
                         else -> throw ExpressionError("can only take negative of int or float", subexpr.position)
                     }
-                    prefixExpr.operator == "~" -> when {
+                    "~" -> when (subexpr.type) {
-                        subexpr.type in IntegerDatatypes -> {
+                        in IntegerDatatypes -> {
                             optimizationsDone++
                             NumericLiteralValue.optimalNumeric(subexpr.number.toInt().inv(), subexpr.position)
                         }
                         else -> throw ExpressionError("can only take bitwise inversion of int", subexpr.position)
                     }
-                    prefixExpr.operator == "not" -> {
+                    "not" -> {
                         optimizationsDone++
                         NumericLiteralValue.fromBoolean(subexpr.number.toDouble() == 0.0, subexpr.position)
                     }
@@ -551,57 +554,89 @@ class ConstantFolding(private val program: Program) : IAstModifyingVisitor {
             } catch (x: ExpressionError) {
                 return range
             }
-            val newStep: Expression = stepLiteral?.cast(targetDt) ?: range.step
+            val newStep: Expression = try {
+                stepLiteral?.cast(targetDt)?: range.step
+            } catch(ee: ExpressionError) {
+                range.step
+            }
             return RangeExpr(newFrom, newTo, newStep, range.position)
         }
 
+        val forLoop2 = super.visit(forLoop) as ForLoop
+
+        // check if we need to adjust an array literal to the loop variable's datatype
+        val array = forLoop2.iterable as? ArrayLiteralValue
+        if(array!=null) {
+            val loopvarDt: DataType = when {
+                forLoop.loopVar!=null -> forLoop.loopVar!!.inferType(program).typeOrElse(DataType.UBYTE)
+                forLoop.loopRegister!=null -> DataType.UBYTE
+                else -> throw FatalAstException("weird for loop")
+            }
+
+            val arrayType = when(loopvarDt) {
+                DataType.UBYTE -> DataType.ARRAY_UB
+                DataType.BYTE -> DataType.ARRAY_B
+                DataType.UWORD -> DataType.ARRAY_UW
+                DataType.WORD -> DataType.ARRAY_W
+                DataType.FLOAT -> DataType.ARRAY_F
+                else -> throw FatalAstException("invalid array elt type")
+            }
+            val array2 = array.cast(arrayType)
+            if(array2!=null && array2!==array) {
+                forLoop2.iterable = array2
+                array2.linkParents(forLoop2)
+            }
+        }
+
         // adjust the datatype of a range expression in for loops to the loop variable.
-        val resultStmt = super.visit(forLoop) as ForLoop
+        val iterableRange = forLoop2.iterable as? RangeExpr ?: return forLoop2
-        val iterableRange = resultStmt.iterable as? RangeExpr ?: return resultStmt
         val rangeFrom = iterableRange.from as? NumericLiteralValue
         val rangeTo = iterableRange.to as? NumericLiteralValue
-        if(rangeFrom==null || rangeTo==null) return resultStmt
+        if(rangeFrom==null || rangeTo==null) return forLoop2
 
-        val loopvar = resultStmt.loopVar?.targetVarDecl(program.namespace)
+        val loopvar = forLoop2.loopVar?.targetVarDecl(program.namespace)
         if(loopvar!=null) {
             val stepLiteral = iterableRange.step as? NumericLiteralValue
             when(loopvar.datatype) {
                 DataType.UBYTE -> {
                     if(rangeFrom.type!= DataType.UBYTE) {
                         // attempt to translate the iterable into ubyte values
-                        resultStmt.iterable = adjustRangeDt(rangeFrom, loopvar.datatype, rangeTo, stepLiteral, iterableRange)
+                        forLoop2.iterable = adjustRangeDt(rangeFrom, loopvar.datatype, rangeTo, stepLiteral, iterableRange)
                     }
                 }
                 DataType.BYTE -> {
                     if(rangeFrom.type!= DataType.BYTE) {
                         // attempt to translate the iterable into byte values
-                        resultStmt.iterable = adjustRangeDt(rangeFrom, loopvar.datatype, rangeTo, stepLiteral, iterableRange)
+                        forLoop2.iterable = adjustRangeDt(rangeFrom, loopvar.datatype, rangeTo, stepLiteral, iterableRange)
                     }
                 }
                 DataType.UWORD -> {
                     if(rangeFrom.type!= DataType.UWORD) {
                         // attempt to translate the iterable into uword values
-                        resultStmt.iterable = adjustRangeDt(rangeFrom, loopvar.datatype, rangeTo, stepLiteral, iterableRange)
+                        forLoop2.iterable = adjustRangeDt(rangeFrom, loopvar.datatype, rangeTo, stepLiteral, iterableRange)
                     }
                 }
                 DataType.WORD -> {
                     if(rangeFrom.type!= DataType.WORD) {
                         // attempt to translate the iterable into word values
-                        resultStmt.iterable = adjustRangeDt(rangeFrom, loopvar.datatype, rangeTo, stepLiteral, iterableRange)
+                        forLoop2.iterable = adjustRangeDt(rangeFrom, loopvar.datatype, rangeTo, stepLiteral, iterableRange)
                     }
                 }
                 else -> throw FatalAstException("invalid loopvar datatype $loopvar")
             }
         }
-        return resultStmt
+        return forLoop2
     }
 
     override fun visit(arrayLiteral: ArrayLiteralValue): Expression {
         val array = super.visit(arrayLiteral)
         if(array is ArrayLiteralValue) {
             val vardecl = array.parent as? VarDecl
-            if (vardecl!=null) {
+            return if (vardecl!=null) {
-                return fixupArrayDatatype(array, vardecl, program.heap)
+                fixupArrayEltDatatypesFromVardecl(array, vardecl)
+            } else {
+                // it's not an array associated with a vardecl, attempt to guess the data type from the array values
+                fixupArrayEltDatatypes(array, program)
             }
         }
         return array

compiler/src/prog8/optimizer/SimplifyExpressions.kt

@@ -11,7 +11,7 @@ import kotlin.math.log2
 import kotlin.math.pow
 
 /*
-    todo advanced expression optimization: common (sub) expression elimination (turn common expressions into single subroutine call + introduce variable to hold it)
+    todo add more expression optimizations
 
     Also see  https://egorbo.com/peephole-optimizations.html
 
@@ -608,15 +608,13 @@ internal class SimplifyExpressions(private val program: Program) : IAstModifying
 
     }
 
-    private val powersOfTwo = (1 .. 16).map { (2.0).pow(it) }
+    private val powersOfTwo = (1 .. 16).map { (2.0).pow(it) }.toSet()
-    private val negativePowersOfTwo = powersOfTwo.map { -it }
+    private val negativePowersOfTwo = powersOfTwo.map { -it }.toSet()
 
     private fun optimizeDivision(expr: BinaryExpression, leftVal: NumericLiteralValue?, rightVal: NumericLiteralValue?): Expression {
         if(leftVal==null && rightVal==null)
             return expr
 
-        // TODO fix bug in this routine!
-
         // cannot shuffle assiciativity with division!
         if(rightVal!=null) {
             // right value is a constant, see if we can optimize
@@ -712,7 +710,7 @@ internal class SimplifyExpressions(private val program: Program) : IAstModifying
                     optimizationsDone++
                     return expr.left
                 }
-                2.0, 4.0, 8.0, 16.0, 32.0, 64.0, 128.0, 256.0, 512.0, 1024.0, 2048.0, 4096.0, 8192.0, 16384.0, 32768.0, 65536.0 -> {
+                in powersOfTwo -> {
                     if(leftValue.inferType(program).typeOrElse(DataType.STRUCT) in IntegerDatatypes) {
                         // times a power of two => shift left
                         optimizationsDone++
@@ -720,7 +718,7 @@ internal class SimplifyExpressions(private val program: Program) : IAstModifying
                         return BinaryExpression(expr.left, "<<", NumericLiteralValue.optimalInteger(numshifts, expr.position), expr.position)
                     }
                 }
-                -2.0, -4.0, -8.0, -16.0, -32.0, -64.0, -128.0, -256.0, -512.0, -1024.0, -2048.0, -4096.0, -8192.0, -16384.0, -32768.0, -65536.0 -> {
+                in negativePowersOfTwo -> {
                     if(leftValue.inferType(program).typeOrElse(DataType.STRUCT) in IntegerDatatypes) {
                         // times a negative power of two => negate, then shift left
                         optimizationsDone++

compiler/src/prog8/optimizer/StatementOptimizer.kt

@@ -9,15 +9,14 @@ import prog8.ast.expressions.*
 import prog8.ast.processing.IAstModifyingVisitor
 import prog8.ast.processing.IAstVisitor
 import prog8.ast.statements.*
-import prog8.compiler.target.c64.Petscii
+import prog8.compiler.target.CompilationTarget
-import prog8.compiler.target.c64.codegen.AssemblyError
 import prog8.functions.BuiltinFunctions
 import kotlin.math.floor
 
 
 /*
-    TODO: analyse for unreachable code and remove that (f.i. code after goto or return that has no label so can never be jumped to) + print warning about this
+    TODO: remove unreachable code?
-    TODO: proper inlining of small subroutines (correctly renaming/relocating all variables in them and refs to those as well, or restrict to subs without variables?)
+    TODO: proper inlining of tiny subroutines (correctly renaming/relocating all variables in them and refs to those as well, or restrict to subs without variables?)
 */
 
 
@@ -27,10 +26,15 @@ internal class StatementOptimizer(private val program: Program) : IAstModifyingV
 
     private val pureBuiltinFunctions = BuiltinFunctions.filter { it.value.pure }
     private val callgraph = CallGraph(program)
+    private val vardeclsToRemove = mutableListOf<VarDecl>()
 
     override fun visit(program: Program) {
         removeUnusedCode(callgraph)
         super.visit(program)
+
+        for(decl in vardeclsToRemove) {
+            decl.definingScope().remove(decl)
+        }
     }
 
     private fun removeUnusedCode(callgraph: CallGraph) {
@@ -131,7 +135,7 @@ internal class StatementOptimizer(private val program: Program) : IAstModifyingV
         // removes 'duplicate' assignments that assign the isSameAs target
         val linesToRemove = mutableListOf<Int>()
         var previousAssignmentLine: Int? = null
-        for (i in 0 until statements.size) {
+        for (i in statements.indices) {
             val stmt = statements[i] as? Assignment
             if (stmt != null && stmt.value is NumericLiteralValue) {
                 if (previousAssignmentLine == null) {
@@ -165,24 +169,34 @@ internal class StatementOptimizer(private val program: Program) : IAstModifyingV
         if(functionCallStatement.target.nameInSource==listOf("c64scr", "print") ||
                 functionCallStatement.target.nameInSource==listOf("c64scr", "print_p")) {
             // printing a literal string of just 2 or 1 characters is replaced by directly outputting those characters
-            val stringVar = functionCallStatement.arglist.single() as? IdentifierReference
+            val arg = functionCallStatement.args.single()
+            val stringVar: IdentifierReference?
+            stringVar = if(arg is AddressOf) {
+                arg.identifier
+            } else {
+                arg as? IdentifierReference
+            }
             if(stringVar!=null) {
-                val heapId = stringVar.heapId(program.namespace)
+                val vardecl = stringVar.targetVarDecl(program.namespace)!!
-                val string = program.heap.get(heapId).str!!
+                val string = vardecl.value!! as StringLiteralValue
-                if(string.length==1) {
+                if(string.value.length==1) {
-                    val petscii = Petscii.encodePetscii(string, true)[0]
+                    val firstCharEncoded = CompilationTarget.encodeString(string.value)[0]
-                    functionCallStatement.arglist.clear()
+                    functionCallStatement.args.clear()
-                    functionCallStatement.arglist.add(NumericLiteralValue.optimalInteger(petscii.toInt(), functionCallStatement.position))
+                    functionCallStatement.args.add(NumericLiteralValue.optimalInteger(firstCharEncoded.toInt(), functionCallStatement.position))
                     functionCallStatement.target = IdentifierReference(listOf("c64", "CHROUT"), functionCallStatement.target.position)
+                    vardeclsToRemove.add(vardecl)
                     optimizationsDone++
                     return functionCallStatement
-                } else if(string.length==2) {
+                } else if(string.value.length==2) {
-                    val petscii = Petscii.encodePetscii(string, true)
+                    val firstTwoCharsEncoded = CompilationTarget.encodeString(string.value.take(2))
                     val scope = AnonymousScope(mutableListOf(), functionCallStatement.position)
                     scope.statements.add(FunctionCallStatement(IdentifierReference(listOf("c64", "CHROUT"), functionCallStatement.target.position),
-                            mutableListOf(NumericLiteralValue.optimalInteger(petscii[0].toInt(), functionCallStatement.position)), functionCallStatement.position))
+                            mutableListOf(NumericLiteralValue.optimalInteger(firstTwoCharsEncoded[0].toInt(), functionCallStatement.position)),
+                            functionCallStatement.void, functionCallStatement.position))
                     scope.statements.add(FunctionCallStatement(IdentifierReference(listOf("c64", "CHROUT"), functionCallStatement.target.position),
-                            mutableListOf(NumericLiteralValue.optimalInteger(petscii[1].toInt(), functionCallStatement.position)), functionCallStatement.position))
+                            mutableListOf(NumericLiteralValue.optimalInteger(firstTwoCharsEncoded[1].toInt(), functionCallStatement.position)),
+                            functionCallStatement.void, functionCallStatement.position))
+                    vardeclsToRemove.add(vardecl)
                     optimizationsDone++
                     return scope
                 }
@@ -197,7 +211,7 @@ internal class StatementOptimizer(private val program: Program) : IAstModifyingV
             val first = subroutine.statements.asSequence().filterNot { it is VarDecl || it is Directive }.firstOrNull()
             if(first is Jump && first.identifier!=null) {
                 optimizationsDone++
-                return FunctionCallStatement(first.identifier, functionCallStatement.arglist, functionCallStatement.position)
+                return FunctionCallStatement(first.identifier, functionCallStatement.args, functionCallStatement.void, functionCallStatement.position)
             }
             if(first is ReturnFromIrq || first is Return) {
                 optimizationsDone++
@@ -217,7 +231,7 @@ internal class StatementOptimizer(private val program: Program) : IAstModifyingV
             val first = subroutine.statements.asSequence().filterNot { it is VarDecl || it is Directive }.firstOrNull()
             if(first is Jump && first.identifier!=null) {
                 optimizationsDone++
-                return FunctionCall(first.identifier, functionCall.arglist, functionCall.position)
+                return FunctionCall(first.identifier, functionCall.args, functionCall.position)
             }
             if(first is Return && first.value!=null) {
                 val constval = first.value?.constValue(program)
@@ -249,7 +263,7 @@ internal class StatementOptimizer(private val program: Program) : IAstModifyingV
         if(constvalue!=null) {
             return if(constvalue.asBooleanValue){
                 // always true -> keep only if-part
-                printWarning("condition is always true", ifStatement.position)
+                printWarning("condition is always true", ifStatement.position)  // TODO don't warn this if the condition is just the single value 'true'
                 optimizationsDone++
                 ifStatement.truepart
             } else {
@@ -298,19 +312,20 @@ internal class StatementOptimizer(private val program: Program) : IAstModifyingV
         if(constvalue!=null) {
             return if(constvalue.asBooleanValue){
                 // always true -> print a warning, and optimize into body + jump (if there are no continue and break statements)
-                printWarning("condition is always true", whileLoop.position)
+                printWarning("condition is always true", whileLoop.condition.position)
                 if(hasContinueOrBreak(whileLoop.body))
                     return whileLoop
-                val label = Label("_prog8_back", whileLoop.condition.position)
+                val backLabelName = "_prog8_back${whileLoop.position.line}"
+                val label = Label(backLabelName, whileLoop.condition.position)
                 whileLoop.body.statements.add(0, label)
                 whileLoop.body.statements.add(Jump(null,
-                        IdentifierReference(listOf("_prog8_back"), whileLoop.condition.position),
+                        IdentifierReference(listOf(backLabelName), whileLoop.condition.position),
                         null, whileLoop.condition.position))
                 optimizationsDone++
                 return whileLoop.body
             } else {
                 // always false -> ditch whole statement
-                printWarning("condition is always false", whileLoop.position)
+                printWarning("condition is always false", whileLoop.condition.position)
                 optimizationsDone++
                 NopStatement.insteadOf(whileLoop)
             }
@@ -324,7 +339,7 @@ internal class StatementOptimizer(private val program: Program) : IAstModifyingV
         if(constvalue!=null) {
             return if(constvalue.asBooleanValue){
                 // always true -> keep only the statement block (if there are no continue and break statements)
-                printWarning("condition is always true", repeatLoop.position)
+                printWarning("condition is always true", repeatLoop.untilCondition.position)
                 if(hasContinueOrBreak(repeatLoop.body))
                     repeatLoop
                 else {
@@ -333,13 +348,14 @@ internal class StatementOptimizer(private val program: Program) : IAstModifyingV
                 }
             } else {
                 // always false -> print a warning, and optimize into body + jump (if there are no continue and break statements)
-                printWarning("condition is always false", repeatLoop.position)
+                printWarning("condition is always false", repeatLoop.untilCondition.position)
                 if(hasContinueOrBreak(repeatLoop.body))
                     return repeatLoop
-                val label = Label("__back", repeatLoop.untilCondition.position)
+                val backLabelName = "_prog8_back${repeatLoop.position.line}"
+                val label = Label(backLabelName, repeatLoop.untilCondition.position)
                 repeatLoop.body.statements.add(0, label)
                 repeatLoop.body.statements.add(Jump(null,
-                        IdentifierReference(listOf("__back"), repeatLoop.untilCondition.position),
+                        IdentifierReference(listOf(backLabelName), repeatLoop.untilCondition.position),
                         null, repeatLoop.untilCondition.position))
                 optimizationsDone++
                 return repeatLoop.body
@@ -418,7 +434,7 @@ internal class StatementOptimizer(private val program: Program) : IAstModifyingV
         }
         val targetIDt = assignment.target.inferType(program, assignment)
         if(!targetIDt.isKnown)
-            throw AssemblyError("can't infer type of assignment target")
+            throw FatalAstException("can't infer type of assignment target")
         val targetDt = targetIDt.typeOrElse(DataType.STRUCT)
         val bexpr=assignment.value as? BinaryExpression
         if(bexpr!=null) {
@@ -504,7 +520,8 @@ internal class StatementOptimizer(private val program: Program) : IAstModifyingV
                                 val scope = AnonymousScope(mutableListOf(), assignment.position)
                                 var numshifts = cv.toInt()
                                 while (numshifts > 0) {
-                                    scope.statements.add(FunctionCallStatement(IdentifierReference(listOf("lsl"), assignment.position), mutableListOf(bexpr.left), assignment.position))
+                                    scope.statements.add(FunctionCallStatement(IdentifierReference(listOf("lsl"), assignment.position),
+                                            mutableListOf(bexpr.left), true, assignment.position))
                                     numshifts--
                                 }
                                 optimizationsDone++
@@ -525,7 +542,8 @@ internal class StatementOptimizer(private val program: Program) : IAstModifyingV
                                 val scope = AnonymousScope(mutableListOf(), assignment.position)
                                 var numshifts = cv.toInt()
                                 while (numshifts > 0) {
-                                    scope.statements.add(FunctionCallStatement(IdentifierReference(listOf("lsr"), assignment.position), mutableListOf(bexpr.left), assignment.position))
+                                    scope.statements.add(FunctionCallStatement(IdentifierReference(listOf("lsr"), assignment.position),
+                                            mutableListOf(bexpr.left), true, assignment.position))
                                     numshifts--
                                 }
                                 optimizationsDone++

compiler/src/prog8/parser/ModuleParsing.kt

@@ -9,6 +9,7 @@ import prog8.ast.base.SyntaxError
 import prog8.ast.base.checkImportedValid
 import prog8.ast.statements.Directive
 import prog8.ast.statements.DirectiveArg
+import prog8.pathFrom
 import java.io.InputStream
 import java.nio.file.Files
 import java.nio.file.Path
@@ -91,18 +92,18 @@ internal fun importModule(program: Program, stream: CharStream, modulePath: Path
 
 private fun discoverImportedModuleFile(name: String, source: Path, position: Position?): Path {
     val fileName = "$name.p8"
-    val locations = mutableListOf(Paths.get(source.parent.toString()))
+    val locations = mutableListOf(source.parent)
 
     val propPath = System.getProperty("prog8.libdir")
     if(propPath!=null)
-        locations.add(Paths.get(propPath))
+        locations.add(pathFrom(propPath))
     val envPath = System.getenv("PROG8_LIBDIR")
     if(envPath!=null)
-        locations.add(Paths.get(envPath))
+        locations.add(pathFrom(envPath))
     locations.add(Paths.get(Paths.get("").toAbsolutePath().toString(), "prog8lib"))
 
     locations.forEach {
-        val file = Paths.get(it.toString(), fileName)
+        val file = pathFrom(it.toString(), fileName)
         if (Files.isReadable(file)) return file
     }
 
@@ -120,7 +121,7 @@ private fun executeImportDirective(program: Program, import: Directive, source:
     if(existing!=null)
         return null
 
-    val resource = tryGetEmbeddedResource(moduleName+".p8")
+    val resource = tryGetEmbeddedResource("$moduleName.p8")
     val importedModule =
         if(resource!=null) {
             // load the module from the embedded resource

compiler/src/prog8/vm/RuntimeValue.kt

@@ -1,12 +1,13 @@
 package prog8.vm
 
-import prog8.ast.base.*
+import prog8.ast.base.ByteDatatypes
+import prog8.ast.base.DataType
+import prog8.ast.base.WordDatatypes
 import prog8.ast.expressions.ArrayLiteralValue
 import prog8.ast.expressions.NumericLiteralValue
 import prog8.ast.expressions.StringLiteralValue
-import prog8.compiler.HeapValues
+import prog8.vm.astvm.VmExecutionException
-import prog8.compiler.target.c64.Petscii
+import java.util.Objects
-import java.util.*
 import kotlin.math.abs
 import kotlin.math.pow
 
@@ -16,8 +17,14 @@ import kotlin.math.pow
  * this runtime value can be used to *execute* the parsed Ast (or another intermediary form)
  * It contains a value of a variable during run time of the program and provides arithmetic operations on the value.
  */
-open class RuntimeValue(val type: DataType, num: Number?=null, val str: String?=null,
+
-                        val array: Array<Number>?=null, val heapId: Int?=null) {
+abstract class RuntimeValueBase(val type: DataType) {
+    abstract fun numericValue(): Number
+    abstract fun integerValue(): Int
+}
+
+
+class RuntimeValueNumeric(type: DataType, num: Number): RuntimeValueBase(type) {
 
     val byteval: Short?
     val wordval: Int?
@@ -25,116 +32,78 @@ open class RuntimeValue(val type: DataType, num: Number?=null, val str: String?=
     val asBoolean: Boolean
 
     companion object {
-        fun fromLv(literalValue: NumericLiteralValue): RuntimeValue {
+        fun fromLv(literalValue: NumericLiteralValue): RuntimeValueNumeric {
-            return RuntimeValue(literalValue.type, num = literalValue.number)
+            return RuntimeValueNumeric(literalValue.type, num = literalValue.number)
         }
-
-        fun fromLv(string: StringLiteralValue, heap: HeapValues): RuntimeValue = fromHeapId(string.heapId!!, heap)
-        fun fromLv(array: ArrayLiteralValue, heap: HeapValues): RuntimeValue = fromHeapId(array.heapId!!, heap)
-
-        fun fromHeapId(heapId: Int, heap: HeapValues): RuntimeValue {
-            val value = heap.get(heapId)
-            return when {
-                value.type in StringDatatypes ->
-                    RuntimeValue(value.type, str = value.str!!, heapId = heapId)
-                value.type in ArrayDatatypes ->
-                    if (value.type == DataType.ARRAY_F) {
-                        RuntimeValue(value.type, array = value.doubleArray!!.toList().toTypedArray(), heapId = heapId)
-                    } else {
-                        val array = value.array!!
-                        val resultArray = mutableListOf<Number>()
-                        for(elt in array.withIndex()){
-                            if(elt.value.integer!=null)
-                                resultArray.add(elt.value.integer!!)
-                            else {
-                                TODO("ADDRESSOF ${elt.value}")
-                            }
-                        }
-                        RuntimeValue(value.type, array = resultArray.toTypedArray(), heapId = heapId)
-                        //RuntimeValue(value.type, array = array.map { it.integer!! }.toTypedArray(), heapId = heapId)
-                    }
-                else -> throw IllegalArgumentException("weird value type on heap $value")
-            }
-        }
-
     }
 
     init {
-        when(type) {
+        when (type) {
             DataType.UBYTE -> {
-                val inum = num!!.toInt()
+                val inum = num.toInt()
-                if(inum !in 0 .. 255)
+                require(inum in 0..255) { "invalid value for ubyte: $inum" }
-                    throw IllegalArgumentException("invalid value for ubyte: $inum")
                 byteval = inum.toShort()
                 wordval = null
                 floatval = null
                 asBoolean = byteval != 0.toShort()
             }
             DataType.BYTE -> {
-                val inum = num!!.toInt()
+                val inum = num.toInt()
-                if(inum !in -128 .. 127)
+                require(inum in -128..127) { "invalid value for byte: $inum" }
-                    throw IllegalArgumentException("invalid value for byte: $inum")
                 byteval = inum.toShort()
                 wordval = null
                 floatval = null
                 asBoolean = byteval != 0.toShort()
             }
             DataType.UWORD -> {
-                val inum = num!!.toInt()
+                val inum = num.toInt()
-                if(inum !in 0 .. 65535)
+                require(inum in 0..65535) { "invalid value for uword: $inum" }
-                    throw IllegalArgumentException("invalid value for uword: $inum")
                 wordval = inum
                 byteval = null
                 floatval = null
                 asBoolean = wordval != 0
             }
             DataType.WORD -> {
-                val inum = num!!.toInt()
+                val inum = num.toInt()
-                if(inum !in -32768 .. 32767)
+                require(inum in -32768..32767) { "invalid value for word: $inum" }
-                    throw IllegalArgumentException("invalid value for word: $inum")
                 wordval = inum
                 byteval = null
                 floatval = null
                 asBoolean = wordval != 0
             }
             DataType.FLOAT -> {
-                floatval = num!!.toDouble()
+                floatval = num.toDouble()
                 byteval = null
                 wordval = null
                 asBoolean = floatval != 0.0
             }
-            else -> {
+            else -> throw VmExecutionException("not a numeric value")
-                byteval = null
-                wordval = null
-                floatval = null
-                asBoolean = true
-            }
         }
     }
 
     override fun toString(): String {
-        return when(type) {
+        return when (type) {
             DataType.UBYTE -> "ub:%02x".format(byteval)
             DataType.BYTE -> {
-                if(byteval!!<0)
+                if (byteval!! < 0)
                     "b:-%02x".format(abs(byteval.toInt()))
                 else
                     "b:%02x".format(byteval)
             }
             DataType.UWORD -> "uw:%04x".format(wordval)
             DataType.WORD -> {
-                if(wordval!!<0)
+                if (wordval!! < 0)
                     "w:-%04x".format(abs(wordval))
                 else
                     "w:%04x".format(wordval)
             }
             DataType.FLOAT -> "f:$floatval"
-            else -> "heap:$heapId"
+            else -> "???"
         }
     }
 
-    fun numericValue(): Number {
+    override fun numericValue(): Number {
-        return when(type) {
+        return when (type) {
             in ByteDatatypes -> byteval!!
             in WordDatatypes -> wordval!!
             DataType.FLOAT -> floatval!!
@@ -142,8 +111,8 @@ open class RuntimeValue(val type: DataType, num: Number?=null, val str: String?=
         }
     }
 
-    fun integerValue(): Int {
+    override fun integerValue(): Int {
-        return when(type) {
+        return when (type) {
             in ByteDatatypes -> byteval!!.toInt()
             in WordDatatypes -> wordval!!
             DataType.FLOAT -> throw ArithmeticException("float to integer loss of precision")
@@ -154,75 +123,69 @@ open class RuntimeValue(val type: DataType, num: Number?=null, val str: String?=
     override fun hashCode(): Int = Objects.hash(byteval, wordval, floatval, type)
 
     override fun equals(other: Any?): Boolean {
-        if(other==null || other !is RuntimeValue)
+        if (other == null || other !is RuntimeValueNumeric)
             return false
-        if(type==other.type)
+        return compareTo(other) == 0      // note: datatype doesn't matter
-            return if (type in IterableDatatypes) heapId==other.heapId else compareTo(other)==0
-        return compareTo(other)==0      // note: datatype doesn't matter
     }
 
-    operator fun compareTo(other: RuntimeValue): Int {
+    operator fun compareTo(other: RuntimeValueNumeric): Int = numericValue().toDouble().compareTo(other.numericValue().toDouble())
-        return if (type in NumericDatatypes && other.type in NumericDatatypes)
-            numericValue().toDouble().compareTo(other.numericValue().toDouble())
-        else throw ArithmeticException("comparison can only be done between two numeric values")
-    }
 
-    private fun arithResult(leftDt: DataType, result: Number, rightDt: DataType, op: String): RuntimeValue {
+    private fun arithResult(leftDt: DataType, result: Number, rightDt: DataType, op: String): RuntimeValueNumeric {
-        if(leftDt!=rightDt)
+        if (leftDt != rightDt)
             throw ArithmeticException("left and right datatypes are not the same")
-        if(result.toDouble() < 0 ) {
+        if (result.toDouble() < 0) {
-            return when(leftDt) {
+            return when (leftDt) {
                 DataType.UBYTE, DataType.UWORD -> {
                     // storing a negative number in an unsigned one is done by storing the 2's complement instead
                     val number = abs(result.toDouble().toInt())
-                    if(leftDt== DataType.UBYTE)
+                    if (leftDt == DataType.UBYTE)
-                        RuntimeValue(DataType.UBYTE, (number xor 255) + 1)
+                        RuntimeValueNumeric(DataType.UBYTE, (number xor 255) + 1)
                     else
-                        RuntimeValue(DataType.UWORD, (number xor 65535) + 1)
+                        RuntimeValueNumeric(DataType.UWORD, (number xor 65535) + 1)
                 }
                 DataType.BYTE -> {
-                    val v=result.toInt() and 255
+                    val v = result.toInt() and 255
-                    if(v<128)
+                    if (v < 128)
-                        RuntimeValue(DataType.BYTE, v)
+                        RuntimeValueNumeric(DataType.BYTE, v)
                     else
-                        RuntimeValue(DataType.BYTE, v-256)
+                        RuntimeValueNumeric(DataType.BYTE, v - 256)
                 }
                 DataType.WORD -> {
-                    val v=result.toInt() and 65535
+                    val v = result.toInt() and 65535
-                    if(v<32768)
+                    if (v < 32768)
-                        RuntimeValue(DataType.WORD, v)
+                        RuntimeValueNumeric(DataType.WORD, v)
                     else
-                        RuntimeValue(DataType.WORD, v-65536)
+                        RuntimeValueNumeric(DataType.WORD, v - 65536)
                 }
-                DataType.FLOAT -> RuntimeValue(DataType.FLOAT, result)
+                DataType.FLOAT -> RuntimeValueNumeric(DataType.FLOAT, result)
                 else -> throw ArithmeticException("$op on non-numeric type")
             }
         }
 
-        return when(leftDt) {
+        return when (leftDt) {
-            DataType.UBYTE -> RuntimeValue(DataType.UBYTE, result.toInt() and 255)
+            DataType.UBYTE -> RuntimeValueNumeric(DataType.UBYTE, result.toInt() and 255)
             DataType.BYTE -> {
                 val v = result.toInt() and 255
-                if(v<128)
+                if (v < 128)
-                    RuntimeValue(DataType.BYTE, v)
+                    RuntimeValueNumeric(DataType.BYTE, v)
                 else
-                    RuntimeValue(DataType.BYTE, v-256)
+                    RuntimeValueNumeric(DataType.BYTE, v - 256)
             }
-            DataType.UWORD -> RuntimeValue(DataType.UWORD, result.toInt() and 65535)
+            DataType.UWORD -> RuntimeValueNumeric(DataType.UWORD, result.toInt() and 65535)
             DataType.WORD -> {
                 val v = result.toInt() and 65535
-                if(v<32768)
+                if (v < 32768)
-                    RuntimeValue(DataType.WORD, v)
+                    RuntimeValueNumeric(DataType.WORD, v)
                 else
-                    RuntimeValue(DataType.WORD, v-65536)
+                    RuntimeValueNumeric(DataType.WORD, v - 65536)
             }
-            DataType.FLOAT -> RuntimeValue(DataType.FLOAT, result)
+            DataType.FLOAT -> RuntimeValueNumeric(DataType.FLOAT, result)
             else -> throw ArithmeticException("$op on non-numeric type")
         }
     }
 
-    fun add(other: RuntimeValue): RuntimeValue {
+    fun add(other: RuntimeValueNumeric): RuntimeValueNumeric {
-        if(other.type == DataType.FLOAT && (type!= DataType.FLOAT))
+        if (other.type == DataType.FLOAT && (type != DataType.FLOAT))
             throw ArithmeticException("floating point loss of precision on type $type")
         val v1 = numericValue()
         val v2 = other.numericValue()
@@ -230,8 +193,8 @@ open class RuntimeValue(val type: DataType, num: Number?=null, val str: String?=
         return arithResult(type, result, other.type, "add")
     }
 
-    fun sub(other: RuntimeValue): RuntimeValue {
+    fun sub(other: RuntimeValueNumeric): RuntimeValueNumeric {
-        if(other.type == DataType.FLOAT && (type!= DataType.FLOAT))
+        if (other.type == DataType.FLOAT && (type != DataType.FLOAT))
             throw ArithmeticException("floating point loss of precision on type $type")
         val v1 = numericValue()
         val v2 = other.numericValue()
@@ -239,8 +202,8 @@ open class RuntimeValue(val type: DataType, num: Number?=null, val str: String?=
         return arithResult(type, result, other.type, "sub")
     }
 
-    fun mul(other: RuntimeValue): RuntimeValue {
+    fun mul(other: RuntimeValueNumeric): RuntimeValueNumeric {
-        if(other.type == DataType.FLOAT && (type!= DataType.FLOAT))
+        if (other.type == DataType.FLOAT && (type != DataType.FLOAT))
             throw ArithmeticException("floating point loss of precision on type $type")
         val v1 = numericValue()
         val v2 = other.numericValue()
@@ -248,317 +211,318 @@ open class RuntimeValue(val type: DataType, num: Number?=null, val str: String?=
         return arithResult(type, result, other.type, "mul")
     }
 
-    fun div(other: RuntimeValue): RuntimeValue {
+    fun div(other: RuntimeValueNumeric): RuntimeValueNumeric {
-        if(other.type == DataType.FLOAT && (type!= DataType.FLOAT))
+        if (other.type == DataType.FLOAT && (type != DataType.FLOAT))
             throw ArithmeticException("floating point loss of precision on type $type")
         val v1 = numericValue()
         val v2 = other.numericValue()
-        if(v2.toDouble()==0.0) {
+        if (v2.toDouble() == 0.0) {
             when (type) {
-                DataType.UBYTE -> return RuntimeValue(DataType.UBYTE, 255)
+                DataType.UBYTE -> return RuntimeValueNumeric(DataType.UBYTE, 255)
-                DataType.BYTE -> return RuntimeValue(DataType.BYTE, 127)
+                DataType.BYTE -> return RuntimeValueNumeric(DataType.BYTE, 127)
-                DataType.UWORD -> return RuntimeValue(DataType.UWORD, 65535)
+                DataType.UWORD -> return RuntimeValueNumeric(DataType.UWORD, 65535)
-                DataType.WORD -> return RuntimeValue(DataType.WORD, 32767)
+                DataType.WORD -> return RuntimeValueNumeric(DataType.WORD, 32767)
-                else -> {}
+                else -> {
+                }
             }
         }
         val result = v1.toDouble() / v2.toDouble()
         // NOTE: integer division returns integer result!
-        return when(type) {
+        return when (type) {
-            DataType.UBYTE -> RuntimeValue(DataType.UBYTE, result)
+            DataType.UBYTE -> RuntimeValueNumeric(DataType.UBYTE, result)
-            DataType.BYTE -> RuntimeValue(DataType.BYTE, result)
+            DataType.BYTE -> RuntimeValueNumeric(DataType.BYTE, result)
-            DataType.UWORD -> RuntimeValue(DataType.UWORD, result)
+            DataType.UWORD -> RuntimeValueNumeric(DataType.UWORD, result)
-            DataType.WORD -> RuntimeValue(DataType.WORD, result)
+            DataType.WORD -> RuntimeValueNumeric(DataType.WORD, result)
-            DataType.FLOAT -> RuntimeValue(DataType.FLOAT, result)
+            DataType.FLOAT -> RuntimeValueNumeric(DataType.FLOAT, result)
             else -> throw ArithmeticException("div on non-numeric type")
         }
     }
 
-    fun remainder(other: RuntimeValue): RuntimeValue {
+    fun remainder(other: RuntimeValueNumeric): RuntimeValueNumeric {
         val v1 = numericValue()
         val v2 = other.numericValue()
         val result = v1.toDouble() % v2.toDouble()
         return arithResult(type, result, other.type, "remainder")
     }
 
-    fun pow(other: RuntimeValue): RuntimeValue {
+    fun pow(other: RuntimeValueNumeric): RuntimeValueNumeric {
         val v1 = numericValue()
         val v2 = other.numericValue()
         val result = v1.toDouble().pow(v2.toDouble())
-        return arithResult(type, result, other.type,"pow")
+        return arithResult(type, result, other.type, "pow")
     }
 
-    fun shl(): RuntimeValue {
+    fun shl(): RuntimeValueNumeric {
         val v = integerValue()
         return when (type) {
-            DataType.UBYTE -> RuntimeValue(type, (v shl 1) and 255)
+            DataType.UBYTE -> RuntimeValueNumeric(type, (v shl 1) and 255)
-            DataType.UWORD -> RuntimeValue(type, (v shl 1) and 65535)
+            DataType.UWORD -> RuntimeValueNumeric(type, (v shl 1) and 65535)
             DataType.BYTE -> {
                 val value = v shl 1
-                if(value<128)
+                if (value < 128)
-                    RuntimeValue(type, value)
+                    RuntimeValueNumeric(type, value)
                 else
-                    RuntimeValue(type, value-256)
+                    RuntimeValueNumeric(type, value - 256)
             }
             DataType.WORD -> {
                 val value = v shl 1
-                if(value<32768)
+                if (value < 32768)
-                    RuntimeValue(type, value)
+                    RuntimeValueNumeric(type, value)
                 else
-                    RuntimeValue(type, value-65536)
+                    RuntimeValueNumeric(type, value - 65536)
             }
             else -> throw ArithmeticException("invalid type for shl: $type")
         }
     }
 
-    fun shr(): RuntimeValue {
+    fun shr(): RuntimeValueNumeric {
         val v = integerValue()
-        return when(type){
+        return when (type) {
-            DataType.UBYTE -> RuntimeValue(type, v ushr 1)
+            DataType.UBYTE -> RuntimeValueNumeric(type, v ushr 1)
-            DataType.BYTE -> RuntimeValue(type, v shr 1)
+            DataType.BYTE -> RuntimeValueNumeric(type, v shr 1)
-            DataType.UWORD -> RuntimeValue(type, v ushr 1)
+            DataType.UWORD -> RuntimeValueNumeric(type, v ushr 1)
-            DataType.WORD -> RuntimeValue(type, v shr 1)
+            DataType.WORD -> RuntimeValueNumeric(type, v shr 1)
             else -> throw ArithmeticException("invalid type for shr: $type")
         }
     }
 
-    fun rol(carry: Boolean): Pair<RuntimeValue, Boolean> {
+    fun rol(carry: Boolean): Pair<RuntimeValueNumeric, Boolean> {
         // 9 or 17 bit rotate left (with carry))
-        return when(type) {
+        return when (type) {
             DataType.UBYTE, DataType.BYTE -> {
                 val v = byteval!!.toInt()
                 val newCarry = (v and 0x80) != 0
-                val newval = (v and 0x7f shl 1) or (if(carry) 1 else 0)
+                val newval = (v and 0x7f shl 1) or (if (carry) 1 else 0)
-                Pair(RuntimeValue(DataType.UBYTE, newval), newCarry)
+                Pair(RuntimeValueNumeric(DataType.UBYTE, newval), newCarry)
             }
             DataType.UWORD, DataType.WORD -> {
                 val v = wordval!!
                 val newCarry = (v and 0x8000) != 0
-                val newval = (v and 0x7fff shl 1) or (if(carry) 1 else 0)
+                val newval = (v and 0x7fff shl 1) or (if (carry) 1 else 0)
-                Pair(RuntimeValue(DataType.UWORD, newval), newCarry)
+                Pair(RuntimeValueNumeric(DataType.UWORD, newval), newCarry)
             }
             else -> throw ArithmeticException("rol can only work on byte/word")
         }
     }
 
-    fun ror(carry: Boolean): Pair<RuntimeValue, Boolean> {
+    fun ror(carry: Boolean): Pair<RuntimeValueNumeric, Boolean> {
         // 9 or 17 bit rotate right (with carry)
-        return when(type) {
+        return when (type) {
             DataType.UBYTE, DataType.BYTE -> {
                 val v = byteval!!.toInt()
                 val newCarry = v and 1 != 0
-                val newval = (v ushr 1) or (if(carry) 0x80 else 0)
+                val newval = (v ushr 1) or (if (carry) 0x80 else 0)
-                Pair(RuntimeValue(DataType.UBYTE, newval), newCarry)
+                Pair(RuntimeValueNumeric(DataType.UBYTE, newval), newCarry)
             }
             DataType.UWORD, DataType.WORD -> {
                 val v = wordval!!
                 val newCarry = v and 1 != 0
-                val newval = (v ushr 1) or (if(carry) 0x8000 else 0)
+                val newval = (v ushr 1) or (if (carry) 0x8000 else 0)
-                Pair(RuntimeValue(DataType.UWORD, newval), newCarry)
+                Pair(RuntimeValueNumeric(DataType.UWORD, newval), newCarry)
             }
             else -> throw ArithmeticException("ror2 can only work on byte/word")
         }
     }
 
-    fun rol2(): RuntimeValue {
+    fun rol2(): RuntimeValueNumeric {
         // 8 or 16 bit rotate left
-        return when(type) {
+        return when (type) {
             DataType.UBYTE, DataType.BYTE -> {
                 val v = byteval!!.toInt()
                 val carry = (v and 0x80) ushr 7
                 val newval = (v and 0x7f shl 1) or carry
-                RuntimeValue(DataType.UBYTE, newval)
+                RuntimeValueNumeric(DataType.UBYTE, newval)
             }
             DataType.UWORD, DataType.WORD -> {
                 val v = wordval!!
                 val carry = (v and 0x8000) ushr 15
                 val newval = (v and 0x7fff shl 1) or carry
-                RuntimeValue(DataType.UWORD, newval)
+                RuntimeValueNumeric(DataType.UWORD, newval)
             }
             else -> throw ArithmeticException("rol2 can only work on byte/word")
         }
     }
 
-    fun ror2(): RuntimeValue {
+    fun ror2(): RuntimeValueNumeric {
         // 8 or 16 bit rotate right
-        return when(type) {
+        return when (type) {
             DataType.UBYTE, DataType.BYTE -> {
                 val v = byteval!!.toInt()
                 val carry = v and 1 shl 7
                 val newval = (v ushr 1) or carry
-                RuntimeValue(DataType.UBYTE, newval)
+                RuntimeValueNumeric(DataType.UBYTE, newval)
             }
             DataType.UWORD, DataType.WORD -> {
                 val v = wordval!!
                 val carry = v and 1 shl 15
                 val newval = (v ushr 1) or carry
-                RuntimeValue(DataType.UWORD, newval)
+                RuntimeValueNumeric(DataType.UWORD, newval)
             }
             else -> throw ArithmeticException("ror2 can only work on byte/word")
         }
     }
 
-    fun neg(): RuntimeValue {
+    fun neg(): RuntimeValueNumeric {
-        return when(type) {
+        return when (type) {
-            DataType.BYTE -> RuntimeValue(DataType.BYTE, -(byteval!!))
+            DataType.BYTE -> RuntimeValueNumeric(DataType.BYTE, -(byteval!!))
-            DataType.WORD -> RuntimeValue(DataType.WORD, -(wordval!!))
+            DataType.WORD -> RuntimeValueNumeric(DataType.WORD, -(wordval!!))
-            DataType.FLOAT -> RuntimeValue(DataType.FLOAT, -(floatval)!!)
+            DataType.FLOAT -> RuntimeValueNumeric(DataType.FLOAT, -(floatval)!!)
             else -> throw ArithmeticException("neg can only work on byte/word/float")
         }
     }
 
-    fun abs(): RuntimeValue {
+    fun abs(): RuntimeValueNumeric {
-        return when(type) {
+        return when (type) {
-            DataType.BYTE -> RuntimeValue(DataType.BYTE, abs(byteval!!.toInt()))
+            DataType.BYTE -> RuntimeValueNumeric(DataType.BYTE, abs(byteval!!.toInt()))
-            DataType.WORD -> RuntimeValue(DataType.WORD, abs(wordval!!))
+            DataType.WORD -> RuntimeValueNumeric(DataType.WORD, abs(wordval!!))
-            DataType.FLOAT -> RuntimeValue(DataType.FLOAT, abs(floatval!!))
+            DataType.FLOAT -> RuntimeValueNumeric(DataType.FLOAT, abs(floatval!!))
             else -> throw ArithmeticException("abs can only work on byte/word/float")
         }
     }
 
-    fun bitand(other: RuntimeValue): RuntimeValue {
+    fun bitand(other: RuntimeValueNumeric): RuntimeValueNumeric {
         val v1 = integerValue()
         val v2 = other.integerValue()
         val result = v1 and v2
-        return RuntimeValue(type, result)
+        return RuntimeValueNumeric(type, result)
     }
 
-    fun bitor(other: RuntimeValue): RuntimeValue {
+    fun bitor(other: RuntimeValueNumeric): RuntimeValueNumeric {
         val v1 = integerValue()
         val v2 = other.integerValue()
         val result = v1 or v2
-        return RuntimeValue(type, result)
+        return RuntimeValueNumeric(type, result)
     }
 
-    fun bitxor(other: RuntimeValue): RuntimeValue {
+    fun bitxor(other: RuntimeValueNumeric): RuntimeValueNumeric {
         val v1 = integerValue()
         val v2 = other.integerValue()
         val result = v1 xor v2
-        return RuntimeValue(type, result)
+        return RuntimeValueNumeric(type, result)
     }
 
-    fun and(other: RuntimeValue) = RuntimeValue(DataType.UBYTE, if (this.asBoolean && other.asBoolean) 1 else 0)
+    fun and(other: RuntimeValueNumeric) = RuntimeValueNumeric(DataType.UBYTE, if (this.asBoolean && other.asBoolean) 1 else 0)
-    fun or(other: RuntimeValue) = RuntimeValue(DataType.UBYTE, if (this.asBoolean || other.asBoolean) 1 else 0)
+    fun or(other: RuntimeValueNumeric) = RuntimeValueNumeric(DataType.UBYTE, if (this.asBoolean || other.asBoolean) 1 else 0)
-    fun xor(other: RuntimeValue) = RuntimeValue(DataType.UBYTE, if (this.asBoolean xor other.asBoolean) 1 else 0)
+    fun xor(other: RuntimeValueNumeric) = RuntimeValueNumeric(DataType.UBYTE, if (this.asBoolean xor other.asBoolean) 1 else 0)
-    fun not() = RuntimeValue(DataType.UBYTE, if (this.asBoolean) 0 else 1)
+    fun not() = RuntimeValueNumeric(DataType.UBYTE, if (this.asBoolean) 0 else 1)
 
-    fun inv(): RuntimeValue {
+    fun inv(): RuntimeValueNumeric {
-        return when(type) {
+        return when (type) {
-            DataType.UBYTE -> RuntimeValue(type, byteval!!.toInt().inv() and 255)
+            DataType.UBYTE -> RuntimeValueNumeric(type, byteval!!.toInt().inv() and 255)
-            DataType.UWORD -> RuntimeValue(type, wordval!!.inv() and 65535)
+            DataType.UWORD -> RuntimeValueNumeric(type, wordval!!.inv() and 65535)
-            DataType.BYTE -> RuntimeValue(type, byteval!!.toInt().inv())
+            DataType.BYTE -> RuntimeValueNumeric(type, byteval!!.toInt().inv())
-            DataType.WORD -> RuntimeValue(type, wordval!!.inv())
+            DataType.WORD -> RuntimeValueNumeric(type, wordval!!.inv())
             else -> throw ArithmeticException("inv can only work on byte/word")
         }
     }
 
-    fun inc(): RuntimeValue {
+    fun inc(): RuntimeValueNumeric {
-        return when(type) {
+        return when (type) {
-            DataType.UBYTE -> RuntimeValue(type, (byteval!! + 1) and 255)
+            DataType.UBYTE -> RuntimeValueNumeric(type, (byteval!! + 1) and 255)
-            DataType.UWORD -> RuntimeValue(type, (wordval!! + 1) and 65535)
+            DataType.UWORD -> RuntimeValueNumeric(type, (wordval!! + 1) and 65535)
             DataType.BYTE -> {
                 val newval = byteval!! + 1
-                if(newval == 128)
+                if (newval == 128)
-                    RuntimeValue(type, -128)
+                    RuntimeValueNumeric(type, -128)
                 else
-                    RuntimeValue(type, newval)
+                    RuntimeValueNumeric(type, newval)
             }
             DataType.WORD -> {
                 val newval = wordval!! + 1
-                if(newval == 32768)
+                if (newval == 32768)
-                    RuntimeValue(type, -32768)
+                    RuntimeValueNumeric(type, -32768)
                 else
-                    RuntimeValue(type, newval)
+                    RuntimeValueNumeric(type, newval)
             }
-            DataType.FLOAT -> RuntimeValue(DataType.FLOAT, floatval!! + 1)
+            DataType.FLOAT -> RuntimeValueNumeric(DataType.FLOAT, floatval!! + 1)
             else -> throw ArithmeticException("inc can only work on numeric types")
         }
     }
 
-    fun dec(): RuntimeValue {
+    fun dec(): RuntimeValueNumeric {
-        return when(type) {
+        return when (type) {
-            DataType.UBYTE -> RuntimeValue(type, (byteval!! - 1) and 255)
+            DataType.UBYTE -> RuntimeValueNumeric(type, (byteval!! - 1) and 255)
-            DataType.UWORD -> RuntimeValue(type, (wordval!! - 1) and 65535)
+            DataType.UWORD -> RuntimeValueNumeric(type, (wordval!! - 1) and 65535)
             DataType.BYTE -> {
                 val newval = byteval!! - 1
-                if(newval == -129)
+                if (newval == -129)
-                    RuntimeValue(type, 127)
+                    RuntimeValueNumeric(type, 127)
                 else
-                    RuntimeValue(type, newval)
+                    RuntimeValueNumeric(type, newval)
             }
             DataType.WORD -> {
                 val newval = wordval!! - 1
-                if(newval == -32769)
+                if (newval == -32769)
-                    RuntimeValue(type, 32767)
+                    RuntimeValueNumeric(type, 32767)
                 else
-                    RuntimeValue(type, newval)
+                    RuntimeValueNumeric(type, newval)
             }
-            DataType.FLOAT -> RuntimeValue(DataType.FLOAT, floatval!! - 1)
+            DataType.FLOAT -> RuntimeValueNumeric(DataType.FLOAT, floatval!! - 1)
             else -> throw ArithmeticException("dec can only work on numeric types")
         }
     }
 
-    fun msb(): RuntimeValue {
+    fun msb(): RuntimeValueNumeric {
-        return when(type) {
+        return when (type) {
-            in ByteDatatypes -> RuntimeValue(DataType.UBYTE, 0)
+            in ByteDatatypes -> RuntimeValueNumeric(DataType.UBYTE, 0)
-            in WordDatatypes -> RuntimeValue(DataType.UBYTE, wordval!! ushr 8 and 255)
+            in WordDatatypes -> RuntimeValueNumeric(DataType.UBYTE, wordval!! ushr 8 and 255)
             else -> throw ArithmeticException("msb can only work on (u)byte/(u)word")
         }
     }
 
-    fun cast(targetType: DataType): RuntimeValue {
+    fun cast(targetType: DataType): RuntimeValueNumeric {
         return when (type) {
             DataType.UBYTE -> {
                 when (targetType) {
                     DataType.UBYTE -> this
                     DataType.BYTE -> {
-                        val nval=byteval!!.toInt()
+                        val nval = byteval!!.toInt()
-                        if(nval<128)
+                        if (nval < 128)
-                            RuntimeValue(DataType.BYTE, nval)
+                            RuntimeValueNumeric(DataType.BYTE, nval)
                         else
-                            RuntimeValue(DataType.BYTE, nval-256)
+                            RuntimeValueNumeric(DataType.BYTE, nval - 256)
                     }
-                    DataType.UWORD -> RuntimeValue(DataType.UWORD, numericValue())
+                    DataType.UWORD -> RuntimeValueNumeric(DataType.UWORD, numericValue())
                     DataType.WORD -> {
                         val nval = numericValue().toInt()
-                        if(nval<32768)
+                        if (nval < 32768)
-                            RuntimeValue(DataType.WORD, nval)
+                            RuntimeValueNumeric(DataType.WORD, nval)
                         else
-                            RuntimeValue(DataType.WORD, nval-65536)
+                            RuntimeValueNumeric(DataType.WORD, nval - 65536)
                     }
-                    DataType.FLOAT -> RuntimeValue(DataType.FLOAT, numericValue())
+                    DataType.FLOAT -> RuntimeValueNumeric(DataType.FLOAT, numericValue())
                     else -> throw ArithmeticException("invalid type cast from $type to $targetType")
                 }
             }
             DataType.BYTE -> {
                 when (targetType) {
                     DataType.BYTE -> this
-                    DataType.UBYTE -> RuntimeValue(DataType.UBYTE, integerValue() and 255)
+                    DataType.UBYTE -> RuntimeValueNumeric(DataType.UBYTE, integerValue() and 255)
-                    DataType.UWORD -> RuntimeValue(DataType.UWORD, integerValue() and 65535)
+                    DataType.UWORD -> RuntimeValueNumeric(DataType.UWORD, integerValue() and 65535)
-                    DataType.WORD -> RuntimeValue(DataType.WORD, integerValue())
+                    DataType.WORD -> RuntimeValueNumeric(DataType.WORD, integerValue())
-                    DataType.FLOAT -> RuntimeValue(DataType.FLOAT, numericValue())
+                    DataType.FLOAT -> RuntimeValueNumeric(DataType.FLOAT, numericValue())
                     else -> throw ArithmeticException("invalid type cast from $type to $targetType")
                 }
             }
             DataType.UWORD -> {
                 when (targetType) {
                     DataType.BYTE -> {
-                        val v=integerValue()
+                        val v = integerValue()
-                        if(v<128)
+                        if (v < 128)
-                            RuntimeValue(DataType.BYTE, v)
+                            RuntimeValueNumeric(DataType.BYTE, v)
                         else
-                            RuntimeValue(DataType.BYTE, v-256)
+                            RuntimeValueNumeric(DataType.BYTE, v - 256)
                     }
-                    DataType.UBYTE -> RuntimeValue(DataType.UBYTE, integerValue() and 255)
+                    DataType.UBYTE -> RuntimeValueNumeric(DataType.UBYTE, integerValue() and 255)
                     DataType.UWORD -> this
                     DataType.WORD -> {
-                        val v=integerValue()
+                        val v = integerValue()
-                        if(v<32768)
+                        if (v < 32768)
-                            RuntimeValue(DataType.WORD, v)
+                            RuntimeValueNumeric(DataType.WORD, v)
                         else
-                            RuntimeValue(DataType.WORD, v-65536)
+                            RuntimeValueNumeric(DataType.WORD, v - 65536)
                     }
-                    DataType.FLOAT -> RuntimeValue(DataType.FLOAT, numericValue())
+                    DataType.FLOAT -> RuntimeValueNumeric(DataType.FLOAT, numericValue())
                     else -> throw ArithmeticException("invalid type cast from $type to $targetType")
                 }
             }
@@ -566,33 +530,33 @@ open class RuntimeValue(val type: DataType, num: Number?=null, val str: String?=
                 when (targetType) {
                     DataType.BYTE -> {
                         val v = integerValue() and 255
-                        if(v<128)
+                        if (v < 128)
-                            RuntimeValue(DataType.BYTE, v)
+                            RuntimeValueNumeric(DataType.BYTE, v)
                         else
-                            RuntimeValue(DataType.BYTE, v-256)
+                            RuntimeValueNumeric(DataType.BYTE, v - 256)
                     }
-                    DataType.UBYTE -> RuntimeValue(DataType.UBYTE, integerValue() and 65535)
+                    DataType.UBYTE -> RuntimeValueNumeric(DataType.UBYTE, integerValue() and 65535)
-                    DataType.UWORD -> RuntimeValue(DataType.UWORD, integerValue())
+                    DataType.UWORD -> RuntimeValueNumeric(DataType.UWORD, integerValue())
                     DataType.WORD -> this
-                    DataType.FLOAT -> RuntimeValue(DataType.FLOAT, numericValue())
+                    DataType.FLOAT -> RuntimeValueNumeric(DataType.FLOAT, numericValue())
                     else -> throw ArithmeticException("invalid type cast from $type to $targetType")
                 }
             }
             DataType.FLOAT -> {
                 when (targetType) {
                     DataType.BYTE -> {
-                        val integer=numericValue().toInt()
+                        val integer = numericValue().toInt()
-                        if(integer in -128..127)
+                        if (integer in -128..127)
-                            RuntimeValue(DataType.BYTE, integer)
+                            RuntimeValueNumeric(DataType.BYTE, integer)
                         else
                             throw ArithmeticException("overflow when casting float to byte: $this")
                     }
-                    DataType.UBYTE -> RuntimeValue(DataType.UBYTE, numericValue().toInt())
+                    DataType.UBYTE -> RuntimeValueNumeric(DataType.UBYTE, numericValue().toInt())
-                    DataType.UWORD -> RuntimeValue(DataType.UWORD, numericValue().toInt())
+                    DataType.UWORD -> RuntimeValueNumeric(DataType.UWORD, numericValue().toInt())
                     DataType.WORD -> {
-                        val integer=numericValue().toInt()
+                        val integer = numericValue().toInt()
-                        if(integer in -32768..32767)
+                        if (integer in -32768..32767)
-                            RuntimeValue(DataType.WORD, integer)
+                            RuntimeValueNumeric(DataType.WORD, integer)
                         else
                             throw ArithmeticException("overflow when casting float to word: $this")
                     }
@@ -603,22 +567,91 @@ open class RuntimeValue(val type: DataType, num: Number?=null, val str: String?=
             else -> throw ArithmeticException("invalid type cast from $type to $targetType")
         }
     }
+}
 
-    open fun iterator(): Iterator<Number> {
+
-        return when (type) {
+class RuntimeValueString(val str: String, val heapId: Int?): RuntimeValueBase(DataType.STR) {
-            in StringDatatypes -> {
+    companion object {
-                Petscii.encodePetscii(str!!, true).iterator()
+        fun fromLv(string: StringLiteralValue): RuntimeValueString {
-            }
+            return RuntimeValueString(string.value, string.heapId)
-            in ArrayDatatypes -> {
-                array!!.iterator()
-            }
-            else -> throw IllegalArgumentException("cannot iterate over $this")
         }
     }
+
+    override fun toString(): String = if(type==DataType.STR) "str:$str"  else "???"
+
+    override fun hashCode(): Int = Objects.hash(type, str)
+
+    override fun equals(other: Any?): Boolean {
+        if (other == null || other !is RuntimeValueString)
+            return false
+        return type == other.type && str == other.str
+    }
+
+    fun iterator(): Iterator<Number> = str.map { it.toShort() }.iterator()
+
+    override fun numericValue(): Number {
+        throw VmExecutionException("string is not a number")
+    }
+
+    override fun integerValue(): Int {
+        throw VmExecutionException("string is not a number")
+    }
 }
 
 
-class RuntimeValueRange(type: DataType, val range: IntProgression): RuntimeValue(type, array=range.toList().toTypedArray()) {
+open class RuntimeValueArray(type: DataType, val array: Array<Number>, val heapId: Int?): RuntimeValueBase(type) {
+
+    companion object {
+        fun fromLv(array: ArrayLiteralValue): RuntimeValueArray {
+            return if (array.type == DataType.ARRAY_F) {
+                val doubleArray = array.value.map { (it as NumericLiteralValue).number }.toTypedArray()
+                RuntimeValueArray(array.type, doubleArray, array.heapId)
+            } else {
+                val resultArray = mutableListOf<Number>()
+                for (elt in array.value.withIndex()) {
+                    if (elt.value is NumericLiteralValue)
+                        resultArray.add((elt.value as NumericLiteralValue).number.toInt())
+                    else {
+                        resultArray.add((elt.hashCode()))  // ...poor man's implementation of ADDRESSOF(array), it probably won't work very well
+                    }
+                }
+                RuntimeValueArray(array.type, resultArray.toTypedArray(), array.heapId)
+            }
+        }
+    }
+
+    override fun toString(): String {
+        return when (type) {
+            DataType.ARRAY_UB -> "array_ub:..."
+            DataType.ARRAY_B -> "array_b:..."
+            DataType.ARRAY_UW -> "array_uw:..."
+            DataType.ARRAY_W -> "array_w:..."
+            DataType.ARRAY_F -> "array_f:..."
+            else -> "???"
+        }
+    }
+
+    override fun hashCode(): Int = Objects.hash(type, array)
+
+    override fun equals(other: Any?): Boolean {
+        if (other == null || other !is RuntimeValueArray)
+            return false
+        return type == other.type && array.contentEquals(other.array)
+    }
+
+    open fun iterator(): Iterator<Number> = array.iterator()
+
+    override fun numericValue(): Number {
+        throw VmExecutionException("array is not a number")
+    }
+
+    override fun integerValue(): Int {
+        throw VmExecutionException("array is not a number")
+    }
+}
+
+
+class RuntimeValueRange(type: DataType, val range: IntProgression): RuntimeValueArray(type, range.toList().toTypedArray(), null) {
     override fun iterator(): Iterator<Number> {
         return range.iterator()
     }

compiler/src/prog8/vm/astvm/AstVm.kt

@@ -7,14 +7,10 @@ import prog8.ast.expressions.Expression
 import prog8.ast.expressions.IdentifierReference
 import prog8.ast.expressions.NumericLiteralValue
 import prog8.ast.statements.*
-import prog8.compiler.IntegerOrAddressOf
+import prog8.compiler.target.c64.C64MachineDefinition
-import prog8.compiler.target.c64.MachineDefinition
+import prog8.vm.*
-import prog8.compiler.target.c64.Petscii
-import prog8.vm.RuntimeValue
-import prog8.vm.RuntimeValueRange
 import java.awt.EventQueue
-import java.io.CharConversionException
+import java.util.ArrayDeque
-import java.util.*
 import kotlin.NoSuchElementException
 import kotlin.concurrent.fixedRateTimer
 import kotlin.math.*
@@ -72,10 +68,14 @@ class StatusFlags {
 
 
 class RuntimeVariables {
-    fun define(scope: INameScope, name: String, initialValue: RuntimeValue) {
+    fun define(scope: INameScope, name: String, initialValue: RuntimeValueBase) {
         val where = vars.getValue(scope)
         where[name] = initialValue
         vars[scope] = where
+        if(initialValue is RuntimeValueString)
+            byHeapId[initialValue.heapId!!] = initialValue
+        else if(initialValue is RuntimeValueArray)
+            byHeapId[initialValue.heapId!!] = initialValue
     }
 
     fun defineMemory(scope: INameScope, name: String, address: Int) {
@@ -84,7 +84,7 @@ class RuntimeVariables {
         memvars[scope] = where
     }
 
-    fun set(scope: INameScope, name: String, value: RuntimeValue) {
+    fun set(scope: INameScope, name: String, value: RuntimeValueBase) {
         val where = vars.getValue(scope)
         val existing = where[name]
         if(existing==null) {
@@ -96,9 +96,15 @@ class RuntimeVariables {
             throw VmExecutionException("new value is of different datatype ${value.type} expected ${existing.type} for $name")
         where[name] = value
         vars[scope] = where
+        if(value is RuntimeValueString)
+            byHeapId[value.heapId!!] = value
+        else if(value is RuntimeValueArray)
+            byHeapId[value.heapId!!] = value
     }
 
-    fun get(scope: INameScope, name: String): RuntimeValue {
+    fun getByHeapId(heapId: Int): RuntimeValueBase = byHeapId.getValue(heapId)
+
+    fun get(scope: INameScope, name: String): RuntimeValueBase {
         val where = vars.getValue(scope)
         return where[name] ?: throw NoSuchElementException("no such runtime variable: ${scope.name}.$name")
     }
@@ -108,8 +114,6 @@ class RuntimeVariables {
         return where[name] ?: throw NoSuchElementException("no such runtime memory-variable: ${scope.name}.$name")
     }
 
-    fun swap(a1: VarDecl, a2: VarDecl) = swap(a1.definingScope(), a1.name, a2.definingScope(), a2.name)
-
     fun swap(scope1: INameScope, name1: String, scope2: INameScope, name2: String) {
         val v1 = get(scope1, name1)
         val v2 = get(scope2, name2)
@@ -117,12 +121,13 @@ class RuntimeVariables {
         set(scope2, name2, v1)
     }
 
-    private val vars = mutableMapOf<INameScope, MutableMap<String, RuntimeValue>>().withDefault { mutableMapOf() }
+    private val vars = mutableMapOf<INameScope, MutableMap<String, RuntimeValueBase>>().withDefault { mutableMapOf() }
     private val memvars = mutableMapOf<INameScope, MutableMap<String, Int>>().withDefault { mutableMapOf() }
+    private val byHeapId = mutableMapOf<Int, RuntimeValueBase>()
 }
 
 
-class AstVm(val program: Program) {
+class AstVm(val program: Program, compilationTarget: String) {
 
     val mem = Memory(::memread, ::memwrite)
     val statusflags = StatusFlags()
@@ -133,13 +138,15 @@ class AstVm(val program: Program) {
     var rtcOffset = bootTime
 
     private val rnd = Random(0)
-    private val statusFlagsSave = Stack<StatusFlags>()
+    private val statusFlagsSave = ArrayDeque<StatusFlags>()
-    private val registerXsave = Stack<RuntimeValue>()
+    private val registerXsave = ArrayDeque<RuntimeValueNumeric>()
-    private val registerYsave = Stack<RuntimeValue>()
+    private val registerYsave = ArrayDeque<RuntimeValueNumeric>()
-    private val registerAsave = Stack<RuntimeValue>()
+    private val registerAsave = ArrayDeque<RuntimeValueNumeric>()
 
 
     init {
+        require(compilationTarget == "c64") {"using the AstVm only works for the C64 compiler target"}
+
         // observe the jiffyclock and screen matrix
         mem.observe(0xa0, 0xa1, 0xa2)
         for(i in 1024..2023)
@@ -166,23 +173,23 @@ class AstVm(val program: Program) {
     fun memwrite(address: Int, value: Short): Short {
         if(address==0xa0 || address==0xa1 || address==0xa2) {
             // a write to the jiffy clock, update the clock offset for the irq
-            val timeHi = if(address==0xa0) value else mem.getUByte_DMA(0xa0)
+            val timeHi = if(address==0xa0) value else mem.getUByteDirectly(0xa0)
-            val timeMid = if(address==0xa1) value else mem.getUByte_DMA(0xa1)
+            val timeMid = if(address==0xa1) value else mem.getUByteDirectly(0xa1)
-            val timeLo = if(address==0xa2) value else mem.getUByte_DMA(0xa2)
+            val timeLo = if(address==0xa2) value else mem.getUByteDirectly(0xa2)
             val jiffies = (timeHi.toInt() shl 16) + (timeMid.toInt() shl 8) + timeLo
             rtcOffset = bootTime - (jiffies*1000/60)
         }
         if(address in 1024..2023) {
             // write to the screen matrix
             val scraddr = address-1024
-            dialog.canvas.setChar(scraddr % 40, scraddr / 40, value, 1)
+            dialog.canvas.setScreenChar(scraddr % 40, scraddr / 40, value, 1)
         }
         return value
     }
 
     fun run() {
         try {
-            val init = VariablesCreator(runtimeVariables, program.heap)
+            val init = VariablesCreator(runtimeVariables)
             init.visit(program)
 
             // initialize all global variables
@@ -231,7 +238,7 @@ class AstVm(val program: Program) {
                     }
                 }
             }
-            dialog.canvas.printText("\n<program ended>", true)
+            dialog.canvas.printAsciiText("\n<program ended>")
             println("PROGRAM EXITED!")
             dialog.title = "PROGRAM EXITED"
         } catch (tx: VmTerminationException) {
@@ -253,9 +260,9 @@ class AstVm(val program: Program) {
             rtcOffset = timeStamp
         }
         // update the C-64 60hz jiffy clock in the ZP addresses:
-        mem.setUByte_DMA(0x00a0, (jiffies ushr 16).toShort())
+        mem.setUByteDirectly(0x00a0, (jiffies ushr 16).toShort())
-        mem.setUByte_DMA(0x00a1, (jiffies ushr 8 and 255).toShort())
+        mem.setUByteDirectly(0x00a1, (jiffies ushr 8 and 255).toShort())
-        mem.setUByte_DMA(0x00a2, (jiffies and 255).toShort())
+        mem.setUByteDirectly(0x00a2, (jiffies and 255).toShort())
     }
 
     private val runtimeVariables = RuntimeVariables()
@@ -263,11 +270,11 @@ class AstVm(val program: Program) {
 
     class LoopControlBreak : Exception()
     class LoopControlContinue : Exception()
-    class LoopControlReturn(val returnvalue: RuntimeValue?) : Exception()
+    class LoopControlReturn(val returnvalue: RuntimeValueNumeric?) : Exception()
     class LoopControlJump(val identifier: IdentifierReference?, val address: Int?, val generatedLabel: String?) : Exception()
 
 
-    internal fun executeSubroutine(sub: Subroutine, arguments: List<RuntimeValue>, startAtLabel: Label?=null): RuntimeValue? {
+    internal fun executeSubroutine(sub: Subroutine, arguments: List<RuntimeValueNumeric>, startAtLabel: Label?=null): RuntimeValueNumeric? {
         if(sub.isAsmSubroutine) {
             return performSyscall(sub, arguments)
         }
@@ -332,10 +339,9 @@ class AstVm(val program: Program) {
                 // should have been defined already when the program started
             }
             is FunctionCallStatement -> {
-                val target = stmt.target.targetStatement(program.namespace)
+                when (val target = stmt.target.targetStatement(program.namespace)) {
-                when (target) {
                     is Subroutine -> {
-                        val args = evaluate(stmt.arglist)
+                        val args = evaluate(stmt.args).map { it as RuntimeValueNumeric }
                         if (target.isAsmSubroutine) {
                             performSyscall(target, args)
                         } else {
@@ -348,7 +354,7 @@ class AstVm(val program: Program) {
                             // swap cannot be implemented as a function, so inline it here
                             executeSwap(stmt)
                         } else {
-                            val args = evaluate(stmt.arglist)
+                            val args = evaluate(stmt.args)
                             performBuiltinFunction(target.name, args, statusflags)
                         }
                     }
@@ -362,7 +368,7 @@ class AstVm(val program: Program) {
                         if(stmt.value==null)
                             null
                         else
-                            evaluate(stmt.value!!, evalCtx)
+                            evaluate(stmt.value!!, evalCtx) as RuntimeValueNumeric
                 throw LoopControlReturn(value)
             }
             is Continue -> throw LoopControlContinue()
@@ -380,19 +386,19 @@ class AstVm(val program: Program) {
                         val identScope = ident.definingScope()
                         when(ident.type){
                             VarDeclType.VAR -> {
-                                var value = runtimeVariables.get(identScope, ident.name)
+                                var value = runtimeVariables.get(identScope, ident.name) as RuntimeValueNumeric
-                                value = when {
+                                value = when (stmt.operator) {
-                                    stmt.operator == "++" -> value.add(RuntimeValue(value.type, 1))
+                                    "++" -> value.add(RuntimeValueNumeric(value.type, 1))
-                                    stmt.operator == "--" -> value.sub(RuntimeValue(value.type, 1))
+                                    "--" -> value.sub(RuntimeValueNumeric(value.type, 1))
                                     else -> throw VmExecutionException("strange postincdec operator $stmt")
                                 }
                                 runtimeVariables.set(identScope, ident.name, value)
                             }
                             VarDeclType.MEMORY -> {
                                 val addr=ident.value!!.constValue(program)!!.number.toInt()
-                                val newval = when {
+                                val newval = when (stmt.operator) {
-                                    stmt.operator == "++" -> mem.getUByte(addr)+1 and 255
+                                    "++" -> mem.getUByte(addr)+1 and 255
-                                    stmt.operator == "--" -> mem.getUByte(addr)-1 and 255
+                                    "--" -> mem.getUByte(addr)-1 and 255
                                     else -> throw VmExecutionException("strange postincdec operator $stmt")
                                 }
                                 mem.setUByte(addr,newval.toShort())
@@ -401,34 +407,34 @@ class AstVm(val program: Program) {
                         }
                     }
                     stmt.target.memoryAddress != null -> {
-                        val addr = evaluate(stmt.target.memoryAddress!!.addressExpression, evalCtx).integerValue()
+                        val addr = (evaluate(stmt.target.memoryAddress!!.addressExpression, evalCtx) as RuntimeValueNumeric).integerValue()
-                        val newval = when {
+                        val newval = when (stmt.operator) {
-                            stmt.operator == "++" -> mem.getUByte(addr)+1 and 255
+                            "++" -> mem.getUByte(addr)+1 and 255
-                            stmt.operator == "--" -> mem.getUByte(addr)-1 and 255
+                            "--" -> mem.getUByte(addr)-1 and 255
                             else -> throw VmExecutionException("strange postincdec operator $stmt")
                         }
                         mem.setUByte(addr,newval.toShort())
                     }
                     stmt.target.arrayindexed != null -> {
                         val arrayvar = stmt.target.arrayindexed!!.identifier.targetVarDecl(program.namespace)!!
-                        val arrayvalue = runtimeVariables.get(arrayvar.definingScope(), arrayvar.name)
+                        val arrayvalue = runtimeVariables.get(arrayvar.definingScope(), arrayvar.name) as RuntimeValueArray
-                        val index = evaluate(stmt.target.arrayindexed!!.arrayspec.index, evalCtx).integerValue()
+                        val index = (evaluate(stmt.target.arrayindexed!!.arrayspec.index, evalCtx) as RuntimeValueNumeric).integerValue()
                         val elementType = stmt.target.arrayindexed!!.inferType(program)
                         if(!elementType.isKnown)
                             throw VmExecutionException("unknown/void elt type")
-                        var value = RuntimeValue(elementType.typeOrElse(DataType.BYTE), arrayvalue.array!![index].toInt())
+                        var value = RuntimeValueNumeric(elementType.typeOrElse(DataType.BYTE), arrayvalue.array[index].toInt())
-                        value = when {
+                        value = when (stmt.operator) {
-                            stmt.operator == "++" -> value.inc()
+                            "++" -> value.inc()
-                            stmt.operator == "--" -> value.dec()
+                            "--" -> value.dec()
                             else -> throw VmExecutionException("strange postincdec operator $stmt")
                         }
                         arrayvalue.array[index] = value.numericValue()
                     }
                     stmt.target.register != null -> {
-                        var value = runtimeVariables.get(program.namespace, stmt.target.register!!.name)
+                        var value = runtimeVariables.get(program.namespace, stmt.target.register!!.name) as RuntimeValueNumeric
-                        value = when {
+                        value = when (stmt.operator) {
-                            stmt.operator == "++" -> value.add(RuntimeValue(value.type, 1))
+                            "++" -> value.add(RuntimeValueNumeric(value.type, 1))
-                            stmt.operator == "--" -> value.sub(RuntimeValue(value.type, 1))
+                            "--" -> value.sub(RuntimeValueNumeric(value.type, 1))
                             else -> throw VmExecutionException("strange postincdec operator $stmt")
                         }
                         runtimeVariables.set(program.namespace, stmt.target.register!!.name, value)
@@ -439,7 +445,7 @@ class AstVm(val program: Program) {
             is Jump -> throw LoopControlJump(stmt.identifier, stmt.address, stmt.generatedLabel)
             is InlineAssembly -> {
                 if (sub is Subroutine) {
-                    val args = sub.parameters.map { runtimeVariables.get(sub, it.name) }
+                    val args = sub.parameters.map { runtimeVariables.get(sub, it.name) as RuntimeValueNumeric }
                     performSyscall(sub, args)
                     throw LoopControlReturn(null)
                 }
@@ -447,7 +453,7 @@ class AstVm(val program: Program) {
             }
             is AnonymousScope -> executeAnonymousScope(stmt)
             is IfStatement -> {
-                val condition = evaluate(stmt.condition, evalCtx)
+                val condition = evaluate(stmt.condition, evalCtx) as RuntimeValueNumeric
                 if (condition.asBoolean)
                     executeAnonymousScope(stmt.truepart)
                 else
@@ -478,7 +484,13 @@ class AstVm(val program: Program) {
                     loopvarDt = dt.typeOrElse(DataType.UBYTE)
                     loopvar = stmt.loopVar!!
                 }
-                val iterator = iterable.iterator()
+                val iterator =
+                        when (iterable) {
+                            is RuntimeValueRange -> iterable.iterator()
+                            is RuntimeValueArray -> iterable.iterator()
+                            is RuntimeValueString -> iterable.iterator()
+                            else -> throw VmExecutionException("not iterable")
+                        }
                 for (loopvalue in iterator) {
                     try {
                         oneForCycle(stmt, loopvarDt, loopvalue, loopvar)
@@ -490,11 +502,11 @@ class AstVm(val program: Program) {
                 }
             }
             is WhileLoop -> {
-                var condition = evaluate(stmt.condition, evalCtx)
+                var condition = evaluate(stmt.condition, evalCtx) as RuntimeValueNumeric
                 while (condition.asBoolean) {
                     try {
                         executeAnonymousScope(stmt.body)
-                        condition = evaluate(stmt.condition, evalCtx)
+                        condition = evaluate(stmt.condition, evalCtx) as RuntimeValueNumeric
                     } catch (b: LoopControlBreak) {
                         break
                     } catch (c: LoopControlContinue) {
@@ -504,7 +516,7 @@ class AstVm(val program: Program) {
             }
             is RepeatLoop -> {
                 do {
-                    val condition = evaluate(stmt.untilCondition, evalCtx)
+                    val condition = evaluate(stmt.untilCondition, evalCtx) as RuntimeValueNumeric
                     try {
                         executeAnonymousScope(stmt.body)
                     } catch (b: LoopControlBreak) {
@@ -515,7 +527,7 @@ class AstVm(val program: Program) {
                 } while (!condition.asBoolean)
             }
             is WhenStatement -> {
-                val condition=evaluate(stmt.condition, evalCtx)
+                val condition=evaluate(stmt.condition, evalCtx) as RuntimeValueNumeric
                 for(choice in stmt.choices) {
                     if(choice.values==null) {
                         // the 'else' choice
@@ -523,7 +535,7 @@ class AstVm(val program: Program) {
                         break
                     } else {
                         val value = choice.values!!.single().constValue(evalCtx.program) ?: throw VmExecutionException("can only use const values in when choices ${choice.position}")
-                        val rtval = RuntimeValue.fromLv(value)
+                        val rtval = RuntimeValueNumeric.fromLv(value)
                         if(condition==rtval) {
                             executeAnonymousScope(choice.statements)
                             break
@@ -538,8 +550,8 @@ class AstVm(val program: Program) {
     }
 
     private fun executeSwap(swap: FunctionCallStatement) {
-        val v1 = swap.arglist[0]
+        val v1 = swap.args[0]
-        val v2 = swap.arglist[1]
+        val v2 = swap.args[1]
         val value1 = evaluate(v1, evalCtx)
         val value2 = evaluate(v2, evalCtx)
         val target1 = AssignTarget.fromExpr(v1)
@@ -548,7 +560,7 @@ class AstVm(val program: Program) {
         performAssignment(target2, value1, swap, evalCtx)
     }
 
-    fun performAssignment(target: AssignTarget, value: RuntimeValue, contextStmt: Statement, evalCtx: EvalContext) {
+    fun performAssignment(target: AssignTarget, value: RuntimeValueBase, contextStmt: Statement, evalCtx: EvalContext) {
         val targetIdent = target.identifier
         val targetArrayIndexed = target.arrayindexed
         when {
@@ -558,27 +570,26 @@ class AstVm(val program: Program) {
                 if (decl.type == VarDeclType.MEMORY) {
                     val address = runtimeVariables.getMemoryAddress(decl.definingScope(), decl.name)
                     when (decl.datatype) {
-                        DataType.UBYTE -> mem.setUByte(address, value.byteval!!)
+                        DataType.UBYTE -> mem.setUByte(address, (value as RuntimeValueNumeric).byteval!!)
-                        DataType.BYTE -> mem.setSByte(address, value.byteval!!)
+                        DataType.BYTE -> mem.setSByte(address, (value as RuntimeValueNumeric).byteval!!)
-                        DataType.UWORD -> mem.setUWord(address, value.wordval!!)
+                        DataType.UWORD -> mem.setUWord(address, (value as RuntimeValueNumeric).wordval!!)
-                        DataType.WORD -> mem.setSWord(address, value.wordval!!)
+                        DataType.WORD -> mem.setSWord(address, (value as RuntimeValueNumeric).wordval!!)
-                        DataType.FLOAT -> mem.setFloat(address, value.floatval!!)
+                        DataType.FLOAT -> mem.setFloat(address, (value as RuntimeValueNumeric).floatval!!)
-                        DataType.STR -> mem.setString(address, value.str!!)
+                        DataType.STR -> mem.setString(address, (value as RuntimeValueString).str)
-                        DataType.STR_S -> mem.setScreencodeString(address, value.str!!)
                         else -> throw VmExecutionException("weird memaddress type $decl")
                     }
                 } else
                     runtimeVariables.set(decl.definingScope(), decl.name, value)
             }
             target.memoryAddress != null -> {
-                val address = evaluate(target.memoryAddress.addressExpression, evalCtx).wordval!!
+                val address = (evaluate(target.memoryAddress.addressExpression, evalCtx) as RuntimeValueNumeric).wordval!!
-                evalCtx.mem.setUByte(address, value.byteval!!)
+                evalCtx.mem.setUByte(address, (value as RuntimeValueNumeric).byteval!!)
             }
             targetArrayIndexed != null -> {
                 val vardecl = targetArrayIndexed.identifier.targetVarDecl(program.namespace)!!
                 if(vardecl.type==VarDeclType.VAR) {
                     val array = evaluate(targetArrayIndexed.identifier, evalCtx)
-                    val index = evaluate(targetArrayIndexed.arrayspec.index, evalCtx)
+                    val index = evaluate(targetArrayIndexed.arrayspec.index, evalCtx) as RuntimeValueNumeric
                     when (array.type) {
                         DataType.ARRAY_UB -> {
                             if (value.type != DataType.UBYTE)
@@ -600,28 +611,28 @@ class AstVm(val program: Program) {
                             if (value.type != DataType.FLOAT)
                                 throw VmExecutionException("new value is of different datatype ${value.type} for $array")
                         }
-                        DataType.STR, DataType.STR_S -> {
+                        DataType.STR -> {
                             if (value.type !in ByteDatatypes)
                                 throw VmExecutionException("new value is of different datatype ${value.type} for $array")
                         }
                         else -> throw VmExecutionException("strange array type ${array.type}")
                     }
                     if (array.type in ArrayDatatypes)
-                        array.array!![index.integerValue()] = value.numericValue()
+                        (array as RuntimeValueArray).array[index.integerValue()] = value.numericValue()
-                    else if (array.type in StringDatatypes) {
+                    else if (array.type == DataType.STR) {
                         val indexInt = index.integerValue()
-                        val newchr = Petscii.decodePetscii(listOf(value.numericValue().toShort()), true)
+                        val newchr = value.numericValue().toChar().toString()
-                        val newstr = array.str!!.replaceRange(indexInt, indexInt + 1, newchr)
+                        val newstr = (array as RuntimeValueString).str.replaceRange(indexInt, indexInt + 1, newchr)
                         val ident = contextStmt.definingScope().lookup(targetArrayIndexed.identifier.nameInSource, contextStmt) as? VarDecl
                                 ?: throw VmExecutionException("can't find assignment target ${target.identifier}")
                         val identScope = ident.definingScope()
-                        program.heap.update(array.heapId!!, newstr)
+                        runtimeVariables.set(identScope, ident.name, RuntimeValueString(newstr, array.heapId))
-                        runtimeVariables.set(identScope, ident.name, RuntimeValue(array.type, str = newstr, heapId = array.heapId))
                     }
                 }
                 else {
+                    value as RuntimeValueNumeric
                     val address = (vardecl.value as NumericLiteralValue).number.toInt()
-                    val index = evaluate(targetArrayIndexed.arrayspec.index, evalCtx).integerValue()
+                    val index = (evaluate(targetArrayIndexed.arrayspec.index, evalCtx) as RuntimeValueNumeric).integerValue()
                     val elementType = targetArrayIndexed.inferType(program)
                     if(!elementType.isKnown)
                         throw VmExecutionException("unknown/void array elt type $targetArrayIndexed")
@@ -630,7 +641,7 @@ class AstVm(val program: Program) {
                         DataType.BYTE -> mem.setSByte(address+index, value.byteval!!)
                         DataType.UWORD -> mem.setUWord(address+index*2, value.wordval!!)
                         DataType.WORD -> mem.setSWord(address+index*2, value.wordval!!)
-                        DataType.FLOAT -> mem.setFloat(address+index* MachineDefinition.Mflpt5.MemorySize, value.floatval!!)
+                        DataType.FLOAT -> mem.setFloat(address+index* C64MachineDefinition.FLOAT_MEM_SIZE, value.floatval!!)
                         else -> throw VmExecutionException("strange array elt type $elementType")
                     }
                 }
@@ -645,60 +656,60 @@ class AstVm(val program: Program) {
     private fun oneForCycle(stmt: ForLoop, loopvarDt: DataType, loopValue: Number, loopVar: IdentifierReference) {
         // assign the new loop value to the loopvar, and run the code
         performAssignment(AssignTarget(null, loopVar, null, null, loopVar.position),
-                RuntimeValue(loopvarDt, loopValue), stmt.body.statements.first(), evalCtx)
+                RuntimeValueNumeric(loopvarDt, loopValue), stmt.body.statements.first(), evalCtx)
         executeAnonymousScope(stmt.body)
     }
 
     private fun evaluate(args: List<Expression>) = args.map { evaluate(it, evalCtx) }
 
-    private fun performSyscall(sub: Subroutine, args: List<RuntimeValue>): RuntimeValue? {
+    private fun performSyscall(sub: Subroutine, args: List<RuntimeValueNumeric>): RuntimeValueNumeric? {
-        var result: RuntimeValue? = null
+        var result: RuntimeValueNumeric? = null
         when (sub.scopedname) {
             "c64scr.print" -> {
                 // if the argument is an UWORD, consider it to be the "address" of the string (=heapId)
                 if (args[0].wordval != null) {
-                    val str = program.heap.get(args[0].wordval!!).str!!
+                    val string = getAsciiStringFromRuntimeVars(args[0].wordval!!)
-                    dialog.canvas.printText(str, true)
+                    dialog.canvas.printAsciiText(string)
                 } else
-                    dialog.canvas.printText(args[0].str!!, true)
+                    throw VmExecutionException("print non-heap string")
             }
             "c64scr.print_ub" -> {
-                dialog.canvas.printText(args[0].byteval!!.toString(), true)
+                dialog.canvas.printAsciiText(args[0].byteval!!.toString())
             }
             "c64scr.print_ub0" -> {
-                dialog.canvas.printText("%03d".format(args[0].byteval!!), true)
+                dialog.canvas.printAsciiText("%03d".format(args[0].byteval!!))
             }
             "c64scr.print_b" -> {
-                dialog.canvas.printText(args[0].byteval!!.toString(), true)
+                dialog.canvas.printAsciiText(args[0].byteval!!.toString())
             }
             "c64scr.print_uw" -> {
-                dialog.canvas.printText(args[0].wordval!!.toString(), true)
+                dialog.canvas.printAsciiText(args[0].wordval!!.toString())
             }
             "c64scr.print_uw0" -> {
-                dialog.canvas.printText("%05d".format(args[0].wordval!!), true)
+                dialog.canvas.printAsciiText("%05d".format(args[0].wordval!!))
             }
             "c64scr.print_w" -> {
-                dialog.canvas.printText(args[0].wordval!!.toString(), true)
+                dialog.canvas.printAsciiText(args[0].wordval!!.toString())
             }
             "c64scr.print_ubhex" -> {
                 val number = args[0].byteval!!
                 val prefix = if (args[1].asBoolean) "$" else ""
-                dialog.canvas.printText("$prefix${number.toString(16).padStart(2, '0')}", true)
+                dialog.canvas.printAsciiText("$prefix${number.toString(16).padStart(2, '0')}")
             }
             "c64scr.print_uwhex" -> {
                 val number = args[0].wordval!!
                 val prefix = if (args[1].asBoolean) "$" else ""
-                dialog.canvas.printText("$prefix${number.toString(16).padStart(4, '0')}", true)
+                dialog.canvas.printAsciiText("$prefix${number.toString(16).padStart(4, '0')}")
             }
             "c64scr.print_uwbin" -> {
                 val number = args[0].wordval!!
                 val prefix = if (args[1].asBoolean) "%" else ""
-                dialog.canvas.printText("$prefix${number.toString(2).padStart(16, '0')}", true)
+                dialog.canvas.printAsciiText("$prefix${number.toString(2).padStart(16, '0')}")
             }
             "c64scr.print_ubbin" -> {
                 val number = args[0].byteval!!
                 val prefix = if (args[1].asBoolean) "%" else ""
-                dialog.canvas.printText("$prefix${number.toString(2).padStart(8, '0')}", true)
+                dialog.canvas.printAsciiText("$prefix${number.toString(2).padStart(8, '0')}")
             }
             "c64scr.clear_screenchars" -> {
                 dialog.canvas.clearScreen(6)
@@ -707,7 +718,7 @@ class AstVm(val program: Program) {
                 dialog.canvas.clearScreen(args[0].integerValue().toShort())
             }
             "c64scr.setcc" -> {
-                dialog.canvas.setChar(args[0].integerValue(), args[1].integerValue(), args[2].integerValue().toShort(), args[3].integerValue().toShort())
+                dialog.canvas.setScreenChar(args[0].integerValue(), args[1].integerValue(), args[2].integerValue().toShort(), args[3].integerValue().toShort())
             }
             "c64scr.plot" -> {
                 dialog.canvas.setCursorPos(args[0].integerValue(), args[1].integerValue())
@@ -723,26 +734,23 @@ class AstVm(val program: Program) {
                         break
                     else {
                         input.add(char)
-                        val printChar = try {
+                        dialog.canvas.printAsciiText(char.toString())
-                            Petscii.encodePetscii("" + char, true).first()
-                        } catch (cv: CharConversionException) {
-                            0x3f.toShort()
-                        }
-                        dialog.canvas.printPetscii(printChar)
                     }
                 }
-                val inputStr = input.joinToString("")
+                var inputStr = input.joinToString("")
+                val inputLength = inputStr.length
                 val heapId = args[0].wordval!!
-                val origStr = program.heap.get(heapId).str!!
+                val origStrLength = getAsciiStringFromRuntimeVars(heapId).length
-                val paddedStr=inputStr.padEnd(origStr.length+1, '\u0000').substring(0, origStr.length)
+                while(inputStr.length < origStrLength) {
-                program.heap.update(heapId, paddedStr)
+                    inputStr += '\u0000'
-                result = RuntimeValue(DataType.UBYTE, paddedStr.indexOf('\u0000'))
+                }
+                result = RuntimeValueNumeric(DataType.UBYTE, inputLength)
             }
             "c64flt.print_f" -> {
-                dialog.canvas.printText(args[0].floatval.toString(), false)
+                dialog.canvas.printAsciiText(args[0].floatval.toString())
             }
             "c64.CHROUT" -> {
-                dialog.canvas.printPetscii(args[0].byteval!!)
+                dialog.canvas.printPetsciiChar(args[0].byteval!!)
             }
             "c64.CLEARSCR" -> {
                 dialog.canvas.clearScreen(6)
@@ -752,13 +760,20 @@ class AstVm(val program: Program) {
                     Thread.sleep(10)
                 }
                 val char=dialog.keyboardBuffer.pop()
-                result = RuntimeValue(DataType.UBYTE, char.toShort())
+                result = RuntimeValueNumeric(DataType.UBYTE, char.toShort())
+            }
+            "c64.GETIN" -> {
+                Thread.sleep(1)
+                result = if(dialog.keyboardBuffer.isEmpty())
+                    RuntimeValueNumeric(DataType.UBYTE, 0)
+                else
+                    RuntimeValueNumeric(DataType.UBYTE, dialog.keyboardBuffer.pop().toShort())
             }
             "c64utils.str2uword" -> {
                 val heapId = args[0].wordval!!
-                val argString = program.heap.get(heapId).str!!
+                val argString = getAsciiStringFromRuntimeVars(heapId)
                 val numericpart = argString.takeWhile { it.isDigit() }
-                result = RuntimeValue(DataType.UWORD, numericpart.toInt() and 65535)
+                result = RuntimeValueNumeric(DataType.UWORD, numericpart.toInt() and 65535)
             }
             else -> TODO("syscall  ${sub.scopedname} $sub")
         }
@@ -766,144 +781,152 @@ class AstVm(val program: Program) {
         return result
     }
 
-    private fun performBuiltinFunction(name: String, args: List<RuntimeValue>, statusflags: StatusFlags): RuntimeValue? {
+    private fun getAsciiStringFromRuntimeVars(heapId: Int): String =
+            (runtimeVariables.getByHeapId(heapId) as RuntimeValueString).str
+
+    private fun getArrayFromRuntimeVars(heapId: Int): IntArray {
+        val arrayvar = runtimeVariables.getByHeapId(heapId) as RuntimeValueArray
+        return arrayvar.array.map { it.toInt() }.toIntArray()
+    }
+
+    private fun performBuiltinFunction(name: String, args: List<RuntimeValueBase>, statusflags: StatusFlags): RuntimeValueNumeric? {
         return when (name) {
-            "rnd" -> RuntimeValue(DataType.UBYTE, rnd.nextInt() and 255)
+            "rnd" -> RuntimeValueNumeric(DataType.UBYTE, rnd.nextInt() and 255)
-            "rndw" -> RuntimeValue(DataType.UWORD, rnd.nextInt() and 65535)
+            "rndw" -> RuntimeValueNumeric(DataType.UWORD, rnd.nextInt() and 65535)
-            "rndf" -> RuntimeValue(DataType.FLOAT, rnd.nextDouble())
+            "rndf" -> RuntimeValueNumeric(DataType.FLOAT, rnd.nextDouble())
-            "lsb" -> RuntimeValue(DataType.UBYTE, args[0].integerValue() and 255)
+            "lsb" -> RuntimeValueNumeric(DataType.UBYTE, args[0].integerValue() and 255)
-            "msb" -> RuntimeValue(DataType.UBYTE, (args[0].integerValue() ushr 8) and 255)
+            "msb" -> RuntimeValueNumeric(DataType.UBYTE, (args[0].integerValue() ushr 8) and 255)
-            "sin" -> RuntimeValue(DataType.FLOAT, sin(args[0].numericValue().toDouble()))
+            "sin" -> RuntimeValueNumeric(DataType.FLOAT, sin(args[0].numericValue().toDouble()))
             "sin8" -> {
                 val rad = args[0].numericValue().toDouble() / 256.0 * 2.0 * PI
-                RuntimeValue(DataType.BYTE, (127.0 * sin(rad)).toShort())
+                RuntimeValueNumeric(DataType.BYTE, (127.0 * sin(rad)).toShort())
             }
             "sin8u" -> {
                 val rad = args[0].numericValue().toDouble() / 256.0 * 2.0 * PI
-                RuntimeValue(DataType.UBYTE, (128.0 + 127.5 * sin(rad)).toShort())
+                RuntimeValueNumeric(DataType.UBYTE, (128.0 + 127.5 * sin(rad)).toShort())
             }
             "sin16" -> {
                 val rad = args[0].numericValue().toDouble() / 256.0 * 2.0 * PI
-                RuntimeValue(DataType.BYTE, (32767.0 * sin(rad)).toShort())
+                RuntimeValueNumeric(DataType.BYTE, (32767.0 * sin(rad)).toShort())
             }
             "sin16u" -> {
                 val rad = args[0].numericValue().toDouble() / 256.0 * 2.0 * PI
-                RuntimeValue(DataType.UBYTE, (32768.0 + 32767.5 * sin(rad)).toShort())
+                RuntimeValueNumeric(DataType.UBYTE, (32768.0 + 32767.5 * sin(rad)).toShort())
             }
-            "cos" -> RuntimeValue(DataType.FLOAT, cos(args[0].numericValue().toDouble()))
+            "cos" -> RuntimeValueNumeric(DataType.FLOAT, cos(args[0].numericValue().toDouble()))
             "cos8" -> {
                 val rad = args[0].numericValue().toDouble() / 256.0 * 2.0 * PI
-                RuntimeValue(DataType.BYTE, (127.0 * cos(rad)).toShort())
+                RuntimeValueNumeric(DataType.BYTE, (127.0 * cos(rad)).toShort())
             }
             "cos8u" -> {
                 val rad = args[0].numericValue().toDouble() / 256.0 * 2.0 * PI
-                RuntimeValue(DataType.UBYTE, (128.0 + 127.5 * cos(rad)).toShort())
+                RuntimeValueNumeric(DataType.UBYTE, (128.0 + 127.5 * cos(rad)).toShort())
             }
             "cos16" -> {
                 val rad = args[0].numericValue().toDouble() / 256.0 * 2.0 * PI
-                RuntimeValue(DataType.BYTE, (32767.0 * cos(rad)).toShort())
+                RuntimeValueNumeric(DataType.BYTE, (32767.0 * cos(rad)).toShort())
             }
             "cos16u" -> {
                 val rad = args[0].numericValue().toDouble() / 256.0 * 2.0 * PI
-                RuntimeValue(DataType.UBYTE, (32768.0 + 32767.5 * cos(rad)).toShort())
+                RuntimeValueNumeric(DataType.UBYTE, (32768.0 + 32767.5 * cos(rad)).toShort())
             }
-            "tan" -> RuntimeValue(DataType.FLOAT, tan(args[0].numericValue().toDouble()))
+            "tan" -> RuntimeValueNumeric(DataType.FLOAT, tan(args[0].numericValue().toDouble()))
-            "atan" -> RuntimeValue(DataType.FLOAT, atan(args[0].numericValue().toDouble()))
+            "atan" -> RuntimeValueNumeric(DataType.FLOAT, atan(args[0].numericValue().toDouble()))
-            "ln" -> RuntimeValue(DataType.FLOAT, ln(args[0].numericValue().toDouble()))
+            "ln" -> RuntimeValueNumeric(DataType.FLOAT, ln(args[0].numericValue().toDouble()))
-            "log2" -> RuntimeValue(DataType.FLOAT, log2(args[0].numericValue().toDouble()))
+            "log2" -> RuntimeValueNumeric(DataType.FLOAT, log2(args[0].numericValue().toDouble()))
-            "sqrt" -> RuntimeValue(DataType.FLOAT, sqrt(args[0].numericValue().toDouble()))
+            "sqrt" -> RuntimeValueNumeric(DataType.FLOAT, sqrt(args[0].numericValue().toDouble()))
-            "sqrt16" -> RuntimeValue(DataType.UBYTE, sqrt(args[0].wordval!!.toDouble()).toInt())
+            "sqrt16" -> RuntimeValueNumeric(DataType.UBYTE, sqrt((args[0] as RuntimeValueNumeric).wordval!!.toDouble()).toInt())
-            "rad" -> RuntimeValue(DataType.FLOAT, Math.toRadians(args[0].numericValue().toDouble()))
+            "rad" -> RuntimeValueNumeric(DataType.FLOAT, Math.toRadians(args[0].numericValue().toDouble()))
-            "deg" -> RuntimeValue(DataType.FLOAT, Math.toDegrees(args[0].numericValue().toDouble()))
+            "deg" -> RuntimeValueNumeric(DataType.FLOAT, Math.toDegrees(args[0].numericValue().toDouble()))
-            "round" -> RuntimeValue(DataType.FLOAT, round(args[0].numericValue().toDouble()))
+            "round" -> RuntimeValueNumeric(DataType.FLOAT, round(args[0].numericValue().toDouble()))
-            "floor" -> RuntimeValue(DataType.FLOAT, floor(args[0].numericValue().toDouble()))
+            "floor" -> RuntimeValueNumeric(DataType.FLOAT, floor(args[0].numericValue().toDouble()))
-            "ceil" -> RuntimeValue(DataType.FLOAT, ceil(args[0].numericValue().toDouble()))
+            "ceil" -> RuntimeValueNumeric(DataType.FLOAT, ceil(args[0].numericValue().toDouble()))
             "rol" -> {
-                val (result, newCarry) = args[0].rol(statusflags.carry)
+                val (result, newCarry) = (args[0] as RuntimeValueNumeric).rol(statusflags.carry)
                 statusflags.carry = newCarry
                 return result
             }
-            "rol2" -> args[0].rol2()
+            "rol2" -> (args[0] as RuntimeValueNumeric).rol2()
             "ror" -> {
-                val (result, newCarry) = args[0].ror(statusflags.carry)
+                val (result, newCarry) = (args[0] as RuntimeValueNumeric).ror(statusflags.carry)
                 statusflags.carry = newCarry
                 return result
             }
-            "ror2" -> args[0].ror2()
+            "ror2" -> (args[0] as RuntimeValueNumeric).ror2()
-            "lsl" -> args[0].shl()
+            "lsl" -> (args[0] as RuntimeValueNumeric).shl()
-            "lsr" -> args[0].shr()
+            "lsr" -> (args[0] as RuntimeValueNumeric).shr()
             "abs" -> {
                 when (args[0].type) {
-                    DataType.UBYTE -> args[0]
+                    DataType.UBYTE -> (args[0]  as RuntimeValueNumeric)
-                    DataType.BYTE -> RuntimeValue(DataType.UBYTE, abs(args[0].numericValue().toDouble()))
+                    DataType.BYTE -> RuntimeValueNumeric(DataType.UBYTE, abs(args[0].numericValue().toDouble()))
-                    DataType.UWORD -> args[0]
+                    DataType.UWORD -> (args[0] as RuntimeValueNumeric)
-                    DataType.WORD -> RuntimeValue(DataType.UWORD, abs(args[0].numericValue().toDouble()))
+                    DataType.WORD -> RuntimeValueNumeric(DataType.UWORD, abs(args[0].numericValue().toDouble()))
-                    DataType.FLOAT -> RuntimeValue(DataType.FLOAT, abs(args[0].numericValue().toDouble()))
+                    DataType.FLOAT -> RuntimeValueNumeric(DataType.FLOAT, abs(args[0].numericValue().toDouble()))
                     else -> throw VmExecutionException("strange abs type ${args[0]}")
                 }
             }
             "max" -> {
-                val numbers = args.single().array!!.map { it.toDouble() }
+                val numbers = (args.single() as RuntimeValueArray).array.map { it.toDouble() }
-                RuntimeValue(ArrayElementTypes.getValue(args[0].type), numbers.max())
+                RuntimeValueNumeric(ArrayElementTypes.getValue(args[0].type), numbers.max()!!)
             }
             "min" -> {
-                val numbers = args.single().array!!.map { it.toDouble() }
+                val numbers = (args.single() as RuntimeValueArray).array.map { it.toDouble() }
-                RuntimeValue(ArrayElementTypes.getValue(args[0].type), numbers.min())
+                RuntimeValueNumeric(ArrayElementTypes.getValue(args[0].type), numbers.min()!!)
             }
             "sum" -> {
-                val sum = args.single().array!!.map { it.toDouble() }.sum()
+                val sum = (args.single() as RuntimeValueArray).array.map { it.toDouble() }.sum()
                 when (args[0].type) {
-                    DataType.ARRAY_UB -> RuntimeValue(DataType.UWORD, sum)
+                    DataType.ARRAY_UB -> RuntimeValueNumeric(DataType.UWORD, sum)
-                    DataType.ARRAY_B -> RuntimeValue(DataType.WORD, sum)
+                    DataType.ARRAY_B -> RuntimeValueNumeric(DataType.WORD, sum)
-                    DataType.ARRAY_UW -> RuntimeValue(DataType.UWORD, sum)
+                    DataType.ARRAY_UW -> RuntimeValueNumeric(DataType.UWORD, sum)
-                    DataType.ARRAY_W -> RuntimeValue(DataType.WORD, sum)
+                    DataType.ARRAY_W -> RuntimeValueNumeric(DataType.WORD, sum)
-                    DataType.ARRAY_F -> RuntimeValue(DataType.FLOAT, sum)
+                    DataType.ARRAY_F -> RuntimeValueNumeric(DataType.FLOAT, sum)
                     else -> throw VmExecutionException("weird sum type ${args[0]}")
                 }
             }
             "any" -> {
-                val numbers = args.single().array!!.map { it.toDouble() }
+                val numbers = (args.single() as RuntimeValueArray).array.map { it.toDouble() }
-                RuntimeValue(DataType.UBYTE, if (numbers.any { it != 0.0 }) 1 else 0)
+                RuntimeValueNumeric(DataType.UBYTE, if (numbers.any { it != 0.0 }) 1 else 0)
             }
             "all" -> {
-                val numbers = args.single().array!!.map { it.toDouble() }
+                val numbers = (args.single() as RuntimeValueArray).array.map { it.toDouble() }
-                RuntimeValue(DataType.UBYTE, if (numbers.all { it != 0.0 }) 1 else 0)
+                RuntimeValueNumeric(DataType.UBYTE, if (numbers.all { it != 0.0 }) 1 else 0)
             }
             "swap" ->
                 throw VmExecutionException("swap() cannot be implemented as a function")
             "strlen" -> {
-                val zeroIndex = args[0].str!!.indexOf(0.toChar())
+                val zeroIndex = (args[0] as RuntimeValueString).str.indexOf(0.toChar())
                 if (zeroIndex >= 0)
-                    RuntimeValue(DataType.UBYTE, zeroIndex)
+                    RuntimeValueNumeric(DataType.UBYTE, zeroIndex)
                 else
-                    RuntimeValue(DataType.UBYTE, args[0].str!!.length)
+                    RuntimeValueNumeric(DataType.UBYTE, (args[0] as RuntimeValueString).str.length)
             }
             "memset" -> {
-                val heapId = args[0].wordval!!
+                val heapId = (args[0] as RuntimeValueNumeric).wordval!!
-                val target = program.heap.get(heapId).array ?: throw VmExecutionException("memset target is not an array")
+                val target = getArrayFromRuntimeVars(heapId)
                 val amount = args[1].integerValue()
                 val value = args[2].integerValue()
                 for (i in 0 until amount) {
-                    target[i] = IntegerOrAddressOf(value, null)
+                    target[i] = value
                 }
                 null
             }
             "memsetw" -> {
-                val heapId = args[0].wordval!!
+                val heapId = (args[0] as RuntimeValueNumeric).wordval!!
-                val target = program.heap.get(heapId).array  ?: throw VmExecutionException("memset target is not an array")
+                val target = getArrayFromRuntimeVars(heapId)
                 val amount = args[1].integerValue()
                 val value = args[2].integerValue()
                 for (i in 0 until amount step 2) {
-                    target[i * 2] = IntegerOrAddressOf(value and 255, null)
+                    target[i * 2] = value and 255
-                    target[i * 2 + 1] = IntegerOrAddressOf(value ushr 8, null)
+                    target[i * 2 + 1] = value ushr 8
                 }
                 null
             }
             "memcopy" -> {
-                val sourceHeapId = args[0].wordval!!
+                val sourceHeapId = (args[0] as RuntimeValueNumeric).wordval!!
-                val destHeapId = args[1].wordval!!
+                val destHeapId = (args[1] as RuntimeValueNumeric).wordval!!
-                val source = program.heap.get(sourceHeapId).array!!
+                val source = getArrayFromRuntimeVars(sourceHeapId)
-                val dest = program.heap.get(destHeapId).array!!
+                val dest = getArrayFromRuntimeVars(destHeapId)
                 val amount = args[2].integerValue()
                 for(i in 0 until amount) {
                     dest[i] = source[i]
@@ -912,7 +935,7 @@ class AstVm(val program: Program) {
             }
             "mkword" -> {
                 val result = (args[1].integerValue() shl 8) or args[0].integerValue()
-                RuntimeValue(DataType.UWORD, result)
+                RuntimeValueNumeric(DataType.UWORD, result)
             }
             "set_carry" -> {
                 statusflags.carry=true
@@ -935,13 +958,13 @@ class AstVm(val program: Program) {
                 val zero = if(statusflags.zero) 2 else 0
                 val irqd = if(statusflags.irqd) 4 else 0
                 val negative = if(statusflags.negative) 128 else 0
-                RuntimeValue(DataType.UBYTE, carry or zero or irqd or negative)
+                RuntimeValueNumeric(DataType.UBYTE, carry or zero or irqd or negative)
             }
             "rsave" -> {
                 statusFlagsSave.push(statusflags)
-                registerAsave.push(runtimeVariables.get(program.namespace, Register.A.name))
+                registerAsave.push(runtimeVariables.get(program.namespace, Register.A.name) as RuntimeValueNumeric)
-                registerXsave.push(runtimeVariables.get(program.namespace, Register.X.name))
+                registerXsave.push(runtimeVariables.get(program.namespace, Register.X.name) as RuntimeValueNumeric)
-                registerYsave.push(runtimeVariables.get(program.namespace, Register.Y.name))
+                registerYsave.push(runtimeVariables.get(program.namespace, Register.Y.name) as RuntimeValueNumeric)
                 null
             }
             "rrestore" -> {
@@ -955,8 +978,25 @@ class AstVm(val program: Program) {
                 runtimeVariables.set(program.namespace, Register.Y.name, registerYsave.pop())
                 null
             }
+            "sort" -> {
+                val array=args.single() as RuntimeValueArray
+                array.array.sort()
+                null
+            }
+            "reverse" -> {
+                val array=args.single() as RuntimeValueArray
+                array.array.reverse()
+                null
+            }
+            "sgn" -> {
+                val value = args.single().numericValue().toDouble()
+                when {
+                    value<0.0 -> RuntimeValueNumeric(DataType.BYTE, -1)
+                    value==0.0 -> RuntimeValueNumeric(DataType.BYTE, 0)
+                    else -> RuntimeValueNumeric(DataType.BYTE, 1)
+                }
+            }
             else -> TODO("builtin function $name")
         }
     }
-
 }

compiler/src/prog8/vm/astvm/Expressions.kt

@@ -10,12 +10,11 @@ import prog8.ast.statements.BuiltinFunctionStatementPlaceholder
 import prog8.ast.statements.Label
 import prog8.ast.statements.Subroutine
 import prog8.ast.statements.VarDecl
-import prog8.vm.RuntimeValue
+import prog8.vm.*
-import prog8.vm.RuntimeValueRange
 
 
-typealias BuiltinfunctionCaller =  (name: String, args: List<RuntimeValue>, flags: StatusFlags) -> RuntimeValue?
+typealias BuiltinfunctionCaller =  (name: String, args: List<RuntimeValueNumeric>, flags: StatusFlags) -> RuntimeValueNumeric?
-typealias SubroutineCaller =  (sub: Subroutine, args: List<RuntimeValue>, startAtLabel: Label?) -> RuntimeValue?
+typealias SubroutineCaller =  (sub: Subroutine, args: List<RuntimeValueNumeric>, startAtLabel: Label?) -> RuntimeValueNumeric?
 
 
 class EvalContext(val program: Program, val mem: Memory, val statusflags: StatusFlags,
@@ -23,34 +22,34 @@ class EvalContext(val program: Program, val mem: Memory, val statusflags: Status
                   val performBuiltinFunction: BuiltinfunctionCaller,
                   val executeSubroutine: SubroutineCaller)
 
-fun evaluate(expr: Expression, ctx: EvalContext): RuntimeValue {
+fun evaluate(expr: Expression, ctx: EvalContext): RuntimeValueBase {
     val constval = expr.constValue(ctx.program)
     if(constval!=null)
-        return RuntimeValue.fromLv(constval)
+        return RuntimeValueNumeric.fromLv(constval)
 
     when(expr) {
-        is NumericLiteralValue -> return RuntimeValue.fromLv(expr)
+        is NumericLiteralValue -> return RuntimeValueNumeric.fromLv(expr)
-        is StringLiteralValue -> return RuntimeValue.fromLv(expr, ctx.program.heap)
+        is StringLiteralValue -> return RuntimeValueString.fromLv(expr)
-        is ArrayLiteralValue -> return RuntimeValue.fromLv(expr, ctx.program.heap)
+        is ArrayLiteralValue -> return RuntimeValueArray.fromLv(expr)
         is PrefixExpression -> {
             return when(expr.operator) {
-                "-" -> evaluate(expr.expression, ctx).neg()
+                "-" -> (evaluate(expr.expression, ctx) as RuntimeValueNumeric).neg()
-                "~" -> evaluate(expr.expression, ctx).inv()
+                "~" -> (evaluate(expr.expression, ctx) as RuntimeValueNumeric).inv()
-                "not" -> evaluate(expr.expression, ctx).not()
+                "not" -> (evaluate(expr.expression, ctx) as RuntimeValueNumeric).not()
                 // unary '+' should have been optimized away
                 else -> throw VmExecutionException("unsupported prefix operator "+expr.operator)
             }
         }
         is BinaryExpression -> {
-            val left = evaluate(expr.left, ctx)
+            val left = evaluate(expr.left, ctx) as RuntimeValueNumeric
-            val right = evaluate(expr.right, ctx)
+            val right = evaluate(expr.right, ctx) as RuntimeValueNumeric
             return when(expr.operator) {
-                "<" -> RuntimeValue(DataType.UBYTE, if (left < right) 1 else 0)
+                "<" -> RuntimeValueNumeric(DataType.UBYTE, if (left < right) 1 else 0)
-                "<=" -> RuntimeValue(DataType.UBYTE, if (left <= right) 1 else 0)
+                "<=" -> RuntimeValueNumeric(DataType.UBYTE, if (left <= right) 1 else 0)
-                ">" -> RuntimeValue(DataType.UBYTE, if (left > right) 1 else 0)
+                ">" -> RuntimeValueNumeric(DataType.UBYTE, if (left > right) 1 else 0)
-                ">=" -> RuntimeValue(DataType.UBYTE, if (left >= right) 1 else 0)
+                ">=" -> RuntimeValueNumeric(DataType.UBYTE, if (left >= right) 1 else 0)
-                "==" -> RuntimeValue(DataType.UBYTE, if (left == right) 1 else 0)
+                "==" -> RuntimeValueNumeric(DataType.UBYTE, if (left == right) 1 else 0)
-                "!=" -> RuntimeValue(DataType.UBYTE, if (left != right) 1 else 0)
+                "!=" -> RuntimeValueNumeric(DataType.UBYTE, if (left != right) 1 else 0)
                 "+" -> left.add(right)
                 "-" -> left.sub(right)
                 "*" -> left.mul(right)
@@ -78,27 +77,36 @@ fun evaluate(expr: Expression, ctx: EvalContext): RuntimeValue {
         }
         is ArrayIndexedExpression -> {
             val array = evaluate(expr.identifier, ctx)
-            val index = evaluate(expr.arrayspec.index, ctx)
+            val index = evaluate(expr.arrayspec.index, ctx) as RuntimeValueNumeric
-            val value = array.array!![index.integerValue()]
+            return when (array) {
-            return RuntimeValue(ArrayElementTypes.getValue(array.type), value)
+                is RuntimeValueString -> {
+                    val value = array.str[index.integerValue()]
+                    RuntimeValueNumeric(ArrayElementTypes.getValue(array.type), value.toShort())
+                }
+                is RuntimeValueArray -> {
+                    val value = array.array[index.integerValue()]
+                    RuntimeValueNumeric(ArrayElementTypes.getValue(array.type), value)
+                }
+                else -> throw VmExecutionException("weird type")
+            }
         }
         is TypecastExpression -> {
-            return evaluate(expr.expression, ctx).cast(expr.type)
+            return (evaluate(expr.expression, ctx) as RuntimeValueNumeric).cast(expr.type)
         }
         is AddressOf -> {
             // we support: address of heap var -> the heap id
             return try {
                 val heapId = expr.identifier.heapId(ctx.program.namespace)
-                RuntimeValue(DataType.UWORD, heapId)
+                RuntimeValueNumeric(DataType.UWORD, heapId)
             } catch( f: FatalAstException) {
                 // fallback: use the hash of the name, so we have at least *a* value...
                 val address = expr.identifier.hashCode() and 65535
-                RuntimeValue(DataType.UWORD, address)
+                RuntimeValueNumeric(DataType.UWORD, address)
             }
         }
         is DirectMemoryRead -> {
-            val address = evaluate(expr.addressExpression, ctx).wordval!!
+            val address = (evaluate(expr.addressExpression, ctx) as RuntimeValueNumeric).wordval!!
-            return RuntimeValue(DataType.UBYTE, ctx.mem.getUByte(address))
+            return RuntimeValueNumeric(DataType.UBYTE, ctx.mem.getUByte(address))
         }
         is RegisterExpr -> return ctx.runtimeVars.get(ctx.program.namespace, expr.register.name)
         is IdentifierReference -> {
@@ -111,13 +119,12 @@ fun evaluate(expr: Expression, ctx: EvalContext): RuntimeValue {
                     else -> {
                         val address = ctx.runtimeVars.getMemoryAddress(variable.definingScope(), variable.name)
                         return when(variable.datatype) {
-                            DataType.UBYTE -> RuntimeValue(DataType.UBYTE, ctx.mem.getUByte(address))
+                            DataType.UBYTE -> RuntimeValueNumeric(DataType.UBYTE, ctx.mem.getUByte(address))
-                            DataType.BYTE -> RuntimeValue(DataType.BYTE, ctx.mem.getSByte(address))
+                            DataType.BYTE -> RuntimeValueNumeric(DataType.BYTE, ctx.mem.getSByte(address))
-                            DataType.UWORD -> RuntimeValue(DataType.UWORD, ctx.mem.getUWord(address))
+                            DataType.UWORD -> RuntimeValueNumeric(DataType.UWORD, ctx.mem.getUWord(address))
-                            DataType.WORD -> RuntimeValue(DataType.WORD, ctx.mem.getSWord(address))
+                            DataType.WORD -> RuntimeValueNumeric(DataType.WORD, ctx.mem.getSWord(address))
-                            DataType.FLOAT -> RuntimeValue(DataType.FLOAT, ctx.mem.getFloat(address))
+                            DataType.FLOAT -> RuntimeValueNumeric(DataType.FLOAT, ctx.mem.getFloat(address))
-                            DataType.STR -> RuntimeValue(DataType.STR, str = ctx.mem.getString(address))
+                            DataType.STR -> RuntimeValueString(ctx.mem.getString(address), null)
-                            DataType.STR_S -> RuntimeValue(DataType.STR_S, str = ctx.mem.getScreencodeString(address))
                             else -> throw VmExecutionException("unexpected datatype $variable")
                         }
                     }
@@ -127,7 +134,7 @@ fun evaluate(expr: Expression, ctx: EvalContext): RuntimeValue {
         }
         is FunctionCall -> {
             val sub = expr.target.targetStatement(ctx.program.namespace)
-            val args = expr.arglist.map { evaluate(it, ctx) }
+            val args = expr.args.map { evaluate(it, ctx) as RuntimeValueNumeric }
             return when(sub) {
                 is Subroutine -> {
                     val result = ctx.executeSubroutine(sub, args, null)
@@ -153,9 +160,9 @@ fun evaluate(expr: Expression, ctx: EvalContext): RuntimeValue {
                 else
                     throw VmExecutionException("couldn't determine datatype")
             }
-            val fromVal = evaluate(expr.from, ctx).integerValue()
+            val fromVal = (evaluate(expr.from, ctx) as RuntimeValueNumeric).integerValue()
-            val toVal = evaluate(expr.to, ctx).integerValue()
+            val toVal = (evaluate(expr.to, ctx) as RuntimeValueNumeric).integerValue()
-            val stepVal = evaluate(expr.step, ctx).integerValue()
+            val stepVal = (evaluate(expr.step, ctx) as RuntimeValueNumeric).integerValue()
             val range = makeRange(fromVal, toVal, stepVal)
             val dt = expr.inferType(ctx.program)
             if(dt.isKnown)

compiler/src/prog8/vm/astvm/Memory.kt

@@ -1,7 +1,7 @@
 package prog8.vm.astvm
 
-import prog8.compiler.target.c64.MachineDefinition
+import prog8.compiler.target.CompilationTarget
-import prog8.compiler.target.c64.Petscii
+import prog8.compiler.target.c64.C64MachineDefinition
 import kotlin.math.abs
 
 class Memory(private val readObserver: (address: Int, value: Short) -> Short,
@@ -21,7 +21,7 @@ class Memory(private val readObserver: (address: Int, value: Short) -> Short,
         else mem[address]
     }
 
-    fun getUByte_DMA(address: Int): Short {
+    fun getUByteDirectly(address: Int): Short {
         return mem[address]
     }
 
@@ -39,7 +39,7 @@ class Memory(private val readObserver: (address: Int, value: Short) -> Short,
                 else value
     }
 
-    fun setUByte_DMA(address: Int, value: Short) {
+    fun setUByteDirectly(address: Int, value: Short) {
         if(value !in 0..255)
             throw VmExecutionException("ubyte value out of range $value")
         mem[address] = value
@@ -80,7 +80,7 @@ class Memory(private val readObserver: (address: Int, value: Short) -> Short,
     }
 
     fun setFloat(address: Int, value: Double) {
-        val mflpt5 = MachineDefinition.Mflpt5.fromNumber(value)
+        val mflpt5 = C64MachineDefinition.Mflpt5.fromNumber(value)
         setUByte(address, mflpt5.b0)
         setUByte(address+1, mflpt5.b1)
         setUByte(address+2, mflpt5.b2)
@@ -89,28 +89,26 @@ class Memory(private val readObserver: (address: Int, value: Short) -> Short,
     }
 
     fun getFloat(address: Int): Double {
-        return MachineDefinition.Mflpt5(getUByte(address), getUByte(address + 1), getUByte(address + 2),
+        return C64MachineDefinition.Mflpt5(getUByte(address), getUByte(address + 1), getUByte(address + 2),
                 getUByte(address + 3), getUByte(address + 4)).toDouble()
     }
 
     fun setString(address: Int, str: String) {
-        // lowercase PETSCII
+        val encoded = CompilationTarget.encodeString(str)
-        val petscii = Petscii.encodePetscii(str, true)
         var addr = address
-        for (c in petscii) setUByte(addr++, c)
+        for (c in encoded) setUByte(addr++, c)
         setUByte(addr, 0)
     }
 
     fun getString(strAddress: Int): String {
-        // lowercase PETSCII
+        val encoded = mutableListOf<Short>()
-        val petscii = mutableListOf<Short>()
         var addr = strAddress
         while(true) {
             val byte = getUByte(addr++)
             if(byte==0.toShort()) break
-            petscii.add(byte)
+            encoded.add(byte)
         }
-        return Petscii.decodePetscii(petscii, true)
+        return CompilationTarget.decodeString(encoded)
     }
 
     fun clear() {
@@ -121,24 +119,4 @@ class Memory(private val readObserver: (address: Int, value: Short) -> Short,
         for(i in 0 until numbytes)
             setUByte(to+i, getUByte(from+i))
     }
-
-    fun getScreencodeString(strAddress: Int): String? {
-        // lowercase Screencodes
-        val screencodes = mutableListOf<Short>()
-        var addr = strAddress
-        while(true) {
-            val byte = getUByte(addr++)
-            if(byte==0.toShort()) break
-            screencodes.add(byte)
-        }
-        return Petscii.decodeScreencode(screencodes, true)
-    }
-
-    fun setScreencodeString(address: Int, str: String) {
-        // lowercase screencodes
-        val screencodes = Petscii.encodeScreencode(str, true)
-        var addr = address
-        for (c in screencodes) setUByte(addr++, c)
-        setUByte(addr, 0)
-    }
 }

compiler/src/prog8/vm/astvm/ScreenDialog.kt

@@ -1,12 +1,12 @@
 package prog8.vm.astvm
 
-import prog8.compiler.target.c64.MachineDefinition
+import prog8.compiler.target.c64.C64MachineDefinition
 import prog8.compiler.target.c64.Petscii
 import java.awt.*
 import java.awt.event.KeyEvent
 import java.awt.event.KeyListener
 import java.awt.image.BufferedImage
-import java.util.*
+import java.util.ArrayDeque
 import javax.swing.JFrame
 import javax.swing.JPanel
 import javax.swing.Timer
@@ -18,7 +18,7 @@ class BitmapScreenPanel : KeyListener, JPanel() {
     private val g2d = image.graphics as Graphics2D
     private var cursorX: Int=0
     private var cursorY: Int=0
-    val keyboardBuffer: Deque<Char> = LinkedList()
+    val keyboardBuffer = ArrayDeque<Char>()
 
     init {
         val size = Dimension(image.width * SCALING, image.height * SCALING)
@@ -50,37 +50,33 @@ class BitmapScreenPanel : KeyListener, JPanel() {
     }
 
     fun clearScreen(color: Short) {
-        g2d.background = MachineDefinition.colorPalette[color % MachineDefinition.colorPalette.size]
+        g2d.background = C64MachineDefinition.colorPalette[color % C64MachineDefinition.colorPalette.size]
         g2d.clearRect(0, 0, SCREENWIDTH, SCREENHEIGHT)
         cursorX = 0
         cursorY = 0
     }
     fun setPixel(x: Int, y: Int, color: Short) {
-        image.setRGB(x, y, MachineDefinition.colorPalette[color % MachineDefinition.colorPalette.size].rgb)
+        image.setRGB(x, y, C64MachineDefinition.colorPalette[color % C64MachineDefinition.colorPalette.size].rgb)
     }
     fun drawLine(x1: Int, y1: Int, x2: Int, y2: Int, color: Short) {
-        g2d.color = MachineDefinition.colorPalette[color % MachineDefinition.colorPalette.size]
+        g2d.color = C64MachineDefinition.colorPalette[color % C64MachineDefinition.colorPalette.size]
         g2d.drawLine(x1, y1, x2, y2)
     }
 
-    fun printText(text: String, lowercase: Boolean, inverseVideo: Boolean=false) {
+    fun printAsciiText(text: String) {
         val t2 = text.substringBefore(0.toChar())
-        val lines = t2.split('\n')
+        val petscii = Petscii.encodePetscii(t2, true)
-        for(line in lines.withIndex()) {
+        petscii.forEach { printPetsciiChar(it) }
-            val petscii = Petscii.encodePetscii(line.value, lowercase)
-            petscii.forEach { printPetscii(it, inverseVideo) }
-            if(line.index<lines.size-1) {
-                printPetscii(13)    // newline
-            }
-        }
     }
 
-    fun printPetscii(char: Short, inverseVideo: Boolean=false) {
+    fun printPetsciiChar(petscii: Short) {
-        if(char==13.toShort() || char==141.toShort()) {
+        if(petscii in listOf(0x0d.toShort(), 0x8d.toShort())) {
+            // Return and shift-Return
             cursorX=0
             cursorY++
         } else {
-            setPetscii(cursorX, cursorY, char, 1, inverseVideo)
+            val scr = Petscii.petscii2scr(petscii, false)
+            setScreenChar(cursorX, cursorY, scr, 1)
             cursorX++
             if (cursorX >= (SCREENWIDTH / 8)) {
                 cursorY++
@@ -94,38 +90,17 @@ class BitmapScreenPanel : KeyListener, JPanel() {
             val graphics = image.graphics as Graphics2D
             graphics.drawImage(screen, 0, -8, null)
             val color = graphics.color
-            graphics.color = MachineDefinition.colorPalette[6]
+            graphics.color = C64MachineDefinition.colorPalette[6]
             graphics.fillRect(0, 24*8, SCREENWIDTH, 25*8)
             graphics.color=color
             cursorY--
         }
     }
 
-    fun writeTextAt(x: Int, y: Int, text: String, color: Short, lowercase: Boolean, inverseVideo: Boolean=false) {
+    fun setScreenChar(x: Int, y: Int, screencode: Short, color: Short) {
-        val colorIdx = (color % MachineDefinition.colorPalette.size).toShort()
-        var xx=x
-        for(clearx in xx until xx+text.length) {
-            g2d.clearRect(8*clearx, 8*y, 8, 8)
-        }
-        for(sc in Petscii.encodePetscii(text, lowercase)) {
-            if(sc==0.toShort())
-                break
-            setPetscii(xx++, y, sc, colorIdx, inverseVideo)
-        }
-    }
-
-    fun setPetscii(x: Int, y: Int, petscii: Short, color: Short, inverseVideo: Boolean) {
         g2d.clearRect(8*x, 8*y, 8, 8)
-        val colorIdx = (color % MachineDefinition.colorPalette.size).toShort()
+        val colorIdx = (color % C64MachineDefinition.colorPalette.size).toShort()
-        val screencode = Petscii.petscii2scr(petscii, inverseVideo)
+        val coloredImage = C64MachineDefinition.Charset.getColoredChar(screencode, colorIdx)
-        val coloredImage = MachineDefinition.Charset.getColoredChar(screencode, colorIdx)
-        g2d.drawImage(coloredImage, 8*x, 8*y , null)
-    }
-
-    fun setChar(x: Int, y: Int, screencode: Short, color: Short) {
-        g2d.clearRect(8*x, 8*y, 8, 8)
-        val colorIdx = (color % MachineDefinition.colorPalette.size).toShort()
-        val coloredImage = MachineDefinition.Charset.getColoredChar(screencode, colorIdx)
         g2d.drawImage(coloredImage, 8*x, 8*y , null)
     }
 
@@ -159,19 +134,19 @@ class ScreenDialog(title: String) : JFrame(title) {
         // the borders (top, left, right, bottom)
         val borderTop = JPanel().apply {
             preferredSize = Dimension(BitmapScreenPanel.SCALING * (BitmapScreenPanel.SCREENWIDTH +2*borderWidth), BitmapScreenPanel.SCALING * borderWidth)
-            background = MachineDefinition.colorPalette[14]
+            background = C64MachineDefinition.colorPalette[14]
         }
         val borderBottom = JPanel().apply {
             preferredSize =Dimension(BitmapScreenPanel.SCALING * (BitmapScreenPanel.SCREENWIDTH +2*borderWidth), BitmapScreenPanel.SCALING * borderWidth)
-            background = MachineDefinition.colorPalette[14]
+            background = C64MachineDefinition.colorPalette[14]
         }
         val borderLeft = JPanel().apply {
             preferredSize =Dimension(BitmapScreenPanel.SCALING * borderWidth, BitmapScreenPanel.SCALING * BitmapScreenPanel.SCREENHEIGHT)
-            background = MachineDefinition.colorPalette[14]
+            background = C64MachineDefinition.colorPalette[14]
         }
         val borderRight = JPanel().apply {
             preferredSize =Dimension(BitmapScreenPanel.SCALING * borderWidth, BitmapScreenPanel.SCALING * BitmapScreenPanel.SCREENHEIGHT)
-            background = MachineDefinition.colorPalette[14]
+            background = C64MachineDefinition.colorPalette[14]
         }
         var c = GridBagConstraints()
         c.gridx=0; c.gridy=1; c.gridwidth=3

compiler/src/prog8/vm/astvm/VariablesCreator.kt

@@ -13,16 +13,17 @@ import prog8.ast.statements.Statement
 import prog8.ast.statements.StructDecl
 import prog8.ast.statements.VarDecl
 import prog8.ast.statements.ZeropageWish
-import prog8.compiler.HeapValues
+import prog8.vm.RuntimeValueArray
-import prog8.vm.RuntimeValue
+import prog8.vm.RuntimeValueNumeric
+import prog8.vm.RuntimeValueString
 
-class VariablesCreator(private val runtimeVariables: RuntimeVariables, private val heap: HeapValues) : IAstModifyingVisitor {
+class VariablesCreator(private val runtimeVariables: RuntimeVariables) : IAstModifyingVisitor {
 
     override fun visit(program: Program) {
         // define the three registers as global variables
-        runtimeVariables.define(program.namespace, Register.A.name, RuntimeValue(DataType.UBYTE, 0))
+        runtimeVariables.define(program.namespace, Register.A.name, RuntimeValueNumeric(DataType.UBYTE, 0))
-        runtimeVariables.define(program.namespace, Register.X.name, RuntimeValue(DataType.UBYTE, 255))
+        runtimeVariables.define(program.namespace, Register.X.name, RuntimeValueNumeric(DataType.UBYTE, 255))
-        runtimeVariables.define(program.namespace, Register.Y.name, RuntimeValue(DataType.UBYTE, 0))
+        runtimeVariables.define(program.namespace, Register.Y.name, RuntimeValueNumeric(DataType.UBYTE, 0))
 
         val globalpos = Position("<<global>>", 0, 0, 0)
         val vdA = VarDecl(VarDeclType.VAR, DataType.UBYTE, ZeropageWish.DONTCARE, null, Register.A.name, null,
@@ -49,12 +50,19 @@ class VariablesCreator(private val runtimeVariables: RuntimeVariables, private v
                     if(decl.datatype!=DataType.STRUCT) {
                         val numericLv = decl.value as? NumericLiteralValue
                         val value = if(numericLv!=null) {
-                            RuntimeValue.fromLv(numericLv)
+                            RuntimeValueNumeric.fromLv(numericLv)
                         } else {
-                            if(decl.value is StringLiteralValue)
+                            val strLv = decl.value as? StringLiteralValue
-                                RuntimeValue.fromLv(decl.value as StringLiteralValue, heap)
+                            val arrayLv = decl.value as? ArrayLiteralValue
-                            else
+                            when {
-                                RuntimeValue.fromLv(decl.value as ArrayLiteralValue, heap)
+                                strLv!=null -> {
+                                    RuntimeValueString.fromLv(strLv)
+                                }
+                                arrayLv!=null -> {
+                                    RuntimeValueArray.fromLv(arrayLv)
+                                }
+                                else -> throw VmExecutionException("weird var type")
+                            }
                         }
                         runtimeVariables.define(decl.definingScope(), decl.name, value)
                     }
@@ -69,12 +77,4 @@ class VariablesCreator(private val runtimeVariables: RuntimeVariables, private v
         }
         return super.visit(decl)
     }
-
-//    override fun accept(assignment: Assignment): Statement {
-//        if(assignment is VariableInitializationAssignment) {
-//            println("INIT VAR $assignment")
-//        }
-//        return super.accept(assignment)
-//    }
-
 }

compiler/test/LiteralValueTests.kt

@@ -83,8 +83,8 @@ class TestParserNumericLiteralValue {
 
     @Test
     fun testEqualsRef() {
-        assertTrue(StringLiteralValue(DataType.STR, "hello", position = dummyPos) == StringLiteralValue(DataType.STR, "hello", position = dummyPos))
+        assertEquals(StringLiteralValue("hello", dummyPos), StringLiteralValue("hello", dummyPos))
-        assertFalse(StringLiteralValue(DataType.STR, "hello", position = dummyPos) == StringLiteralValue(DataType.STR, "bye", position = dummyPos))
+        assertNotEquals(StringLiteralValue("hello", dummyPos), StringLiteralValue("bye", dummyPos))
 
         val lvOne = NumericLiteralValue(DataType.UBYTE, 1, dummyPos)
         val lvTwo = NumericLiteralValue(DataType.UBYTE, 2, dummyPos)
@@ -93,9 +93,9 @@ class TestParserNumericLiteralValue {
         val lvTwoR = NumericLiteralValue(DataType.UBYTE, 2, dummyPos)
         val lvThreeR = NumericLiteralValue(DataType.UBYTE, 3, dummyPos)
         val lvFour= NumericLiteralValue(DataType.UBYTE, 4, dummyPos)
-        val lv1 = ArrayLiteralValue(DataType.ARRAY_UB, arrayOf(lvOne, lvTwo, lvThree), position = dummyPos)
+        val lv1 = ArrayLiteralValue(DataType.ARRAY_UB, arrayOf(lvOne, lvTwo, lvThree), dummyPos)
-        val lv2 = ArrayLiteralValue(DataType.ARRAY_UB, arrayOf(lvOneR, lvTwoR, lvThreeR), position = dummyPos)
+        val lv2 = ArrayLiteralValue(DataType.ARRAY_UB, arrayOf(lvOneR, lvTwoR, lvThreeR), dummyPos)
-        val lv3 = ArrayLiteralValue(DataType.ARRAY_UB, arrayOf(lvOneR, lvTwoR, lvFour), position = dummyPos)
+        val lv3 = ArrayLiteralValue(DataType.ARRAY_UB, arrayOf(lvOneR, lvTwoR, lvFour), dummyPos)
         assertEquals(lv1, lv2)
         assertNotEquals(lv1, lv3)
     }

compiler/test/RuntimeValueTests.kt

@@ -3,66 +3,66 @@ package prog8tests
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import prog8.ast.base.DataType
-import prog8.vm.RuntimeValue
+import prog8.vm.RuntimeValueNumeric
 import kotlin.test.*
 
 
-private fun sameValueAndType(v1: RuntimeValue, v2: RuntimeValue): Boolean {
+private fun sameValueAndType(v1: RuntimeValueNumeric, v2: RuntimeValueNumeric): Boolean {
     return v1.type==v2.type && v1==v2
 }
 
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class TestRuntimeValue {
+class TestRuntimeValueNumeric {
 
     @Test
     fun testValueRanges() {
-        assertEquals(0, RuntimeValue(DataType.UBYTE, 0).integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.UBYTE, 0).integerValue())
-        assertEquals(255, RuntimeValue(DataType.UBYTE, 255).integerValue())
+        assertEquals(255, RuntimeValueNumeric(DataType.UBYTE, 255).integerValue())
-        assertFailsWith<IllegalArgumentException> { RuntimeValue(DataType.UBYTE, -1)}
+        assertFailsWith<IllegalArgumentException> { RuntimeValueNumeric(DataType.UBYTE, -1)}
-        assertFailsWith<IllegalArgumentException> { RuntimeValue(DataType.UBYTE, 256)}
+        assertFailsWith<IllegalArgumentException> { RuntimeValueNumeric(DataType.UBYTE, 256)}
 
-        assertEquals(0, RuntimeValue(DataType.BYTE, 0).integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.BYTE, 0).integerValue())
-        assertEquals(-128, RuntimeValue(DataType.BYTE, -128).integerValue())
+        assertEquals(-128, RuntimeValueNumeric(DataType.BYTE, -128).integerValue())
-        assertEquals(127, RuntimeValue(DataType.BYTE, 127).integerValue())
+        assertEquals(127, RuntimeValueNumeric(DataType.BYTE, 127).integerValue())
-        assertFailsWith<IllegalArgumentException> { RuntimeValue(DataType.BYTE, -129)}
+        assertFailsWith<IllegalArgumentException> { RuntimeValueNumeric(DataType.BYTE, -129)}
-        assertFailsWith<IllegalArgumentException> { RuntimeValue(DataType.BYTE, 128)}
+        assertFailsWith<IllegalArgumentException> { RuntimeValueNumeric(DataType.BYTE, 128)}
 
-        assertEquals(0, RuntimeValue(DataType.UWORD, 0).integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.UWORD, 0).integerValue())
-        assertEquals(65535, RuntimeValue(DataType.UWORD, 65535).integerValue())
+        assertEquals(65535, RuntimeValueNumeric(DataType.UWORD, 65535).integerValue())
-        assertFailsWith<IllegalArgumentException> { RuntimeValue(DataType.UWORD, -1)}
+        assertFailsWith<IllegalArgumentException> { RuntimeValueNumeric(DataType.UWORD, -1)}
-        assertFailsWith<IllegalArgumentException> { RuntimeValue(DataType.UWORD, 65536)}
+        assertFailsWith<IllegalArgumentException> { RuntimeValueNumeric(DataType.UWORD, 65536)}
 
-        assertEquals(0, RuntimeValue(DataType.WORD, 0).integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.WORD, 0).integerValue())
-        assertEquals(-32768, RuntimeValue(DataType.WORD, -32768).integerValue())
+        assertEquals(-32768, RuntimeValueNumeric(DataType.WORD, -32768).integerValue())
-        assertEquals(32767, RuntimeValue(DataType.WORD, 32767).integerValue())
+        assertEquals(32767, RuntimeValueNumeric(DataType.WORD, 32767).integerValue())
-        assertFailsWith<IllegalArgumentException> { RuntimeValue(DataType.WORD, -32769)}
+        assertFailsWith<IllegalArgumentException> { RuntimeValueNumeric(DataType.WORD, -32769)}
-        assertFailsWith<IllegalArgumentException> { RuntimeValue(DataType.WORD, 32768)}
+        assertFailsWith<IllegalArgumentException> { RuntimeValueNumeric(DataType.WORD, 32768)}
     }
 
     @Test
     fun testTruthiness()
     {
-        assertFalse(RuntimeValue(DataType.BYTE, 0).asBoolean)
+        assertFalse(RuntimeValueNumeric(DataType.BYTE, 0).asBoolean)
-        assertFalse(RuntimeValue(DataType.UBYTE, 0).asBoolean)
+        assertFalse(RuntimeValueNumeric(DataType.UBYTE, 0).asBoolean)
-        assertFalse(RuntimeValue(DataType.WORD, 0).asBoolean)
+        assertFalse(RuntimeValueNumeric(DataType.WORD, 0).asBoolean)
-        assertFalse(RuntimeValue(DataType.UWORD, 0).asBoolean)
+        assertFalse(RuntimeValueNumeric(DataType.UWORD, 0).asBoolean)
-        assertFalse(RuntimeValue(DataType.FLOAT, 0.0).asBoolean)
+        assertFalse(RuntimeValueNumeric(DataType.FLOAT, 0.0).asBoolean)
 
-        assertTrue(RuntimeValue(DataType.BYTE, 42).asBoolean)
+        assertTrue(RuntimeValueNumeric(DataType.BYTE, 42).asBoolean)
-        assertTrue(RuntimeValue(DataType.UBYTE, 42).asBoolean)
+        assertTrue(RuntimeValueNumeric(DataType.UBYTE, 42).asBoolean)
-        assertTrue(RuntimeValue(DataType.WORD, 42).asBoolean)
+        assertTrue(RuntimeValueNumeric(DataType.WORD, 42).asBoolean)
-        assertTrue(RuntimeValue(DataType.UWORD, 42).asBoolean)
+        assertTrue(RuntimeValueNumeric(DataType.UWORD, 42).asBoolean)
-        assertTrue(RuntimeValue(DataType.FLOAT, 42.0).asBoolean)
+        assertTrue(RuntimeValueNumeric(DataType.FLOAT, 42.0).asBoolean)
-        assertTrue(RuntimeValue(DataType.BYTE, -42).asBoolean)
+        assertTrue(RuntimeValueNumeric(DataType.BYTE, -42).asBoolean)
-        assertTrue(RuntimeValue(DataType.WORD, -42).asBoolean)
+        assertTrue(RuntimeValueNumeric(DataType.WORD, -42).asBoolean)
-        assertTrue(RuntimeValue(DataType.FLOAT, -42.0).asBoolean)
+        assertTrue(RuntimeValueNumeric(DataType.FLOAT, -42.0).asBoolean)
     }
 
 
     @Test
     fun testIdentity() {
-        val v = RuntimeValue(DataType.UWORD, 12345)
+        val v = RuntimeValueNumeric(DataType.UWORD, 12345)
         assertEquals(v, v)
         assertFalse(v != v)
         assertTrue(v<=v)
@@ -70,300 +70,283 @@ class TestRuntimeValue {
         assertFalse(v<v)
         assertFalse(v>v)
 
-        assertTrue(sameValueAndType(RuntimeValue(DataType.UBYTE, 100), RuntimeValue(DataType.UBYTE, 100)))
+        assertTrue(sameValueAndType(RuntimeValueNumeric(DataType.UBYTE, 100), RuntimeValueNumeric(DataType.UBYTE, 100)))
     }
 
     @Test
     fun testEqualsAndNotEquals() {
-        assertEquals(RuntimeValue(DataType.UBYTE, 100), RuntimeValue(DataType.UBYTE, 100))
+        assertEquals(RuntimeValueNumeric(DataType.UBYTE, 100), RuntimeValueNumeric(DataType.UBYTE, 100))
-        assertEquals(RuntimeValue(DataType.UBYTE, 100), RuntimeValue(DataType.UWORD, 100))
+        assertEquals(RuntimeValueNumeric(DataType.UBYTE, 100), RuntimeValueNumeric(DataType.UWORD, 100))
-        assertEquals(RuntimeValue(DataType.UBYTE, 100), RuntimeValue(DataType.FLOAT, 100))
+        assertEquals(RuntimeValueNumeric(DataType.UBYTE, 100), RuntimeValueNumeric(DataType.FLOAT, 100))
-        assertEquals(RuntimeValue(DataType.UWORD, 254), RuntimeValue(DataType.UBYTE, 254))
+        assertEquals(RuntimeValueNumeric(DataType.UWORD, 254), RuntimeValueNumeric(DataType.UBYTE, 254))
-        assertEquals(RuntimeValue(DataType.UWORD, 12345), RuntimeValue(DataType.UWORD, 12345))
+        assertEquals(RuntimeValueNumeric(DataType.UWORD, 12345), RuntimeValueNumeric(DataType.UWORD, 12345))
-        assertEquals(RuntimeValue(DataType.UWORD, 12345), RuntimeValue(DataType.FLOAT, 12345))
+        assertEquals(RuntimeValueNumeric(DataType.UWORD, 12345), RuntimeValueNumeric(DataType.FLOAT, 12345))
-        assertEquals(RuntimeValue(DataType.FLOAT, 100.0), RuntimeValue(DataType.UBYTE, 100))
+        assertEquals(RuntimeValueNumeric(DataType.FLOAT, 100.0), RuntimeValueNumeric(DataType.UBYTE, 100))
-        assertEquals(RuntimeValue(DataType.FLOAT, 22239.0), RuntimeValue(DataType.UWORD, 22239))
+        assertEquals(RuntimeValueNumeric(DataType.FLOAT, 22239.0), RuntimeValueNumeric(DataType.UWORD, 22239))
-        assertEquals(RuntimeValue(DataType.FLOAT, 9.99), RuntimeValue(DataType.FLOAT, 9.99))
+        assertEquals(RuntimeValueNumeric(DataType.FLOAT, 9.99), RuntimeValueNumeric(DataType.FLOAT, 9.99))
 
-        assertTrue(sameValueAndType(RuntimeValue(DataType.UBYTE, 100), RuntimeValue(DataType.UBYTE, 100)))
+        assertTrue(sameValueAndType(RuntimeValueNumeric(DataType.UBYTE, 100), RuntimeValueNumeric(DataType.UBYTE, 100)))
-        assertFalse(sameValueAndType(RuntimeValue(DataType.UBYTE, 100), RuntimeValue(DataType.UWORD, 100)))
+        assertFalse(sameValueAndType(RuntimeValueNumeric(DataType.UBYTE, 100), RuntimeValueNumeric(DataType.UWORD, 100)))
-        assertFalse(sameValueAndType(RuntimeValue(DataType.UBYTE, 100), RuntimeValue(DataType.FLOAT, 100)))
+        assertFalse(sameValueAndType(RuntimeValueNumeric(DataType.UBYTE, 100), RuntimeValueNumeric(DataType.FLOAT, 100)))
-        assertFalse(sameValueAndType(RuntimeValue(DataType.UWORD, 254), RuntimeValue(DataType.UBYTE, 254)))
+        assertFalse(sameValueAndType(RuntimeValueNumeric(DataType.UWORD, 254), RuntimeValueNumeric(DataType.UBYTE, 254)))
-        assertTrue(sameValueAndType(RuntimeValue(DataType.UWORD, 12345), RuntimeValue(DataType.UWORD, 12345)))
+        assertTrue(sameValueAndType(RuntimeValueNumeric(DataType.UWORD, 12345), RuntimeValueNumeric(DataType.UWORD, 12345)))
-        assertFalse(sameValueAndType(RuntimeValue(DataType.UWORD, 12345), RuntimeValue(DataType.FLOAT, 12345)))
+        assertFalse(sameValueAndType(RuntimeValueNumeric(DataType.UWORD, 12345), RuntimeValueNumeric(DataType.FLOAT, 12345)))
-        assertFalse(sameValueAndType(RuntimeValue(DataType.FLOAT, 100.0), RuntimeValue(DataType.UBYTE, 100)))
+        assertFalse(sameValueAndType(RuntimeValueNumeric(DataType.FLOAT, 100.0), RuntimeValueNumeric(DataType.UBYTE, 100)))
-        assertFalse(sameValueAndType(RuntimeValue(DataType.FLOAT, 22239.0), RuntimeValue(DataType.UWORD, 22239)))
+        assertFalse(sameValueAndType(RuntimeValueNumeric(DataType.FLOAT, 22239.0), RuntimeValueNumeric(DataType.UWORD, 22239)))
-        assertTrue(sameValueAndType(RuntimeValue(DataType.FLOAT, 9.99), RuntimeValue(DataType.FLOAT, 9.99)))
+        assertTrue(sameValueAndType(RuntimeValueNumeric(DataType.FLOAT, 9.99), RuntimeValueNumeric(DataType.FLOAT, 9.99)))
 
-        assertNotEquals(RuntimeValue(DataType.UBYTE, 100), RuntimeValue(DataType.UBYTE, 101))
+        assertNotEquals(RuntimeValueNumeric(DataType.UBYTE, 100), RuntimeValueNumeric(DataType.UBYTE, 101))
-        assertNotEquals(RuntimeValue(DataType.UBYTE, 100), RuntimeValue(DataType.UWORD, 101))
+        assertNotEquals(RuntimeValueNumeric(DataType.UBYTE, 100), RuntimeValueNumeric(DataType.UWORD, 101))
-        assertNotEquals(RuntimeValue(DataType.UBYTE, 100), RuntimeValue(DataType.FLOAT, 101))
+        assertNotEquals(RuntimeValueNumeric(DataType.UBYTE, 100), RuntimeValueNumeric(DataType.FLOAT, 101))
-        assertNotEquals(RuntimeValue(DataType.UWORD, 245), RuntimeValue(DataType.UBYTE, 246))
+        assertNotEquals(RuntimeValueNumeric(DataType.UWORD, 245), RuntimeValueNumeric(DataType.UBYTE, 246))
-        assertNotEquals(RuntimeValue(DataType.UWORD, 12345), RuntimeValue(DataType.UWORD, 12346))
+        assertNotEquals(RuntimeValueNumeric(DataType.UWORD, 12345), RuntimeValueNumeric(DataType.UWORD, 12346))
-        assertNotEquals(RuntimeValue(DataType.UWORD, 12345), RuntimeValue(DataType.FLOAT, 12346))
+        assertNotEquals(RuntimeValueNumeric(DataType.UWORD, 12345), RuntimeValueNumeric(DataType.FLOAT, 12346))
-        assertNotEquals(RuntimeValue(DataType.FLOAT, 9.99), RuntimeValue(DataType.UBYTE, 9))
+        assertNotEquals(RuntimeValueNumeric(DataType.FLOAT, 9.99), RuntimeValueNumeric(DataType.UBYTE, 9))
-        assertNotEquals(RuntimeValue(DataType.FLOAT, 9.99), RuntimeValue(DataType.UWORD, 9))
+        assertNotEquals(RuntimeValueNumeric(DataType.FLOAT, 9.99), RuntimeValueNumeric(DataType.UWORD, 9))
-        assertNotEquals(RuntimeValue(DataType.FLOAT, 9.99), RuntimeValue(DataType.FLOAT, 9.0))
+        assertNotEquals(RuntimeValueNumeric(DataType.FLOAT, 9.99), RuntimeValueNumeric(DataType.FLOAT, 9.0))
 
-        assertFalse(sameValueAndType(RuntimeValue(DataType.UBYTE, 100), RuntimeValue(DataType.UBYTE, 101)))
+        assertFalse(sameValueAndType(RuntimeValueNumeric(DataType.UBYTE, 100), RuntimeValueNumeric(DataType.UBYTE, 101)))
-        assertFalse(sameValueAndType(RuntimeValue(DataType.UBYTE, 100), RuntimeValue(DataType.UWORD, 101)))
+        assertFalse(sameValueAndType(RuntimeValueNumeric(DataType.UBYTE, 100), RuntimeValueNumeric(DataType.UWORD, 101)))
-        assertFalse(sameValueAndType(RuntimeValue(DataType.UBYTE, 100), RuntimeValue(DataType.FLOAT, 101)))
+        assertFalse(sameValueAndType(RuntimeValueNumeric(DataType.UBYTE, 100), RuntimeValueNumeric(DataType.FLOAT, 101)))
-        assertFalse(sameValueAndType(RuntimeValue(DataType.UWORD, 245), RuntimeValue(DataType.UBYTE, 246)))
+        assertFalse(sameValueAndType(RuntimeValueNumeric(DataType.UWORD, 245), RuntimeValueNumeric(DataType.UBYTE, 246)))
-        assertFalse(sameValueAndType(RuntimeValue(DataType.UWORD, 12345), RuntimeValue(DataType.UWORD, 12346)))
+        assertFalse(sameValueAndType(RuntimeValueNumeric(DataType.UWORD, 12345), RuntimeValueNumeric(DataType.UWORD, 12346)))
-        assertFalse(sameValueAndType(RuntimeValue(DataType.UWORD, 12345), RuntimeValue(DataType.FLOAT, 12346)))
+        assertFalse(sameValueAndType(RuntimeValueNumeric(DataType.UWORD, 12345), RuntimeValueNumeric(DataType.FLOAT, 12346)))
-        assertFalse(sameValueAndType(RuntimeValue(DataType.FLOAT, 9.99), RuntimeValue(DataType.UBYTE, 9)))
+        assertFalse(sameValueAndType(RuntimeValueNumeric(DataType.FLOAT, 9.99), RuntimeValueNumeric(DataType.UBYTE, 9)))
-        assertFalse(sameValueAndType(RuntimeValue(DataType.FLOAT, 9.99), RuntimeValue(DataType.UWORD, 9)))
+        assertFalse(sameValueAndType(RuntimeValueNumeric(DataType.FLOAT, 9.99), RuntimeValueNumeric(DataType.UWORD, 9)))
-        assertFalse(sameValueAndType(RuntimeValue(DataType.FLOAT, 9.99), RuntimeValue(DataType.FLOAT, 9.0)))
+        assertFalse(sameValueAndType(RuntimeValueNumeric(DataType.FLOAT, 9.99), RuntimeValueNumeric(DataType.FLOAT, 9.0)))
-    }
-
-    @Test
-    fun testEqualityHeapTypes()
-    {
-        assertTrue(sameValueAndType(RuntimeValue(DataType.STR, heapId = 999), RuntimeValue(DataType.STR, heapId = 999)))
-        assertFalse(sameValueAndType(RuntimeValue(DataType.STR, heapId = 999), RuntimeValue(DataType.STR, heapId = 222)))
-
-        assertTrue(sameValueAndType(RuntimeValue(DataType.ARRAY_UB, heapId = 99), RuntimeValue(DataType.ARRAY_UB, heapId = 99)))
-        assertFalse(sameValueAndType(RuntimeValue(DataType.ARRAY_UB, heapId = 99), RuntimeValue(DataType.ARRAY_UB, heapId = 22)))
-
-        assertTrue(sameValueAndType(RuntimeValue(DataType.ARRAY_UW, heapId = 999), RuntimeValue(DataType.ARRAY_UW, heapId = 999)))
-        assertFalse(sameValueAndType(RuntimeValue(DataType.ARRAY_UW, heapId = 999), RuntimeValue(DataType.ARRAY_UW, heapId = 222)))
-
-        assertTrue(sameValueAndType(RuntimeValue(DataType.ARRAY_F, heapId = 999), RuntimeValue(DataType.ARRAY_F, heapId = 999)))
-        assertFalse(sameValueAndType(RuntimeValue(DataType.ARRAY_F, heapId = 999), RuntimeValue(DataType.ARRAY_UW, heapId = 999)))
-        assertFalse(sameValueAndType(RuntimeValue(DataType.ARRAY_F, heapId = 999), RuntimeValue(DataType.ARRAY_F, heapId = 222)))
     }
 
     @Test
     fun testGreaterThan(){
-        assertTrue(RuntimeValue(DataType.UBYTE, 100) > RuntimeValue(DataType.UBYTE, 99))
+        assertTrue(RuntimeValueNumeric(DataType.UBYTE, 100) > RuntimeValueNumeric(DataType.UBYTE, 99))
-        assertTrue(RuntimeValue(DataType.UWORD, 254) > RuntimeValue(DataType.UWORD, 253))
+        assertTrue(RuntimeValueNumeric(DataType.UWORD, 254) > RuntimeValueNumeric(DataType.UWORD, 253))
-        assertTrue(RuntimeValue(DataType.FLOAT, 100.0) > RuntimeValue(DataType.FLOAT, 99.9))
+        assertTrue(RuntimeValueNumeric(DataType.FLOAT, 100.0) > RuntimeValueNumeric(DataType.FLOAT, 99.9))
 
-        assertTrue(RuntimeValue(DataType.UBYTE, 100) >= RuntimeValue(DataType.UBYTE, 100))
+        assertTrue(RuntimeValueNumeric(DataType.UBYTE, 100) >= RuntimeValueNumeric(DataType.UBYTE, 100))
-        assertTrue(RuntimeValue(DataType.UWORD, 254) >= RuntimeValue(DataType.UWORD, 254))
+        assertTrue(RuntimeValueNumeric(DataType.UWORD, 254) >= RuntimeValueNumeric(DataType.UWORD, 254))
-        assertTrue(RuntimeValue(DataType.FLOAT, 100.0) >= RuntimeValue(DataType.FLOAT, 100.0))
+        assertTrue(RuntimeValueNumeric(DataType.FLOAT, 100.0) >= RuntimeValueNumeric(DataType.FLOAT, 100.0))
 
-        assertFalse(RuntimeValue(DataType.UBYTE, 100) > RuntimeValue(DataType.UBYTE, 100))
+        assertFalse(RuntimeValueNumeric(DataType.UBYTE, 100) > RuntimeValueNumeric(DataType.UBYTE, 100))
-        assertFalse(RuntimeValue(DataType.UWORD, 254) > RuntimeValue(DataType.UWORD, 254))
+        assertFalse(RuntimeValueNumeric(DataType.UWORD, 254) > RuntimeValueNumeric(DataType.UWORD, 254))
-        assertFalse(RuntimeValue(DataType.FLOAT, 100.0) > RuntimeValue(DataType.FLOAT, 100.0))
+        assertFalse(RuntimeValueNumeric(DataType.FLOAT, 100.0) > RuntimeValueNumeric(DataType.FLOAT, 100.0))
 
-        assertFalse(RuntimeValue(DataType.UBYTE, 100) >= RuntimeValue(DataType.UBYTE, 101))
+        assertFalse(RuntimeValueNumeric(DataType.UBYTE, 100) >= RuntimeValueNumeric(DataType.UBYTE, 101))
-        assertFalse(RuntimeValue(DataType.UWORD, 254) >= RuntimeValue(DataType.UWORD, 255))
+        assertFalse(RuntimeValueNumeric(DataType.UWORD, 254) >= RuntimeValueNumeric(DataType.UWORD, 255))
-        assertFalse(RuntimeValue(DataType.FLOAT, 100.0) >= RuntimeValue(DataType.FLOAT, 100.1))
+        assertFalse(RuntimeValueNumeric(DataType.FLOAT, 100.0) >= RuntimeValueNumeric(DataType.FLOAT, 100.1))
     }
 
     @Test
     fun testLessThan() {
-        assertTrue(RuntimeValue(DataType.UBYTE, 100) < RuntimeValue(DataType.UBYTE, 101))
+        assertTrue(RuntimeValueNumeric(DataType.UBYTE, 100) < RuntimeValueNumeric(DataType.UBYTE, 101))
-        assertTrue(RuntimeValue(DataType.UWORD, 254) < RuntimeValue(DataType.UWORD, 255))
+        assertTrue(RuntimeValueNumeric(DataType.UWORD, 254) < RuntimeValueNumeric(DataType.UWORD, 255))
-        assertTrue(RuntimeValue(DataType.FLOAT, 100.0) < RuntimeValue(DataType.FLOAT, 100.1))
+        assertTrue(RuntimeValueNumeric(DataType.FLOAT, 100.0) < RuntimeValueNumeric(DataType.FLOAT, 100.1))
 
-        assertTrue(RuntimeValue(DataType.UBYTE, 100) <= RuntimeValue(DataType.UBYTE, 100))
+        assertTrue(RuntimeValueNumeric(DataType.UBYTE, 100) <= RuntimeValueNumeric(DataType.UBYTE, 100))
-        assertTrue(RuntimeValue(DataType.UWORD, 254) <= RuntimeValue(DataType.UWORD, 254))
+        assertTrue(RuntimeValueNumeric(DataType.UWORD, 254) <= RuntimeValueNumeric(DataType.UWORD, 254))
-        assertTrue(RuntimeValue(DataType.FLOAT, 100.0) <= RuntimeValue(DataType.FLOAT, 100.0))
+        assertTrue(RuntimeValueNumeric(DataType.FLOAT, 100.0) <= RuntimeValueNumeric(DataType.FLOAT, 100.0))
 
-        assertFalse(RuntimeValue(DataType.UBYTE, 100) < RuntimeValue(DataType.UBYTE, 100))
+        assertFalse(RuntimeValueNumeric(DataType.UBYTE, 100) < RuntimeValueNumeric(DataType.UBYTE, 100))
-        assertFalse(RuntimeValue(DataType.UWORD, 254) < RuntimeValue(DataType.UWORD, 254))
+        assertFalse(RuntimeValueNumeric(DataType.UWORD, 254) < RuntimeValueNumeric(DataType.UWORD, 254))
-        assertFalse(RuntimeValue(DataType.FLOAT, 100.0) < RuntimeValue(DataType.FLOAT, 100.0))
+        assertFalse(RuntimeValueNumeric(DataType.FLOAT, 100.0) < RuntimeValueNumeric(DataType.FLOAT, 100.0))
 
-        assertFalse(RuntimeValue(DataType.UBYTE, 100) <= RuntimeValue(DataType.UBYTE, 99))
+        assertFalse(RuntimeValueNumeric(DataType.UBYTE, 100) <= RuntimeValueNumeric(DataType.UBYTE, 99))
-        assertFalse(RuntimeValue(DataType.UWORD, 254) <= RuntimeValue(DataType.UWORD, 253))
+        assertFalse(RuntimeValueNumeric(DataType.UWORD, 254) <= RuntimeValueNumeric(DataType.UWORD, 253))
-        assertFalse(RuntimeValue(DataType.FLOAT, 100.0) <= RuntimeValue(DataType.FLOAT, 99.9))
+        assertFalse(RuntimeValueNumeric(DataType.FLOAT, 100.0) <= RuntimeValueNumeric(DataType.FLOAT, 99.9))
     }
 
     @Test
     fun testNoDtConversion() {
         assertFailsWith<ArithmeticException> {
-            RuntimeValue(DataType.UWORD, 100).add(RuntimeValue(DataType.UBYTE, 120))
+            RuntimeValueNumeric(DataType.UWORD, 100).add(RuntimeValueNumeric(DataType.UBYTE, 120))
         }
         assertFailsWith<ArithmeticException> {
-            RuntimeValue(DataType.UBYTE, 100).add(RuntimeValue(DataType.UWORD, 120))
+            RuntimeValueNumeric(DataType.UBYTE, 100).add(RuntimeValueNumeric(DataType.UWORD, 120))
         }
         assertFailsWith<ArithmeticException> {
-            RuntimeValue(DataType.FLOAT, 100.22).add(RuntimeValue(DataType.UWORD, 120))
+            RuntimeValueNumeric(DataType.FLOAT, 100.22).add(RuntimeValueNumeric(DataType.UWORD, 120))
         }
         assertFailsWith<ArithmeticException> {
-            RuntimeValue(DataType.UWORD, 1002).add(RuntimeValue(DataType.FLOAT, 120.22))
+            RuntimeValueNumeric(DataType.UWORD, 1002).add(RuntimeValueNumeric(DataType.FLOAT, 120.22))
         }
         assertFailsWith<ArithmeticException> {
-            RuntimeValue(DataType.FLOAT, 100.22).add(RuntimeValue(DataType.UBYTE, 120))
+            RuntimeValueNumeric(DataType.FLOAT, 100.22).add(RuntimeValueNumeric(DataType.UBYTE, 120))
         }
         assertFailsWith<ArithmeticException> {
-            RuntimeValue(DataType.UBYTE, 12).add(RuntimeValue(DataType.FLOAT, 120.22))
+            RuntimeValueNumeric(DataType.UBYTE, 12).add(RuntimeValueNumeric(DataType.FLOAT, 120.22))
         }
     }
 
     @Test
     fun testNoAutoFloatConversion() {
         assertFailsWith<ArithmeticException> {
-            RuntimeValue(DataType.UBYTE, 233).add(RuntimeValue(DataType.FLOAT, 1.234))
+            RuntimeValueNumeric(DataType.UBYTE, 233).add(RuntimeValueNumeric(DataType.FLOAT, 1.234))
         }
         assertFailsWith<ArithmeticException> {
-            RuntimeValue(DataType.UWORD, 233).add(RuntimeValue(DataType.FLOAT, 1.234))
+            RuntimeValueNumeric(DataType.UWORD, 233).add(RuntimeValueNumeric(DataType.FLOAT, 1.234))
         }
         assertFailsWith<ArithmeticException> {
-            RuntimeValue(DataType.UBYTE, 233).mul(RuntimeValue(DataType.FLOAT, 1.234))
+            RuntimeValueNumeric(DataType.UBYTE, 233).mul(RuntimeValueNumeric(DataType.FLOAT, 1.234))
         }
         assertFailsWith<ArithmeticException> {
-            RuntimeValue(DataType.UWORD, 233).mul(RuntimeValue(DataType.FLOAT, 1.234))
+            RuntimeValueNumeric(DataType.UWORD, 233).mul(RuntimeValueNumeric(DataType.FLOAT, 1.234))
         }
         assertFailsWith<ArithmeticException> {
-            RuntimeValue(DataType.UBYTE, 233).div(RuntimeValue(DataType.FLOAT, 1.234))
+            RuntimeValueNumeric(DataType.UBYTE, 233).div(RuntimeValueNumeric(DataType.FLOAT, 1.234))
         }
         assertFailsWith<ArithmeticException> {
-            RuntimeValue(DataType.UWORD, 233).div(RuntimeValue(DataType.FLOAT, 1.234))
+            RuntimeValueNumeric(DataType.UWORD, 233).div(RuntimeValueNumeric(DataType.FLOAT, 1.234))
         }
-        val result = RuntimeValue(DataType.FLOAT, 233.333).add(RuntimeValue(DataType.FLOAT, 1.234))
+        val result = RuntimeValueNumeric(DataType.FLOAT, 233.333).add(RuntimeValueNumeric(DataType.FLOAT, 1.234))
     }
 
     @Test
     fun arithmetictestUbyte() {
-        assertEquals(255, RuntimeValue(DataType.UBYTE, 200).add(RuntimeValue(DataType.UBYTE, 55)).integerValue())
+        assertEquals(255, RuntimeValueNumeric(DataType.UBYTE, 200).add(RuntimeValueNumeric(DataType.UBYTE, 55)).integerValue())
-        assertEquals(0, RuntimeValue(DataType.UBYTE, 200).add(RuntimeValue(DataType.UBYTE, 56)).integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.UBYTE, 200).add(RuntimeValueNumeric(DataType.UBYTE, 56)).integerValue())
-        assertEquals(1, RuntimeValue(DataType.UBYTE, 200).add(RuntimeValue(DataType.UBYTE, 57)).integerValue())
+        assertEquals(1, RuntimeValueNumeric(DataType.UBYTE, 200).add(RuntimeValueNumeric(DataType.UBYTE, 57)).integerValue())
 
-        assertEquals(1, RuntimeValue(DataType.UBYTE, 2).sub(RuntimeValue(DataType.UBYTE, 1)).integerValue())
+        assertEquals(1, RuntimeValueNumeric(DataType.UBYTE, 2).sub(RuntimeValueNumeric(DataType.UBYTE, 1)).integerValue())
-        assertEquals(0, RuntimeValue(DataType.UBYTE, 2).sub(RuntimeValue(DataType.UBYTE, 2)).integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.UBYTE, 2).sub(RuntimeValueNumeric(DataType.UBYTE, 2)).integerValue())
-        assertEquals(255, RuntimeValue(DataType.UBYTE, 2).sub(RuntimeValue(DataType.UBYTE, 3)).integerValue())
+        assertEquals(255, RuntimeValueNumeric(DataType.UBYTE, 2).sub(RuntimeValueNumeric(DataType.UBYTE, 3)).integerValue())
 
-        assertEquals(255, RuntimeValue(DataType.UBYTE, 254).inc().integerValue())
+        assertEquals(255, RuntimeValueNumeric(DataType.UBYTE, 254).inc().integerValue())
-        assertEquals(0, RuntimeValue(DataType.UBYTE, 255).inc().integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.UBYTE, 255).inc().integerValue())
-        assertEquals(0, RuntimeValue(DataType.UBYTE, 1).dec().integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.UBYTE, 1).dec().integerValue())
-        assertEquals(255, RuntimeValue(DataType.UBYTE, 0).dec().integerValue())
+        assertEquals(255, RuntimeValueNumeric(DataType.UBYTE, 0).dec().integerValue())
 
-        assertEquals(255, RuntimeValue(DataType.UBYTE, 0).inv().integerValue())
+        assertEquals(255, RuntimeValueNumeric(DataType.UBYTE, 0).inv().integerValue())
-        assertEquals(0b00110011, RuntimeValue(DataType.UBYTE, 0b11001100).inv().integerValue())
+        assertEquals(0b00110011, RuntimeValueNumeric(DataType.UBYTE, 0b11001100).inv().integerValue())
-//        assertEquals(0, RuntimeValue(DataType.UBYTE, 0).neg().integerValue())
+//        assertEquals(0, RuntimeValueNumeric(DataType.UBYTE, 0).neg().integerValue())
-//        assertEquals(0, RuntimeValue(DataType.UBYTE, 0).neg().integerValue())
+//        assertEquals(0, RuntimeValueNumeric(DataType.UBYTE, 0).neg().integerValue())
-        assertEquals(1, RuntimeValue(DataType.UBYTE, 0).not().integerValue())
+        assertEquals(1, RuntimeValueNumeric(DataType.UBYTE, 0).not().integerValue())
-        assertEquals(0, RuntimeValue(DataType.UBYTE, 1).not().integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.UBYTE, 1).not().integerValue())
-        assertEquals(0, RuntimeValue(DataType.UBYTE, 111).not().integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.UBYTE, 111).not().integerValue())
-        assertEquals(0, RuntimeValue(DataType.UBYTE, 255).not().integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.UBYTE, 255).not().integerValue())
 
-        assertEquals(200, RuntimeValue(DataType.UBYTE, 20).mul(RuntimeValue(DataType.UBYTE, 10)).integerValue())
+        assertEquals(200, RuntimeValueNumeric(DataType.UBYTE, 20).mul(RuntimeValueNumeric(DataType.UBYTE, 10)).integerValue())
-        assertEquals(144, RuntimeValue(DataType.UBYTE, 20).mul(RuntimeValue(DataType.UBYTE, 20)).integerValue())
+        assertEquals(144, RuntimeValueNumeric(DataType.UBYTE, 20).mul(RuntimeValueNumeric(DataType.UBYTE, 20)).integerValue())
 
-        assertEquals(25, RuntimeValue(DataType.UBYTE, 5).pow(RuntimeValue(DataType.UBYTE, 2)).integerValue())
+        assertEquals(25, RuntimeValueNumeric(DataType.UBYTE, 5).pow(RuntimeValueNumeric(DataType.UBYTE, 2)).integerValue())
-        assertEquals(125, RuntimeValue(DataType.UBYTE, 5).pow(RuntimeValue(DataType.UBYTE, 3)).integerValue())
+        assertEquals(125, RuntimeValueNumeric(DataType.UBYTE, 5).pow(RuntimeValueNumeric(DataType.UBYTE, 3)).integerValue())
-        assertEquals(113, RuntimeValue(DataType.UBYTE, 5).pow(RuntimeValue(DataType.UBYTE, 4)).integerValue())
+        assertEquals(113, RuntimeValueNumeric(DataType.UBYTE, 5).pow(RuntimeValueNumeric(DataType.UBYTE, 4)).integerValue())
 
-        assertEquals(100, RuntimeValue(DataType.UBYTE, 50).shl().integerValue())
+        assertEquals(100, RuntimeValueNumeric(DataType.UBYTE, 50).shl().integerValue())
-        assertEquals(200, RuntimeValue(DataType.UBYTE, 100).shl().integerValue())
+        assertEquals(200, RuntimeValueNumeric(DataType.UBYTE, 100).shl().integerValue())
-        assertEquals(144, RuntimeValue(DataType.UBYTE, 200).shl().integerValue())
+        assertEquals(144, RuntimeValueNumeric(DataType.UBYTE, 200).shl().integerValue())
     }
 
     @Test
     fun arithmetictestUWord() {
-        assertEquals(65535, RuntimeValue(DataType.UWORD, 60000).add(RuntimeValue(DataType.UWORD, 5535)).integerValue())
+        assertEquals(65535, RuntimeValueNumeric(DataType.UWORD, 60000).add(RuntimeValueNumeric(DataType.UWORD, 5535)).integerValue())
-        assertEquals(0, RuntimeValue(DataType.UWORD, 60000).add(RuntimeValue(DataType.UWORD, 5536)).integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.UWORD, 60000).add(RuntimeValueNumeric(DataType.UWORD, 5536)).integerValue())
-        assertEquals(1, RuntimeValue(DataType.UWORD, 60000).add(RuntimeValue(DataType.UWORD, 5537)).integerValue())
+        assertEquals(1, RuntimeValueNumeric(DataType.UWORD, 60000).add(RuntimeValueNumeric(DataType.UWORD, 5537)).integerValue())
 
-        assertEquals(1, RuntimeValue(DataType.UWORD, 2).sub(RuntimeValue(DataType.UWORD, 1)).integerValue())
+        assertEquals(1, RuntimeValueNumeric(DataType.UWORD, 2).sub(RuntimeValueNumeric(DataType.UWORD, 1)).integerValue())
-        assertEquals(0, RuntimeValue(DataType.UWORD, 2).sub(RuntimeValue(DataType.UWORD, 2)).integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.UWORD, 2).sub(RuntimeValueNumeric(DataType.UWORD, 2)).integerValue())
-        assertEquals(65535, RuntimeValue(DataType.UWORD, 2).sub(RuntimeValue(DataType.UWORD, 3)).integerValue())
+        assertEquals(65535, RuntimeValueNumeric(DataType.UWORD, 2).sub(RuntimeValueNumeric(DataType.UWORD, 3)).integerValue())
 
-        assertEquals(65535, RuntimeValue(DataType.UWORD, 65534).inc().integerValue())
+        assertEquals(65535, RuntimeValueNumeric(DataType.UWORD, 65534).inc().integerValue())
-        assertEquals(0, RuntimeValue(DataType.UWORD, 65535).inc().integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.UWORD, 65535).inc().integerValue())
-        assertEquals(0, RuntimeValue(DataType.UWORD, 1).dec().integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.UWORD, 1).dec().integerValue())
-        assertEquals(65535, RuntimeValue(DataType.UWORD, 0).dec().integerValue())
+        assertEquals(65535, RuntimeValueNumeric(DataType.UWORD, 0).dec().integerValue())
 
-        assertEquals(65535, RuntimeValue(DataType.UWORD, 0).inv().integerValue())
+        assertEquals(65535, RuntimeValueNumeric(DataType.UWORD, 0).inv().integerValue())
-        assertEquals(0b0011001101010101, RuntimeValue(DataType.UWORD, 0b1100110010101010).inv().integerValue())
+        assertEquals(0b0011001101010101, RuntimeValueNumeric(DataType.UWORD, 0b1100110010101010).inv().integerValue())
-//        assertEquals(0, RuntimeValue(DataType.UWORD, 0).neg().integerValue())
+//        assertEquals(0, RuntimeValueNumeric(DataType.UWORD, 0).neg().integerValue())
-//        assertEquals(0, RuntimeValue(DataType.UWORD, 0).neg().integerValue())
+//        assertEquals(0, RuntimeValueNumeric(DataType.UWORD, 0).neg().integerValue())
-        assertEquals(1, RuntimeValue(DataType.UWORD, 0).not().integerValue())
+        assertEquals(1, RuntimeValueNumeric(DataType.UWORD, 0).not().integerValue())
-        assertEquals(0, RuntimeValue(DataType.UWORD, 1).not().integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.UWORD, 1).not().integerValue())
-        assertEquals(0, RuntimeValue(DataType.UWORD, 11111).not().integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.UWORD, 11111).not().integerValue())
-        assertEquals(0, RuntimeValue(DataType.UWORD, 65535).not().integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.UWORD, 65535).not().integerValue())
 
-        assertEquals(2000, RuntimeValue(DataType.UWORD, 200).mul(RuntimeValue(DataType.UWORD, 10)).integerValue())
+        assertEquals(2000, RuntimeValueNumeric(DataType.UWORD, 200).mul(RuntimeValueNumeric(DataType.UWORD, 10)).integerValue())
-        assertEquals(40000, RuntimeValue(DataType.UWORD, 200).mul(RuntimeValue(DataType.UWORD, 200)).integerValue())
+        assertEquals(40000, RuntimeValueNumeric(DataType.UWORD, 200).mul(RuntimeValueNumeric(DataType.UWORD, 200)).integerValue())
-        assertEquals(14464, RuntimeValue(DataType.UWORD, 200).mul(RuntimeValue(DataType.UWORD, 400)).integerValue())
+        assertEquals(14464, RuntimeValueNumeric(DataType.UWORD, 200).mul(RuntimeValueNumeric(DataType.UWORD, 400)).integerValue())
 
-        assertEquals(15625, RuntimeValue(DataType.UWORD, 5).pow(RuntimeValue(DataType.UWORD, 6)).integerValue())
+        assertEquals(15625, RuntimeValueNumeric(DataType.UWORD, 5).pow(RuntimeValueNumeric(DataType.UWORD, 6)).integerValue())
-        assertEquals(12589, RuntimeValue(DataType.UWORD, 5).pow(RuntimeValue(DataType.UWORD, 7)).integerValue())
+        assertEquals(12589, RuntimeValueNumeric(DataType.UWORD, 5).pow(RuntimeValueNumeric(DataType.UWORD, 7)).integerValue())
 
-        assertEquals(10000, RuntimeValue(DataType.UWORD, 5000).shl().integerValue())
+        assertEquals(10000, RuntimeValueNumeric(DataType.UWORD, 5000).shl().integerValue())
-        assertEquals(60000, RuntimeValue(DataType.UWORD, 30000).shl().integerValue())
+        assertEquals(60000, RuntimeValueNumeric(DataType.UWORD, 30000).shl().integerValue())
-        assertEquals(14464, RuntimeValue(DataType.UWORD, 40000).shl().integerValue())
+        assertEquals(14464, RuntimeValueNumeric(DataType.UWORD, 40000).shl().integerValue())
     }
 
     @Test
     fun arithmetictestByte() {
-        assertEquals(127, RuntimeValue(DataType.BYTE, 100).add(RuntimeValue(DataType.BYTE, 27)).integerValue())
+        assertEquals(127, RuntimeValueNumeric(DataType.BYTE, 100).add(RuntimeValueNumeric(DataType.BYTE, 27)).integerValue())
-        assertEquals(-128, RuntimeValue(DataType.BYTE, 100).add(RuntimeValue(DataType.BYTE, 28)).integerValue())
+        assertEquals(-128, RuntimeValueNumeric(DataType.BYTE, 100).add(RuntimeValueNumeric(DataType.BYTE, 28)).integerValue())
-        assertEquals(-127, RuntimeValue(DataType.BYTE, 100).add(RuntimeValue(DataType.BYTE, 29)).integerValue())
+        assertEquals(-127, RuntimeValueNumeric(DataType.BYTE, 100).add(RuntimeValueNumeric(DataType.BYTE, 29)).integerValue())
 
-        assertEquals(1, RuntimeValue(DataType.BYTE, 2).sub(RuntimeValue(DataType.BYTE, 1)).integerValue())
+        assertEquals(1, RuntimeValueNumeric(DataType.BYTE, 2).sub(RuntimeValueNumeric(DataType.BYTE, 1)).integerValue())
-        assertEquals(0, RuntimeValue(DataType.BYTE, 2).sub(RuntimeValue(DataType.BYTE, 2)).integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.BYTE, 2).sub(RuntimeValueNumeric(DataType.BYTE, 2)).integerValue())
-        assertEquals(-1, RuntimeValue(DataType.BYTE, 2).sub(RuntimeValue(DataType.BYTE, 3)).integerValue())
+        assertEquals(-1, RuntimeValueNumeric(DataType.BYTE, 2).sub(RuntimeValueNumeric(DataType.BYTE, 3)).integerValue())
-        assertEquals(-128, RuntimeValue(DataType.BYTE, -100).sub(RuntimeValue(DataType.BYTE, 28)).integerValue())
+        assertEquals(-128, RuntimeValueNumeric(DataType.BYTE, -100).sub(RuntimeValueNumeric(DataType.BYTE, 28)).integerValue())
-        assertEquals(127, RuntimeValue(DataType.BYTE, -100).sub(RuntimeValue(DataType.BYTE, 29)).integerValue())
+        assertEquals(127, RuntimeValueNumeric(DataType.BYTE, -100).sub(RuntimeValueNumeric(DataType.BYTE, 29)).integerValue())
 
-        assertEquals(127, RuntimeValue(DataType.BYTE, 126).inc().integerValue())
+        assertEquals(127, RuntimeValueNumeric(DataType.BYTE, 126).inc().integerValue())
-        assertEquals(-128, RuntimeValue(DataType.BYTE, 127).inc().integerValue())
+        assertEquals(-128, RuntimeValueNumeric(DataType.BYTE, 127).inc().integerValue())
-        assertEquals(0, RuntimeValue(DataType.BYTE, 1).dec().integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.BYTE, 1).dec().integerValue())
-        assertEquals(-1, RuntimeValue(DataType.BYTE, 0).dec().integerValue())
+        assertEquals(-1, RuntimeValueNumeric(DataType.BYTE, 0).dec().integerValue())
-        assertEquals(-128, RuntimeValue(DataType.BYTE, -127).dec().integerValue())
+        assertEquals(-128, RuntimeValueNumeric(DataType.BYTE, -127).dec().integerValue())
-        assertEquals(127, RuntimeValue(DataType.BYTE, -128).dec().integerValue())
+        assertEquals(127, RuntimeValueNumeric(DataType.BYTE, -128).dec().integerValue())
 
-        assertEquals(-1, RuntimeValue(DataType.BYTE, 0).inv().integerValue())
+        assertEquals(-1, RuntimeValueNumeric(DataType.BYTE, 0).inv().integerValue())
-        assertEquals(-103, RuntimeValue(DataType.BYTE, 0b01100110).inv().integerValue())
+        assertEquals(-103, RuntimeValueNumeric(DataType.BYTE, 0b01100110).inv().integerValue())
-        assertEquals(0, RuntimeValue(DataType.BYTE, 0).neg().integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.BYTE, 0).neg().integerValue())
-        assertEquals(-2, RuntimeValue(DataType.BYTE, 2).neg().integerValue())
+        assertEquals(-2, RuntimeValueNumeric(DataType.BYTE, 2).neg().integerValue())
-        assertEquals(1, RuntimeValue(DataType.BYTE, 0).not().integerValue())
+        assertEquals(1, RuntimeValueNumeric(DataType.BYTE, 0).not().integerValue())
-        assertEquals(0, RuntimeValue(DataType.BYTE, 1).not().integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.BYTE, 1).not().integerValue())
-        assertEquals(0, RuntimeValue(DataType.BYTE, 111).not().integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.BYTE, 111).not().integerValue())
-        assertEquals(0, RuntimeValue(DataType.BYTE, -33).not().integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.BYTE, -33).not().integerValue())
 
-        assertEquals(100, RuntimeValue(DataType.BYTE, 10).mul(RuntimeValue(DataType.BYTE, 10)).integerValue())
+        assertEquals(100, RuntimeValueNumeric(DataType.BYTE, 10).mul(RuntimeValueNumeric(DataType.BYTE, 10)).integerValue())
-        assertEquals(-56, RuntimeValue(DataType.BYTE, 20).mul(RuntimeValue(DataType.BYTE, 10)).integerValue())
+        assertEquals(-56, RuntimeValueNumeric(DataType.BYTE, 20).mul(RuntimeValueNumeric(DataType.BYTE, 10)).integerValue())
 
-        assertEquals(25, RuntimeValue(DataType.BYTE, 5).pow(RuntimeValue(DataType.BYTE, 2)).integerValue())
+        assertEquals(25, RuntimeValueNumeric(DataType.BYTE, 5).pow(RuntimeValueNumeric(DataType.BYTE, 2)).integerValue())
-        assertEquals(125, RuntimeValue(DataType.BYTE, 5).pow(RuntimeValue(DataType.BYTE, 3)).integerValue())
+        assertEquals(125, RuntimeValueNumeric(DataType.BYTE, 5).pow(RuntimeValueNumeric(DataType.BYTE, 3)).integerValue())
-        assertEquals(113, RuntimeValue(DataType.BYTE, 5).pow(RuntimeValue(DataType.BYTE, 4)).integerValue())
+        assertEquals(113, RuntimeValueNumeric(DataType.BYTE, 5).pow(RuntimeValueNumeric(DataType.BYTE, 4)).integerValue())
 
-        assertEquals(100, RuntimeValue(DataType.BYTE, 50).shl().integerValue())
+        assertEquals(100, RuntimeValueNumeric(DataType.BYTE, 50).shl().integerValue())
-        assertEquals(-56, RuntimeValue(DataType.BYTE, 100).shl().integerValue())
+        assertEquals(-56, RuntimeValueNumeric(DataType.BYTE, 100).shl().integerValue())
-        assertEquals(-2, RuntimeValue(DataType.BYTE, -1).shl().integerValue())
+        assertEquals(-2, RuntimeValueNumeric(DataType.BYTE, -1).shl().integerValue())
     }
 
     @Test
     fun arithmetictestWorrd() {
-        assertEquals(32767, RuntimeValue(DataType.WORD, 32700).add(RuntimeValue(DataType.WORD, 67)).integerValue())
+        assertEquals(32767, RuntimeValueNumeric(DataType.WORD, 32700).add(RuntimeValueNumeric(DataType.WORD, 67)).integerValue())
-        assertEquals(-32768, RuntimeValue(DataType.WORD, 32700).add(RuntimeValue(DataType.WORD, 68)).integerValue())
+        assertEquals(-32768, RuntimeValueNumeric(DataType.WORD, 32700).add(RuntimeValueNumeric(DataType.WORD, 68)).integerValue())
-        assertEquals(-32767, RuntimeValue(DataType.WORD, 32700).add(RuntimeValue(DataType.WORD, 69)).integerValue())
+        assertEquals(-32767, RuntimeValueNumeric(DataType.WORD, 32700).add(RuntimeValueNumeric(DataType.WORD, 69)).integerValue())
 
-        assertEquals(1, RuntimeValue(DataType.WORD, 2).sub(RuntimeValue(DataType.WORD, 1)).integerValue())
+        assertEquals(1, RuntimeValueNumeric(DataType.WORD, 2).sub(RuntimeValueNumeric(DataType.WORD, 1)).integerValue())
-        assertEquals(0, RuntimeValue(DataType.WORD, 2).sub(RuntimeValue(DataType.WORD, 2)).integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.WORD, 2).sub(RuntimeValueNumeric(DataType.WORD, 2)).integerValue())
-        assertEquals(-1, RuntimeValue(DataType.WORD, 2).sub(RuntimeValue(DataType.WORD, 3)).integerValue())
+        assertEquals(-1, RuntimeValueNumeric(DataType.WORD, 2).sub(RuntimeValueNumeric(DataType.WORD, 3)).integerValue())
-        assertEquals(-32768, RuntimeValue(DataType.WORD, -32700).sub(RuntimeValue(DataType.WORD, 68)).integerValue())
+        assertEquals(-32768, RuntimeValueNumeric(DataType.WORD, -32700).sub(RuntimeValueNumeric(DataType.WORD, 68)).integerValue())
-        assertEquals(32767, RuntimeValue(DataType.WORD, -32700).sub(RuntimeValue(DataType.WORD, 69)).integerValue())
+        assertEquals(32767, RuntimeValueNumeric(DataType.WORD, -32700).sub(RuntimeValueNumeric(DataType.WORD, 69)).integerValue())
 
-        assertEquals(32767, RuntimeValue(DataType.WORD, 32766).inc().integerValue())
+        assertEquals(32767, RuntimeValueNumeric(DataType.WORD, 32766).inc().integerValue())
-        assertEquals(-32768, RuntimeValue(DataType.WORD, 32767).inc().integerValue())
+        assertEquals(-32768, RuntimeValueNumeric(DataType.WORD, 32767).inc().integerValue())
-        assertEquals(0, RuntimeValue(DataType.WORD, 1).dec().integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.WORD, 1).dec().integerValue())
-        assertEquals(-1, RuntimeValue(DataType.WORD, 0).dec().integerValue())
+        assertEquals(-1, RuntimeValueNumeric(DataType.WORD, 0).dec().integerValue())
-        assertEquals(-32768, RuntimeValue(DataType.WORD, -32767).dec().integerValue())
+        assertEquals(-32768, RuntimeValueNumeric(DataType.WORD, -32767).dec().integerValue())
-        assertEquals(32767, RuntimeValue(DataType.WORD, -32768).dec().integerValue())
+        assertEquals(32767, RuntimeValueNumeric(DataType.WORD, -32768).dec().integerValue())
 
-        assertEquals(-1, RuntimeValue(DataType.WORD, 0).inv().integerValue())
+        assertEquals(-1, RuntimeValueNumeric(DataType.WORD, 0).inv().integerValue())
-        assertEquals(-103, RuntimeValue(DataType.WORD, 0b01100110).inv().integerValue())
+        assertEquals(-103, RuntimeValueNumeric(DataType.WORD, 0b01100110).inv().integerValue())
-        assertEquals(0, RuntimeValue(DataType.WORD, 0).neg().integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.WORD, 0).neg().integerValue())
-        assertEquals(-2, RuntimeValue(DataType.WORD, 2).neg().integerValue())
+        assertEquals(-2, RuntimeValueNumeric(DataType.WORD, 2).neg().integerValue())
-        assertEquals(1, RuntimeValue(DataType.WORD, 0).not().integerValue())
+        assertEquals(1, RuntimeValueNumeric(DataType.WORD, 0).not().integerValue())
-        assertEquals(0, RuntimeValue(DataType.WORD, 1).not().integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.WORD, 1).not().integerValue())
-        assertEquals(0, RuntimeValue(DataType.WORD, 111).not().integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.WORD, 111).not().integerValue())
-        assertEquals(0, RuntimeValue(DataType.WORD, -33).not().integerValue())
+        assertEquals(0, RuntimeValueNumeric(DataType.WORD, -33).not().integerValue())
 
-        assertEquals(10000, RuntimeValue(DataType.WORD, 100).mul(RuntimeValue(DataType.WORD, 100)).integerValue())
+        assertEquals(10000, RuntimeValueNumeric(DataType.WORD, 100).mul(RuntimeValueNumeric(DataType.WORD, 100)).integerValue())
-        assertEquals(-25536, RuntimeValue(DataType.WORD, 200).mul(RuntimeValue(DataType.WORD, 200)).integerValue())
+        assertEquals(-25536, RuntimeValueNumeric(DataType.WORD, 200).mul(RuntimeValueNumeric(DataType.WORD, 200)).integerValue())
 
-        assertEquals(15625, RuntimeValue(DataType.WORD, 5).pow(RuntimeValue(DataType.WORD, 6)).integerValue())
+        assertEquals(15625, RuntimeValueNumeric(DataType.WORD, 5).pow(RuntimeValueNumeric(DataType.WORD, 6)).integerValue())
-        assertEquals(-6487, RuntimeValue(DataType.WORD, 9).pow(RuntimeValue(DataType.WORD, 5)).integerValue())
+        assertEquals(-6487, RuntimeValueNumeric(DataType.WORD, 9).pow(RuntimeValueNumeric(DataType.WORD, 5)).integerValue())
 
-        assertEquals(18000, RuntimeValue(DataType.WORD, 9000).shl().integerValue())
+        assertEquals(18000, RuntimeValueNumeric(DataType.WORD, 9000).shl().integerValue())
-        assertEquals(-25536, RuntimeValue(DataType.WORD, 20000).shl().integerValue())
+        assertEquals(-25536, RuntimeValueNumeric(DataType.WORD, 20000).shl().integerValue())
-        assertEquals(-2, RuntimeValue(DataType.WORD, -1).shl().integerValue())
+        assertEquals(-2, RuntimeValueNumeric(DataType.WORD, -1).shl().integerValue())
     }
 }

compiler/test/UnitTests.kt

@@ -10,16 +10,15 @@ import prog8.ast.base.Position
 import prog8.ast.expressions.NumericLiteralValue
 import prog8.ast.expressions.StringLiteralValue
 import prog8.compiler.*
-import prog8.compiler.target.c64.MachineDefinition.C64Zeropage
+import prog8.compiler.target.c64.C64MachineDefinition.C64Zeropage
-import prog8.compiler.target.c64.MachineDefinition.FLOAT_MAX_NEGATIVE
+import prog8.compiler.target.c64.C64MachineDefinition.FLOAT_MAX_NEGATIVE
-import prog8.compiler.target.c64.MachineDefinition.FLOAT_MAX_POSITIVE
+import prog8.compiler.target.c64.C64MachineDefinition.FLOAT_MAX_POSITIVE
-import prog8.compiler.target.c64.MachineDefinition.Mflpt5
+import prog8.compiler.target.c64.C64MachineDefinition.Mflpt5
 import prog8.compiler.target.c64.Petscii
-import prog8.vm.RuntimeValue
+import prog8.vm.RuntimeValueNumeric
 import java.io.CharConversionException
 import kotlin.test.*
 
-
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class TestCompiler {
     @Test
@@ -54,7 +53,6 @@ class TestCompiler {
         assertFailsWith<CompilerException> { 65536L.toHex()  }
     }
 
-
     @Test
     fun testFloatToMflpt5() {
         assertThat(Mflpt5.fromNumber(0), equalTo(Mflpt5(0x00, 0x00, 0x00, 0x00, 0x00)))
@@ -97,29 +95,29 @@ class TestCompiler {
 
     @Test
     fun testMflpt5ToFloat() {
-        val PRECISION=0.000000001
+        val epsilon=0.000000001
         assertThat(Mflpt5(0x00, 0x00, 0x00, 0x00, 0x00).toDouble(), equalTo(0.0))
-        assertThat(Mflpt5(0x82, 0x49, 0x0F, 0xDA, 0xA1).toDouble(), closeTo(3.141592653, PRECISION))
+        assertThat(Mflpt5(0x82, 0x49, 0x0F, 0xDA, 0xA1).toDouble(), closeTo(3.141592653, epsilon))
-        assertThat(Mflpt5(0x82, 0x49, 0x0F, 0xDA, 0xA2).toDouble(), closeTo(3.141592653589793, PRECISION))
+        assertThat(Mflpt5(0x82, 0x49, 0x0F, 0xDA, 0xA2).toDouble(), closeTo(3.141592653589793, epsilon))
         assertThat(Mflpt5(0x90, 0x00, 0x00, 0x00, 0x00).toDouble(), equalTo(32768.0))
         assertThat(Mflpt5(0x90, 0x80, 0x00, 0x00, 0x00).toDouble(), equalTo(-32768.0))
         assertThat(Mflpt5(0x81, 0x00, 0x00, 0x00, 0x00).toDouble(), equalTo(1.0))
-        assertThat(Mflpt5(0x80, 0x35, 0x04, 0xF3, 0x34).toDouble(), closeTo(0.7071067812, PRECISION))
+        assertThat(Mflpt5(0x80, 0x35, 0x04, 0xF3, 0x34).toDouble(), closeTo(0.7071067812, epsilon))
-        assertThat(Mflpt5(0x80, 0x35, 0x04, 0xF3, 0x33).toDouble(), closeTo(0.7071067811865476, PRECISION))
+        assertThat(Mflpt5(0x80, 0x35, 0x04, 0xF3, 0x33).toDouble(), closeTo(0.7071067811865476, epsilon))
-        assertThat(Mflpt5(0x81, 0x35, 0x04, 0xF3, 0x34).toDouble(), closeTo(1.4142135624, PRECISION))
+        assertThat(Mflpt5(0x81, 0x35, 0x04, 0xF3, 0x34).toDouble(), closeTo(1.4142135624, epsilon))
-        assertThat(Mflpt5(0x81, 0x35, 0x04, 0xF3, 0x33).toDouble(), closeTo(1.4142135623730951, PRECISION))
+        assertThat(Mflpt5(0x81, 0x35, 0x04, 0xF3, 0x33).toDouble(), closeTo(1.4142135623730951, epsilon))
         assertThat(Mflpt5(0x80, 0x80, 0x00, 0x00, 0x00).toDouble(), equalTo(-.5))
-        assertThat(Mflpt5(0x80, 0x31, 0x72, 0x17, 0xF8).toDouble(), closeTo(0.69314718061, PRECISION))
+        assertThat(Mflpt5(0x80, 0x31, 0x72, 0x17, 0xF8).toDouble(), closeTo(0.69314718061, epsilon))
-        assertThat(Mflpt5(0x80, 0x31, 0x72, 0x17, 0xF7).toDouble(), closeTo(0.6931471805599453, PRECISION))
+        assertThat(Mflpt5(0x80, 0x31, 0x72, 0x17, 0xF7).toDouble(), closeTo(0.6931471805599453, epsilon))
         assertThat(Mflpt5(0x84, 0x20, 0x00, 0x00, 0x00).toDouble(), equalTo(10.0))
         assertThat(Mflpt5(0x9E, 0x6E, 0x6B, 0x28, 0x00).toDouble(), equalTo(1000000000.0))
         assertThat(Mflpt5(0x80, 0x00, 0x00, 0x00, 0x00).toDouble(), equalTo(.5))
-        assertThat(Mflpt5(0x81, 0x38, 0xAA, 0x3B, 0x29).toDouble(), closeTo(1.4426950408889634, PRECISION))
+        assertThat(Mflpt5(0x81, 0x38, 0xAA, 0x3B, 0x29).toDouble(), closeTo(1.4426950408889634, epsilon))
-        assertThat(Mflpt5(0x81, 0x49, 0x0F, 0xDA, 0xA2).toDouble(), closeTo(1.5707963267948966, PRECISION))
+        assertThat(Mflpt5(0x81, 0x49, 0x0F, 0xDA, 0xA2).toDouble(), closeTo(1.5707963267948966, epsilon))
-        assertThat(Mflpt5(0x83, 0x49, 0x0F, 0xDA, 0xA2).toDouble(), closeTo(6.283185307179586, PRECISION))
+        assertThat(Mflpt5(0x83, 0x49, 0x0F, 0xDA, 0xA2).toDouble(), closeTo(6.283185307179586, epsilon))
         assertThat(Mflpt5(0x7F, 0x00, 0x00, 0x00, 0x00).toDouble(), equalTo(.25))
         assertThat(Mflpt5(0xd1, 0x02, 0xb7, 0x06, 0xfb).toDouble(), closeTo(123.45678e22, 1.0e15))
-        assertThat(Mflpt5(0x3e, 0xe9, 0x34, 0x09, 0x1b).toDouble(), closeTo(-123.45678e-22, PRECISION))
+        assertThat(Mflpt5(0x3e, 0xe9, 0x34, 0x09, 0x1b).toDouble(), closeTo(-123.45678e-22, epsilon))
     }
 }
 
@@ -371,8 +369,8 @@ class TestPetscii {
         assertTrue(ten <= ten)
         assertFalse(ten < ten)
 
-        val abc = StringLiteralValue(DataType.STR, "abc", position = Position("", 0, 0, 0))
+        val abc = StringLiteralValue("abc", Position("", 0, 0, 0))
-        val abd = StringLiteralValue(DataType.STR, "abd", position = Position("", 0, 0, 0))
+        val abd = StringLiteralValue("abd", Position("", 0, 0, 0))
         assertEquals(abc, abc)
         assertTrue(abc!=abd)
         assertFalse(abc!=abc)
@@ -380,8 +378,8 @@ class TestPetscii {
 
     @Test
     fun testStackvmValueComparisons() {
-        val ten = RuntimeValue(DataType.FLOAT, 10)
+        val ten = RuntimeValueNumeric(DataType.FLOAT, 10)
-        val nine = RuntimeValue(DataType.UWORD, 9)
+        val nine = RuntimeValueNumeric(DataType.UWORD, 9)
         assertEquals(ten, ten)
         assertNotEquals(ten, nine)
         assertFalse(ten != ten)

docs/docs.iml

@@ -5,7 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.7 (py3)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.8 virtualenv" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

docs/source/building.rst

@@ -94,6 +94,13 @@ Start the compiler with the ``-watch`` argument to enable this.
 It will compile your program and then instead of exiting, it waits for any changes in the module source files.
 As soon as a change happens, the program gets compiled again.
 
+Other options
+^^^^^^^^^^^^^
+There's an option to specify the output directory if you're not happy with the default (the current working directory).
+Also it is possible to specify more than one main module to compile:
+this can be useful to quickly recompile multiple separate programs quickly.
+(compiling in a batch like this is a lot faster than invoking the compiler again once per main file)
+
 
 Module source code files
 ------------------------
@@ -163,22 +170,16 @@ or::
 
 
 
-Virtual Machine
+Virtual Machine / Simulator
----------------
+---------------------------
 
-You may have noticed the ``-avm`` and ``-vm`` command line options for the compiler:
+You may have noticed the ``-sim`` command line option for the compiler:
 
--avm
+-sim
-    Launches the "AST virtual machine" that directly executes the parsed program.
+    Launches the "AST virtual machine Simulator" that directly executes the parsed program.
     No compilation steps will be performed.
     Allows for very fast testing and debugging before actually compiling programs
     to machine code.
     It simulates a bare minimum of features from the target platform, so most stuff
     that calls ROM routines or writes into hardware registers won't work. But basic
     system routines are emulated.
-
--vm   <vm bytecode file>
-    Launches the "intermediate code VM"
-    it interprets the intermediate code that the compiler can write when using the ``-writevm``
-    option. This is the code that will be fed to the assembly code generator,
-    so you'll skip that last step.

docs/source/index.rst

@@ -158,7 +158,7 @@ Design principles and features
 - The compiler tries to optimize the program and generated code, but hand-tuning of the
   performance or space-critical parts will likely still be required. This is supported by
   the ability to easily write embedded assembly code directly in the program source code.
-- There are many built-in functions such as ``sin``, ``cos``, ``rnd``, ``abs``, ``min``, ``max``, ``sqrt``, ``msb``, ``rol``, ``ror``, ``swap``, ``memset``, ``memcopy``
+- There are many built-in functions such as ``sin``, ``cos``, ``rnd``, ``abs``, ``min``, ``max``, ``sqrt``, ``msb``, ``rol``, ``ror``, ``swap``, ``memset``, ``memcopy``, ``sort`` and ``reverse``
 
 
 .. _requirements:

docs/source/programming.rst

@@ -271,9 +271,8 @@ Strings
 Strings are a sequence of characters enclosed in ``"`` quotes. The length is limited to 255 characters.
 They're stored and treated much the same as a byte array,
 but they have some special properties because they are considered to be *text*.
-Strings in your source code files will be encoded (translated from ASCII/UTF-8) into either CBM PETSCII or C-64 screencodes.
+Strings in your source code files will be encoded (translated from ASCII/UTF-8) into the byte-encoding
-PETSCII is the default choice. If you need screencodes (also called 'poke' codes) instead,
+that is used on the target platform. For the C-64, this is CBM PETSCII.
-you have to use the ``str_s`` variants of the string type identifier.
 
 You can concatenate two string literals using '+' (not very useful though) or repeat
 a string literal a given number of times using '*'::
@@ -283,10 +282,10 @@ a string literal a given number of times using '*'::
 
 
 .. caution::
-    It's probably best that you don't change strings after they're created.
+    Avoid changing strings after they've been created.
     This is because if your program exits and is restarted (without loading it again),
-    it will then operate on the changed strings instead of the original ones.
+    it will then start working with the changed strings instead of the original ones.
-    The same is true for arrays by the way.
+    The same is true for arrays.
 
 
 Structs
@@ -395,8 +394,7 @@ Loops
 -----
 
 The *for*-loop is used to let a variable (or register) iterate over a range of values. Iteration is done in steps of 1, but you can change this.
-The loop variable can be declared as byte or word earlier so you can reuse it for multiple occasions,
+The loop variable must be declared as byte or word earlier so you can reuse it for multiple occasions.
-or you can declare one directly in the for statement which will only be visible in the for loop body.
 Iterating with a floating point variable is not supported. If you want to loop over a floating-point array, use a loop with an integer index variable instead.
 
 The *while*-loop is used to repeat a piece of code while a certain condition is still true.
@@ -408,9 +406,6 @@ You can also create loops by using the ``goto`` statement, but this should usual
     The value of the loop variable or register after executing the loop *is undefined*. Don't use it immediately
     after the loop without first assigning a new value to it!
     (this is an optimization issue to avoid having to deal with mostly useless post-loop logic to adjust the loop variable's value)
-    Loop variables that are declared inline are not different to them being
-    defined in a separate var declaration in the subroutine, it's just a readability convenience.
-    (this may change in the future if the compiler gets more advanced with additional sub-scopes)
 
 
 Conditional Execution
@@ -612,8 +607,8 @@ Calling a subroutine
 ^^^^^^^^^^^^^^^^^^^^
 
 The arguments in parentheses after the function name, should match the parameters in the subroutine definition.
-It is possible to not store the return value but the compiler
+If you want to ignore a return value of a subroutine, you should prefix the call with the ``void`` keyword.
-will issue a warning then telling you the result values of a subroutine call are discarded.
+Otherwise the compiler will issue a warning about discarding a result value.
 
 .. caution::
     Note that due to the way parameters are processed by the compiler,
@@ -663,52 +658,58 @@ cos16u(x)
     Fast 16-bit uword cosine of angle 0..255, result is in range 0..65535
 
 cos16(x)
-    Fast 16-bit word cosine of angle 0..255, result is in range -32767..32767
+   Fast 16-bit word cosine of angle 0..255, result is in range -32767..32767
 
 abs(x)
-	Absolute value.
+    Absolute value.
 
 tan(x)
-	Tangent.
+    Tangent.
 
 atan(x)
-	Arctangent.
+    Arctangent.
 
 ln(x)
-	Natural logarithm (base e).
+    Natural logarithm (base e).
 
 log2(x)
     Base 2 logarithm.
 
 sqrt16(w)
-	16 bit unsigned integer Square root. Result is unsigned byte.
+    16 bit unsigned integer Square root. Result is unsigned byte.
 
 sqrt(x)
-	Floating point Square root.
+    Floating point Square root.
 
 round(x)
-	Rounds the floating point to the closest integer.
+    Rounds the floating point to the closest integer.
 
 floor (x)
-	Rounds the floating point down to an integer towards minus infinity.
+    Rounds the floating point down to an integer towards minus infinity.
 
 ceil(x)
-	Rounds the floating point up to an integer towards positive infinity.
+    Rounds the floating point up to an integer towards positive infinity.
 
 rad(x)
-	Degrees to radians.
+    Degrees to radians.
 
 deg(x)
-	Radians to degrees.
+    Radians to degrees.
 
 max(x)
-	Maximum of the values in the array value x
+    Maximum of the values in the array value x
 
 min(x)
-	Minimum of the values in the array value x
+    Minimum of the values in the array value x
 
 sum(x)
-	Sum of the values in the array value x
+    Sum of the values in the array value x
+
+sort(array)
+    Sort the array in ascending order (in-place)
+
+reverse(array)
+    Reverse the values in the array (in-place). Can be used after sort() to sort an array in descending order.
 
 len(x)
     Number of values in the array value x, or the number of characters in a string (excluding the size or 0-byte).
@@ -766,7 +767,7 @@ rol(x)
     Modifies in-place, doesn't return a value (so can't be used in an expression).
 
 rol2(x)
-    Like _rol but now as 8-bit or 16-bit rotation.
+    Like ``rol`` but now as 8-bit or 16-bit rotation.
     It uses some extra logic to not consider the carry flag as extra rotation bit.
     Modifies in-place, doesn't return a value (so can't be used in an expression).
 
@@ -778,7 +779,7 @@ ror(x)
     Modifies in-place, doesn't return a value (so can't be used in an expression).
 
 ror2(x)
-    Like _ror but now as 8-bit or 16-bit rotation.
+    Like ``ror`` but now as 8-bit or 16-bit rotation.
     It uses some extra logic to not consider the carry flag as extra rotation bit.
     Modifies in-place, doesn't return a value (so can't be used in an expression).
 

docs/source/syntaxreference.rst

@@ -268,8 +268,6 @@ type identifier  type                     storage size       example var declara
 ``float[]``      floating-point array     depends on value   ``float[] myvar = [1.1, 2.2, 3.3, 4.4]``
 ``str``          string (petscii)         varies             ``str myvar = "hello."``
                                                              implicitly terminated by a 0-byte
-``str_s``        string (screencodes)     varies             ``str_s myvar = "hello."``
-                                                             implicitly terminated by a 0-byte
 ===============  =======================  =================  =========================================
 
 **arrays:** you can split an array initializer list over several lines if you want. When an initialization
@@ -453,14 +451,17 @@ Subroutine / function calls
 
 You call a subroutine like this::
 
-        [ result = ]  subroutinename_or_address ( [argument...] )
+        [ void / result = ] subroutinename_or_address ( [argument...] )
 
         ; example:
         resultvariable = subroutine(arg1, arg2, arg3)
+        void noresultvaluesub(arg)
+
 
 Arguments are separated by commas. The argument list can also be empty if the subroutine
-takes no parameters.  If the subroutine returns a value, you can still omit the assignment to
+takes no parameters.  If the subroutine returns a value, usually you assign it to a variable.
-a result variable (but the compiler will warn you about discarding the result of the call).
+If you're not interested in the return value, prefix the function call with the ``void`` keyword.
+Otherwise the compiler will warn you about discarding the result of the call.
 
 Normal subroutines can only return zero or one return values.
 However, the special ``asmsub`` routines (implemented in assembly code or referencing
@@ -517,42 +518,39 @@ Loops
 for loop
 ^^^^^^^^
 
-The loop variable must be a register or a byte/word variable. It must be defined in the local scope (to reuse
+The loop variable must be a register or a byte/word variable,
-an existing variable), or you can declare it in the for loop directly to make a new one that is only visible
+and must be defined first in the local scope of the for loop.
-in the body of the for loop.
 The expression that you loop over can be anything that supports iteration (such as ranges like ``0 to 100``,
 array variables and strings) *except* floating-point arrays (because a floating-point loop variable is not supported).
 
 You can use a single statement, or a statement block like in the example below::
 
-	for [byte | word]  <loopvar>  in  <expression>  [ step <amount> ]   {
+	for <loopvar>  in  <expression>  [ step <amount> ]   {
 		; do something...
 		break		; break out of the loop
 		continue	; immediately enter next iteration
 	}
 
-For example, this is a for loop using the existing byte variable ``i`` to loop over a certain range of numbers::
+For example, this is a for loop using a byte variable ``i``, defined before, to loop over a certain range of numbers::
+
+    ubyte i
+
+    ...
 
     for i in 20 to 155 {
         ; do something
     }
 
-And this is a loop over the values of the array ``fibonacci_numbers`` where the loop variable is declared in the loop itself::
+And this is a loop over the values of the array ``fibonacci_numbers``::
 
-    word[] fibonacci_numbers = [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987, 1597, 2584, 4181]
+    uword[] fibonacci_numbers = [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987, 1597, 2584, 4181]
 
-    for word fibnr in fibonacci_numbers {
+    uword number
-        ; do something
+    for number in fibonacci_numbers {
+        ; do something with number
     }
 
 
-You can inline the loop variable declaration in the for statement, including optional zp-tag. In this case
-the variable is not visible outside of the for loop::
-
-    for ubyte @zp fastindex in 10 to 20 {
-        ; do something
-    }
-
 
 while loop
 ^^^^^^^^^^

docs/source/todo.rst

@@ -2,22 +2,25 @@
 TODO
 ====
 
+- option to load library files from a directory instead of the embedded ones
+- @"zzz"  screencode encoded strings  + add this to docs too
+
+
 Memory Block Operations integrated in language?
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-list,string memory block operations?
+array/string memory block operations?
 
-- list operations (whole list, individual element)
+- array operations
-  operations: set, get, copy (from another list with the same length), shift-N(left,right), rotate-N(left,right)
+  copy (from another array with the same length), shift-N(left,right), rotate-N(left,right)
-  clear (set whole list to the given value, default 0)
+  clear (set whole array to the given value, default 0)
 
-- list operations ofcourse work identical on vars and on memory mapped vars of these types.
+- array operations ofcourse work identical on vars and on memory mapped vars of these types.
 
-- strings: identical operations as on lists.
+- strings: identical operations as on array.
 
-these should call optimized pieces of assembly code, so they run as fast as possible
+For now, we have the ``memcopy`` and ``memset`` builtin functions.
 
-For now, we have the ``memcopy``, ``memset`` and ``strlen`` builtin functions.
 
 More optimizations
 ^^^^^^^^^^^^^^^^^^
@@ -45,12 +48,14 @@ Allocate a fixed word in ZP that is the TOS so we can always operate on TOS dire
 without having to to index into the stack?
 
 
+Bugs
+^^^^
+Ofcourse there are still bugs to fix ;)
+
+
 Misc
 ^^^^
 
-Add sort() function that can sort an array (ascending and descending)
-
-
 Several ideas were discussed on my reddit post
 https://www.reddit.com/r/programming/comments/alhj59/creating_a_programming_language_and_cross/
 

examples/arithmetic/bitshift.p8

@@ -1,8 +1,6 @@
 %import c64utils
 %zeropage basicsafe
 
-; TODO implement asm generation for all operation in here
-
 main {
 
     byte bb
@@ -11,15 +9,50 @@ main {
     uword uw
     &ubyte  membyte=9999
     &uword  memword=9999
-    ubyte[10] barray
+    ubyte[] ubarray = [8,8,8]
+    uword[] uwarray = [8200, 8200, 8200]
+    byte[] bbarray = [8,8,8]
+    word[] wwarray = [8200, 8200, 8200]
+
+    sub unimplemented() {
+        ; TODO implement these asm routines
+        lsr(ubarray[1])
+        lsl(ubarray[1])
+        ror(ubarray[1])
+        rol(ubarray[1])
+        ror2(ubarray[1])
+        rol2(ubarray[1])
+        lsr(bbarray[1])
+        lsl(bbarray[1])
+
+        lsr(uwarray[1])
+        lsl(uwarray[1])
+        ror(uwarray[1])
+        rol(uwarray[1])
+        ror2(uwarray[1])
+        rol2(uwarray[1])
+        lsr(wwarray[1])
+        lsl(wwarray[1])
+    }
 
     sub start() {
+        unimplemented()
         lsr(A)
         lsl(A)
         ror(A)
         rol(A)
         ror2(A)
         rol2(A)
+        lsr(Y)
+        lsl(Y)
+        ror(Y)
+        rol(Y)
+        ror2(Y)
+        rol2(Y)
+
+        lsr(bb)
+        lsl(bb)
+
         lsr(membyte)
         lsl(membyte)
         ror(membyte)
@@ -32,19 +65,20 @@ main {
         rol(memword)
         ror2(memword)
         rol2(memword)
+
         lsl(@(9999))
         lsr(@(9999))
         ror(@(9999))
         rol(@(9999))
         ror2(@(9999))
         rol2(@(9999))
-        lsr(barray[1])
-        lsl(barray[1])
-        ror(barray[1])
-        rol(barray[1])
-        ror2(barray[1])
-        rol2(barray[1])
 
+        lsl(@(9999+A))
+        lsr(@(9999+A))
+        ror(@(9999+A))
+        rol(@(9999+A))
+        ror2(@(9999+A))
+        rol2(@(9999+A))
 
         bb /= 2
         bb >>= 1

examples/bdmusic.p8

@@ -13,11 +13,12 @@ sub start() {
     c64.MVOL = 15
 
     c64scr.print("will play the music from boulderdash,\nmade in 1984 by peter liepa.\npress enter to start: ")
-    c64.CHRIN()
+    void c64.CHRIN()
     c64.CLEARSCR()
 
     while(true) {
-        for uword note in notes {
+        uword note
+        for note in notes {
             ubyte note1 = lsb(note)
             ubyte note2 = msb(note)
             c64.FREQ1 = music_freq_table[note1]    ; set lo+hi freq of voice 1
@@ -35,7 +36,8 @@ sub start() {
     }
 
     sub delay() {
-        for ubyte d in 0 to 12 {
+        ubyte d
+        for d in 0 to 12 {
             while(c64.RASTER!=0) {
                 ; tempo delay synced to screen refresh
             }

examples/comparison_ifs_word.p8

@@ -106,6 +106,39 @@ main {
         else
             c64scr.print("error in -222>=-222!\n")
 
+        v1 = 1000
+        v2 = 1000
+        if v1==v2
+            c64scr.print("ok: 1000 == 1000\n")
+        else
+            c64scr.print("error in 1000==1000!\n")
+
+        if v1!=v2
+            c64scr.print("error in 1000!=1000!\n")
+        else
+            c64scr.print("ok: 1000 is not != 1000\n")
+
+        if v1<v2
+            c64scr.print("error in 1000<1000!\n")
+        else
+            c64scr.print("ok: 1000 is not < 1000\n")
+
+        if v1<=v2
+            c64scr.print("ok: 1000 <= 1000\n")
+        else
+            c64scr.print("error in 1000<=1000!\n")
+
+        if v1>v2
+            c64scr.print("error in 1000>1000!\n")
+        else
+            c64scr.print("ok: 1000 is not > 1000\n")
+
+        if v1>=v2
+            c64scr.print("ok: 1000 >= 1000\n")
+        else
+            c64scr.print("error in 1000>=1000!\n")
+
+
         ubyte endX = X
         if endX == 255
             c64scr.print("stack x ok!\n")

examples/cube3d-float.p8

@@ -55,7 +55,8 @@ main {
         float Azy = cosb*sinc
         float Azz = cosb*cosc
 
-        for ubyte i in 0 to len(xcoor)-1 {
+        ubyte i
+        for i in 0 to len(xcoor)-1 {
             rotatedx[i] = Axx*xcoor[i] + Axy*ycoor[i] + Axz*zcoor[i]
             rotatedy[i] = Ayx*xcoor[i] + Ayy*ycoor[i] + Ayz*zcoor[i]
             rotatedz[i] = Azx*xcoor[i] + Azy*ycoor[i] + Azz*zcoor[i]

examples/cube3d-sprites.p8

@@ -1,8 +1,6 @@
 %import c64lib
 %import c64utils
 
-; TODO:  some optimizer breaks this..   runs fine without optimization
-
 spritedata $2000 {
     ; this memory block contains the sprite data
     ; it must start on an address aligned to 64 bytes.
@@ -122,7 +120,8 @@ main {
         word Azy = wcosb*wsinc / 128
         word Azz = wcosb*wcosc / 128
 
-        for ubyte i in 0 to len(xcoor)-1 {
+        ubyte i
+        for i in 0 to len(xcoor)-1 {
             ; don't normalize by dividing by 128, instead keep some precision for perspective calc later
             rotatedx[i] = (Axx*xcoor[i] + Axy*ycoor[i] + Axz*zcoor[i])
             rotatedy[i] = (Ayx*xcoor[i] + Ayy*ycoor[i] + Ayz*zcoor[i])
@@ -137,9 +136,10 @@ main {
 
         ; first sort vertices to sprite order so the back/front order is correct as well
         ; (simple bubble sort as it's only 8 items to sort)
-        ; TODO make a builtin function sort()
+        ubyte i
-        for ubyte sorti in 6 to 0 step -1 {
+        ubyte i1
-            for ubyte i1 in 0 to sorti {
+        for i in 6 to 0 step -1 {
+            for i1 in 0 to i {
                 ubyte i2 = i1+1
                 if(rotatedz[i1] > rotatedz[i2]) {
                     swap(rotatedx[i1], rotatedx[i2])
@@ -151,7 +151,7 @@ main {
 
         ubyte[] spritecolors = [1,1,7,15,12,11,9,9]
 
-        for ubyte i in 0 to 7 {
+        for i in 0 to 7 {
             word zc = rotatedz[i]
             word persp = 300+zc/256
             ubyte sx = rotatedx[i] / persp + width/2 as ubyte + 20

examples/cube3d.p8

@@ -61,7 +61,8 @@ main {
         word Azy = wcosb*wsinc / 128
         word Azz = wcosb*wcosc / 128
 
-        for ubyte i in 0 to len(xcoor)-1 {
+        ubyte i
+        for i in 0 to len(xcoor)-1 {
             ; don't normalize by dividing by 128, instead keep some precision for perspective calc later
             rotatedx[i] = (Axx*xcoor[i] + Axy*ycoor[i] + Axz*zcoor[i])
             rotatedy[i] = (Ayx*xcoor[i] + Ayy*ycoor[i] + Ayz*zcoor[i])
@@ -79,7 +80,6 @@ main {
         word persp
         byte sx
         byte sy
-        ubyte color
 
         for i in 0 to len(xcoor)-1 {
             rz = rotatedz[i]

examples/hello.p8

@@ -17,13 +17,14 @@ main {
 
         ; use iteration to write text
         str question = "How are you?\n"
-        for ubyte char in question
+        ubyte char
+        for char in question
             c64.CHROUT(char)
 
         ; use indexed loop to write characters
         str bye = "Goodbye!\n"
-        for ubyte c in 0 to len(bye)
+        for char in 0 to len(bye)-1
-            c64.CHROUT(bye[c])
+            c64.CHROUT(bye[char])
 
 
         float clock_seconds = ((mkword(c64.TIME_LO, c64.TIME_MID) as float) + (c64.TIME_HI as float)*65536.0) / 60
@@ -39,6 +40,8 @@ main {
         c64.CHROUT(':')
         c64flt.print_f(clock_seconds)
         c64.CHROUT('\n')
+
+        c64scr.print("bye!\n")
     }
 
 }

examples/mandelbrot.p8

@@ -16,10 +16,13 @@ main {
         c64.TIME_MID=0
         c64.TIME_LO=0
 
-        for ubyte pixely in 0 to height-1 {
+        ubyte pixelx
+        ubyte pixely
+
+        for pixely in 0 to height-1 {
             float yy = (pixely as float)/0.4/height - 1.0
 
-            for ubyte pixelx in 0 to width-1 {
+            for pixelx in 0 to width-1 {
                 float xx = (pixelx as float)/0.3/width - 2.2
 
                 float xsquared = 0.0

examples/numbergame.p8

@@ -10,15 +10,16 @@ main {
         str   name    = "????????????????????????????????????????"
         str   input   = "??????????"
         ubyte secretnumber = rnd() % 99 + 1     ; random number 1..100
+        ubyte attempts_left
 
         c64.VMCSB |= 2  ; switch lowercase chars
         c64scr.print("Please introduce yourself: ")
-        c64scr.input_chars(name)
+        void c64scr.input_chars(name)
         c64scr.print("\n\nHello, ")
         c64scr.print(name)
         c64scr.print(".\nLet's play a number guessing game.\nI am thinking of a number from 1 to 100!You'll have to guess it!\n")
 
-        for ubyte attempts_left in 10 to 1 step -1 {
+        for attempts_left in 10 to 1 step -1 {
 
             c64scr.print("\nYou have ")
             c64scr.print_ub(attempts_left)
@@ -26,7 +27,7 @@ main {
             if attempts_left>1
                 c64scr.print("es")
             c64scr.print(" left.\nWhat is your next guess? ")
-            c64scr.input_chars(input)
+            void c64scr.input_chars(input)
             ubyte guess = lsb(c64utils.str2uword(input))
 
             if guess==secretnumber {

examples/screencodes.p8

@@ -0,0 +1,27 @@
+%import c64lib
+%import c64utils
+%zeropage basicsafe
+
+
+main {
+
+    sub start() {
+
+        c64.VMCSB |= 2  ; switch to lowercase charset
+
+        str s1 = "HELLO hello 1234 @[/]\n"      ; regular strings have default encoding (petscii on c64)
+        str s2 = @"HELLO hello 1234 @[/]\n"     ; TODO @-strings for alternate encoding (screencode on c64)
+
+        c64scr.print("\n\n\n\nString output via print:\n")
+        c64scr.print(s1)
+        c64scr.print(s2)
+
+        c64scr.print("\nThe top two screen lines are set via screencodes.\n")
+        ubyte i
+        for i in 0 to len(s1)-1
+            @($0400+i) = s1[i]
+
+        for i in 0 to len(s2)-1
+            @($0400+40+i) = s2[i]
+    }
+}

examples/sorting.p8

@@ -0,0 +1,66 @@
+%import c64lib
+%import c64utils
+%zeropage basicsafe
+
+main {
+
+    sub start() {
+
+        ubyte[] uba = [10,0,2,8,5,4,3,9]
+        uword[] uwa = [1000,0,200,8000,50,40000,3,900]
+        byte[] ba = [-10,0,-2,8,5,4,-3,9,-99]
+        word[] wa = [-1000,0,-200,8000,50,31111,3,-900]
+
+        c64scr.print("original\n")
+        print_arrays()
+
+        sort(uba)
+        sort(uwa)
+        sort(ba)
+        sort(wa)
+
+        c64scr.print("sorted\n")
+        print_arrays()
+
+        reverse(uba)
+        reverse(uwa)
+        reverse(ba)
+        reverse(wa)
+
+        c64scr.print("reversed\n")
+        print_arrays()
+        return
+
+
+        sub print_arrays() {
+            ubyte ub
+            uword uw
+            byte bb
+            word ww
+            for ub in uba {
+                c64scr.print_ub(ub)
+                c64.CHROUT(',')
+            }
+            c64.CHROUT('\n')
+
+            for uw in uwa {
+                c64scr.print_uw(uw)
+                c64.CHROUT(',')
+            }
+            c64.CHROUT('\n')
+
+            for bb in ba {
+                c64scr.print_b(bb)
+                c64.CHROUT(',')
+            }
+            c64.CHROUT('\n')
+
+            for ww in wa {
+                c64scr.print_w(ww)
+                c64.CHROUT(',')
+            }
+            c64.CHROUT('\n')
+            c64.CHROUT('\n')
+        }
+    }
+}

examples/sprites.p8

@@ -40,7 +40,8 @@ main {
 
         c64scr.print("balloon sprites!\n...we are all floating...\n")
 
-        for ubyte i in 0 to 7 {
+        ubyte @zp i
+        for i in 0 to 7 {
             c64.SPRPTR[i] = $0a00 / 64
             c64.SPXY[i*2] = 50+25*i
             c64.SPXY[i*2+1] = rnd()
@@ -58,7 +59,8 @@ irq {
         c64.EXTCOL--
 
         ; float up & wobble horizontally
-        for ubyte @zp i in 0 to 14 step 2 {
+        ubyte @zp i
+        for i in 0 to 14 step 2 {
             c64.SPXY[i+1]--
             ubyte @zp r = rnd()
             if r>200