Merge branch 'master' into c128target

# Conflicts:
#	compiler/src/prog8/CompilerMain.kt
#	examples/test.p8
This commit is contained in:
Irmen de Jong
2021-12-30 18:22:05 +01:00
26 changed files with 143 additions and 47 deletions

View File

@@ -28,5 +28,7 @@ class CompilationOptions(val output: OutputType,
// these are set based on command line arguments:
var slowCodegenWarnings: Boolean = false,
var optimize: Boolean = false,
var optimizeFloatExpressions: Boolean = false
var optimizeFloatExpressions: Boolean = false,
var asmQuiet: Boolean = false,
var asmListfile: Boolean = false
)

View File

@@ -11,5 +11,5 @@ const val subroutineFloatEvalResultVar2 = "_prog8_float_eval_result2"
interface IAssemblyProgram {
val valid: Boolean
val name: String
fun assemble(quiet: Boolean, options: CompilationOptions): Int
fun assemble(options: CompilationOptions): Int
}