get rid of the noshortcircuit fallback

codeCore/src/prog8/code/core/CompilationOptions.kt

@@ -18,7 +18,6 @@ class CompilationOptions(val output: OutputType,
                          var optimize: Boolean = false,
                          var asmQuiet: Boolean = false,
                          var asmListfile: Boolean = false,
-                         var shortCircuit: Boolean = true,
                          var includeSourcelines: Boolean = false,
                          var experimentalCodegen: Boolean = false,
                          var varsHighBank: Int? = null,

codeGenCpu6502/src/prog8/codegen/cpu6502/assignment/AssignmentAsmGen.kt

@@ -1076,7 +1076,7 @@ internal class AssignmentAsmGen(private val program: PtProgram,
                 return true
             }
 
-            if(asmgen.options.shortCircuit && (!expr.left.isSimple() && !expr.right.isSimple())) {
+            if(!expr.right.isSimple()) {
                 // shortcircuit evaluation into A
                 val shortcutLabel = asmgen.makeLabel("shortcut")
                 when (expr.operator) {
@@ -1097,7 +1097,7 @@ internal class AssignmentAsmGen(private val program: PtProgram,
                     else -> throw AssemblyError("invalid logical operator")
                 }
             } else {
-                // normal evaluation into A
+                // normal evaluation into A, it is *likely* shorter and faster because of the simple operands.
                 assignExpressionToRegister(expr.left, RegisterOrPair.A, false)
                 if(directIntoY(expr.right)) {
                     assignExpressionToRegister(expr.right, RegisterOrPair.Y, false)

codeGenCpu6502/src/prog8/codegen/cpu6502/assignment/AugmentableAssignmentAsmGen.kt

@@ -793,36 +793,27 @@ internal class AugmentableAssignmentAsmGen(private val program: PtProgram,
     }
 
     private fun inplacemodificationByteVariableWithValue(name: String, dt: DataType, operator: String, value: PtExpression) {
-        if(asmgen.options.shortCircuit) {
+        val shortcutLabel = asmgen.makeLabel("shortcut")
-            val shortcutLabel = asmgen.makeLabel("shortcut")
+        when (operator) {
-            when (operator) {
+            "and" -> {
-                "and" -> {
+                // short-circuit  LEFT and RIGHT  -->  if LEFT then RIGHT else LEFT   (== if !LEFT then LEFT else RIGHT)
-                    // short-circuit  LEFT and RIGHT  -->  if LEFT then RIGHT else LEFT   (== if !LEFT then LEFT else RIGHT)
+                asmgen.out("  lda  $name |  beq  $shortcutLabel")
-                    asmgen.out("  lda  $name |  beq  $shortcutLabel")
+                asmgen.assignExpressionToRegister(value, RegisterOrPair.A, dt in SignedDatatypes)
-                    asmgen.assignExpressionToRegister(value, RegisterOrPair.A, dt in SignedDatatypes)
+                asmgen.out("""
-                    asmgen.out("""
+                     and  $name
-                         and  $name
+                     sta  $name
-                         sta  $name
 $shortcutLabel:""")
-                    return
+            }
-                }
+            "or" -> {
-                "or" -> {
+                // short-circuit  LEFT or RIGHT  -->  if LEFT then LEFT else RIGHT
-                    // short-circuit  LEFT or RIGHT  -->  if LEFT then LEFT else RIGHT
+                asmgen.out("  lda  $name |  bne  $shortcutLabel")
-                    asmgen.out("  lda  $name |  bne  $shortcutLabel")
+                asmgen.assignExpressionToRegister(value, RegisterOrPair.A, dt in SignedDatatypes)
-                    asmgen.assignExpressionToRegister(value, RegisterOrPair.A, dt in SignedDatatypes)
+                asmgen.out("""
-                    asmgen.out("""
+                     ora  $name
-                         ora  $name
+                     sta  $name
-                         sta  $name
 $shortcutLabel:""")
-                    return
-                }
             }
         }
-
-        // normal evaluation
-        asmgen.assignExpressionToRegister(value, RegisterOrPair.A, dt in SignedDatatypes)
-        inplacemodificationRegisterAwithVariableWithSwappedOperands(operator, name, dt in SignedDatatypes)
-        asmgen.out("  sta  $name")
     }
 
     private fun inplacemodificationByteVariableWithVariable(name: String, dt: DataType, operator: String, otherName: String) {

codeGenIntermediate/src/prog8/codegen/intermediate/ExpressionGen.kt

@@ -708,7 +708,7 @@ internal class ExpressionGen(private val codeGen: IRCodeGen) {
 
     private fun operatorAnd(binExpr: PtBinaryExpression, vmDt: IRDataType, bitwise: Boolean): ExpressionCodeResult {
         val result = mutableListOf<IRCodeChunkBase>()
-        if(!bitwise && codeGen.options.shortCircuit && (!binExpr.left.isSimple() && !binExpr.right.isSimple())) {
+        if(!bitwise && !binExpr.right.isSimple()) {
             // short-circuit  LEFT and RIGHT  -->  if LEFT then RIGHT else LEFT   (== if !LEFT then LEFT else RIGHT)
             val leftTr = translateExpression(binExpr.left)
             addToResult(result, leftTr, leftTr.resultReg, -1)
@@ -737,7 +737,7 @@ internal class ExpressionGen(private val codeGen: IRCodeGen) {
 
     private fun operatorOr(binExpr: PtBinaryExpression, vmDt: IRDataType, bitwise: Boolean): ExpressionCodeResult {
         val result = mutableListOf<IRCodeChunkBase>()
-        if(!bitwise && codeGen.options.shortCircuit && (!binExpr.left.isSimple() && !binExpr.right.isSimple())) {
+        if(!bitwise && !binExpr.right.isSimple()) {
             // short-circuit  LEFT or RIGHT  -->  if LEFT then LEFT else RIGHT
             val leftTr = translateExpression(binExpr.left)
             addToResult(result, leftTr, leftTr.resultReg, -1)
@@ -1011,7 +1011,7 @@ internal class ExpressionGen(private val codeGen: IRCodeGen) {
     internal fun operatorLogicalAndInplace(knownAddress: Int?, symbol: String?, vmDt: IRDataType, operand: PtExpression): IRCodeChunks {
         val result = mutableListOf<IRCodeChunkBase>()
         val tr = translateExpression(operand)
-        if(codeGen.options.shortCircuit && !operand.isSimple()) {
+        if(!operand.isSimple()) {
             // short-circuit  LEFT and RIGHT  -->  if LEFT then RIGHT else LEFT   (== if !LEFT then LEFT else RIGHT)
             val inplaceReg = codeGen.registers.nextFree()
             val shortcutLabel = codeGen.createLabelName()
@@ -1029,7 +1029,7 @@ internal class ExpressionGen(private val codeGen: IRCodeGen) {
                 IRInstruction(Opcode.STOREM, vmDt, reg1=tr.resultReg, labelSymbol = symbol), null)
             result += IRCodeChunk(shortcutLabel, null)
         } else {
-            // normal evaluation
+            // normal evaluation, it is *likely* shorter and faster because of the simple operands.
             addToResult(result, tr, tr.resultReg, -1)
             addInstr(result, if(knownAddress!=null)
                 IRInstruction(Opcode.ANDM, vmDt, reg1=tr.resultReg, address = knownAddress)
@@ -1053,7 +1053,7 @@ internal class ExpressionGen(private val codeGen: IRCodeGen) {
     internal fun operatorLogicalOrInplace(knownAddress: Int?, symbol: String?, vmDt: IRDataType, operand: PtExpression): IRCodeChunks {
         val result = mutableListOf<IRCodeChunkBase>()
         val tr = translateExpression(operand)
-        if(codeGen.options.shortCircuit && !operand.isSimple()) {
+        if(!operand.isSimple()) {
             // short-circuit  LEFT or RIGHT  -->  if LEFT then LEFT else RIGHT
             val inplaceReg = codeGen.registers.nextFree()
             val shortcutLabel = codeGen.createLabelName()
@@ -1071,6 +1071,7 @@ internal class ExpressionGen(private val codeGen: IRCodeGen) {
                 IRInstruction(Opcode.STOREM, vmDt, reg1=tr.resultReg, labelSymbol = symbol), null)
             result += IRCodeChunk(shortcutLabel, null)
         } else {
+            // normal evaluation, it is *likely* shorter and faster because of the simple operands.
             addToResult(result, tr, tr.resultReg, -1)
             addInstr(result, if(knownAddress!=null)
                 IRInstruction(Opcode.ORM, vmDt, reg1=tr.resultReg, address = knownAddress)

compiler/src/prog8/CompilerMain.kt

@@ -50,7 +50,6 @@ private fun compileMain(args: Array<String>): Boolean {
     val sourceDirs by cli.option(ArgType.String, fullName="srcdirs", description = "list of extra paths, separated with ${File.pathSeparator}, to search in for imported modules").multiple().delimiter(File.pathSeparator)
     val includeSourcelines by cli.option(ArgType.Boolean, fullName = "sourcelines", description = "include original Prog8 source lines in generated asm code")
     val splitWordArrays by cli.option(ArgType.Boolean, fullName = "splitarrays", description = "treat all word arrays as tagged with @split to make them lsb/msb split in memory")
-    val noShortCircuit by cli.option(ArgType.Boolean, fullName = "noshortcircuit", description = "do not apply McCarthy/short-circuit evaluation to boolean expressions")
     val printAst1 by cli.option(ArgType.Boolean, fullName = "printast1", description = "print out the compiler AST")
     val printAst2 by cli.option(ArgType.Boolean, fullName = "printast2", description = "print out the intermediate AST that is used for code generation")
     val breakpointCpuInstruction by cli.option(ArgType.Boolean, fullName = "breakinstr", description = "also use a CPU instruction for %breakpoint")
@@ -151,7 +150,6 @@ private fun compileMain(args: Array<String>): Boolean {
                     warnSymbolShadowing == true,
                     quietAssembler == true,
                     asmListfile == true,
-                    noShortCircuit != true,
                     includeSourcelines == true,
                     experimentalCodegen == true,
                     varsHighBank,
@@ -230,7 +228,6 @@ private fun compileMain(args: Array<String>): Boolean {
                     warnSymbolShadowing == true,
                     quietAssembler == true,
                     asmListfile == true,
-                    noShortCircuit != true,
                     includeSourcelines == true,
                     experimentalCodegen == true,
                     varsHighBank,

compiler/src/prog8/compiler/Compiler.kt

@@ -36,7 +36,6 @@ class CompilerArguments(val filepath: Path,
                         val warnSymbolShadowing: Boolean,
                         val quietAssembler: Boolean,
                         val asmListfile: Boolean,
-                        val shortCircuit: Boolean,
                         val includeSourcelines: Boolean,
                         val experimentalCodegen: Boolean,
                         val varsHighBank: Int?,
@@ -82,7 +81,6 @@ fun compileProgram(args: CompilerArguments): CompilationResult? {
                 optimize = args.optimize
                 asmQuiet = args.quietAssembler
                 asmListfile = args.asmListfile
-                shortCircuit = args.shortCircuit
                 includeSourcelines = args.includeSourcelines
                 experimentalCodegen = args.experimentalCodegen
                 breakpointCpuInstruction = args.breakpointCpuInstruction

compiler/test/TestCompilerOnExamples.kt

@@ -30,7 +30,6 @@ private fun compileTheThing(filepath: Path, optimize: Boolean, target: ICompilat
         warnSymbolShadowing = false,
         quietAssembler = true,
         asmListfile = false,
-        shortCircuit = true,
         includeSourcelines = false,
         experimentalCodegen = false,
         varsHighBank = null,

compiler/test/TestCompilerOptionLibdirs.kt

@@ -28,7 +28,6 @@ class TestCompilerOptionSourcedirs: FunSpec({
             warnSymbolShadowing = false,
             quietAssembler = true,
             asmListfile = false,
-            shortCircuit = true,
             includeSourcelines = false,
             experimentalCodegen = false,
             varsHighBank = null,

compiler/test/helpers/compileXyz.kt

@@ -27,7 +27,6 @@ internal fun compileFile(
         warnSymbolShadowing = false,
         quietAssembler = true,
         asmListfile = false,
-        shortCircuit = true,
         includeSourcelines = false,
         experimentalCodegen = false,
         varsHighBank = null,

docs/source/compiling.rst

@@ -202,11 +202,6 @@ One or more .p8 module files
     This removes the need to add @split yourself but some programs may fail to compile with
     this option as not all array operations are implemented yet on split arrays.
 
-``-noshortcircuit``
-    Do *not* apply `McCarthy/short-circuit evaluation <https://en.wikipedia.org/wiki/Short-circuit_evaluation>`_ to boolean expressions.
-    This is a new feature and changes the behavior of existing programs so it can be turned off again for now.
-    This toggle will disappear eventually.
-
 ``-vm``
     load and run a p8-virt or p8-ir listing in the internal VirtualMachine instead of compiling a prog8 program file..
 

docs/source/todo.rst

@@ -13,7 +13,6 @@ Future Things and Ideas
 ^^^^^^^^^^^^^^^^^^^^^^^
 Compiler:
 
-- get rid of the noshortcircuit fallback option and code.
 - instead of copy-pasting inline asmsubs, make them into a 64tass macro and use that instead.
   that will allow them to be reused from custom user written assembly code as well.
 - Multidimensional arrays and chained indexing, purely as syntactic sugar over regular arrays.

httpCompilerService/src/prog8/http/TestHttp.kt

@@ -40,7 +40,6 @@ class RequestParser : Take {
             quietAssembler = false,
             includeSourcelines = false,
             asmListfile = false,
-            shortCircuit = true,
             experimentalCodegen = false,
             splitWordArrays = false,
             breakpointCpuInstruction = false,