diff --git a/.output/actual/eta/eval/logged/Fast/from-eas/bottles.logged b/.output/actual/eta/eval/logged/Fast/from-eas/bottles.logged index ce8ccd7f9..944365c75 100644 --- a/.output/actual/eta/eval/logged/Fast/from-eas/bottles.logged +++ b/.output/actual/eta/eval/logged/Fast/from-eas/bottles.logged @@ -34,8 +34,8 @@ dump: Memory ( MNatural 4 ) ) , ICF - ( Labeled - ( LImmediate 6 ) ( Branch NE ) + ( Branch + ( BImmediate 6 ) NE ) , ICF ( Mark @@ -82,8 +82,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 11 ) ( Branch NE ) + ( Branch + ( BImmediate 11 ) NE ) , ICF ( Mark @@ -94,8 +94,7 @@ dump: Memory ( Cons 48 ) ) , IAL ( SIO OutputChar ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , ICF ( Labeled LTop Jump ) , ICF ( Mark @@ -112,8 +111,8 @@ dump: Memory ( MNatural 12 ) ) , ICF - ( Labeled - ( LImmediate 14 ) ( Branch NE ) + ( Branch + ( BImmediate 14 ) NE ) , ICF ( Mark @@ -662,16 +661,16 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 32 ) ( Branch NE ) + ( Branch + ( BImmediate 32 ) NE ) , ICF ( Mark ( MNatural 42 ) ) , ICF - ( Labeled - ( LImmediate 0 ) ( Branch NE ) + ( Branch + ( BImmediate 0 ) NE ) , ICF ( Mark diff --git "a/.output/actual/eta/eval/logged/Fast/from-eas/fact0\n.logged" "b/.output/actual/eta/eval/logged/Fast/from-eas/fact0\n.logged" index bb9ab5475..c78338ffd 100644 --- "a/.output/actual/eta/eval/logged/Fast/from-eas/fact0\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/from-eas/fact0\n.logged" @@ -81,8 +81,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 9 ) ( Branch NE ) + ( Branch + ( BImmediate 9 ) NE ) , ICF ( Mark @@ -173,16 +173,16 @@ dump: Memory ( MNatural 16 ) ) , ICF - ( Labeled - ( LImmediate 18 ) ( Branch NE ) + ( Branch + ( BImmediate 18 ) NE ) , ICF ( Mark ( MNatural 17 ) ) , ICF - ( Labeled - ( LImmediate 14 ) ( Branch NE ) + ( Branch + ( BImmediate 14 ) NE ) , ICF ( Mark @@ -276,8 +276,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 27 ) ( Branch NE ) + ( Branch + ( BImmediate 27 ) NE ) , ICF ( Mark @@ -304,8 +304,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 29 ) ( Branch NE ) + ( Branch + ( BImmediate 29 ) NE ) , ICF ( Mark @@ -334,8 +334,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 19 ) ( Branch NE ) + ( Branch + ( BImmediate 19 ) NE ) , ICF ( Mark @@ -378,8 +378,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 35 ) ( Branch NE ) + ( Branch + ( BImmediate 35 ) NE ) , ICF ( Mark @@ -390,8 +390,7 @@ dump: Memory ( Cons 48 ) ) , IAL ( SIO OutputChar ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , ICF ( Labeled LTop Jump ) , ICF ( Mark @@ -408,8 +407,8 @@ dump: Memory ( MNatural 36 ) ) , ICF - ( Labeled - ( LImmediate 38 ) ( Branch NE ) + ( Branch + ( BImmediate 38 ) NE ) , ICF ( Mark @@ -547,8 +546,8 @@ dump: Memory ( MNatural 49 ) ) , ICF - ( Labeled - ( LImmediate 51 ) ( Branch NE ) + ( Branch + ( BImmediate 51 ) NE ) , ICF ( Mark @@ -632,14 +631,7 @@ dump: Memory ( Mark ( MNatural 58 ) ) - , IAL - ( SPure - ( Indexed - ( IImmediate 1 ) Move - ) - ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BSwapped NE ) , ICF ( Mark ( MNatural 59 ) @@ -676,8 +668,8 @@ dump: Memory ( MNatural 62 ) ) , ICF - ( Labeled - ( LImmediate 64 ) ( Branch NE ) + ( Branch + ( BImmediate 64 ) NE ) , ICF ( Mark @@ -709,7 +701,7 @@ dump: Memory ) , End ] - , programCounter = 170 + , programCounter = 169 , returnStack = IS [] } , memoryStack = fromList diff --git "a/.output/actual/eta/eval/logged/Fast/from-eas/fact1\n.logged" "b/.output/actual/eta/eval/logged/Fast/from-eas/fact1\n.logged" index e20f74506..a171ba9b9 100644 --- "a/.output/actual/eta/eval/logged/Fast/from-eas/fact1\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/from-eas/fact1\n.logged" @@ -81,8 +81,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 9 ) ( Branch NE ) + ( Branch + ( BImmediate 9 ) NE ) , ICF ( Mark @@ -173,16 +173,16 @@ dump: Memory ( MNatural 16 ) ) , ICF - ( Labeled - ( LImmediate 18 ) ( Branch NE ) + ( Branch + ( BImmediate 18 ) NE ) , ICF ( Mark ( MNatural 17 ) ) , ICF - ( Labeled - ( LImmediate 14 ) ( Branch NE ) + ( Branch + ( BImmediate 14 ) NE ) , ICF ( Mark @@ -276,8 +276,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 27 ) ( Branch NE ) + ( Branch + ( BImmediate 27 ) NE ) , ICF ( Mark @@ -304,8 +304,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 29 ) ( Branch NE ) + ( Branch + ( BImmediate 29 ) NE ) , ICF ( Mark @@ -334,8 +334,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 19 ) ( Branch NE ) + ( Branch + ( BImmediate 19 ) NE ) , ICF ( Mark @@ -378,8 +378,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 35 ) ( Branch NE ) + ( Branch + ( BImmediate 35 ) NE ) , ICF ( Mark @@ -390,8 +390,7 @@ dump: Memory ( Cons 48 ) ) , IAL ( SIO OutputChar ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , ICF ( Labeled LTop Jump ) , ICF ( Mark @@ -408,8 +407,8 @@ dump: Memory ( MNatural 36 ) ) , ICF - ( Labeled - ( LImmediate 38 ) ( Branch NE ) + ( Branch + ( BImmediate 38 ) NE ) , ICF ( Mark @@ -547,8 +546,8 @@ dump: Memory ( MNatural 49 ) ) , ICF - ( Labeled - ( LImmediate 51 ) ( Branch NE ) + ( Branch + ( BImmediate 51 ) NE ) , ICF ( Mark @@ -632,14 +631,7 @@ dump: Memory ( Mark ( MNatural 58 ) ) - , IAL - ( SPure - ( Indexed - ( IImmediate 1 ) Move - ) - ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BSwapped NE ) , ICF ( Mark ( MNatural 59 ) @@ -676,8 +668,8 @@ dump: Memory ( MNatural 62 ) ) , ICF - ( Labeled - ( LImmediate 64 ) ( Branch NE ) + ( Branch + ( BImmediate 64 ) NE ) , ICF ( Mark @@ -709,7 +701,7 @@ dump: Memory ) , End ] - , programCounter = 170 + , programCounter = 169 , returnStack = IS [] } , memoryStack = fromList diff --git "a/.output/actual/eta/eval/logged/Fast/from-eas/fact10\n.logged" "b/.output/actual/eta/eval/logged/Fast/from-eas/fact10\n.logged" new file mode 100644 index 000000000..2c647be5a --- /dev/null +++ "b/.output/actual/eta/eval/logged/Fast/from-eas/fact10\n.logged" @@ -0,0 +1,717 @@ + [Undefined label 506] +CPM.labeledIImmediateInstruction +CPM.labeledITopInstruction + [i ICF (Labeled LTop Jump)] [Automaton.nextState Memory + { memoryCM = CM + { program = + [ ICF + ( Mark + ( MNatural 1 ) + ) + , IAL + ( SPure + ( Cons 2 ) + ) + , ICF + ( Labeled + ( LImmediate 14 ) Jump + ) + , ICF + ( Mark + ( MNatural 2 ) + ) + , IAL + ( SPure + ( Cons 3 ) + ) + , ICF + ( Labeled + ( LImmediate 5 ) Jump + ) + , ICF + ( Mark + ( MNatural 3 ) + ) + , IAL + ( SPure + ( Cons 4 ) + ) + , ICF + ( Labeled + ( LImmediate 32 ) Jump + ) + , ICF + ( Mark + ( MNatural 4 ) + ) + , IAL + ( SPure + ( Cons 10 ) + ) + , IAL ( SIO OutputChar ) + , ICF + ( Labeled + ( LImmediate 0 ) Jump + ) + , ICF + ( Mark + ( MNatural 5 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 1 ) Move + ) + ) + , ICF + ( Mark + ( MNatural 6 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 0 ) Copy + ) + ) + , ICF + ( Mark + ( MNatural 7 ) + ) + , IAL + ( SPure + ( Unary + ( UImmediate 1 Sub ) + ) + ) + , ICF + ( Branch + ( BImmediate 9 ) NE + ) + , ICF + ( Mark + ( MNatural 8 ) + ) + , ICF + ( Labeled + ( LImmediate 13 ) Jump + ) + , ICF + ( Mark + ( MNatural 9 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 0 ) Copy + ) + ) + , ICF + ( Mark + ( MNatural 10 ) + ) + , IAL + ( SPure + ( Unary + ( UImmediate 1 Sub ) + ) + ) + , ICF + ( Mark + ( MNatural 11 ) + ) + , IAL + ( SPure + ( Cons 12 ) + ) + , ICF + ( Labeled + ( LImmediate 5 ) Jump + ) + , ICF + ( Mark + ( MNatural 12 ) + ) + , IAL + ( SPure + ( Cons 13 ) + ) + , ICF + ( Labeled + ( LImmediate 44 ) Jump + ) + , ICF + ( Mark + ( MNatural 13 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 1 ) Move + ) + ) + , ICF ( Labeled LTop Jump ) + , ICF + ( Mark + ( MNatural 14 ) + ) + , IAL ( SIO InputChar ) + , ICF + ( Mark + ( MNatural 15 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 0 ) Copy + ) + ) + , IAL + ( SPure + ( Unary + ( UImmediate 32 Sub ) + ) + ) + , ICF + ( Mark + ( MNatural 16 ) + ) + , ICF + ( Branch + ( BImmediate 18 ) NE + ) + , ICF + ( Mark + ( MNatural 17 ) + ) + , ICF + ( Branch + ( BImmediate 14 ) NE + ) + , ICF + ( Mark + ( MNatural 18 ) + ) + , IAL + ( SPure + ( Cons 0 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 1 ) Move + ) + ) + , ICF + ( Mark + ( MNatural 19 ) + ) + , IAL + ( SPure + ( Cons 16 ) + ) + , ICF + ( Mark + ( MNatural 20 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 1 ) Move + ) + ) + , ICF + ( Mark + ( MNatural 21 ) + ) + , IAL + ( SPure + ( Cons 10 ) + ) + , IAL + ( SPure + ( Cons 22 ) + ) + , ICF + ( Labeled + ( LImmediate 44 ) Jump + ) + , ICF + ( Mark + ( MNatural 22 ) + ) + , IAL + ( SPure + ( Cons 0 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 1 ) Move + ) + ) + , ICF + ( Mark + ( MNatural 23 ) + ) + , IAL + ( SPure ( Binary Sub ) ) + , IAL + ( SPure ( Binary Sub ) ) + , ICF + ( Mark + ( MNatural 24 ) + ) + , IAL ( SIO InputChar ) + , ICF + ( Mark + ( MNatural 25 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 0 ) Copy + ) + ) + , IAL + ( SPure + ( Unary + ( UImmediate 32 Sub ) + ) + ) + , ICF + ( Branch + ( BImmediate 27 ) NE + ) + , ICF + ( Mark + ( MNatural 26 ) + ) + , ICF + ( Labeled + ( LImmediate 30 ) Jump + ) + , ICF + ( Mark + ( MNatural 27 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 0 ) Copy + ) + ) + , IAL + ( SPure + ( Unary + ( UImmediate 10 Sub ) + ) + ) + , ICF + ( Branch + ( BImmediate 29 ) NE + ) + , ICF + ( Mark + ( MNatural 28 ) + ) + , ICF + ( Labeled + ( LImmediate 30 ) Jump + ) + , ICF + ( Mark + ( MNatural 29 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 0 ) Copy + ) + ) + , IAL + ( SPure + ( Unary + ( UImmediate + ( -1 ) Sub + ) + ) + ) + , ICF + ( Branch + ( BImmediate 19 ) NE + ) + , ICF + ( Mark + ( MNatural 30 ) + ) + , IAL ( SPure Discard ) + , ICF + ( Mark + ( MNatural 31 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 1 ) Move + ) + ) + , ICF ( Labeled LTop Jump ) + , ICF + ( Mark + ( MNatural 32 ) + ) + , IAL + ( SPure + ( Cons 0 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 2 ) Move + ) + ) + , ICF + ( Mark + ( MNatural 33 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 0 ) Copy + ) + ) + , ICF + ( Branch + ( BImmediate 35 ) NE + ) + , ICF + ( Mark + ( MNatural 34 ) + ) + , IAL + ( SPure + ( Cons 48 ) + ) + , IAL ( SIO OutputChar ) + , ICF ( Branch BTop NE ) + , ICF ( Labeled LTop Jump ) + , ICF + ( Mark + ( MNatural 35 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 0 ) Copy + ) + ) + , ICF + ( Mark + ( MNatural 36 ) + ) + , ICF + ( Branch + ( BImmediate 38 ) NE + ) + , ICF + ( Mark + ( MNatural 37 ) + ) + , IAL + ( SPure ( Binary Sub ) ) + , ICF + ( Labeled + ( LImmediate 42 ) Jump + ) + , ICF + ( Mark + ( MNatural 38 ) + ) + , IAL + ( SPure + ( Cons 10 ) + ) + , IAL + ( SPure + ( Binaries + [ Mod + , Div + ] + ) + ) + , ICF + ( Mark + ( MArtificial "38" ) + ) + , ICF + ( Mark + ( MNatural 39 ) + ) + , IAL + ( SPure + ( Unary + ( UImmediate + ( -48 ) Sub + ) + ) + ) + , ICF + ( Mark + ( MNatural 40 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 1 ) Move + ) + ) + , ICF + ( Mark + ( MNatural 41 ) + ) + , ICF + ( Labeled + ( LImmediate 35 ) Jump + ) + , ICF + ( Mark + ( MNatural 42 ) + ) + , IAL + ( SPure + ( Cons 43 ) + ) + , ICF + ( Labeled + ( LImmediate 60 ) Jump + ) + , ICF + ( Mark + ( MNatural 43 ) + ) + , ICF ( Labeled LTop Jump ) + , ICF + ( Mark + ( MNatural 44 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 2 ) Move + ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 2 ) Move + ) + ) + , ICF + ( Mark + ( MNatural 45 ) + ) + , IAL + ( SPure + ( Cons 0 ) + ) + , ICF + ( Mark + ( MNatural 46 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 2 ) Move + ) + ) + , ICF + ( Mark + ( MNatural 47 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 2 ) Move + ) + ) + , ICF + ( Mark + ( MNatural 48 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 0 ) Copy + ) + ) + , ICF + ( Mark + ( MNatural 49 ) + ) + , ICF + ( Branch + ( BImmediate 51 ) NE + ) + , ICF + ( Mark + ( MNatural 50 ) + ) + , ICF + ( Labeled + ( LImmediate 58 ) Jump + ) + , ICF + ( Mark + ( MNatural 51 ) + ) + , IAL + ( SPure + ( Unary + ( UImmediate 1 Sub ) + ) + ) + , ICF + ( Mark + ( MNatural 52 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 2 ) Move + ) + ) + , ICF + ( Mark + ( MNatural 53 ) + ) + , IAL + ( SPure + ( Cons 0 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 3 ) Copy + ) + ) + , ICF + ( Mark + ( MNatural 54 ) + ) + , IAL + ( SPure ( Binary Sub ) ) + , IAL + ( SPure ( Binary Sub ) ) + , ICF + ( Mark + ( MNatural 55 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 2 ) Move + ) + ) + , ICF + ( Mark + ( MNatural 56 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 2 ) Move + ) + ) + , ICF + ( Mark + ( MNatural 57 ) + ) + , ICF + ( Labeled + ( LImmediate 48 ) Jump + ) + , ICF + ( Mark + ( MNatural 58 ) + ) + , ICF ( Branch BSwapped NE ) + , ICF + ( Mark + ( MNatural 59 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 1 ) Move + ) + ) + , ICF ( Labeled LTop Jump ) + , ICF + ( Mark + ( MNatural 60 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 1 ) Move + ) + ) + , ICF + ( Mark + ( MNatural 61 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 0 ) Copy + ) + ) + , ICF + ( Mark + ( MNatural 62 ) + ) + , ICF + ( Branch + ( BImmediate 64 ) NE + ) + , ICF + ( Mark + ( MNatural 63 ) + ) + , IAL + ( SPure ( Binary Sub ) ) + , ICF ( Labeled LTop Jump ) + , ICF + ( Mark + ( MNatural 64 ) + ) + , IAL ( SIO OutputChar ) + , ICF + ( Mark + ( MNatural 65 ) + ) + , ICF + ( Labeled + ( LImmediate 60 ) Jump + ) + , ICF + ( Mark + ( MNatural 66 ) + ) + , ICF + ( Mark + ( MNatural 0 ) + ) + , End + ] + , programCounter = 83 + , returnStack = IS [] + } + , memoryStack = fromList + [ 506 + , 496 + , 0 + , 2 + ] + , memoryRAM = [] + }] diff --git "a/.output/actual/eta/eval/logged/Fast/from-eas/fact9\n.logged" "b/.output/actual/eta/eval/logged/Fast/from-eas/fact9\n.logged" index 29d095b3a..80a0b0430 100644 --- "a/.output/actual/eta/eval/logged/Fast/from-eas/fact9\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/from-eas/fact9\n.logged" @@ -81,8 +81,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 9 ) ( Branch NE ) + ( Branch + ( BImmediate 9 ) NE ) , ICF ( Mark @@ -173,16 +173,16 @@ dump: Memory ( MNatural 16 ) ) , ICF - ( Labeled - ( LImmediate 18 ) ( Branch NE ) + ( Branch + ( BImmediate 18 ) NE ) , ICF ( Mark ( MNatural 17 ) ) , ICF - ( Labeled - ( LImmediate 14 ) ( Branch NE ) + ( Branch + ( BImmediate 14 ) NE ) , ICF ( Mark @@ -276,8 +276,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 27 ) ( Branch NE ) + ( Branch + ( BImmediate 27 ) NE ) , ICF ( Mark @@ -304,8 +304,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 29 ) ( Branch NE ) + ( Branch + ( BImmediate 29 ) NE ) , ICF ( Mark @@ -334,8 +334,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 19 ) ( Branch NE ) + ( Branch + ( BImmediate 19 ) NE ) , ICF ( Mark @@ -378,8 +378,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 35 ) ( Branch NE ) + ( Branch + ( BImmediate 35 ) NE ) , ICF ( Mark @@ -390,8 +390,7 @@ dump: Memory ( Cons 48 ) ) , IAL ( SIO OutputChar ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , ICF ( Labeled LTop Jump ) , ICF ( Mark @@ -408,8 +407,8 @@ dump: Memory ( MNatural 36 ) ) , ICF - ( Labeled - ( LImmediate 38 ) ( Branch NE ) + ( Branch + ( BImmediate 38 ) NE ) , ICF ( Mark @@ -547,8 +546,8 @@ dump: Memory ( MNatural 49 ) ) , ICF - ( Labeled - ( LImmediate 51 ) ( Branch NE ) + ( Branch + ( BImmediate 51 ) NE ) , ICF ( Mark @@ -632,14 +631,7 @@ dump: Memory ( Mark ( MNatural 58 ) ) - , IAL - ( SPure - ( Indexed - ( IImmediate 1 ) Move - ) - ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BSwapped NE ) , ICF ( Mark ( MNatural 59 ) @@ -676,8 +668,8 @@ dump: Memory ( MNatural 62 ) ) , ICF - ( Labeled - ( LImmediate 64 ) ( Branch NE ) + ( Branch + ( BImmediate 64 ) NE ) , ICF ( Mark @@ -709,7 +701,7 @@ dump: Memory ) , End ] - , programCounter = 170 + , programCounter = 169 , returnStack = IS [] } , memoryStack = fromList diff --git a/.output/actual/eta/eval/logged/Fast/from-eas/hello2.logged b/.output/actual/eta/eval/logged/Fast/from-eas/hello2.logged index 9b5000b57..d2788ff52 100644 --- a/.output/actual/eta/eval/logged/Fast/from-eas/hello2.logged +++ b/.output/actual/eta/eval/logged/Fast/from-eas/hello2.logged @@ -110,8 +110,8 @@ dump: Memory ( MNatural 6 ) ) , ICF - ( Labeled - ( LImmediate 8 ) ( Branch NE ) + ( Branch + ( BImmediate 8 ) NE ) , ICF ( Mark diff --git a/.output/actual/eta/eval/logged/Fast/from-eas/hello3.logged b/.output/actual/eta/eval/logged/Fast/from-eas/hello3.logged index 9b5000b57..d2788ff52 100644 --- a/.output/actual/eta/eval/logged/Fast/from-eas/hello3.logged +++ b/.output/actual/eta/eval/logged/Fast/from-eas/hello3.logged @@ -110,8 +110,8 @@ dump: Memory ( MNatural 6 ) ) , ICF - ( Labeled - ( LImmediate 8 ) ( Branch NE ) + ( Branch + ( BImmediate 8 ) NE ) , ICF ( Mark diff --git a/.output/actual/eta/eval/logged/Fast/from-eas/hello4.logged b/.output/actual/eta/eval/logged/Fast/from-eas/hello4.logged index 9b5000b57..d2788ff52 100644 --- a/.output/actual/eta/eval/logged/Fast/from-eas/hello4.logged +++ b/.output/actual/eta/eval/logged/Fast/from-eas/hello4.logged @@ -110,8 +110,8 @@ dump: Memory ( MNatural 6 ) ) , ICF - ( Labeled - ( LImmediate 8 ) ( Branch NE ) + ( Branch + ( BImmediate 8 ) NE ) , ICF ( Mark diff --git "a/.output/actual/eta/eval/logged/Fast/from-eas/readnum0\n.logged" "b/.output/actual/eta/eval/logged/Fast/from-eas/readnum0\n.logged" index 2454d32a4..2b483ba9e 100644 --- "a/.output/actual/eta/eval/logged/Fast/from-eas/readnum0\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/from-eas/readnum0\n.logged" @@ -28,16 +28,16 @@ ALU.move index must be less then lenght [i 1] [ll 1] ( MNatural 3 ) ) , ICF - ( Labeled - ( LImmediate 5 ) ( Branch NE ) + ( Branch + ( BImmediate 5 ) NE ) , ICF ( Mark ( MNatural 4 ) ) , ICF - ( Labeled - ( LImmediate 1 ) ( Branch NE ) + ( Branch + ( BImmediate 1 ) NE ) , ICF ( Mark @@ -133,8 +133,8 @@ ALU.move index must be less then lenght [i 1] [ll 1] ) ) , ICF - ( Labeled - ( LImmediate 14 ) ( Branch NE ) + ( Branch + ( BImmediate 14 ) NE ) , ICF ( Mark @@ -161,8 +161,8 @@ ALU.move index must be less then lenght [i 1] [ll 1] ) ) , ICF - ( Labeled - ( LImmediate 16 ) ( Branch NE ) + ( Branch + ( BImmediate 16 ) NE ) , ICF ( Mark @@ -191,8 +191,8 @@ ALU.move index must be less then lenght [i 1] [ll 1] ) ) , ICF - ( Labeled - ( LImmediate 6 ) ( Branch NE ) + ( Branch + ( BImmediate 6 ) NE ) , ICF ( Mark @@ -269,8 +269,8 @@ ALU.move index must be less then lenght [i 1] [ll 1] ( MNatural 24 ) ) , ICF - ( Labeled - ( LImmediate 26 ) ( Branch NE ) + ( Branch + ( BImmediate 26 ) NE ) , ICF ( Mark @@ -354,14 +354,7 @@ ALU.move index must be less then lenght [i 1] [ll 1] ( Mark ( MNatural 33 ) ) - , IAL - ( SPure - ( Indexed - ( IImmediate 1 ) Move - ) - ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BSwapped NE ) , ICF ( Mark ( MNatural 34 ) diff --git "a/.output/actual/eta/eval/logged/Fast/from-eas/readnum1\n.logged" "b/.output/actual/eta/eval/logged/Fast/from-eas/readnum1\n.logged" index f6c37e591..e0f41de15 100644 --- "a/.output/actual/eta/eval/logged/Fast/from-eas/readnum1\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/from-eas/readnum1\n.logged" @@ -28,16 +28,16 @@ ALU.move index must be less then lenght [i 1] [ll 1] ( MNatural 3 ) ) , ICF - ( Labeled - ( LImmediate 5 ) ( Branch NE ) + ( Branch + ( BImmediate 5 ) NE ) , ICF ( Mark ( MNatural 4 ) ) , ICF - ( Labeled - ( LImmediate 1 ) ( Branch NE ) + ( Branch + ( BImmediate 1 ) NE ) , ICF ( Mark @@ -133,8 +133,8 @@ ALU.move index must be less then lenght [i 1] [ll 1] ) ) , ICF - ( Labeled - ( LImmediate 14 ) ( Branch NE ) + ( Branch + ( BImmediate 14 ) NE ) , ICF ( Mark @@ -161,8 +161,8 @@ ALU.move index must be less then lenght [i 1] [ll 1] ) ) , ICF - ( Labeled - ( LImmediate 16 ) ( Branch NE ) + ( Branch + ( BImmediate 16 ) NE ) , ICF ( Mark @@ -191,8 +191,8 @@ ALU.move index must be less then lenght [i 1] [ll 1] ) ) , ICF - ( Labeled - ( LImmediate 6 ) ( Branch NE ) + ( Branch + ( BImmediate 6 ) NE ) , ICF ( Mark @@ -269,8 +269,8 @@ ALU.move index must be less then lenght [i 1] [ll 1] ( MNatural 24 ) ) , ICF - ( Labeled - ( LImmediate 26 ) ( Branch NE ) + ( Branch + ( BImmediate 26 ) NE ) , ICF ( Mark @@ -354,14 +354,7 @@ ALU.move index must be less then lenght [i 1] [ll 1] ( Mark ( MNatural 33 ) ) - , IAL - ( SPure - ( Indexed - ( IImmediate 1 ) Move - ) - ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BSwapped NE ) , ICF ( Mark ( MNatural 34 ) diff --git a/.output/actual/eta/eval/logged/Fast/original/bottles.logged b/.output/actual/eta/eval/logged/Fast/original/bottles.logged index feb3faacb..68c7bb2c7 100644 --- a/.output/actual/eta/eval/logged/Fast/original/bottles.logged +++ b/.output/actual/eta/eval/logged/Fast/original/bottles.logged @@ -13,17 +13,14 @@ dump: Memory ( Mark ( MArtificial "1" ) ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , IAL ( SPure ( Cons 2 ) ) , IAL ( SIO InputChar ) - , ICF - ( Labeled LTop ( Branch NE ) ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) + , ICF ( Branch BTop NE ) , IAL ( SPure ( Binaries @@ -33,8 +30,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 4 ) ( Branch NE ) + ( Branch + ( BImmediate 4 ) NE ) , IAL ( SPure @@ -70,8 +67,7 @@ dump: Memory ) ) , IAL ( SIO InputChar ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , IAL ( SPure ( Binary Sub ) ) , IAL ( SPure Halibut ) @@ -99,13 +95,11 @@ dump: Memory ) , IAL ( SPure ( Binary Sub ) ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , IAL ( SPure ( Binary Sub ) ) , IAL ( SIO InputChar ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , IAL ( SPure ( Binary Sub ) ) , IAL @@ -121,8 +115,8 @@ dump: Memory ( MNatural 4 ) ) , ICF - ( Labeled - ( LImmediate 6 ) ( Branch NE ) + ( Branch + ( BImmediate 6 ) NE ) , ICF ( Mark @@ -169,8 +163,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 11 ) ( Branch NE ) + ( Branch + ( BImmediate 11 ) NE ) , ICF ( Mark @@ -181,8 +175,7 @@ dump: Memory ( Cons 48 ) ) , IAL ( SIO OutputChar ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , ICF ( Labeled LTop Jump ) , ICF ( Mark @@ -199,8 +192,8 @@ dump: Memory ( MNatural 12 ) ) , ICF - ( Labeled - ( LImmediate 14 ) ( Branch NE ) + ( Branch + ( BImmediate 14 ) NE ) , ICF ( Mark @@ -516,8 +509,8 @@ dump: Memory , IAL ( SPure ( Binary Sub ) ) , ICF - ( Labeled - ( LImmediate 32 ) ( Branch NE ) + ( Branch + ( BImmediate 32 ) NE ) , IAL ( SPure @@ -825,16 +818,16 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 33 ) ( Branch NE ) + ( Branch + ( BImmediate 33 ) NE ) , ICF ( Mark ( MNatural 47 ) ) , ICF - ( Labeled - ( LImmediate 0 ) ( Branch NE ) + ( Branch + ( BImmediate 0 ) NE ) , ICF ( Mark diff --git "a/.output/actual/eta/eval/logged/Fast/original/fact1\n.logged" "b/.output/actual/eta/eval/logged/Fast/original/fact1\n.logged" index 624e498d1..33e02cc97 100644 --- "a/.output/actual/eta/eval/logged/Fast/original/fact1\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/original/fact1\n.logged" @@ -81,8 +81,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 9 ) ( Branch NE ) + ( Branch + ( BImmediate 9 ) NE ) , ICF ( Mark @@ -173,16 +173,16 @@ dump: Memory ( MNatural 16 ) ) , ICF - ( Labeled - ( LImmediate 18 ) ( Branch NE ) + ( Branch + ( BImmediate 18 ) NE ) , ICF ( Mark ( MNatural 17 ) ) , ICF - ( Labeled - ( LImmediate 14 ) ( Branch NE ) + ( Branch + ( BImmediate 14 ) NE ) , ICF ( Mark @@ -250,11 +250,9 @@ dump: Memory ] ) ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , IAL ( SIO InputChar ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , IAL ( SPure ( Binaries @@ -307,8 +305,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 27 ) ( Branch NE ) + ( Branch + ( BImmediate 27 ) NE ) , ICF ( Mark @@ -335,8 +333,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 29 ) ( Branch NE ) + ( Branch + ( BImmediate 29 ) NE ) , ICF ( Mark @@ -365,8 +363,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 19 ) ( Branch NE ) + ( Branch + ( BImmediate 19 ) NE ) , ICF ( Mark @@ -413,8 +411,8 @@ dump: Memory ( MNatural 34 ) ) , ICF - ( Labeled - ( LImmediate 36 ) ( Branch NE ) + ( Branch + ( BImmediate 36 ) NE ) , ICF ( Mark @@ -552,8 +550,8 @@ dump: Memory ( MNatural 47 ) ) , ICF - ( Labeled - ( LImmediate 49 ) ( Branch NE ) + ( Branch + ( BImmediate 49 ) NE ) , ICF ( Mark @@ -637,14 +635,7 @@ dump: Memory ( Mark ( MNatural 56 ) ) - , IAL - ( SPure - ( Indexed - ( IImmediate 1 ) Move - ) - ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BSwapped NE ) , ICF ( Mark ( MNatural 57 ) @@ -681,8 +672,8 @@ dump: Memory ( MNatural 60 ) ) , ICF - ( Labeled - ( LImmediate 62 ) ( Branch NE ) + ( Branch + ( BImmediate 62 ) NE ) , ICF ( Mark @@ -714,7 +705,7 @@ dump: Memory ) , End ] - , programCounter = 169 + , programCounter = 168 , returnStack = IS [] } , memoryStack = fromList [] diff --git "a/.output/actual/eta/eval/logged/Fast/original/fact9\n.logged" "b/.output/actual/eta/eval/logged/Fast/original/fact9\n.logged" index 624e498d1..33e02cc97 100644 --- "a/.output/actual/eta/eval/logged/Fast/original/fact9\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/original/fact9\n.logged" @@ -81,8 +81,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 9 ) ( Branch NE ) + ( Branch + ( BImmediate 9 ) NE ) , ICF ( Mark @@ -173,16 +173,16 @@ dump: Memory ( MNatural 16 ) ) , ICF - ( Labeled - ( LImmediate 18 ) ( Branch NE ) + ( Branch + ( BImmediate 18 ) NE ) , ICF ( Mark ( MNatural 17 ) ) , ICF - ( Labeled - ( LImmediate 14 ) ( Branch NE ) + ( Branch + ( BImmediate 14 ) NE ) , ICF ( Mark @@ -250,11 +250,9 @@ dump: Memory ] ) ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , IAL ( SIO InputChar ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , IAL ( SPure ( Binaries @@ -307,8 +305,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 27 ) ( Branch NE ) + ( Branch + ( BImmediate 27 ) NE ) , ICF ( Mark @@ -335,8 +333,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 29 ) ( Branch NE ) + ( Branch + ( BImmediate 29 ) NE ) , ICF ( Mark @@ -365,8 +363,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 19 ) ( Branch NE ) + ( Branch + ( BImmediate 19 ) NE ) , ICF ( Mark @@ -413,8 +411,8 @@ dump: Memory ( MNatural 34 ) ) , ICF - ( Labeled - ( LImmediate 36 ) ( Branch NE ) + ( Branch + ( BImmediate 36 ) NE ) , ICF ( Mark @@ -552,8 +550,8 @@ dump: Memory ( MNatural 47 ) ) , ICF - ( Labeled - ( LImmediate 49 ) ( Branch NE ) + ( Branch + ( BImmediate 49 ) NE ) , ICF ( Mark @@ -637,14 +635,7 @@ dump: Memory ( Mark ( MNatural 56 ) ) - , IAL - ( SPure - ( Indexed - ( IImmediate 1 ) Move - ) - ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BSwapped NE ) , ICF ( Mark ( MNatural 57 ) @@ -681,8 +672,8 @@ dump: Memory ( MNatural 60 ) ) , ICF - ( Labeled - ( LImmediate 62 ) ( Branch NE ) + ( Branch + ( BImmediate 62 ) NE ) , ICF ( Mark @@ -714,7 +705,7 @@ dump: Memory ) , End ] - , programCounter = 169 + , programCounter = 168 , returnStack = IS [] } , memoryStack = fromList [] diff --git a/.output/actual/eta/eval/logged/Fast/original/hello.logged b/.output/actual/eta/eval/logged/Fast/original/hello.logged index 44fc3aea1..1358cb686 100644 --- a/.output/actual/eta/eval/logged/Fast/original/hello.logged +++ b/.output/actual/eta/eval/logged/Fast/original/hello.logged @@ -22,17 +22,14 @@ dump: Memory ] ) ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , IAL ( SPure ( Cons 2 ) ) , IAL ( SIO InputChar ) - , ICF - ( Labeled LTop ( Branch NE ) ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) + , ICF ( Branch BTop NE ) , IAL ( SPure ( Binaries @@ -42,8 +39,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 4 ) ( Branch NE ) + ( Branch + ( BImmediate 4 ) NE ) , IAL ( SPure @@ -82,8 +79,7 @@ dump: Memory ( Mark ( MNatural 5 ) ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , IAL ( SPure ( Binary Sub ) ) , IAL diff --git a/.output/actual/eta/eval/logged/Fast/original/hello2.logged b/.output/actual/eta/eval/logged/Fast/original/hello2.logged index bdbd3a91f..34f2feaa1 100644 --- a/.output/actual/eta/eval/logged/Fast/original/hello2.logged +++ b/.output/actual/eta/eval/logged/Fast/original/hello2.logged @@ -90,8 +90,8 @@ dump: Memory ( MArtificial "3" ) ) , ICF - ( Labeled - ( LImmediate 4 ) ( Branch NE ) + ( Branch + ( BImmediate 4 ) NE ) , IAL ( SIO InputChar ) , IAL @@ -117,8 +117,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 6 ) ( Branch NE ) + ( Branch + ( BImmediate 6 ) NE ) , ICF ( Mark diff --git "a/.output/actual/eta/eval/output/Fast/from-eas/fact10\n.output" "b/.output/actual/eta/eval/output/Fast/from-eas/fact10\n.output" new file mode 100644 index 000000000..e69de29bb diff --git a/.output/actual/eta/il/optimized/from-eas/bottles.il b/.output/actual/eta/il/optimized/from-eas/bottles.il index eaead5bfc..e21878ef5 100644 --- a/.output/actual/eta/il/optimized/from-eas/bottles.il +++ b/.output/actual/eta/il/optimized/from-eas/bottles.il @@ -1,218 +1,218 @@ -Mark (MNatural 1) -Labeled (LImmediate 31) Jump +markM 1 +jumpI 31 -Mark (MNatural 2) -SPure (Indexed (IImmediate 1) Move) +markM 2 +moveI 1 -Mark (MNatural 3) -SPure (Indexed (IImmediate 0) Copy) +markM 3 +copyI 0 -Mark (MNatural 4) -Labeled (LImmediate 6) (Branch NE) +markM 4 +bNEI 6 -Mark (MNatural 5) -SPure (Binary Sub) -Labeled LTop Jump - -Mark (MNatural 6) -SIO OutputChar - -Mark (MNatural 7) -Labeled (LImmediate 2) Jump - -Mark (MNatural 8) -SPure (Cons 0) -SPure (Indexed (IImmediate 2) Move) - -Mark (MNatural 9) -SPure (Indexed (IImmediate 0) Copy) -Labeled (LImmediate 11) (Branch NE) - -Mark (MNatural 10) -SPure (Cons 48) -SIO OutputChar -Labeled LTop (Branch NE) -Labeled LTop Jump - -Mark (MNatural 11) -SPure (Indexed (IImmediate 0) Copy) - -Mark (MNatural 12) -Labeled (LImmediate 14) (Branch NE) - -Mark (MNatural 13) -SPure (Binary Sub) -Labeled (LImmediate 18) Jump - -Mark (MNatural 14) -SPure (Cons 10) -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "14") - -Mark (MNatural 15) -SPure (Unary (UImmediate (-48) Sub)) - -Mark (MNatural 16) -SPure (Indexed (IImmediate 1) Move) - -Mark (MNatural 17) -Labeled (LImmediate 11) Jump - -Mark (MNatural 18) -SPure (Cons 19) -Labeled (LImmediate 2) Jump - -Mark (MNatural 19) -Labeled LTop Jump - -Mark (MNatural 20) - -Mark (MNatural 21) -SPure (Indexed (IImmediate 1) Move) - -Mark (MNatural 22) -SPure (Cons 23) -Labeled (LImmediate 8) Jump - -Mark (MNatural 23) -SPure (Cons 0) -SPure (Cons 114) -SPure (Cons 101) -SPure (Cons 101) -SPure (Cons 98) -SPure (Cons 32) -SPure (Cons 102) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 115) -SPure (Cons 101) -SPure (Cons 108) -SPure (Cons 116) -SPure (Cons 116) -SPure (Cons 111) -SPure (Cons 98) -SPure (Cons 32) - -Mark (MNatural 24) -SPure (Cons 25) -Labeled (LImmediate 2) Jump - -Mark (MNatural 25) -Labeled LTop Jump - -Mark (MNatural 26) -SPure (Indexed (IImmediate 1) Move) - -Mark (MNatural 27) -SPure (Cons 28) -Labeled (LImmediate 21) Jump - -Mark (MNatural 28) -SPure (Cons 0) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 97) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 104) -SPure (Cons 116) -SPure (Cons 32) -SPure (Cons 110) -SPure (Cons 111) -SPure (Cons 32) - -Mark (MNatural 29) -SPure (Cons 30) -Labeled (LImmediate 2) Jump - -Mark (MNatural 30) -Labeled LTop Jump - -Mark (MNatural 31) -SPure (Cons 3) - -Mark (MNatural 32) -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 33) -Labeled (LImmediate 26) Jump - -Mark (MNatural 33) -SPure (Cons 44) -SIO OutputChar -SPure (Cons 32) -SIO OutputChar - -Mark (MNatural 34) -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 35) -Labeled (LImmediate 21) Jump - -Mark (MNatural 35) -SPure (Cons 10) -SIO OutputChar - -Mark (MNatural 36) -SPure (Cons 0) -SPure (Cons 10) -SPure (Cons 100) -SPure (Cons 110) -SPure (Cons 117) -SPure (Cons 111) -SPure (Cons 114) -SPure (Cons 97) -SPure (Cons 32) -SPure (Cons 116) -SPure (Cons 105) -SPure (Cons 32) -SPure (Cons 115) -SPure (Cons 115) -SPure (Cons 97) -SPure (Cons 112) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 110) -SPure (Cons 119) -SPure (Cons 111) -SPure (Cons 100) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 110) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 107) -SPure (Cons 97) -SPure (Cons 84) - -Mark (MNatural 37) -SPure (Cons 38) -Labeled (LImmediate 2) Jump - -Mark (MNatural 38) -SPure (Unary (UImmediate 1 Sub)) - -Mark (MNatural 39) -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 40) -Labeled (LImmediate 26) Jump - -Mark (MNatural 40) -SPure (Cons 10) -SPure (Cons 10) -SIO OutputChar -SIO OutputChar - -Mark (MNatural 41) -SPure (Indexed (IImmediate 0) Copy) -Labeled (LImmediate 32) (Branch NE) - -Mark (MNatural 42) -Labeled (LImmediate 0) (Branch NE) - -Mark (MNatural 43) - -Mark (MNatural 0) -End +markM 5 +sub +jump + +markM 6 +outputCS + +markM 7 +jumpI 2 + +markM 8 +cons 0 +moveI 2 + +markM 9 +copyI 0 +bNEI 11 + +markM 10 +cons 48 +outputCS +bNE +jump + +markM 11 +copyI 0 + +markM 12 +bNEI 14 + +markM 13 +sub +jumpI 18 + +markM 14 +cons 10 +moddiv + +markA "14" + +markM 15 +subI -48 + +markM 16 +moveI 1 + +markM 17 +jumpI 11 + +markM 18 +cons 19 +jumpI 2 + +markM 19 +jump + +markM 20 + +markM 21 +moveI 1 + +markM 22 +cons 23 +jumpI 8 + +markM 23 +cons 0 +cons 114 +cons 101 +cons 101 +cons 98 +cons 32 +cons 102 +cons 111 +cons 32 +cons 115 +cons 101 +cons 108 +cons 116 +cons 116 +cons 111 +cons 98 +cons 32 + +markM 24 +cons 25 +jumpI 2 + +markM 25 +jump + +markM 26 +moveI 1 + +markM 27 +cons 28 +jumpI 21 + +markM 28 +cons 0 +cons 108 +cons 108 +cons 97 +cons 119 +cons 32 +cons 101 +cons 104 +cons 116 +cons 32 +cons 110 +cons 111 +cons 32 + +markM 29 +cons 30 +jumpI 2 + +markM 30 +jump + +markM 31 +cons 3 + +markM 32 +copyI 0 +cons 33 +jumpI 26 + +markM 33 +cons 44 +outputCS +cons 32 +outputCS + +markM 34 +copyI 0 +cons 35 +jumpI 21 + +markM 35 +cons 10 +outputCS + +markM 36 +cons 0 +cons 10 +cons 100 +cons 110 +cons 117 +cons 111 +cons 114 +cons 97 +cons 32 +cons 116 +cons 105 +cons 32 +cons 115 +cons 115 +cons 97 +cons 112 +cons 32 +cons 44 +cons 110 +cons 119 +cons 111 +cons 100 +cons 32 +cons 101 +cons 110 +cons 111 +cons 32 +cons 101 +cons 107 +cons 97 +cons 84 + +markM 37 +cons 38 +jumpI 2 + +markM 38 +subI 1 + +markM 39 +copyI 0 +cons 40 +jumpI 26 + +markM 40 +cons 10 +cons 10 +outputCS +outputCS + +markM 41 +copyI 0 +bNEI 32 + +markM 42 +bNEI 0 + +markM 43 + +markM 0 +end diff --git a/.output/actual/eta/il/optimized/from-eas/euclid.il b/.output/actual/eta/il/optimized/from-eas/euclid.il index 435af23fa..d52b286fd 100644 --- a/.output/actual/eta/il/optimized/from-eas/euclid.il +++ b/.output/actual/eta/il/optimized/from-eas/euclid.il @@ -1,46 +1,46 @@ -Mark (MNatural 1) -SPure (Indexed (IImmediate 2) Move) -SPure (Indexed (IImmediate 2) Move) +markM 1 +moveI 2 +moveI 2 -Mark (MNatural 2) -SPure (Indexed (IImmediate 0) Copy) +markM 2 +copyI 0 -Mark (MNatural 3) -Labeled (LImmediate 5) (Branch NE) +markM 3 +bNEI 5 -Mark (MNatural 4) -Labeled (LImmediate 10) Jump +markM 4 +jumpI 10 -Mark (MNatural 5) -SPure (Indexed (IImmediate 1) Copy) +markM 5 +copyI 1 -Mark (MNatural 6) -SPure (Binaries [Mod,Div]) +markM 6 +moddiv -Mark (MArtificial "6") +markA "6" -Mark (MNatural 7) -SPure (Indexed (IImmediate 1) Move) -SPure Discard +markM 7 +moveI 1 +discard -Mark (MNatural 8) -SPure (Indexed (IImmediate 1) Move) +markM 8 +moveI 1 -Mark (MNatural 9) -Labeled (LImmediate 2) Jump +markM 9 +jumpI 2 -Mark (MNatural 10) -Labeled (LImmediate 0) (Branch NE) +markM 10 +bNEI 0 -Mark (MNatural 11) -SPure (Cons 1) -SPure (Indexed (IImmediate 2) Move) +markM 11 +cons 1 +moveI 2 -Mark (MNatural 12) -Labeled LTop (Branch NE) +markM 12 +bNE -Mark (MNatural 13) +markM 13 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/actual/eta/il/optimized/from-eas/fact.il b/.output/actual/eta/il/optimized/from-eas/fact.il index 998a9f6b2..8ce517f12 100644 --- a/.output/actual/eta/il/optimized/from-eas/fact.il +++ b/.output/actual/eta/il/optimized/from-eas/fact.il @@ -1,238 +1,237 @@ -Mark (MNatural 1) -SPure (Cons 2) -Labeled (LImmediate 14) Jump +markM 1 +cons 2 +jumpI 14 -Mark (MNatural 2) -SPure (Cons 3) -Labeled (LImmediate 5) Jump +markM 2 +cons 3 +jumpI 5 -Mark (MNatural 3) -SPure (Cons 4) -Labeled (LImmediate 32) Jump +markM 3 +cons 4 +jumpI 32 -Mark (MNatural 4) -SPure (Cons 10) -SIO OutputChar -Labeled (LImmediate 0) Jump +markM 4 +cons 10 +outputCS +jumpI 0 -Mark (MNatural 5) -SPure (Indexed (IImmediate 1) Move) +markM 5 +moveI 1 -Mark (MNatural 6) -SPure (Indexed (IImmediate 0) Copy) +markM 6 +copyI 0 -Mark (MNatural 7) -SPure (Unary (UImmediate 1 Sub)) -Labeled (LImmediate 9) (Branch NE) +markM 7 +subI 1 +bNEI 9 -Mark (MNatural 8) -Labeled (LImmediate 13) Jump +markM 8 +jumpI 13 -Mark (MNatural 9) -SPure (Indexed (IImmediate 0) Copy) +markM 9 +copyI 0 -Mark (MNatural 10) -SPure (Unary (UImmediate 1 Sub)) +markM 10 +subI 1 -Mark (MNatural 11) -SPure (Cons 12) -Labeled (LImmediate 5) Jump +markM 11 +cons 12 +jumpI 5 -Mark (MNatural 12) -SPure (Cons 13) -Labeled (LImmediate 44) Jump +markM 12 +cons 13 +jumpI 44 -Mark (MNatural 13) -SPure (Indexed (IImmediate 1) Move) -Labeled LTop Jump +markM 13 +moveI 1 +jump -Mark (MNatural 14) -SIO InputChar +markM 14 +inputCS -Mark (MNatural 15) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 32 Sub)) +markM 15 +copyI 0 +subI 32 -Mark (MNatural 16) -Labeled (LImmediate 18) (Branch NE) +markM 16 +bNEI 18 -Mark (MNatural 17) -Labeled (LImmediate 14) (Branch NE) +markM 17 +bNEI 14 -Mark (MNatural 18) -SPure (Cons 0) -SPure (Indexed (IImmediate 1) Move) +markM 18 +cons 0 +moveI 1 -Mark (MNatural 19) -SPure (Cons 16) +markM 19 +cons 16 -Mark (MNatural 20) -SPure (Indexed (IImmediate 1) Move) +markM 20 +moveI 1 -Mark (MNatural 21) -SPure (Cons 10) -SPure (Cons 22) -Labeled (LImmediate 44) Jump +markM 21 +cons 10 +cons 22 +jumpI 44 -Mark (MNatural 22) -SPure (Cons 0) -SPure (Indexed (IImmediate 1) Move) +markM 22 +cons 0 +moveI 1 -Mark (MNatural 23) -SPure (Binary Sub) -SPure (Binary Sub) +markM 23 +sub +sub -Mark (MNatural 24) -SIO InputChar +markM 24 +inputCS -Mark (MNatural 25) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 32 Sub)) -Labeled (LImmediate 27) (Branch NE) +markM 25 +copyI 0 +subI 32 +bNEI 27 -Mark (MNatural 26) -Labeled (LImmediate 30) Jump +markM 26 +jumpI 30 -Mark (MNatural 27) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 10 Sub)) -Labeled (LImmediate 29) (Branch NE) +markM 27 +copyI 0 +subI 10 +bNEI 29 -Mark (MNatural 28) -Labeled (LImmediate 30) Jump +markM 28 +jumpI 30 -Mark (MNatural 29) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate (-1) Sub)) -Labeled (LImmediate 19) (Branch NE) +markM 29 +copyI 0 +subI -1 +bNEI 19 -Mark (MNatural 30) -SPure Discard +markM 30 +discard -Mark (MNatural 31) -SPure (Indexed (IImmediate 1) Move) -Labeled LTop Jump +markM 31 +moveI 1 +jump -Mark (MNatural 32) -SPure (Cons 0) -SPure (Indexed (IImmediate 2) Move) +markM 32 +cons 0 +moveI 2 -Mark (MNatural 33) -SPure (Indexed (IImmediate 0) Copy) -Labeled (LImmediate 35) (Branch NE) +markM 33 +copyI 0 +bNEI 35 -Mark (MNatural 34) -SPure (Cons 48) -SIO OutputChar -Labeled LTop (Branch NE) -Labeled LTop Jump +markM 34 +cons 48 +outputCS +bNE +jump -Mark (MNatural 35) -SPure (Indexed (IImmediate 0) Copy) +markM 35 +copyI 0 -Mark (MNatural 36) -Labeled (LImmediate 38) (Branch NE) +markM 36 +bNEI 38 -Mark (MNatural 37) -SPure (Binary Sub) -Labeled (LImmediate 42) Jump +markM 37 +sub +jumpI 42 -Mark (MNatural 38) -SPure (Cons 10) -SPure (Binaries [Mod,Div]) +markM 38 +cons 10 +moddiv -Mark (MArtificial "38") +markA "38" -Mark (MNatural 39) -SPure (Unary (UImmediate (-48) Sub)) +markM 39 +subI -48 -Mark (MNatural 40) -SPure (Indexed (IImmediate 1) Move) +markM 40 +moveI 1 -Mark (MNatural 41) -Labeled (LImmediate 35) Jump +markM 41 +jumpI 35 -Mark (MNatural 42) -SPure (Cons 43) -Labeled (LImmediate 60) Jump +markM 42 +cons 43 +jumpI 60 -Mark (MNatural 43) -Labeled LTop Jump +markM 43 +jump -Mark (MNatural 44) -SPure (Indexed (IImmediate 2) Move) -SPure (Indexed (IImmediate 2) Move) +markM 44 +moveI 2 +moveI 2 -Mark (MNatural 45) -SPure (Cons 0) +markM 45 +cons 0 -Mark (MNatural 46) -SPure (Indexed (IImmediate 2) Move) +markM 46 +moveI 2 -Mark (MNatural 47) -SPure (Indexed (IImmediate 2) Move) +markM 47 +moveI 2 -Mark (MNatural 48) -SPure (Indexed (IImmediate 0) Copy) +markM 48 +copyI 0 -Mark (MNatural 49) -Labeled (LImmediate 51) (Branch NE) +markM 49 +bNEI 51 -Mark (MNatural 50) -Labeled (LImmediate 58) Jump +markM 50 +jumpI 58 -Mark (MNatural 51) -SPure (Unary (UImmediate 1 Sub)) +markM 51 +subI 1 -Mark (MNatural 52) -SPure (Indexed (IImmediate 2) Move) +markM 52 +moveI 2 -Mark (MNatural 53) -SPure (Cons 0) -SPure (Indexed (IImmediate 3) Copy) +markM 53 +cons 0 +copyI 3 -Mark (MNatural 54) -SPure (Binary Sub) -SPure (Binary Sub) +markM 54 +sub +sub -Mark (MNatural 55) -SPure (Indexed (IImmediate 2) Move) +markM 55 +moveI 2 -Mark (MNatural 56) -SPure (Indexed (IImmediate 2) Move) +markM 56 +moveI 2 -Mark (MNatural 57) -Labeled (LImmediate 48) Jump +markM 57 +jumpI 48 -Mark (MNatural 58) -SPure (Indexed (IImmediate 1) Move) -Labeled LTop (Branch NE) +markM 58 +bNES -Mark (MNatural 59) -SPure (Indexed (IImmediate 1) Move) -Labeled LTop Jump +markM 59 +moveI 1 +jump -Mark (MNatural 60) -SPure (Indexed (IImmediate 1) Move) +markM 60 +moveI 1 -Mark (MNatural 61) -SPure (Indexed (IImmediate 0) Copy) +markM 61 +copyI 0 -Mark (MNatural 62) -Labeled (LImmediate 64) (Branch NE) +markM 62 +bNEI 64 -Mark (MNatural 63) -SPure (Binary Sub) -Labeled LTop Jump +markM 63 +sub +jump -Mark (MNatural 64) -SIO OutputChar +markM 64 +outputCS -Mark (MNatural 65) -Labeled (LImmediate 60) Jump +markM 65 +jumpI 60 -Mark (MNatural 66) +markM 66 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/actual/eta/il/optimized/from-eas/function.il b/.output/actual/eta/il/optimized/from-eas/function.il index 80fe55795..37b182451 100644 --- a/.output/actual/eta/il/optimized/from-eas/function.il +++ b/.output/actual/eta/il/optimized/from-eas/function.il @@ -1,32 +1,32 @@ -Mark (MNatural 1) -SPure (Indexed (IImmediate 2) Move) +markM 1 +moveI 2 -Mark (MNatural 2) -SPure (Indexed (IImmediate 2) Move) +markM 2 +moveI 2 -Mark (MNatural 3) -SPure (Cons 0) +markM 3 +cons 0 -Mark (MNatural 4) -SPure (Indexed (IImmediate 1) Move) +markM 4 +moveI 1 -Mark (MNatural 5) -SPure (Binary Sub) +markM 5 +sub -Mark (MNatural 6) -SPure (Binary Sub) +markM 6 +sub -Mark (MNatural 7) -SPure (Cons 1) +markM 7 +cons 1 -Mark (MNatural 8) -SPure (Indexed (IImmediate 2) Move) +markM 8 +moveI 2 -Mark (MNatural 9) -Labeled LTop (Branch NE) +markM 9 +bNE -Mark (MNatural 10) +markM 10 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/actual/eta/il/optimized/from-eas/hello.il b/.output/actual/eta/il/optimized/from-eas/hello.il index cc8950b8a..d8b88a64a 100644 --- a/.output/actual/eta/il/optimized/from-eas/hello.il +++ b/.output/actual/eta/il/optimized/from-eas/hello.il @@ -1,45 +1,45 @@ -Mark (MNatural 1) -SPure (Cons 32) - -Mark (MNatural 2) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) - -Mark (MNatural 3) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar - -Mark (MNatural 4) -SPure (Cons 10) - -Mark (MNatural 5) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) - -Mark (MNatural 6) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar - -Mark (MNatural 7) - -Mark (MNatural 0) -End +markM 1 +cons 32 + +markM 2 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 + +markM 3 +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS + +markM 4 +cons 10 + +markM 5 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 + +markM 6 +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS + +markM 7 + +markM 0 +end diff --git a/.output/actual/eta/il/optimized/from-eas/hello2.il b/.output/actual/eta/il/optimized/from-eas/hello2.il index d8e6e9bdc..044511ff5 100644 --- a/.output/actual/eta/il/optimized/from-eas/hello2.il +++ b/.output/actual/eta/il/optimized/from-eas/hello2.il @@ -1,48 +1,48 @@ -Mark (MNatural 1) -SPure (Cons 0) -SPure (Cons 10) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) - -Mark (MNatural 2) -SPure (Cons 3) -Labeled (LImmediate 4) Jump - -Mark (MNatural 3) -Labeled (LImmediate 0) Jump - -Mark (MNatural 4) -SPure (Indexed (IImmediate 1) Move) - -Mark (MNatural 5) -SPure (Indexed (IImmediate 0) Copy) - -Mark (MNatural 6) -Labeled (LImmediate 8) (Branch NE) - -Mark (MNatural 7) -SPure (Binary Sub) -Labeled LTop Jump - -Mark (MNatural 8) -SIO OutputChar - -Mark (MNatural 9) -Labeled (LImmediate 4) Jump - -Mark (MNatural 10) - -Mark (MNatural 0) -End +markM 1 +cons 0 +cons 10 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 +cons 32 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 + +markM 2 +cons 3 +jumpI 4 + +markM 3 +jumpI 0 + +markM 4 +moveI 1 + +markM 5 +copyI 0 + +markM 6 +bNEI 8 + +markM 7 +sub +jump + +markM 8 +outputCS + +markM 9 +jumpI 4 + +markM 10 + +markM 0 +end diff --git a/.output/actual/eta/il/optimized/from-eas/hello3.il b/.output/actual/eta/il/optimized/from-eas/hello3.il index d8e6e9bdc..044511ff5 100644 --- a/.output/actual/eta/il/optimized/from-eas/hello3.il +++ b/.output/actual/eta/il/optimized/from-eas/hello3.il @@ -1,48 +1,48 @@ -Mark (MNatural 1) -SPure (Cons 0) -SPure (Cons 10) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) - -Mark (MNatural 2) -SPure (Cons 3) -Labeled (LImmediate 4) Jump - -Mark (MNatural 3) -Labeled (LImmediate 0) Jump - -Mark (MNatural 4) -SPure (Indexed (IImmediate 1) Move) - -Mark (MNatural 5) -SPure (Indexed (IImmediate 0) Copy) - -Mark (MNatural 6) -Labeled (LImmediate 8) (Branch NE) - -Mark (MNatural 7) -SPure (Binary Sub) -Labeled LTop Jump - -Mark (MNatural 8) -SIO OutputChar - -Mark (MNatural 9) -Labeled (LImmediate 4) Jump - -Mark (MNatural 10) - -Mark (MNatural 0) -End +markM 1 +cons 0 +cons 10 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 +cons 32 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 + +markM 2 +cons 3 +jumpI 4 + +markM 3 +jumpI 0 + +markM 4 +moveI 1 + +markM 5 +copyI 0 + +markM 6 +bNEI 8 + +markM 7 +sub +jump + +markM 8 +outputCS + +markM 9 +jumpI 4 + +markM 10 + +markM 0 +end diff --git a/.output/actual/eta/il/optimized/from-eas/hello4.il b/.output/actual/eta/il/optimized/from-eas/hello4.il index d8e6e9bdc..044511ff5 100644 --- a/.output/actual/eta/il/optimized/from-eas/hello4.il +++ b/.output/actual/eta/il/optimized/from-eas/hello4.il @@ -1,48 +1,48 @@ -Mark (MNatural 1) -SPure (Cons 0) -SPure (Cons 10) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) - -Mark (MNatural 2) -SPure (Cons 3) -Labeled (LImmediate 4) Jump - -Mark (MNatural 3) -Labeled (LImmediate 0) Jump - -Mark (MNatural 4) -SPure (Indexed (IImmediate 1) Move) - -Mark (MNatural 5) -SPure (Indexed (IImmediate 0) Copy) - -Mark (MNatural 6) -Labeled (LImmediate 8) (Branch NE) - -Mark (MNatural 7) -SPure (Binary Sub) -Labeled LTop Jump - -Mark (MNatural 8) -SIO OutputChar - -Mark (MNatural 9) -Labeled (LImmediate 4) Jump - -Mark (MNatural 10) - -Mark (MNatural 0) -End +markM 1 +cons 0 +cons 10 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 +cons 32 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 + +markM 2 +cons 3 +jumpI 4 + +markM 3 +jumpI 0 + +markM 4 +moveI 1 + +markM 5 +copyI 0 + +markM 6 +bNEI 8 + +markM 7 +sub +jump + +markM 8 +outputCS + +markM 9 +jumpI 4 + +markM 10 + +markM 0 +end diff --git a/.output/actual/eta/il/optimized/from-eas/multiply.il b/.output/actual/eta/il/optimized/from-eas/multiply.il index baf1464fb..ce1a7907b 100644 --- a/.output/actual/eta/il/optimized/from-eas/multiply.il +++ b/.output/actual/eta/il/optimized/from-eas/multiply.il @@ -1,58 +1,57 @@ -Mark (MNatural 1) -SPure (Indexed (IImmediate 2) Move) -SPure (Indexed (IImmediate 2) Move) +markM 1 +moveI 2 +moveI 2 -Mark (MNatural 2) -SPure (Cons 0) +markM 2 +cons 0 -Mark (MNatural 3) -SPure (Indexed (IImmediate 2) Move) +markM 3 +moveI 2 -Mark (MNatural 4) -SPure (Indexed (IImmediate 2) Move) +markM 4 +moveI 2 -Mark (MNatural 5) -SPure (Indexed (IImmediate 0) Copy) +markM 5 +copyI 0 -Mark (MNatural 6) -Labeled (LImmediate 8) (Branch NE) +markM 6 +bNEI 8 -Mark (MNatural 7) -Labeled (LImmediate 15) Jump +markM 7 +jumpI 15 -Mark (MNatural 8) -SPure (Unary (UImmediate 1 Sub)) +markM 8 +subI 1 -Mark (MNatural 9) -SPure (Indexed (IImmediate 2) Move) +markM 9 +moveI 2 -Mark (MNatural 10) -SPure (Cons 0) -SPure (Indexed (IImmediate 3) Copy) +markM 10 +cons 0 +copyI 3 -Mark (MNatural 11) -SPure (Binary Sub) -SPure (Binary Sub) +markM 11 +sub +sub -Mark (MNatural 12) -SPure (Indexed (IImmediate 2) Move) +markM 12 +moveI 2 -Mark (MNatural 13) -SPure (Indexed (IImmediate 2) Move) +markM 13 +moveI 2 -Mark (MNatural 14) -Labeled (LImmediate 5) Jump +markM 14 +jumpI 5 -Mark (MNatural 15) -SPure (Indexed (IImmediate 1) Move) -Labeled LTop (Branch NE) +markM 15 +bNES -Mark (MNatural 16) -SPure (Indexed (IImmediate 1) Move) -Labeled LTop Jump +markM 16 +moveI 1 +jump -Mark (MNatural 17) +markM 17 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/actual/eta/il/optimized/from-eas/pip.il b/.output/actual/eta/il/optimized/from-eas/pip.il index 5fc3b2fed..cc6d670e4 100644 --- a/.output/actual/eta/il/optimized/from-eas/pip.il +++ b/.output/actual/eta/il/optimized/from-eas/pip.il @@ -1,29 +1,29 @@ -Mark (MNatural 1) -SIO InputChar +markM 1 +inputCS -Mark (MNatural 2) -SPure (Indexed (IImmediate 0) Copy) +markM 2 +copyI 0 -Mark (MNatural 3) -SPure (Unary (UImmediate (-1) Sub)) +markM 3 +subI -1 -Mark (MNatural 4) -Labeled (LImmediate 7) (Branch NE) +markM 4 +bNEI 7 -Mark (MNatural 5) -SPure Discard +markM 5 +discard -Mark (MNatural 6) -Labeled (LImmediate 0) Jump +markM 6 +jumpI 0 -Mark (MNatural 7) -SIO OutputChar +markM 7 +outputCS -Mark (MNatural 8) -Labeled (LImmediate 1) Jump +markM 8 +jumpI 1 -Mark (MNatural 9) +markM 9 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/actual/eta/il/optimized/from-eas/pip2.il b/.output/actual/eta/il/optimized/from-eas/pip2.il index 4ea0059ee..7b205707f 100644 --- a/.output/actual/eta/il/optimized/from-eas/pip2.il +++ b/.output/actual/eta/il/optimized/from-eas/pip2.il @@ -1,17 +1,17 @@ -Mark (MNatural 1) -SIO InputChar -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate (-1) Sub)) -Labeled (LImmediate 2) (Branch NE) -SPure Discard -Labeled (LImmediate 0) Jump +markM 1 +inputCS +copyI 0 +subI -1 +bNEI 2 +discard +jumpI 0 -Mark (MNatural 2) -SIO OutputChar -Labeled (LImmediate 1) Jump +markM 2 +outputCS +jumpI 1 -Mark (MNatural 3) +markM 3 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/actual/eta/il/optimized/from-eas/readnum.il b/.output/actual/eta/il/optimized/from-eas/readnum.il index 233f81908..f42eec909 100644 --- a/.output/actual/eta/il/optimized/from-eas/readnum.il +++ b/.output/actual/eta/il/optimized/from-eas/readnum.il @@ -1,123 +1,122 @@ -Mark (MNatural 1) -SIO InputChar +markM 1 +inputCS -Mark (MNatural 2) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 32 Sub)) +markM 2 +copyI 0 +subI 32 -Mark (MNatural 3) -Labeled (LImmediate 5) (Branch NE) +markM 3 +bNEI 5 -Mark (MNatural 4) -Labeled (LImmediate 1) (Branch NE) +markM 4 +bNEI 1 -Mark (MNatural 5) -SPure (Cons 0) -SPure (Indexed (IImmediate 1) Move) +markM 5 +cons 0 +moveI 1 -Mark (MNatural 6) -SPure (Unary (UImmediate 48 Sub)) +markM 6 +subI 48 -Mark (MNatural 7) -SPure (Indexed (IImmediate 1) Move) +markM 7 +moveI 1 -Mark (MNatural 8) -SPure (Cons 10) -SPure (Cons 9) -Labeled (LImmediate 19) Jump +markM 8 +cons 10 +cons 9 +jumpI 19 -Mark (MNatural 9) -SPure (Cons 0) -SPure (Indexed (IImmediate 1) Move) +markM 9 +cons 0 +moveI 1 -Mark (MNatural 10) -SPure (Binary Sub) -SPure (Binary Sub) +markM 10 +sub +sub -Mark (MNatural 11) -SIO InputChar +markM 11 +inputCS -Mark (MNatural 12) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 32 Sub)) -Labeled (LImmediate 14) (Branch NE) +markM 12 +copyI 0 +subI 32 +bNEI 14 -Mark (MNatural 13) -Labeled (LImmediate 17) Jump +markM 13 +jumpI 17 -Mark (MNatural 14) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 10 Sub)) -Labeled (LImmediate 16) (Branch NE) +markM 14 +copyI 0 +subI 10 +bNEI 16 -Mark (MNatural 15) -Labeled (LImmediate 17) Jump +markM 15 +jumpI 17 -Mark (MNatural 16) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate (-1) Sub)) -Labeled (LImmediate 6) (Branch NE) +markM 16 +copyI 0 +subI -1 +bNEI 6 -Mark (MNatural 17) -SPure Discard +markM 17 +discard -Mark (MNatural 18) -SPure (Indexed (IImmediate 1) Move) -Labeled LTop Jump +markM 18 +moveI 1 +jump -Mark (MNatural 19) -SPure (Indexed (IImmediate 2) Move) -SPure (Indexed (IImmediate 2) Move) +markM 19 +moveI 2 +moveI 2 -Mark (MNatural 20) -SPure (Cons 0) +markM 20 +cons 0 -Mark (MNatural 21) -SPure (Indexed (IImmediate 2) Move) +markM 21 +moveI 2 -Mark (MNatural 22) -SPure (Indexed (IImmediate 2) Move) +markM 22 +moveI 2 -Mark (MNatural 23) -SPure (Indexed (IImmediate 0) Copy) +markM 23 +copyI 0 -Mark (MNatural 24) -Labeled (LImmediate 26) (Branch NE) +markM 24 +bNEI 26 -Mark (MNatural 25) -Labeled (LImmediate 33) Jump +markM 25 +jumpI 33 -Mark (MNatural 26) -SPure (Unary (UImmediate 1 Sub)) +markM 26 +subI 1 -Mark (MNatural 27) -SPure (Indexed (IImmediate 2) Move) +markM 27 +moveI 2 -Mark (MNatural 28) -SPure (Cons 0) -SPure (Indexed (IImmediate 3) Copy) +markM 28 +cons 0 +copyI 3 -Mark (MNatural 29) -SPure (Binary Sub) -SPure (Binary Sub) +markM 29 +sub +sub -Mark (MNatural 30) -SPure (Indexed (IImmediate 2) Move) +markM 30 +moveI 2 -Mark (MNatural 31) -SPure (Indexed (IImmediate 2) Move) +markM 31 +moveI 2 -Mark (MNatural 32) -Labeled (LImmediate 23) Jump +markM 32 +jumpI 23 -Mark (MNatural 33) -SPure (Indexed (IImmediate 1) Move) -Labeled LTop (Branch NE) +markM 33 +bNES -Mark (MNatural 34) -SPure (Indexed (IImmediate 1) Move) -Labeled LTop Jump +markM 34 +moveI 1 +jump -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/actual/eta/il/optimized/from-eas/reverse.il b/.output/actual/eta/il/optimized/from-eas/reverse.il index ea26e1041..d8e4a57a9 100644 --- a/.output/actual/eta/il/optimized/from-eas/reverse.il +++ b/.output/actual/eta/il/optimized/from-eas/reverse.il @@ -1,32 +1,32 @@ -Mark (MNatural 1) -SPure (Cons (-1)) +markM 1 +cons (-1) -Mark (MNatural 2) -SIO InputChar +markM 2 +inputCS -Mark (MNatural 3) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate (-1) Sub)) -Labeled (LImmediate 2) (Branch NE) +markM 3 +copyI 0 +subI -1 +bNEI 2 -Mark (MNatural 4) -SPure Discard +markM 4 +discard -Mark (MNatural 5) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate (-1) Sub)) -Labeled (LImmediate 7) (Branch NE) +markM 5 +copyI 0 +subI -1 +bNEI 7 -Mark (MNatural 6) -SPure Discard -Labeled (LImmediate 0) Jump +markM 6 +discard +jumpI 0 -Mark (MNatural 7) -SIO OutputChar -Labeled (LImmediate 5) Jump +markM 7 +outputCS +jumpI 5 -Mark (MNatural 8) +markM 8 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/actual/eta/il/optimized/from-eas/true.il b/.output/actual/eta/il/optimized/from-eas/true.il index 1dba14281..9dbe29fbb 100644 --- a/.output/actual/eta/il/optimized/from-eas/true.il +++ b/.output/actual/eta/il/optimized/from-eas/true.il @@ -1,5 +1,5 @@ -Mark (MNatural 1) +markM 1 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/actual/eta/il/optimized/from-eas/writenum.il b/.output/actual/eta/il/optimized/from-eas/writenum.il index a09fa4321..b2a4688fe 100644 --- a/.output/actual/eta/il/optimized/from-eas/writenum.il +++ b/.output/actual/eta/il/optimized/from-eas/writenum.il @@ -1,70 +1,70 @@ -Mark (MNatural 1) -SPure (Cons 0) -SPure (Indexed (IImmediate 2) Move) +markM 1 +cons 0 +moveI 2 -Mark (MNatural 2) -SPure (Indexed (IImmediate 0) Copy) -Labeled (LImmediate 4) (Branch NE) +markM 2 +copyI 0 +bNEI 4 -Mark (MNatural 3) -SPure (Cons 48) -SIO OutputChar -Labeled LTop (Branch NE) -Labeled LTop Jump +markM 3 +cons 48 +outputCS +bNE +jump -Mark (MNatural 4) -SPure (Indexed (IImmediate 0) Copy) +markM 4 +copyI 0 -Mark (MNatural 5) -Labeled (LImmediate 7) (Branch NE) +markM 5 +bNEI 7 -Mark (MNatural 6) -SPure (Binary Sub) -Labeled (LImmediate 11) Jump +markM 6 +sub +jumpI 11 -Mark (MNatural 7) -SPure (Cons 10) -SPure (Binaries [Mod,Div]) +markM 7 +cons 10 +moddiv -Mark (MArtificial "7") +markA "7" -Mark (MNatural 8) -SPure (Unary (UImmediate (-48) Sub)) +markM 8 +subI -48 -Mark (MNatural 9) -SPure (Indexed (IImmediate 1) Move) +markM 9 +moveI 1 -Mark (MNatural 10) -Labeled (LImmediate 4) Jump +markM 10 +jumpI 4 -Mark (MNatural 11) -SPure (Cons 12) -Labeled (LImmediate 13) Jump +markM 11 +cons 12 +jumpI 13 -Mark (MNatural 12) -Labeled LTop Jump +markM 12 +jump -Mark (MNatural 13) -SPure (Indexed (IImmediate 1) Move) +markM 13 +moveI 1 -Mark (MNatural 14) -SPure (Indexed (IImmediate 0) Copy) +markM 14 +copyI 0 -Mark (MNatural 15) -Labeled (LImmediate 17) (Branch NE) +markM 15 +bNEI 17 -Mark (MNatural 16) -SPure (Binary Sub) -Labeled LTop Jump +markM 16 +sub +jump -Mark (MNatural 17) -SIO OutputChar +markM 17 +outputCS -Mark (MNatural 18) -Labeled (LImmediate 13) Jump +markM 18 +jumpI 13 -Mark (MNatural 19) +markM 19 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/actual/eta/il/optimized/from-eas/writestr.il b/.output/actual/eta/il/optimized/from-eas/writestr.il index 37c5fc29c..b428457c9 100644 --- a/.output/actual/eta/il/optimized/from-eas/writestr.il +++ b/.output/actual/eta/il/optimized/from-eas/writestr.il @@ -1,24 +1,24 @@ -Mark (MNatural 1) -SPure (Indexed (IImmediate 1) Move) +markM 1 +moveI 1 -Mark (MNatural 2) -SPure (Indexed (IImmediate 0) Copy) +markM 2 +copyI 0 -Mark (MNatural 3) -Labeled (LImmediate 5) (Branch NE) +markM 3 +bNEI 5 -Mark (MNatural 4) -SPure (Binary Sub) -Labeled LTop Jump +markM 4 +sub +jump -Mark (MNatural 5) -SIO OutputChar +markM 5 +outputCS -Mark (MNatural 6) -Labeled (LImmediate 1) Jump +markM 6 +jumpI 1 -Mark (MNatural 7) +markM 7 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/actual/eta/il/optimized/original/bottles.il b/.output/actual/eta/il/optimized/original/bottles.il index 617024100..ae610f644 100644 --- a/.output/actual/eta/il/optimized/original/bottles.il +++ b/.output/actual/eta/il/optimized/original/bottles.il @@ -1,276 +1,276 @@ -Mark (MNatural 1) -Labeled (LImmediate 32) Jump - -Mark (MArtificial "1") -Labeled LTop (Branch NE) -SPure (Cons 2) -SIO InputChar -Labeled LTop (Branch NE) -Labeled LTop (Branch NE) -SPure (Binaries [Mod,Div]) -Labeled (LImmediate 4) (Branch NE) -SPure (Cons 2) -SIO OutputChar - -Mark (MNatural 2) -SPure (Indexed (IImmediate 1) Move) -Labeled (LImmediate 3) Jump - -Mark (MArtificial "2") -SIO InputChar -SIO OutputChar -SPure (Binaries [Mod,Div]) -SIO InputChar -Labeled LTop (Branch NE) -SPure (Binary Sub) -SPure Halibut -Labeled (LImmediate 3) Jump - -Mark (MNatural 3) -SPure (Indexed (IImmediate 0) Copy) -Labeled (LImmediate 4) Jump - -Mark (MArtificial "3") -SPure (Binary Sub) -Labeled LTop (Branch NE) -SPure (Binary Sub) -SIO InputChar -Labeled LTop (Branch NE) -SPure (Binary Sub) -SPure (Cons 18828800) -SPure (Cons 4) - -Mark (MNatural 4) -Labeled (LImmediate 6) (Branch NE) - -Mark (MNatural 5) -SPure (Binary Sub) -Labeled LTop Jump - -Mark (MNatural 6) -SIO OutputChar - -Mark (MNatural 7) -Labeled (LImmediate 2) Jump - -Mark (MNatural 8) -SPure (Cons 0) -SPure (Indexed (IImmediate 2) Move) - -Mark (MNatural 9) -SPure (Indexed (IImmediate 0) Copy) -Labeled (LImmediate 11) (Branch NE) - -Mark (MNatural 10) -SPure (Cons 48) -SIO OutputChar -Labeled LTop (Branch NE) -Labeled LTop Jump - -Mark (MNatural 11) -SPure (Indexed (IImmediate 0) Copy) - -Mark (MNatural 12) -Labeled (LImmediate 14) (Branch NE) - -Mark (MNatural 13) -SPure (Binary Sub) -Labeled (LImmediate 18) Jump - -Mark (MNatural 14) -SPure (Cons 10) -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "14") - -Mark (MNatural 15) -SPure (Unary (UImmediate (-48) Sub)) - -Mark (MNatural 16) -SPure (Indexed (IImmediate 1) Move) - -Mark (MNatural 17) -Labeled (LImmediate 11) Jump - -Mark (MNatural 18) -SPure (Cons 19) -Labeled (LImmediate 2) Jump - -Mark (MNatural 19) -Labeled LTop Jump - -Mark (MNatural 20) -SPure (Indexed (IImmediate 1) Move) - -Mark (MNatural 21) -SPure (Cons 22) -Labeled (LImmediate 8) Jump - -Mark (MNatural 22) -SPure (Cons 0) -SPure (Cons 114) -SPure (Cons 101) -SPure (Cons 101) -SPure (Cons 98) -SPure (Cons 32) -SPure (Cons 102) -SPure (Cons 111) -SPure (Cons 32) -Labeled (LImmediate 23) Jump - -Mark (MNatural 23) -SPure (Cons 115) -SPure (Cons 101) -SPure (Cons 108) -SPure (Cons 116) -SPure (Cons 116) -SPure (Cons 111) -SPure (Cons 98) -SPure (Cons 32) -Labeled (LImmediate 24) Jump - -Mark (MNatural 24) -SPure (Cons 25) -Labeled (LImmediate 2) Jump - -Mark (MNatural 25) -Labeled LTop Jump - -Mark (MNatural 26) -SPure (Indexed (IImmediate 1) Move) - -Mark (MNatural 27) -SPure (Cons 28) -Labeled (LImmediate 20) Jump - -Mark (MNatural 28) -SPure (Cons 0) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 97) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 101) -Labeled (LImmediate 29) Jump - -Mark (MNatural 29) -SPure (Cons 104) -SPure (Cons 116) -SPure (Cons 32) -SPure (Cons 110) -SPure (Cons 111) -SPure (Cons 32) -Labeled (LImmediate 30) Jump - -Mark (MNatural 30) -SPure (Cons 31) -Labeled (LImmediate 2) Jump - -Mark (MNatural 31) -Labeled LTop Jump - -Mark (MArtificial "31") -SPure (Binary Sub) -Labeled (LImmediate 32) (Branch NE) -SPure (Binaries [Mod,Div]) -SIO InputChar -SPure (Cons 402523) -SPure (Binaries [Mod,Div]) -SIO InputChar -SPure (Cons 1814) -Labeled (LArtificial "32") Jump - -Mark (MNatural 32) -SPure (Cons 99) - -Mark (MNatural 33) -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 34) -Labeled (LImmediate 26) Jump - -Mark (MNatural 34) -SPure (Cons 44) -SIO OutputChar -SPure (Cons 32) -SIO OutputChar - -Mark (MNatural 35) -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 36) -Labeled (LImmediate 20) Jump - -Mark (MNatural 36) -SPure (Cons 10) -SIO OutputChar - -Mark (MNatural 37) -SPure (Cons 0) -SPure (Cons 10) -SPure (Cons 100) -SPure (Cons 110) -SPure (Cons 117) -SPure (Cons 111) - -Mark (MNatural 38) -SPure (Cons 114) -SPure (Cons 97) -SPure (Cons 32) -SPure (Cons 116) -SPure (Cons 105) -SPure (Cons 32) - -Mark (MNatural 39) -SPure (Cons 115) -SPure (Cons 115) -SPure (Cons 97) -SPure (Cons 112) -SPure (Cons 32) -SPure (Cons 44) - -Mark (MNatural 40) -SPure (Cons 110) -SPure (Cons 119) -SPure (Cons 111) -SPure (Cons 100) -SPure (Cons 32) -SPure (Cons 101) - -Mark (MNatural 41) -SPure (Cons 110) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 107) -SPure (Cons 97) -SPure (Cons 84) - -Mark (MNatural 42) -SPure (Cons 43) -Labeled (LImmediate 2) Jump - -Mark (MNatural 43) -SPure (Unary (UImmediate 1 Sub)) - -Mark (MNatural 44) -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 45) -Labeled (LImmediate 26) Jump - -Mark (MNatural 45) -SPure (Cons 10) -SPure (Cons 10) -SIO OutputChar -SIO OutputChar - -Mark (MNatural 46) -SPure (Indexed (IImmediate 0) Copy) -Labeled (LImmediate 33) (Branch NE) - -Mark (MNatural 47) -Labeled (LImmediate 0) (Branch NE) - -Mark (MNatural 48) - -Mark (MNatural 0) -End +markM 1 +jumpI 32 + +markA "1" +bNE +cons 2 +inputCS +bNE +bNE +moddiv +bNEI 4 +cons 2 +outputCS + +markM 2 +moveI 1 +jumpI 3 + +markA "2" +inputCS +outputCS +moddiv +inputCS +bNE +sub +halibut +jumpI 3 + +markM 3 +copyI 0 +jumpI 4 + +markA "3" +sub +bNE +sub +inputCS +bNE +sub +cons 18828800 +cons 4 + +markM 4 +bNEI 6 + +markM 5 +sub +jump + +markM 6 +outputCS + +markM 7 +jumpI 2 + +markM 8 +cons 0 +moveI 2 + +markM 9 +copyI 0 +bNEI 11 + +markM 10 +cons 48 +outputCS +bNE +jump + +markM 11 +copyI 0 + +markM 12 +bNEI 14 + +markM 13 +sub +jumpI 18 + +markM 14 +cons 10 +moddiv + +markA "14" + +markM 15 +subI -48 + +markM 16 +moveI 1 + +markM 17 +jumpI 11 + +markM 18 +cons 19 +jumpI 2 + +markM 19 +jump + +markM 20 +moveI 1 + +markM 21 +cons 22 +jumpI 8 + +markM 22 +cons 0 +cons 114 +cons 101 +cons 101 +cons 98 +cons 32 +cons 102 +cons 111 +cons 32 +jumpI 23 + +markM 23 +cons 115 +cons 101 +cons 108 +cons 116 +cons 116 +cons 111 +cons 98 +cons 32 +jumpI 24 + +markM 24 +cons 25 +jumpI 2 + +markM 25 +jump + +markM 26 +moveI 1 + +markM 27 +cons 28 +jumpI 20 + +markM 28 +cons 0 +cons 108 +cons 108 +cons 97 +cons 119 +cons 32 +cons 101 +jumpI 29 + +markM 29 +cons 104 +cons 116 +cons 32 +cons 110 +cons 111 +cons 32 +jumpI 30 + +markM 30 +cons 31 +jumpI 2 + +markM 31 +jump + +markA "31" +sub +bNEI 32 +moddiv +inputCS +cons 402523 +moddiv +inputCS +cons 1814 +jumpA "32" + +markM 32 +cons 99 + +markM 33 +copyI 0 +cons 34 +jumpI 26 + +markM 34 +cons 44 +outputCS +cons 32 +outputCS + +markM 35 +copyI 0 +cons 36 +jumpI 20 + +markM 36 +cons 10 +outputCS + +markM 37 +cons 0 +cons 10 +cons 100 +cons 110 +cons 117 +cons 111 + +markM 38 +cons 114 +cons 97 +cons 32 +cons 116 +cons 105 +cons 32 + +markM 39 +cons 115 +cons 115 +cons 97 +cons 112 +cons 32 +cons 44 + +markM 40 +cons 110 +cons 119 +cons 111 +cons 100 +cons 32 +cons 101 + +markM 41 +cons 110 +cons 111 +cons 32 +cons 101 +cons 107 +cons 97 +cons 84 + +markM 42 +cons 43 +jumpI 2 + +markM 43 +subI 1 + +markM 44 +copyI 0 +cons 45 +jumpI 26 + +markM 45 +cons 10 +cons 10 +outputCS +outputCS + +markM 46 +copyI 0 +bNEI 33 + +markM 47 +bNEI 0 + +markM 48 + +markM 0 +end diff --git a/.output/actual/eta/il/optimized/original/crlf.il b/.output/actual/eta/il/optimized/original/crlf.il index ed648a532..b5d61461a 100644 --- a/.output/actual/eta/il/optimized/original/crlf.il +++ b/.output/actual/eta/il/optimized/original/crlf.il @@ -1,43 +1,43 @@ -Mark (MNatural 1) -Labeled (LImmediate 3) Jump +markM 1 +jumpI 3 -Mark (MNatural 2) -SPure (Cons 10) -SPure (Cons 49) -SPure (Cons 68) -SPure (Cons 65) -SPure (Cons 66) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -Labeled (LImmediate 0) Jump +markM 2 +cons 10 +cons 49 +cons 68 +cons 65 +cons 66 +outputCS +outputCS +outputCS +outputCS +outputCS +jumpI 0 -Mark (MNatural 3) -SPure (Cons 10) -SPure (Cons 75) -SPure (Cons 79) -SIO OutputChar -SIO OutputChar -SIO OutputChar -Labeled (LImmediate 0) Jump +markM 3 +cons 10 +cons 75 +cons 79 +outputCS +outputCS +outputCS +jumpI 0 -Mark (MNatural 4) -SPure (Cons 10) -SPure (Cons 50) -SPure (Cons 68) -SPure (Cons 65) -SPure (Cons 66) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -Labeled (LImmediate 0) Jump +markM 4 +cons 10 +cons 50 +cons 68 +cons 65 +cons 66 +outputCS +outputCS +outputCS +outputCS +outputCS +jumpI 0 -Mark (MNatural 5) +markM 5 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/actual/eta/il/optimized/original/fact.il b/.output/actual/eta/il/optimized/original/fact.il index 259d0e23a..9914d0bd3 100644 --- a/.output/actual/eta/il/optimized/original/fact.il +++ b/.output/actual/eta/il/optimized/original/fact.il @@ -1,236 +1,235 @@ -Mark (MNatural 1) -SPure (Cons 2) -Labeled (LImmediate 14) Jump +markM 1 +cons 2 +jumpI 14 -Mark (MNatural 2) -SPure (Cons 3) -Labeled (LImmediate 5) Jump +markM 2 +cons 3 +jumpI 5 -Mark (MNatural 3) -SPure (Cons 4) -Labeled (LImmediate 32) Jump +markM 3 +cons 4 +jumpI 32 -Mark (MNatural 4) -SPure (Cons 10) -SIO OutputChar -Labeled (LImmediate 0) Jump +markM 4 +cons 10 +outputCS +jumpI 0 -Mark (MNatural 5) -SPure (Indexed (IImmediate 1) Move) +markM 5 +moveI 1 -Mark (MNatural 6) -SPure (Indexed (IImmediate 0) Copy) +markM 6 +copyI 0 -Mark (MNatural 7) -SPure (Unary (UImmediate 1 Sub)) -Labeled (LImmediate 9) (Branch NE) +markM 7 +subI 1 +bNEI 9 -Mark (MNatural 8) -Labeled (LImmediate 13) Jump +markM 8 +jumpI 13 -Mark (MNatural 9) -SPure (Indexed (IImmediate 0) Copy) +markM 9 +copyI 0 -Mark (MNatural 10) -SPure (Unary (UImmediate 1 Sub)) +markM 10 +subI 1 -Mark (MNatural 11) -SPure (Cons 12) -Labeled (LImmediate 5) Jump +markM 11 +cons 12 +jumpI 5 -Mark (MNatural 12) -SPure (Cons 13) -Labeled (LImmediate 42) Jump +markM 12 +cons 13 +jumpI 42 -Mark (MNatural 13) -SPure (Indexed (IImmediate 1) Move) -Labeled LTop Jump +markM 13 +moveI 1 +jump -Mark (MNatural 14) -SIO InputChar +markM 14 +inputCS -Mark (MNatural 15) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 32 Sub)) +markM 15 +copyI 0 +subI 32 -Mark (MNatural 16) -Labeled (LImmediate 18) (Branch NE) +markM 16 +bNEI 18 -Mark (MNatural 17) -Labeled (LImmediate 14) (Branch NE) +markM 17 +bNEI 14 -Mark (MNatural 18) -SPure (Cons 0) -SPure (Indexed (IImmediate 1) Move) +markM 18 +cons 0 +moveI 1 -Mark (MNatural 19) -SPure (Unary (UImmediate 48 Sub)) +markM 19 +subI 48 -Mark (MNatural 20) -SPure (Indexed (IImmediate 1) Move) +markM 20 +moveI 1 -Mark (MNatural 21) -SPure (Cons 10) -SPure (Cons 22) -Labeled (LImmediate 42) Jump +markM 21 +cons 10 +cons 22 +jumpI 42 -Mark (MArtificial "21") -SPure (Cons 22) -SPure (Binaries [Mod,Div]) -Labeled LTop (Branch NE) -SIO InputChar -Labeled LTop (Branch NE) -SPure (Binaries [Mod,Div]) +markA "21" +cons 22 +moddiv +bNE +inputCS +bNE +moddiv -Mark (MNatural 22) -SPure (Cons 0) -SPure (Indexed (IImmediate 1) Move) +markM 22 +cons 0 +moveI 1 -Mark (MNatural 23) -SPure (Binary Sub) -SPure (Binary Sub) +markM 23 +sub +sub -Mark (MNatural 24) -SIO InputChar +markM 24 +inputCS -Mark (MNatural 25) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 32 Sub)) -Labeled (LImmediate 27) (Branch NE) +markM 25 +copyI 0 +subI 32 +bNEI 27 -Mark (MNatural 26) -Labeled (LImmediate 30) Jump +markM 26 +jumpI 30 -Mark (MNatural 27) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 10 Sub)) -Labeled (LImmediate 29) (Branch NE) +markM 27 +copyI 0 +subI 10 +bNEI 29 -Mark (MNatural 28) -Labeled (LImmediate 30) Jump +markM 28 +jumpI 30 -Mark (MNatural 29) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate (-1) Sub)) -Labeled (LImmediate 19) (Branch NE) +markM 29 +copyI 0 +subI -1 +bNEI 19 -Mark (MNatural 30) -SPure Discard +markM 30 +discard -Mark (MNatural 31) -SPure (Indexed (IImmediate 1) Move) -Labeled LTop Jump +markM 31 +moveI 1 +jump -Mark (MNatural 32) -SPure (Cons 0) -SPure (Indexed (IImmediate 2) Move) +markM 32 +cons 0 +moveI 2 -Mark (MNatural 33) -SPure (Indexed (IImmediate 0) Copy) +markM 33 +copyI 0 -Mark (MNatural 34) -Labeled (LImmediate 36) (Branch NE) +markM 34 +bNEI 36 -Mark (MNatural 35) -SPure (Binary Sub) -Labeled (LImmediate 40) Jump +markM 35 +sub +jumpI 40 -Mark (MNatural 36) -SPure (Cons 10) -SPure (Binaries [Mod,Div]) +markM 36 +cons 10 +moddiv -Mark (MArtificial "36") +markA "36" -Mark (MNatural 37) -SPure (Unary (UImmediate (-48) Sub)) +markM 37 +subI -48 -Mark (MNatural 38) -SPure (Indexed (IImmediate 1) Move) +markM 38 +moveI 1 -Mark (MNatural 39) -Labeled (LImmediate 33) Jump +markM 39 +jumpI 33 -Mark (MNatural 40) -SPure (Cons 41) -Labeled (LImmediate 58) Jump +markM 40 +cons 41 +jumpI 58 -Mark (MNatural 41) -Labeled LTop Jump +markM 41 +jump -Mark (MNatural 42) -SPure (Indexed (IImmediate 2) Move) -SPure (Indexed (IImmediate 2) Move) +markM 42 +moveI 2 +moveI 2 -Mark (MNatural 43) -SPure (Cons 0) +markM 43 +cons 0 -Mark (MNatural 44) -SPure (Indexed (IImmediate 2) Move) +markM 44 +moveI 2 -Mark (MNatural 45) -SPure (Indexed (IImmediate 2) Move) +markM 45 +moveI 2 -Mark (MNatural 46) -SPure (Indexed (IImmediate 0) Copy) +markM 46 +copyI 0 -Mark (MNatural 47) -Labeled (LImmediate 49) (Branch NE) +markM 47 +bNEI 49 -Mark (MNatural 48) -Labeled (LImmediate 56) Jump +markM 48 +jumpI 56 -Mark (MNatural 49) -SPure (Unary (UImmediate 1 Sub)) +markM 49 +subI 1 -Mark (MNatural 50) -SPure (Indexed (IImmediate 2) Move) +markM 50 +moveI 2 -Mark (MNatural 51) -SPure (Cons 0) -SPure (Indexed (IImmediate 3) Copy) +markM 51 +cons 0 +copyI 3 -Mark (MNatural 52) -SPure (Binary Sub) -SPure (Binary Sub) +markM 52 +sub +sub -Mark (MNatural 53) -SPure (Indexed (IImmediate 2) Move) +markM 53 +moveI 2 -Mark (MNatural 54) -SPure (Indexed (IImmediate 2) Move) +markM 54 +moveI 2 -Mark (MNatural 55) -Labeled (LImmediate 46) Jump +markM 55 +jumpI 46 -Mark (MNatural 56) -SPure (Indexed (IImmediate 1) Move) -Labeled LTop (Branch NE) +markM 56 +bNES -Mark (MNatural 57) -SPure (Indexed (IImmediate 1) Move) -Labeled LTop Jump +markM 57 +moveI 1 +jump -Mark (MNatural 58) -SPure (Indexed (IImmediate 1) Move) +markM 58 +moveI 1 -Mark (MNatural 59) -SPure (Indexed (IImmediate 0) Copy) +markM 59 +copyI 0 -Mark (MNatural 60) -Labeled (LImmediate 62) (Branch NE) +markM 60 +bNEI 62 -Mark (MNatural 61) -SPure (Binary Sub) -Labeled LTop Jump +markM 61 +sub +jump -Mark (MNatural 62) -SIO OutputChar +markM 62 +outputCS -Mark (MNatural 63) -Labeled (LImmediate 58) Jump +markM 63 +jumpI 58 -Mark (MNatural 64) +markM 64 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/actual/eta/il/optimized/original/hello.il b/.output/actual/eta/il/optimized/original/hello.il index 411b20f32..5cea6c2fb 100644 --- a/.output/actual/eta/il/optimized/original/hello.il +++ b/.output/actual/eta/il/optimized/original/hello.il @@ -1,77 +1,77 @@ -Mark (MNatural 1) -Labeled (LImmediate 2) Jump - -Mark (MArtificial "1") -SIO OutputChar -SPure (Binaries [Mod,Div]) -Labeled LTop (Branch NE) -SPure (Cons 2) -SIO InputChar -Labeled LTop (Branch NE) -Labeled LTop (Branch NE) -SPure (Binaries [Mod,Div]) -Labeled (LImmediate 4) (Branch NE) -SPure (Cons 2) -SIO OutputChar - -Mark (MNatural 2) - -Mark (MNatural 3) -SPure (Cons 32) - -Mark (MNatural 4) -SPure (Cons 44) -SPure (Cons 111) -Labeled (LArtificial "5") Jump - -Mark (MNatural 5) -Labeled LTop (Branch NE) -SPure (Binary Sub) -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "5") - -Mark (MNatural 6) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) - -Mark (MNatural 7) -SPure (Cons 72) - -Mark (MNatural 8) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar - -Mark (MNatural 9) -SPure (Cons 10) - -Mark (MNatural 10) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) - -Mark (MNatural 11) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) - -Mark (MNatural 12) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar - -Mark (MNatural 13) - -Mark (MNatural 0) -End +markM 1 +jumpI 2 + +markA "1" +outputCS +moddiv +bNE +cons 2 +inputCS +bNE +bNE +moddiv +bNEI 4 +cons 2 +outputCS + +markM 2 + +markM 3 +cons 32 + +markM 4 +cons 44 +cons 111 +jumpA "5" + +markM 5 +bNE +sub +moddiv + +markA "5" + +markM 6 +cons 108 +cons 108 +cons 101 + +markM 7 +cons 72 + +markM 8 +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS + +markM 9 +cons 10 + +markM 10 +cons 33 +cons 100 +cons 108 + +markM 11 +cons 114 +cons 111 +cons 119 + +markM 12 +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS + +markM 13 + +markM 0 +end diff --git a/.output/actual/eta/il/optimized/original/hello2.il b/.output/actual/eta/il/optimized/original/hello2.il index 10c422a79..0b1d81747 100644 --- a/.output/actual/eta/il/optimized/original/hello2.il +++ b/.output/actual/eta/il/optimized/original/hello2.il @@ -1,47 +1,47 @@ -Mark (MNatural 1) -SPure (Cons 0) -SPure (Cons 10) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) -SPure (Cons 32) - -Mark (MNatural 2) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) -SPure (Cons 3) -Labeled (LImmediate 4) Jump - -Mark (MNatural 3) -Labeled (LImmediate 0) Jump - -Mark (MArtificial "3") -Labeled (LImmediate 4) (Branch NE) -SIO InputChar -SPure (Unary (UImmediate 337 Sub)) - -Mark (MNatural 4) -SPure (Indexed (IImmediate 1) Move) -SPure (Indexed (IImmediate 0) Copy) -Labeled (LImmediate 6) (Branch NE) - -Mark (MNatural 5) -SPure (Binary Sub) -Labeled LTop Jump - -Mark (MNatural 6) -SIO OutputChar -Labeled (LImmediate 4) Jump - -Mark (MNatural 7) - -Mark (MNatural 0) -End +markM 1 +cons 0 +cons 10 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 +cons 32 + +markM 2 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 +cons 3 +jumpI 4 + +markM 3 +jumpI 0 + +markA "3" +bNEI 4 +inputCS +subI 337 + +markM 4 +moveI 1 +copyI 0 +bNEI 6 + +markM 5 +sub +jump + +markM 6 +outputCS +jumpI 4 + +markM 7 + +markM 0 +end diff --git a/.output/actual/eta/il/optimized/original/pip.il b/.output/actual/eta/il/optimized/original/pip.il index 5fc3b2fed..cc6d670e4 100644 --- a/.output/actual/eta/il/optimized/original/pip.il +++ b/.output/actual/eta/il/optimized/original/pip.il @@ -1,29 +1,29 @@ -Mark (MNatural 1) -SIO InputChar +markM 1 +inputCS -Mark (MNatural 2) -SPure (Indexed (IImmediate 0) Copy) +markM 2 +copyI 0 -Mark (MNatural 3) -SPure (Unary (UImmediate (-1) Sub)) +markM 3 +subI -1 -Mark (MNatural 4) -Labeled (LImmediate 7) (Branch NE) +markM 4 +bNEI 7 -Mark (MNatural 5) -SPure Discard +markM 5 +discard -Mark (MNatural 6) -Labeled (LImmediate 0) Jump +markM 6 +jumpI 0 -Mark (MNatural 7) -SIO OutputChar +markM 7 +outputCS -Mark (MNatural 8) -Labeled (LImmediate 1) Jump +markM 8 +jumpI 1 -Mark (MNatural 9) +markM 9 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/actual/eta/il/optimized/original/pip2.il b/.output/actual/eta/il/optimized/original/pip2.il index 4ea0059ee..7b205707f 100644 --- a/.output/actual/eta/il/optimized/original/pip2.il +++ b/.output/actual/eta/il/optimized/original/pip2.il @@ -1,17 +1,17 @@ -Mark (MNatural 1) -SIO InputChar -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate (-1) Sub)) -Labeled (LImmediate 2) (Branch NE) -SPure Discard -Labeled (LImmediate 0) Jump +markM 1 +inputCS +copyI 0 +subI -1 +bNEI 2 +discard +jumpI 0 -Mark (MNatural 2) -SIO OutputChar -Labeled (LImmediate 1) Jump +markM 2 +outputCS +jumpI 1 -Mark (MNatural 3) +markM 3 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/actual/eta/il/parsed/from-eas/bottles.il b/.output/actual/eta/il/parsed/from-eas/bottles.il index 8a32f0e9f..f41facdae 100644 --- a/.output/actual/eta/il/parsed/from-eas/bottles.il +++ b/.output/actual/eta/il/parsed/from-eas/bottles.il @@ -1,292 +1,292 @@ -Mark (MNatural 1) -SPure (Cons 1) -SPure (Cons 31) -Labeled LTop (Branch NE) - -Mark (MNatural 2) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 3) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 4) -SPure (Cons 5) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 5) -SPure (Binary Sub) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 6) -SIO OutputChar - -Mark (MNatural 7) -SPure (Cons 1) -SPure (Cons 2) -Labeled LTop (Branch NE) - -Mark (MNatural 8) -SPure (Cons 0) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 9) -SPure (Cons 0) -SPure Halibut -SPure (Cons 10) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 10) -SPure (Cons 48) -SIO OutputChar -Labeled LTop (Branch NE) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 11) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 12) -SPure (Cons 13) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 13) -SPure (Binary Sub) -SPure (Cons 1) -SPure (Cons 18) -Labeled LTop (Branch NE) - -Mark (MNatural 14) -SPure (Cons 10) -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "14") - -Mark (MNatural 15) -SPure (Cons 0) -SPure (Cons 48) -SPure (Binary Sub) -SPure (Binary Sub) - -Mark (MNatural 16) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 17) -SPure (Cons 1) -SPure (Cons 11) -Labeled LTop (Branch NE) - -Mark (MNatural 18) -SPure (Cons 19) -SPure (Cons 1) -SPure (Cons 2) -Labeled LTop (Branch NE) - -Mark (MNatural 19) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 20) - -Mark (MNatural 21) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 22) -SPure (Cons 23) -SPure (Cons 1) -SPure (Cons 8) -Labeled LTop (Branch NE) - -Mark (MNatural 23) -SPure (Cons 0) -SPure (Cons 114) -SPure (Cons 101) -SPure (Cons 101) -SPure (Cons 98) -SPure (Cons 32) -SPure (Cons 102) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 115) -SPure (Cons 101) -SPure (Cons 108) -SPure (Cons 116) -SPure (Cons 116) -SPure (Cons 111) -SPure (Cons 98) -SPure (Cons 32) - -Mark (MNatural 24) -SPure (Cons 25) -SPure (Cons 1) -SPure (Cons 2) -Labeled LTop (Branch NE) - -Mark (MNatural 25) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 26) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 27) -SPure (Cons 28) -SPure (Cons 1) -SPure (Cons 21) -Labeled LTop (Branch NE) - -Mark (MNatural 28) -SPure (Cons 0) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 97) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 104) -SPure (Cons 116) -SPure (Cons 32) -SPure (Cons 110) -SPure (Cons 111) -SPure (Cons 32) - -Mark (MNatural 29) -SPure (Cons 30) -SPure (Cons 1) -SPure (Cons 2) -Labeled LTop (Branch NE) - -Mark (MNatural 30) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 31) -SPure (Cons 3) - -Mark (MNatural 32) -SPure (Cons 0) -SPure Halibut -SPure (Cons 33) -SPure (Cons 1) -SPure (Cons 26) -Labeled LTop (Branch NE) - -Mark (MNatural 33) -SPure (Cons 44) -SIO OutputChar -SPure (Cons 32) -SIO OutputChar - -Mark (MNatural 34) -SPure (Cons 0) -SPure Halibut -SPure (Cons 35) -SPure (Cons 1) -SPure (Cons 21) -Labeled LTop (Branch NE) - -Mark (MNatural 35) -SPure (Cons 10) -SIO OutputChar - -Mark (MNatural 36) -SPure (Cons 0) -SPure (Cons 10) -SPure (Cons 100) -SPure (Cons 110) -SPure (Cons 117) -SPure (Cons 111) -SPure (Cons 114) -SPure (Cons 97) -SPure (Cons 32) -SPure (Cons 116) -SPure (Cons 105) -SPure (Cons 32) -SPure (Cons 115) -SPure (Cons 115) -SPure (Cons 97) -SPure (Cons 112) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 110) -SPure (Cons 119) -SPure (Cons 111) -SPure (Cons 100) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 110) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 107) -SPure (Cons 97) -SPure (Cons 84) - -Mark (MNatural 37) -SPure (Cons 38) -SPure (Cons 1) -SPure (Cons 2) -Labeled LTop (Branch NE) - -Mark (MNatural 38) -SPure (Cons 1) -SPure (Binary Sub) - -Mark (MNatural 39) -SPure (Cons 0) -SPure Halibut -SPure (Cons 40) -SPure (Cons 1) -SPure (Cons 26) -Labeled LTop (Branch NE) - -Mark (MNatural 40) -SPure (Cons 10) -SPure (Cons 10) -SIO OutputChar -SIO OutputChar - -Mark (MNatural 41) -SPure (Cons 0) -SPure Halibut -SPure (Cons 32) -Labeled LTop (Branch NE) - -Mark (MNatural 42) -SPure (Cons 0) -Labeled LTop (Branch NE) - -Mark (MNatural 43) - -Mark (MNatural 0) -End +markM 1 +cons 1 +cons 31 +bNE + +markM 2 +cons 1 +halibut + +markM 3 +cons 0 +halibut + +markM 4 +cons 5 +cons 0 +cons 1 +sub +sub +bNE + +markM 5 +sub +cons 1 +cons 1 +halibut +bNE + +markM 6 +outputCS + +markM 7 +cons 1 +cons 2 +bNE + +markM 8 +cons 0 +cons 2 +halibut + +markM 9 +cons 0 +halibut +cons 10 +cons 0 +cons 1 +sub +sub +bNE + +markM 10 +cons 48 +outputCS +bNE +cons 1 +cons 1 +halibut +bNE + +markM 11 +cons 0 +halibut + +markM 12 +cons 13 +cons 0 +cons 1 +sub +sub +bNE + +markM 13 +sub +cons 1 +cons 18 +bNE + +markM 14 +cons 10 +moddiv + +markA "14" + +markM 15 +cons 0 +cons 48 +sub +sub + +markM 16 +cons 1 +halibut + +markM 17 +cons 1 +cons 11 +bNE + +markM 18 +cons 19 +cons 1 +cons 2 +bNE + +markM 19 +cons 1 +cons 1 +halibut +bNE + +markM 20 + +markM 21 +cons 1 +halibut + +markM 22 +cons 23 +cons 1 +cons 8 +bNE + +markM 23 +cons 0 +cons 114 +cons 101 +cons 101 +cons 98 +cons 32 +cons 102 +cons 111 +cons 32 +cons 115 +cons 101 +cons 108 +cons 116 +cons 116 +cons 111 +cons 98 +cons 32 + +markM 24 +cons 25 +cons 1 +cons 2 +bNE + +markM 25 +cons 1 +cons 1 +halibut +bNE + +markM 26 +cons 1 +halibut + +markM 27 +cons 28 +cons 1 +cons 21 +bNE + +markM 28 +cons 0 +cons 108 +cons 108 +cons 97 +cons 119 +cons 32 +cons 101 +cons 104 +cons 116 +cons 32 +cons 110 +cons 111 +cons 32 + +markM 29 +cons 30 +cons 1 +cons 2 +bNE + +markM 30 +cons 1 +cons 1 +halibut +bNE + +markM 31 +cons 3 + +markM 32 +cons 0 +halibut +cons 33 +cons 1 +cons 26 +bNE + +markM 33 +cons 44 +outputCS +cons 32 +outputCS + +markM 34 +cons 0 +halibut +cons 35 +cons 1 +cons 21 +bNE + +markM 35 +cons 10 +outputCS + +markM 36 +cons 0 +cons 10 +cons 100 +cons 110 +cons 117 +cons 111 +cons 114 +cons 97 +cons 32 +cons 116 +cons 105 +cons 32 +cons 115 +cons 115 +cons 97 +cons 112 +cons 32 +cons 44 +cons 110 +cons 119 +cons 111 +cons 100 +cons 32 +cons 101 +cons 110 +cons 111 +cons 32 +cons 101 +cons 107 +cons 97 +cons 84 + +markM 37 +cons 38 +cons 1 +cons 2 +bNE + +markM 38 +cons 1 +sub + +markM 39 +cons 0 +halibut +cons 40 +cons 1 +cons 26 +bNE + +markM 40 +cons 10 +cons 10 +outputCS +outputCS + +markM 41 +cons 0 +halibut +cons 32 +bNE + +markM 42 +cons 0 +bNE + +markM 43 + +markM 0 +end diff --git a/.output/actual/eta/il/parsed/from-eas/euclid.il b/.output/actual/eta/il/parsed/from-eas/euclid.il index 3500ea5c0..2e9ae629c 100644 --- a/.output/actual/eta/il/parsed/from-eas/euclid.il +++ b/.output/actual/eta/il/parsed/from-eas/euclid.il @@ -1,66 +1,66 @@ -Mark (MNatural 1) -SPure (Cons 2) -SPure Halibut -SPure (Cons 2) -SPure Halibut +markM 1 +cons 2 +halibut +cons 2 +halibut -Mark (MNatural 2) -SPure (Cons 0) -SPure Halibut +markM 2 +cons 0 +halibut -Mark (MNatural 3) -SPure (Cons 4) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) +markM 3 +cons 4 +cons 0 +cons 1 +sub +sub +bNE -Mark (MNatural 4) -SPure (Cons 1) -SPure (Cons 10) -Labeled LTop (Branch NE) +markM 4 +cons 1 +cons 10 +bNE -Mark (MNatural 5) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure Halibut +markM 5 +cons 0 +cons 1 +sub +halibut -Mark (MNatural 6) -SPure (Binaries [Mod,Div]) +markM 6 +moddiv -Mark (MArtificial "6") +markA "6" -Mark (MNatural 7) -SPure (Cons 0) -SPure (Cons 2) -SPure Halibut -Labeled LTop (Branch NE) +markM 7 +cons 0 +cons 2 +halibut +bNE -Mark (MNatural 8) -SPure (Cons 1) -SPure Halibut +markM 8 +cons 1 +halibut -Mark (MNatural 9) -SPure (Cons 1) -SPure (Cons 2) -Labeled LTop (Branch NE) +markM 9 +cons 1 +cons 2 +bNE -Mark (MNatural 10) -SPure (Cons 0) -Labeled LTop (Branch NE) +markM 10 +cons 0 +bNE -Mark (MNatural 11) -SPure (Cons 1) -SPure (Cons 2) -SPure Halibut +markM 11 +cons 1 +cons 2 +halibut -Mark (MNatural 12) -Labeled LTop (Branch NE) +markM 12 +bNE -Mark (MNatural 13) +markM 13 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/actual/eta/il/parsed/from-eas/fact.il b/.output/actual/eta/il/parsed/from-eas/fact.il index 1e8144aaf..53995b229 100644 --- a/.output/actual/eta/il/parsed/from-eas/fact.il +++ b/.output/actual/eta/il/parsed/from-eas/fact.il @@ -1,367 +1,367 @@ -Mark (MNatural 1) -SPure (Cons 2) -SPure (Cons 1) -SPure (Cons 14) -Labeled LTop (Branch NE) - -Mark (MNatural 2) -SPure (Cons 3) -SPure (Cons 1) -SPure (Cons 5) -Labeled LTop (Branch NE) - -Mark (MNatural 3) -SPure (Cons 4) -SPure (Cons 1) -SPure (Cons 32) -Labeled LTop (Branch NE) - -Mark (MNatural 4) -SPure (Cons 10) -SIO OutputChar -SPure (Cons 1) -SPure (Cons 0) -Labeled LTop (Branch NE) - -Mark (MNatural 5) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 6) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 7) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Cons 8) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 8) -SPure (Cons 1) -SPure (Cons 13) -Labeled LTop (Branch NE) - -Mark (MNatural 9) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 10) -SPure (Cons 1) -SPure (Binary Sub) - -Mark (MNatural 11) -SPure (Cons 12) -SPure (Cons 1) -SPure (Cons 5) -Labeled LTop (Branch NE) - -Mark (MNatural 12) -SPure (Cons 13) -SPure (Cons 1) -SPure (Cons 44) -Labeled LTop (Branch NE) - -Mark (MNatural 13) -SPure (Cons 1) -SPure (Cons 2) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 14) -SIO InputChar - -Mark (MNatural 15) -SPure (Cons 0) -SPure Halibut -SPure (Cons 32) -SPure (Binary Sub) - -Mark (MNatural 16) -SPure (Cons 17) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 17) -SPure (Cons 0) -SPure (Cons 1) -Labeled LTop (Branch NE) -SPure (Cons 14) -Labeled LTop (Branch NE) - -Mark (MNatural 18) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 19) -SPure (Cons 48) -SPure (Cons 32) -SPure (Binary Sub) - -Mark (MNatural 20) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 21) -SPure (Cons 10) -SPure (Cons 22) -SPure (Cons 1) -SPure (Cons 44) -Labeled LTop (Branch NE) - -Mark (MNatural 22) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 23) -SPure (Binary Sub) -SPure (Binary Sub) - -Mark (MNatural 24) -SIO InputChar - -Mark (MNatural 25) -SPure (Cons 0) -SPure Halibut -SPure (Cons 32) -SPure (Binary Sub) -SPure (Cons 27) -Labeled LTop (Branch NE) - -Mark (MNatural 26) -SPure (Cons 1) -SPure (Cons 30) -Labeled LTop (Branch NE) - -Mark (MNatural 27) -SPure (Cons 0) -SPure Halibut -SPure (Cons 10) -SPure (Binary Sub) -SPure (Cons 29) -Labeled LTop (Branch NE) - -Mark (MNatural 28) -SPure (Cons 1) -SPure (Cons 30) -Labeled LTop (Branch NE) - -Mark (MNatural 29) -SPure (Cons 0) -SPure Halibut -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -SPure (Cons 19) -Labeled LTop (Branch NE) - -Mark (MNatural 30) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 31) -SPure (Cons 1) -SPure (Cons 2) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 32) -SPure (Cons 0) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 33) -SPure (Cons 0) -SPure Halibut -SPure (Cons 34) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 34) -SPure (Cons 48) -SIO OutputChar -Labeled LTop (Branch NE) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 35) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 36) -SPure (Cons 37) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 37) -SPure (Binary Sub) -SPure (Cons 1) -SPure (Cons 42) -Labeled LTop (Branch NE) - -Mark (MNatural 38) -SPure (Cons 10) -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "38") - -Mark (MNatural 39) -SPure (Cons 0) -SPure (Cons 48) -SPure (Binary Sub) -SPure (Binary Sub) - -Mark (MNatural 40) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 41) -SPure (Cons 1) -SPure (Cons 35) -Labeled LTop (Branch NE) - -Mark (MNatural 42) -SPure (Cons 43) -SPure (Cons 1) -SPure (Cons 60) -Labeled LTop (Branch NE) - -Mark (MNatural 43) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 44) -SPure (Cons 2) -SPure Halibut -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 45) -SPure (Cons 0) - -Mark (MNatural 46) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 47) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 48) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 49) -SPure (Cons 50) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 50) -SPure (Cons 1) -SPure (Cons 58) -Labeled LTop (Branch NE) - -Mark (MNatural 51) -SPure (Cons 1) -SPure (Binary Sub) - -Mark (MNatural 52) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 53) -SPure (Cons 0) -SPure (Cons 0) -SPure (Cons 3) -SPure (Binary Sub) -SPure Halibut - -Mark (MNatural 54) -SPure (Binary Sub) -SPure (Binary Sub) - -Mark (MNatural 55) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 56) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 57) -SPure (Cons 1) -SPure (Cons 48) -Labeled LTop (Branch NE) - -Mark (MNatural 58) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 59) -SPure (Cons 1) -SPure (Cons 2) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 60) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 61) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 62) -SPure (Cons 63) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 63) -SPure (Binary Sub) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 64) -SIO OutputChar - -Mark (MNatural 65) -SPure (Cons 1) -SPure (Cons 60) -Labeled LTop (Branch NE) - -Mark (MNatural 66) - -Mark (MNatural 0) -End +markM 1 +cons 2 +cons 1 +cons 14 +bNE + +markM 2 +cons 3 +cons 1 +cons 5 +bNE + +markM 3 +cons 4 +cons 1 +cons 32 +bNE + +markM 4 +cons 10 +outputCS +cons 1 +cons 0 +bNE + +markM 5 +cons 1 +halibut + +markM 6 +cons 0 +halibut + +markM 7 +cons 1 +sub +cons 8 +cons 0 +cons 1 +sub +sub +bNE + +markM 8 +cons 1 +cons 13 +bNE + +markM 9 +cons 0 +halibut + +markM 10 +cons 1 +sub + +markM 11 +cons 12 +cons 1 +cons 5 +bNE + +markM 12 +cons 13 +cons 1 +cons 44 +bNE + +markM 13 +cons 1 +cons 2 +halibut +bNE + +markM 14 +inputCS + +markM 15 +cons 0 +halibut +cons 32 +sub + +markM 16 +cons 17 +cons 0 +cons 1 +sub +sub +bNE + +markM 17 +cons 0 +cons 1 +bNE +cons 14 +bNE + +markM 18 +cons 0 +cons 1 +halibut + +markM 19 +cons 48 +cons 32 +sub + +markM 20 +cons 1 +halibut + +markM 21 +cons 10 +cons 22 +cons 1 +cons 44 +bNE + +markM 22 +cons 0 +cons 1 +halibut + +markM 23 +sub +sub + +markM 24 +inputCS + +markM 25 +cons 0 +halibut +cons 32 +sub +cons 27 +bNE + +markM 26 +cons 1 +cons 30 +bNE + +markM 27 +cons 0 +halibut +cons 10 +sub +cons 29 +bNE + +markM 28 +cons 1 +cons 30 +bNE + +markM 29 +cons 0 +halibut +cons 0 +cons 1 +sub +sub +cons 19 +bNE + +markM 30 +cons 0 +cons 1 +halibut +bNE + +markM 31 +cons 1 +cons 2 +halibut +bNE + +markM 32 +cons 0 +cons 2 +halibut + +markM 33 +cons 0 +halibut +cons 34 +cons 0 +cons 1 +sub +sub +bNE + +markM 34 +cons 48 +outputCS +bNE +cons 1 +cons 1 +halibut +bNE + +markM 35 +cons 0 +halibut + +markM 36 +cons 37 +cons 0 +cons 1 +sub +sub +bNE + +markM 37 +sub +cons 1 +cons 42 +bNE + +markM 38 +cons 10 +moddiv + +markA "38" + +markM 39 +cons 0 +cons 48 +sub +sub + +markM 40 +cons 1 +halibut + +markM 41 +cons 1 +cons 35 +bNE + +markM 42 +cons 43 +cons 1 +cons 60 +bNE + +markM 43 +cons 1 +cons 1 +halibut +bNE + +markM 44 +cons 2 +halibut +cons 2 +halibut + +markM 45 +cons 0 + +markM 46 +cons 2 +halibut + +markM 47 +cons 2 +halibut + +markM 48 +cons 0 +halibut + +markM 49 +cons 50 +cons 0 +cons 1 +sub +sub +bNE + +markM 50 +cons 1 +cons 58 +bNE + +markM 51 +cons 1 +sub + +markM 52 +cons 2 +halibut + +markM 53 +cons 0 +cons 0 +cons 3 +sub +halibut + +markM 54 +sub +sub + +markM 55 +cons 2 +halibut + +markM 56 +cons 2 +halibut + +markM 57 +cons 1 +cons 48 +bNE + +markM 58 +cons 1 +halibut +bNE + +markM 59 +cons 1 +cons 2 +halibut +bNE + +markM 60 +cons 1 +halibut + +markM 61 +cons 0 +halibut + +markM 62 +cons 63 +cons 0 +cons 1 +sub +sub +bNE + +markM 63 +sub +cons 1 +cons 1 +halibut +bNE + +markM 64 +outputCS + +markM 65 +cons 1 +cons 60 +bNE + +markM 66 + +markM 0 +end diff --git a/.output/actual/eta/il/parsed/from-eas/function.il b/.output/actual/eta/il/parsed/from-eas/function.il index ff12ba76e..f334a373a 100644 --- a/.output/actual/eta/il/parsed/from-eas/function.il +++ b/.output/actual/eta/il/parsed/from-eas/function.il @@ -1,36 +1,36 @@ -Mark (MNatural 1) -SPure (Cons 2) -SPure Halibut +markM 1 +cons 2 +halibut -Mark (MNatural 2) -SPure (Cons 2) -SPure Halibut +markM 2 +cons 2 +halibut -Mark (MNatural 3) -SPure (Cons 0) +markM 3 +cons 0 -Mark (MNatural 4) -SPure (Cons 1) -SPure Halibut +markM 4 +cons 1 +halibut -Mark (MNatural 5) -SPure (Binary Sub) +markM 5 +sub -Mark (MNatural 6) -SPure (Binary Sub) +markM 6 +sub -Mark (MNatural 7) -SPure (Cons 1) +markM 7 +cons 1 -Mark (MNatural 8) -SPure (Cons 2) -SPure Halibut +markM 8 +cons 2 +halibut -Mark (MNatural 9) -Labeled LTop (Branch NE) +markM 9 +bNE -Mark (MNatural 10) +markM 10 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/actual/eta/il/parsed/from-eas/hello.il b/.output/actual/eta/il/parsed/from-eas/hello.il index cc8950b8a..d8b88a64a 100644 --- a/.output/actual/eta/il/parsed/from-eas/hello.il +++ b/.output/actual/eta/il/parsed/from-eas/hello.il @@ -1,45 +1,45 @@ -Mark (MNatural 1) -SPure (Cons 32) - -Mark (MNatural 2) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) - -Mark (MNatural 3) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar - -Mark (MNatural 4) -SPure (Cons 10) - -Mark (MNatural 5) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) - -Mark (MNatural 6) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar - -Mark (MNatural 7) - -Mark (MNatural 0) -End +markM 1 +cons 32 + +markM 2 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 + +markM 3 +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS + +markM 4 +cons 10 + +markM 5 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 + +markM 6 +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS + +markM 7 + +markM 0 +end diff --git a/.output/actual/eta/il/parsed/from-eas/hello2.il b/.output/actual/eta/il/parsed/from-eas/hello2.il index d348d0a6d..4e611db06 100644 --- a/.output/actual/eta/il/parsed/from-eas/hello2.il +++ b/.output/actual/eta/il/parsed/from-eas/hello2.il @@ -1,64 +1,64 @@ -Mark (MNatural 1) -SPure (Cons 0) -SPure (Cons 10) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) +markM 1 +cons 0 +cons 10 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 +cons 32 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 -Mark (MNatural 2) -SPure (Cons 3) -SPure (Cons 1) -SPure (Cons 4) -Labeled LTop (Branch NE) +markM 2 +cons 3 +cons 1 +cons 4 +bNE -Mark (MNatural 3) -SPure (Cons 1) -SPure (Cons 0) -Labeled LTop (Branch NE) +markM 3 +cons 1 +cons 0 +bNE -Mark (MNatural 4) -SPure (Cons 1) -SPure Halibut +markM 4 +cons 1 +halibut -Mark (MNatural 5) -SPure (Cons 0) -SPure Halibut +markM 5 +cons 0 +halibut -Mark (MNatural 6) -SPure (Cons 7) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) +markM 6 +cons 7 +cons 0 +cons 1 +sub +sub +bNE -Mark (MNatural 7) -SPure (Binary Sub) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) +markM 7 +sub +cons 1 +cons 1 +halibut +bNE -Mark (MNatural 8) -SIO OutputChar +markM 8 +outputCS -Mark (MNatural 9) -SPure (Cons 1) -SPure (Cons 4) -Labeled LTop (Branch NE) +markM 9 +cons 1 +cons 4 +bNE -Mark (MNatural 10) +markM 10 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/actual/eta/il/parsed/from-eas/hello3.il b/.output/actual/eta/il/parsed/from-eas/hello3.il index d348d0a6d..4e611db06 100644 --- a/.output/actual/eta/il/parsed/from-eas/hello3.il +++ b/.output/actual/eta/il/parsed/from-eas/hello3.il @@ -1,64 +1,64 @@ -Mark (MNatural 1) -SPure (Cons 0) -SPure (Cons 10) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) +markM 1 +cons 0 +cons 10 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 +cons 32 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 -Mark (MNatural 2) -SPure (Cons 3) -SPure (Cons 1) -SPure (Cons 4) -Labeled LTop (Branch NE) +markM 2 +cons 3 +cons 1 +cons 4 +bNE -Mark (MNatural 3) -SPure (Cons 1) -SPure (Cons 0) -Labeled LTop (Branch NE) +markM 3 +cons 1 +cons 0 +bNE -Mark (MNatural 4) -SPure (Cons 1) -SPure Halibut +markM 4 +cons 1 +halibut -Mark (MNatural 5) -SPure (Cons 0) -SPure Halibut +markM 5 +cons 0 +halibut -Mark (MNatural 6) -SPure (Cons 7) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) +markM 6 +cons 7 +cons 0 +cons 1 +sub +sub +bNE -Mark (MNatural 7) -SPure (Binary Sub) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) +markM 7 +sub +cons 1 +cons 1 +halibut +bNE -Mark (MNatural 8) -SIO OutputChar +markM 8 +outputCS -Mark (MNatural 9) -SPure (Cons 1) -SPure (Cons 4) -Labeled LTop (Branch NE) +markM 9 +cons 1 +cons 4 +bNE -Mark (MNatural 10) +markM 10 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/actual/eta/il/parsed/from-eas/hello4.il b/.output/actual/eta/il/parsed/from-eas/hello4.il index d348d0a6d..4e611db06 100644 --- a/.output/actual/eta/il/parsed/from-eas/hello4.il +++ b/.output/actual/eta/il/parsed/from-eas/hello4.il @@ -1,64 +1,64 @@ -Mark (MNatural 1) -SPure (Cons 0) -SPure (Cons 10) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) +markM 1 +cons 0 +cons 10 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 +cons 32 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 -Mark (MNatural 2) -SPure (Cons 3) -SPure (Cons 1) -SPure (Cons 4) -Labeled LTop (Branch NE) +markM 2 +cons 3 +cons 1 +cons 4 +bNE -Mark (MNatural 3) -SPure (Cons 1) -SPure (Cons 0) -Labeled LTop (Branch NE) +markM 3 +cons 1 +cons 0 +bNE -Mark (MNatural 4) -SPure (Cons 1) -SPure Halibut +markM 4 +cons 1 +halibut -Mark (MNatural 5) -SPure (Cons 0) -SPure Halibut +markM 5 +cons 0 +halibut -Mark (MNatural 6) -SPure (Cons 7) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) +markM 6 +cons 7 +cons 0 +cons 1 +sub +sub +bNE -Mark (MNatural 7) -SPure (Binary Sub) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) +markM 7 +sub +cons 1 +cons 1 +halibut +bNE -Mark (MNatural 8) -SIO OutputChar +markM 8 +outputCS -Mark (MNatural 9) -SPure (Cons 1) -SPure (Cons 4) -Labeled LTop (Branch NE) +markM 9 +cons 1 +cons 4 +bNE -Mark (MNatural 10) +markM 10 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/actual/eta/il/parsed/from-eas/multiply.il b/.output/actual/eta/il/parsed/from-eas/multiply.il index 5430b0af9..ffe9e355c 100644 --- a/.output/actual/eta/il/parsed/from-eas/multiply.il +++ b/.output/actual/eta/il/parsed/from-eas/multiply.il @@ -1,82 +1,82 @@ -Mark (MNatural 1) -SPure (Cons 2) -SPure Halibut -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 2) -SPure (Cons 0) - -Mark (MNatural 3) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 4) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 5) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 6) -SPure (Cons 7) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 7) -SPure (Cons 1) -SPure (Cons 15) -Labeled LTop (Branch NE) - -Mark (MNatural 8) -SPure (Cons 1) -SPure (Binary Sub) - -Mark (MNatural 9) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 10) -SPure (Cons 0) -SPure (Cons 0) -SPure (Cons 3) -SPure (Binary Sub) -SPure Halibut - -Mark (MNatural 11) -SPure (Binary Sub) -SPure (Binary Sub) - -Mark (MNatural 12) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 13) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 14) -SPure (Cons 1) -SPure (Cons 5) -Labeled LTop (Branch NE) - -Mark (MNatural 15) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 16) -SPure (Cons 1) -SPure (Cons 2) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 17) - -Mark (MNatural 0) -End +markM 1 +cons 2 +halibut +cons 2 +halibut + +markM 2 +cons 0 + +markM 3 +cons 2 +halibut + +markM 4 +cons 2 +halibut + +markM 5 +cons 0 +halibut + +markM 6 +cons 7 +cons 0 +cons 1 +sub +sub +bNE + +markM 7 +cons 1 +cons 15 +bNE + +markM 8 +cons 1 +sub + +markM 9 +cons 2 +halibut + +markM 10 +cons 0 +cons 0 +cons 3 +sub +halibut + +markM 11 +sub +sub + +markM 12 +cons 2 +halibut + +markM 13 +cons 2 +halibut + +markM 14 +cons 1 +cons 5 +bNE + +markM 15 +cons 1 +halibut +bNE + +markM 16 +cons 1 +cons 2 +halibut +bNE + +markM 17 + +markM 0 +end diff --git a/.output/actual/eta/il/parsed/from-eas/pip.il b/.output/actual/eta/il/parsed/from-eas/pip.il index f88e592e6..cfed9a247 100644 --- a/.output/actual/eta/il/parsed/from-eas/pip.il +++ b/.output/actual/eta/il/parsed/from-eas/pip.il @@ -1,41 +1,41 @@ -Mark (MNatural 1) -SIO InputChar - -Mark (MNatural 2) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 3) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) - -Mark (MNatural 4) -SPure (Cons 7) -Labeled LTop (Branch NE) - -Mark (MNatural 5) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 6) -SPure (Cons 1) -SPure (Cons 0) -Labeled LTop (Branch NE) - -Mark (MNatural 7) -SIO OutputChar - -Mark (MNatural 8) -SPure (Cons 1) -SPure (Cons 1) -Labeled LTop (Branch NE) - -Mark (MNatural 9) - -Mark (MNatural 0) -End +markM 1 +inputCS + +markM 2 +cons 0 +halibut + +markM 3 +cons 0 +cons 1 +sub +sub + +markM 4 +cons 7 +bNE + +markM 5 +cons 0 +cons 1 +halibut +bNE + +markM 6 +cons 1 +cons 0 +bNE + +markM 7 +outputCS + +markM 8 +cons 1 +cons 1 +bNE + +markM 9 + +markM 0 +end diff --git a/.output/actual/eta/il/parsed/from-eas/pip2.il b/.output/actual/eta/il/parsed/from-eas/pip2.il index e11bc328c..250a029ac 100644 --- a/.output/actual/eta/il/parsed/from-eas/pip2.il +++ b/.output/actual/eta/il/parsed/from-eas/pip2.il @@ -1,29 +1,29 @@ -Mark (MNatural 1) -SIO InputChar -SPure (Cons 0) -SPure Halibut -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -SPure (Cons 2) -Labeled LTop (Branch NE) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) -SPure (Cons 1) -SPure (Cons 0) -Labeled LTop (Branch NE) +markM 1 +inputCS +cons 0 +halibut +cons 0 +cons 1 +sub +sub +cons 2 +bNE +cons 0 +cons 1 +halibut +bNE +cons 1 +cons 0 +bNE -Mark (MNatural 2) -SIO OutputChar -SPure (Cons 1) -SPure (Cons 1) -Labeled LTop (Branch NE) +markM 2 +outputCS +cons 1 +cons 1 +bNE -Mark (MNatural 3) +markM 3 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/actual/eta/il/parsed/from-eas/readnum.il b/.output/actual/eta/il/parsed/from-eas/readnum.il index 00ea65045..94ba518b4 100644 --- a/.output/actual/eta/il/parsed/from-eas/readnum.il +++ b/.output/actual/eta/il/parsed/from-eas/readnum.il @@ -1,184 +1,184 @@ -Mark (MNatural 1) -SIO InputChar - -Mark (MNatural 2) -SPure (Cons 0) -SPure Halibut -SPure (Cons 32) -SPure (Binary Sub) - -Mark (MNatural 3) -SPure (Cons 4) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 4) -SPure (Cons 0) -SPure (Cons 1) -Labeled LTop (Branch NE) -SPure (Cons 1) -Labeled LTop (Branch NE) - -Mark (MNatural 5) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 6) -SPure (Cons 48) -SPure (Binary Sub) - -Mark (MNatural 7) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 8) -SPure (Cons 10) -SPure (Cons 9) -SPure (Cons 1) -SPure (Cons 19) -Labeled LTop (Branch NE) - -Mark (MNatural 9) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 10) -SPure (Binary Sub) -SPure (Binary Sub) - -Mark (MNatural 11) -SIO InputChar - -Mark (MNatural 12) -SPure (Cons 0) -SPure Halibut -SPure (Cons 32) -SPure (Binary Sub) -SPure (Cons 14) -Labeled LTop (Branch NE) - -Mark (MNatural 13) -SPure (Cons 1) -SPure (Cons 17) -Labeled LTop (Branch NE) - -Mark (MNatural 14) -SPure (Cons 0) -SPure Halibut -SPure (Cons 10) -SPure (Binary Sub) -SPure (Cons 16) -Labeled LTop (Branch NE) - -Mark (MNatural 15) -SPure (Cons 1) -SPure (Cons 17) -Labeled LTop (Branch NE) - -Mark (MNatural 16) -SPure (Cons 0) -SPure Halibut -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -SPure (Cons 6) -Labeled LTop (Branch NE) - -Mark (MNatural 17) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 18) -SPure (Cons 1) -SPure (Cons 2) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 19) -SPure (Cons 2) -SPure Halibut -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 20) -SPure (Cons 0) - -Mark (MNatural 21) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 22) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 23) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 24) -SPure (Cons 25) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 25) -SPure (Cons 1) -SPure (Cons 33) -Labeled LTop (Branch NE) - -Mark (MNatural 26) -SPure (Cons 1) -SPure (Binary Sub) - -Mark (MNatural 27) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 28) -SPure (Cons 0) -SPure (Cons 0) -SPure (Cons 3) -SPure (Binary Sub) -SPure Halibut - -Mark (MNatural 29) -SPure (Binary Sub) -SPure (Binary Sub) - -Mark (MNatural 30) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 31) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 32) -SPure (Cons 1) -SPure (Cons 23) -Labeled LTop (Branch NE) - -Mark (MNatural 33) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 34) -SPure (Cons 1) -SPure (Cons 2) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 0) -End +markM 1 +inputCS + +markM 2 +cons 0 +halibut +cons 32 +sub + +markM 3 +cons 4 +cons 0 +cons 1 +sub +sub +bNE + +markM 4 +cons 0 +cons 1 +bNE +cons 1 +bNE + +markM 5 +cons 0 +cons 1 +halibut + +markM 6 +cons 48 +sub + +markM 7 +cons 1 +halibut + +markM 8 +cons 10 +cons 9 +cons 1 +cons 19 +bNE + +markM 9 +cons 0 +cons 1 +halibut + +markM 10 +sub +sub + +markM 11 +inputCS + +markM 12 +cons 0 +halibut +cons 32 +sub +cons 14 +bNE + +markM 13 +cons 1 +cons 17 +bNE + +markM 14 +cons 0 +halibut +cons 10 +sub +cons 16 +bNE + +markM 15 +cons 1 +cons 17 +bNE + +markM 16 +cons 0 +halibut +cons 0 +cons 1 +sub +sub +cons 6 +bNE + +markM 17 +cons 0 +cons 1 +halibut +bNE + +markM 18 +cons 1 +cons 2 +halibut +bNE + +markM 19 +cons 2 +halibut +cons 2 +halibut + +markM 20 +cons 0 + +markM 21 +cons 2 +halibut + +markM 22 +cons 2 +halibut + +markM 23 +cons 0 +halibut + +markM 24 +cons 25 +cons 0 +cons 1 +sub +sub +bNE + +markM 25 +cons 1 +cons 33 +bNE + +markM 26 +cons 1 +sub + +markM 27 +cons 2 +halibut + +markM 28 +cons 0 +cons 0 +cons 3 +sub +halibut + +markM 29 +sub +sub + +markM 30 +cons 2 +halibut + +markM 31 +cons 2 +halibut + +markM 32 +cons 1 +cons 23 +bNE + +markM 33 +cons 1 +halibut +bNE + +markM 34 +cons 1 +cons 2 +halibut +bNE + +markM 0 +end diff --git a/.output/actual/eta/il/parsed/from-eas/reverse.il b/.output/actual/eta/il/parsed/from-eas/reverse.il index def8d566a..424808821 100644 --- a/.output/actual/eta/il/parsed/from-eas/reverse.il +++ b/.output/actual/eta/il/parsed/from-eas/reverse.il @@ -1,58 +1,58 @@ -Mark (MNatural 1) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) - -Mark (MNatural 2) -SIO InputChar - -Mark (MNatural 3) -SPure (Cons 0) -SPure Halibut -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -SPure (Cons 2) -Labeled LTop (Branch NE) - -Mark (MNatural 4) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 5) -SPure (Cons 0) -SPure Halibut -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -SPure (Cons 6) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 6) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) -SPure (Cons 1) -SPure (Cons 0) -Labeled LTop (Branch NE) - -Mark (MNatural 7) -SIO OutputChar -SPure (Cons 1) -SPure (Cons 5) -Labeled LTop (Branch NE) - -Mark (MNatural 8) - -Mark (MNatural 0) -End +markM 1 +cons 0 +cons 1 +sub + +markM 2 +inputCS + +markM 3 +cons 0 +halibut +cons 0 +cons 1 +sub +sub +cons 2 +bNE + +markM 4 +cons 0 +cons 1 +halibut +bNE + +markM 5 +cons 0 +halibut +cons 0 +cons 1 +sub +sub +cons 6 +cons 0 +cons 1 +sub +sub +bNE + +markM 6 +cons 0 +cons 1 +halibut +bNE +cons 1 +cons 0 +bNE + +markM 7 +outputCS +cons 1 +cons 5 +bNE + +markM 8 + +markM 0 +end diff --git a/.output/actual/eta/il/parsed/from-eas/true.il b/.output/actual/eta/il/parsed/from-eas/true.il index 1dba14281..9dbe29fbb 100644 --- a/.output/actual/eta/il/parsed/from-eas/true.il +++ b/.output/actual/eta/il/parsed/from-eas/true.il @@ -1,5 +1,5 @@ -Mark (MNatural 1) +markM 1 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/actual/eta/il/parsed/from-eas/writenum.il b/.output/actual/eta/il/parsed/from-eas/writenum.il index 10bae4d99..7001339ea 100644 --- a/.output/actual/eta/il/parsed/from-eas/writenum.il +++ b/.output/actual/eta/il/parsed/from-eas/writenum.il @@ -1,111 +1,111 @@ -Mark (MNatural 1) -SPure (Cons 0) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 2) -SPure (Cons 0) -SPure Halibut -SPure (Cons 3) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 3) -SPure (Cons 48) -SIO OutputChar -Labeled LTop (Branch NE) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 4) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 5) -SPure (Cons 6) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 6) -SPure (Binary Sub) -SPure (Cons 1) -SPure (Cons 11) -Labeled LTop (Branch NE) - -Mark (MNatural 7) -SPure (Cons 10) -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "7") - -Mark (MNatural 8) -SPure (Cons 0) -SPure (Cons 48) -SPure (Binary Sub) -SPure (Binary Sub) - -Mark (MNatural 9) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 10) -SPure (Cons 1) -SPure (Cons 4) -Labeled LTop (Branch NE) - -Mark (MNatural 11) -SPure (Cons 12) -SPure (Cons 1) -SPure (Cons 13) -Labeled LTop (Branch NE) - -Mark (MNatural 12) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 13) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 14) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 15) -SPure (Cons 16) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 16) -SPure (Binary Sub) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 17) -SIO OutputChar - -Mark (MNatural 18) -SPure (Cons 1) -SPure (Cons 13) -Labeled LTop (Branch NE) - -Mark (MNatural 19) - -Mark (MNatural 0) -End +markM 1 +cons 0 +cons 2 +halibut + +markM 2 +cons 0 +halibut +cons 3 +cons 0 +cons 1 +sub +sub +bNE + +markM 3 +cons 48 +outputCS +bNE +cons 1 +cons 1 +halibut +bNE + +markM 4 +cons 0 +halibut + +markM 5 +cons 6 +cons 0 +cons 1 +sub +sub +bNE + +markM 6 +sub +cons 1 +cons 11 +bNE + +markM 7 +cons 10 +moddiv + +markA "7" + +markM 8 +cons 0 +cons 48 +sub +sub + +markM 9 +cons 1 +halibut + +markM 10 +cons 1 +cons 4 +bNE + +markM 11 +cons 12 +cons 1 +cons 13 +bNE + +markM 12 +cons 1 +cons 1 +halibut +bNE + +markM 13 +cons 1 +halibut + +markM 14 +cons 0 +halibut + +markM 15 +cons 16 +cons 0 +cons 1 +sub +sub +bNE + +markM 16 +sub +cons 1 +cons 1 +halibut +bNE + +markM 17 +outputCS + +markM 18 +cons 1 +cons 13 +bNE + +markM 19 + +markM 0 +end diff --git a/.output/actual/eta/il/parsed/from-eas/writestr.il b/.output/actual/eta/il/parsed/from-eas/writestr.il index c9a375218..683f571b4 100644 --- a/.output/actual/eta/il/parsed/from-eas/writestr.il +++ b/.output/actual/eta/il/parsed/from-eas/writestr.il @@ -1,36 +1,36 @@ -Mark (MNatural 1) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 2) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 3) -SPure (Cons 4) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 4) -SPure (Binary Sub) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 5) -SIO OutputChar - -Mark (MNatural 6) -SPure (Cons 1) -SPure (Cons 1) -Labeled LTop (Branch NE) - -Mark (MNatural 7) - -Mark (MNatural 0) -End +markM 1 +cons 1 +halibut + +markM 2 +cons 0 +halibut + +markM 3 +cons 4 +cons 0 +cons 1 +sub +sub +bNE + +markM 4 +sub +cons 1 +cons 1 +halibut +bNE + +markM 5 +outputCS + +markM 6 +cons 1 +cons 1 +bNE + +markM 7 + +markM 0 +end diff --git a/.output/actual/eta/il/parsed/original/bottles.il b/.output/actual/eta/il/parsed/original/bottles.il index 7d2744f4a..6e705bafd 100644 --- a/.output/actual/eta/il/parsed/original/bottles.il +++ b/.output/actual/eta/il/parsed/original/bottles.il @@ -1,402 +1,402 @@ -Mark (MNatural 1) -SPure (Cons 141) -SPure (Cons 32) -Labeled LTop (Branch NE) -SIO OutputChar -SPure (Cons 155) -SPure (Binary Sub) -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "1") -Labeled LTop (Branch NE) -SPure (Cons 2) -SIO InputChar -Labeled LTop (Branch NE) -Labeled LTop (Branch NE) -SPure (Binaries [Mod,Div]) -SPure (Cons 4) -Labeled LTop (Branch NE) -SPure (Cons 2) -SIO OutputChar - -Mark (MNatural 2) -SPure (Cons 1) -SPure Halibut -SPure (Cons 1) -SPure (Cons 3) -Labeled LTop (Branch NE) -SPure (Binary Sub) -SPure (Cons 3) -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "2") -SIO InputChar -SIO OutputChar -SPure (Binaries [Mod,Div]) -SIO InputChar -Labeled LTop (Branch NE) -SPure (Binary Sub) -SPure Halibut -SPure (Cons 3) -SPure (Cons 3) -Labeled LTop (Branch NE) -SPure (Binaries [Mod,Div]) -SIO InputChar -SPure (Binary Sub) -Labeled LTop (Branch NE) -SIO InputChar -SIO OutputChar -SIO OutputChar - -Mark (MNatural 3) -SPure (Cons 0) -SPure Halibut -SPure (Cons 1) -SPure (Cons 4) -Labeled LTop (Branch NE) -SPure (Binary Sub) -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "3") -SPure (Binary Sub) -Labeled LTop (Branch NE) -SPure (Binary Sub) -SIO InputChar -Labeled LTop (Branch NE) -SPure (Binary Sub) -SPure (Cons 18828800) -SPure (Cons 4) - -Mark (MNatural 4) -SPure (Cons 5) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 5) -SPure (Binary Sub) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 6) -SIO OutputChar - -Mark (MNatural 7) -SPure (Cons 1) -SPure (Cons 2) -Labeled LTop (Branch NE) - -Mark (MNatural 8) -SPure (Cons 0) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 9) -SPure (Cons 0) -SPure Halibut -SPure (Cons 10) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 10) -SPure (Cons 48) -SIO OutputChar -Labeled LTop (Branch NE) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 11) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 12) -SPure (Cons 13) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 13) -SPure (Binary Sub) -SPure (Cons 1) -SPure (Cons 18) -Labeled LTop (Branch NE) - -Mark (MNatural 14) -SPure (Cons 10) -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "14") - -Mark (MNatural 15) -SPure (Cons 0) -SPure (Cons 48) -SPure (Binary Sub) -SPure (Binary Sub) - -Mark (MNatural 16) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 17) -SPure (Cons 1) -SPure (Cons 11) -Labeled LTop (Branch NE) -SPure (Cons 18) -SPure (Cons 11) -SPure (Cons 18) -SPure (Cons 13128773) -SPure (Cons 1) -SPure Halibut -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 18) -SPure (Cons 19) -SPure (Cons 1) -SPure (Cons 2) -Labeled LTop (Branch NE) - -Mark (MNatural 19) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 20) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 21) -SPure (Cons 22) -SPure (Cons 1) -SPure (Cons 8) -Labeled LTop (Branch NE) - -Mark (MNatural 22) -SPure (Cons 0) -SPure (Cons 114) -SPure (Cons 101) -SPure (Cons 101) -SPure (Cons 98) -SPure (Cons 32) -SPure (Cons 102) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 1) -SPure (Cons 23) -Labeled LTop (Branch NE) -SPure (Cons 2348471754576) -Labeled (LArtificial "23") Jump - -Mark (MNatural 23) -SPure (Cons 115) -SPure (Cons 101) -SPure (Cons 108) -SPure (Cons 116) -SPure (Cons 116) -SPure (Cons 111) -SPure (Cons 98) -SPure (Cons 32) -SPure (Cons 1) -SPure (Cons 24) -Labeled LTop (Branch NE) -SPure (Cons 335495964812) -Labeled (LArtificial "24") Jump - -Mark (MNatural 24) -SPure (Cons 25) -SPure (Cons 1) -SPure (Cons 2) -Labeled LTop (Branch NE) - -Mark (MNatural 25) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 26) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 27) -SPure (Cons 28) -SPure (Cons 1) -SPure (Cons 20) -Labeled LTop (Branch NE) - -Mark (MNatural 28) -SPure (Cons 0) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 97) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 1) -SPure (Cons 29) -Labeled LTop (Branch NE) -SPure (Cons 2348471754565) -Labeled (LArtificial "29") Jump - -Mark (MNatural 29) -SPure (Cons 104) -SPure (Cons 116) -SPure (Cons 32) -SPure (Cons 110) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 1) -SPure (Cons 30) -Labeled LTop (Branch NE) -SPure (Cons 335495964812) -Labeled (LArtificial "30") Jump - -Mark (MNatural 30) -SPure (Cons 31) -SPure (Cons 1) -SPure (Cons 2) -Labeled LTop (Branch NE) - -Mark (MNatural 31) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) -SIO InputChar -Labeled LTop (Branch NE) -SPure (Cons 0) -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "31") -SPure (Binary Sub) -SPure (Cons 32) -Labeled LTop (Branch NE) -SPure (Binaries [Mod,Div]) -SIO InputChar -SPure (Cons 402523) -SPure (Binaries [Mod,Div]) -SIO InputChar -SPure (Cons 1814) -Labeled (LArtificial "32") Jump - -Mark (MNatural 32) -SPure (Cons 99) - -Mark (MNatural 33) -SPure (Cons 0) -SPure Halibut -SPure (Cons 34) -SPure (Cons 1) -SPure (Cons 26) -Labeled LTop (Branch NE) - -Mark (MNatural 34) -SPure (Cons 44) -SIO OutputChar -SPure (Cons 32) -SIO OutputChar - -Mark (MNatural 35) -SPure (Cons 0) -SPure Halibut -SPure (Cons 36) -SPure (Cons 1) -SPure (Cons 20) -Labeled LTop (Branch NE) - -Mark (MNatural 36) -SPure (Cons 10) -SIO OutputChar - -Mark (MNatural 37) -SPure (Cons 0) -SPure (Cons 10) -SPure (Cons 100) -SPure (Cons 110) -SPure (Cons 117) -SPure (Cons 111) - -Mark (MNatural 38) -SPure (Cons 114) -SPure (Cons 97) -SPure (Cons 32) -SPure (Cons 116) -SPure (Cons 105) -SPure (Cons 32) - -Mark (MNatural 39) -SPure (Cons 115) -SPure (Cons 115) -SPure (Cons 97) -SPure (Cons 112) -SPure (Cons 32) -SPure (Cons 44) - -Mark (MNatural 40) -SPure (Cons 110) -SPure (Cons 119) -SPure (Cons 111) -SPure (Cons 100) -SPure (Cons 32) -SPure (Cons 101) - -Mark (MNatural 41) -SPure (Cons 110) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 107) -SPure (Cons 97) -SPure (Cons 84) - -Mark (MNatural 42) -SPure (Cons 43) -SPure (Cons 1) -SPure (Cons 2) -Labeled LTop (Branch NE) - -Mark (MNatural 43) -SPure (Cons 1) -SPure (Binary Sub) - -Mark (MNatural 44) -SPure (Cons 0) -SPure Halibut -SPure (Cons 45) -SPure (Cons 1) -SPure (Cons 26) -Labeled LTop (Branch NE) - -Mark (MNatural 45) -SPure (Cons 10) -SPure (Cons 10) -SIO OutputChar -SIO OutputChar - -Mark (MNatural 46) -SPure (Cons 0) -SPure Halibut -SPure (Cons 33) -Labeled LTop (Branch NE) - -Mark (MNatural 47) -SPure (Cons 0) -Labeled LTop (Branch NE) - -Mark (MNatural 48) - -Mark (MNatural 0) -End +markM 1 +cons 141 +cons 32 +bNE +outputCS +cons 155 +sub +moddiv + +markA "1" +bNE +cons 2 +inputCS +bNE +bNE +moddiv +cons 4 +bNE +cons 2 +outputCS + +markM 2 +cons 1 +halibut +cons 1 +cons 3 +bNE +sub +cons 3 +moddiv + +markA "2" +inputCS +outputCS +moddiv +inputCS +bNE +sub +halibut +cons 3 +cons 3 +bNE +moddiv +inputCS +sub +bNE +inputCS +outputCS +outputCS + +markM 3 +cons 0 +halibut +cons 1 +cons 4 +bNE +sub +moddiv + +markA "3" +sub +bNE +sub +inputCS +bNE +sub +cons 18828800 +cons 4 + +markM 4 +cons 5 +cons 0 +cons 1 +sub +sub +bNE + +markM 5 +sub +cons 1 +cons 1 +halibut +bNE + +markM 6 +outputCS + +markM 7 +cons 1 +cons 2 +bNE + +markM 8 +cons 0 +cons 2 +halibut + +markM 9 +cons 0 +halibut +cons 10 +cons 0 +cons 1 +sub +sub +bNE + +markM 10 +cons 48 +outputCS +bNE +cons 1 +cons 1 +halibut +bNE + +markM 11 +cons 0 +halibut + +markM 12 +cons 13 +cons 0 +cons 1 +sub +sub +bNE + +markM 13 +sub +cons 1 +cons 18 +bNE + +markM 14 +cons 10 +moddiv + +markA "14" + +markM 15 +cons 0 +cons 48 +sub +sub + +markM 16 +cons 1 +halibut + +markM 17 +cons 1 +cons 11 +bNE +cons 18 +cons 11 +cons 18 +cons 13128773 +cons 1 +halibut +sub +bNE + +markM 18 +cons 19 +cons 1 +cons 2 +bNE + +markM 19 +cons 1 +cons 1 +halibut +bNE + +markM 20 +cons 1 +halibut + +markM 21 +cons 22 +cons 1 +cons 8 +bNE + +markM 22 +cons 0 +cons 114 +cons 101 +cons 101 +cons 98 +cons 32 +cons 102 +cons 111 +cons 32 +cons 1 +cons 23 +bNE +cons 2348471754576 +jumpA "23" + +markM 23 +cons 115 +cons 101 +cons 108 +cons 116 +cons 116 +cons 111 +cons 98 +cons 32 +cons 1 +cons 24 +bNE +cons 335495964812 +jumpA "24" + +markM 24 +cons 25 +cons 1 +cons 2 +bNE + +markM 25 +cons 1 +cons 1 +halibut +bNE + +markM 26 +cons 1 +halibut + +markM 27 +cons 28 +cons 1 +cons 20 +bNE + +markM 28 +cons 0 +cons 108 +cons 108 +cons 97 +cons 119 +cons 32 +cons 101 +cons 1 +cons 29 +bNE +cons 2348471754565 +jumpA "29" + +markM 29 +cons 104 +cons 116 +cons 32 +cons 110 +cons 111 +cons 32 +cons 1 +cons 30 +bNE +cons 335495964812 +jumpA "30" + +markM 30 +cons 31 +cons 1 +cons 2 +bNE + +markM 31 +cons 1 +cons 1 +halibut +bNE +inputCS +bNE +cons 0 +moddiv + +markA "31" +sub +cons 32 +bNE +moddiv +inputCS +cons 402523 +moddiv +inputCS +cons 1814 +jumpA "32" + +markM 32 +cons 99 + +markM 33 +cons 0 +halibut +cons 34 +cons 1 +cons 26 +bNE + +markM 34 +cons 44 +outputCS +cons 32 +outputCS + +markM 35 +cons 0 +halibut +cons 36 +cons 1 +cons 20 +bNE + +markM 36 +cons 10 +outputCS + +markM 37 +cons 0 +cons 10 +cons 100 +cons 110 +cons 117 +cons 111 + +markM 38 +cons 114 +cons 97 +cons 32 +cons 116 +cons 105 +cons 32 + +markM 39 +cons 115 +cons 115 +cons 97 +cons 112 +cons 32 +cons 44 + +markM 40 +cons 110 +cons 119 +cons 111 +cons 100 +cons 32 +cons 101 + +markM 41 +cons 110 +cons 111 +cons 32 +cons 101 +cons 107 +cons 97 +cons 84 + +markM 42 +cons 43 +cons 1 +cons 2 +bNE + +markM 43 +cons 1 +sub + +markM 44 +cons 0 +halibut +cons 45 +cons 1 +cons 26 +bNE + +markM 45 +cons 10 +cons 10 +outputCS +outputCS + +markM 46 +cons 0 +halibut +cons 33 +bNE + +markM 47 +cons 0 +bNE + +markM 48 + +markM 0 +end diff --git a/.output/actual/eta/il/parsed/original/crlf.il b/.output/actual/eta/il/parsed/original/crlf.il index b6267aaa6..f972991ea 100644 --- a/.output/actual/eta/il/parsed/original/crlf.il +++ b/.output/actual/eta/il/parsed/original/crlf.il @@ -1,51 +1,51 @@ -Mark (MNatural 1) -SPure (Cons 1) -SPure (Cons 3) -Labeled LTop (Branch NE) +markM 1 +cons 1 +cons 3 +bNE -Mark (MNatural 2) -SPure (Cons 10) -SPure (Cons 49) -SPure (Cons 68) -SPure (Cons 65) -SPure (Cons 66) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SPure (Cons 1) -SPure (Cons 0) -Labeled LTop (Branch NE) +markM 2 +cons 10 +cons 49 +cons 68 +cons 65 +cons 66 +outputCS +outputCS +outputCS +outputCS +outputCS +cons 1 +cons 0 +bNE -Mark (MNatural 3) -SPure (Cons 10) -SPure (Cons 75) -SPure (Cons 79) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SPure (Cons 1) -SPure (Cons 0) -Labeled LTop (Branch NE) +markM 3 +cons 10 +cons 75 +cons 79 +outputCS +outputCS +outputCS +cons 1 +cons 0 +bNE -Mark (MNatural 4) -SPure (Cons 10) -SPure (Cons 50) -SPure (Cons 68) -SPure (Cons 65) -SPure (Cons 66) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SPure (Cons 1) -SPure (Cons 0) -Labeled LTop (Branch NE) +markM 4 +cons 10 +cons 50 +cons 68 +cons 65 +cons 66 +outputCS +outputCS +outputCS +outputCS +outputCS +cons 1 +cons 0 +bNE -Mark (MNatural 5) +markM 5 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/actual/eta/il/parsed/original/fact.il b/.output/actual/eta/il/parsed/original/fact.il index 5a4ec05e1..53fd62add 100644 --- a/.output/actual/eta/il/parsed/original/fact.il +++ b/.output/actual/eta/il/parsed/original/fact.il @@ -1,359 +1,359 @@ -Mark (MNatural 1) -SPure (Cons 2) -SPure (Cons 1) -SPure (Cons 14) -Labeled LTop (Branch NE) - -Mark (MNatural 2) -SPure (Cons 3) -SPure (Cons 1) -SPure (Cons 5) -Labeled LTop (Branch NE) - -Mark (MNatural 3) -SPure (Cons 4) -SPure (Cons 1) -SPure (Cons 32) -Labeled LTop (Branch NE) - -Mark (MNatural 4) -SPure (Cons 10) -SIO OutputChar -SPure (Cons 1) -SPure (Cons 0) -Labeled LTop (Branch NE) - -Mark (MNatural 5) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 6) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 7) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Cons 8) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 8) -SPure (Cons 1) -SPure (Cons 13) -Labeled LTop (Branch NE) - -Mark (MNatural 9) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 10) -SPure (Cons 1) -SPure (Binary Sub) - -Mark (MNatural 11) -SPure (Cons 12) -SPure (Cons 1) -SPure (Cons 5) -Labeled LTop (Branch NE) - -Mark (MNatural 12) -SPure (Cons 13) -SPure (Cons 1) -SPure (Cons 42) -Labeled LTop (Branch NE) - -Mark (MNatural 13) -SPure (Cons 1) -SPure (Cons 2) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 14) -SIO InputChar - -Mark (MNatural 15) -SPure (Cons 0) -SPure Halibut -SPure (Cons 32) -SPure (Binary Sub) - -Mark (MNatural 16) -SPure (Cons 17) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 17) -SPure (Cons 0) -SPure (Cons 1) -Labeled LTop (Branch NE) -SPure (Cons 14) -Labeled LTop (Branch NE) - -Mark (MNatural 18) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 19) -SPure (Cons 48) -SPure (Binary Sub) - -Mark (MNatural 20) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 21) -SPure (Cons 10) -SPure (Cons 22) -SPure (Cons 1) -SPure (Cons 42) -Labeled LTop (Branch NE) -SPure (Binary Sub) -Labeled LTop (Branch NE) -SPure Halibut -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "21") -SPure (Cons 22) -SPure (Binaries [Mod,Div]) -Labeled LTop (Branch NE) -SIO InputChar -Labeled LTop (Branch NE) -SPure (Binaries [Mod,Div]) - -Mark (MNatural 22) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 23) -SPure (Binary Sub) -SPure (Binary Sub) - -Mark (MNatural 24) -SIO InputChar - -Mark (MNatural 25) -SPure (Cons 0) -SPure Halibut -SPure (Cons 32) -SPure (Binary Sub) -SPure (Cons 27) -Labeled LTop (Branch NE) - -Mark (MNatural 26) -SPure (Cons 1) -SPure (Cons 30) -Labeled LTop (Branch NE) - -Mark (MNatural 27) -SPure (Cons 0) -SPure Halibut -SPure (Cons 10) -SPure (Binary Sub) -SPure (Cons 29) -Labeled LTop (Branch NE) - -Mark (MNatural 28) -SPure (Cons 1) -SPure (Cons 30) -Labeled LTop (Branch NE) - -Mark (MNatural 29) -SPure (Cons 0) -SPure Halibut -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -SPure (Cons 19) -Labeled LTop (Branch NE) - -Mark (MNatural 30) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 31) -SPure (Cons 1) -SPure (Cons 2) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 32) -SPure (Cons 0) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 33) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 34) -SPure (Cons 35) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 35) -SPure (Binary Sub) -SPure (Cons 1) -SPure (Cons 40) -Labeled LTop (Branch NE) - -Mark (MNatural 36) -SPure (Cons 10) -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "36") - -Mark (MNatural 37) -SPure (Cons 0) -SPure (Cons 48) -SPure (Binary Sub) -SPure (Binary Sub) - -Mark (MNatural 38) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 39) -SPure (Cons 1) -SPure (Cons 33) -Labeled LTop (Branch NE) - -Mark (MNatural 40) -SPure (Cons 41) -SPure (Cons 1) -SPure (Cons 58) -Labeled LTop (Branch NE) - -Mark (MNatural 41) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 42) -SPure (Cons 2) -SPure Halibut -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 43) -SPure (Cons 0) - -Mark (MNatural 44) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 45) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 46) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 47) -SPure (Cons 48) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 48) -SPure (Cons 1) -SPure (Cons 56) -Labeled LTop (Branch NE) - -Mark (MNatural 49) -SPure (Cons 1) -SPure (Binary Sub) - -Mark (MNatural 50) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 51) -SPure (Cons 0) -SPure (Cons 0) -SPure (Cons 3) -SPure (Binary Sub) -SPure Halibut - -Mark (MNatural 52) -SPure (Binary Sub) -SPure (Binary Sub) - -Mark (MNatural 53) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 54) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 55) -SPure (Cons 1) -SPure (Cons 46) -Labeled LTop (Branch NE) - -Mark (MNatural 56) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 57) -SPure (Cons 1) -SPure (Cons 2) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 58) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 59) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 60) -SPure (Cons 61) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 61) -SPure (Binary Sub) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 62) -SIO OutputChar - -Mark (MNatural 63) -SPure (Cons 1) -SPure (Cons 58) -Labeled LTop (Branch NE) - -Mark (MNatural 64) - -Mark (MNatural 0) -End +markM 1 +cons 2 +cons 1 +cons 14 +bNE + +markM 2 +cons 3 +cons 1 +cons 5 +bNE + +markM 3 +cons 4 +cons 1 +cons 32 +bNE + +markM 4 +cons 10 +outputCS +cons 1 +cons 0 +bNE + +markM 5 +cons 1 +halibut + +markM 6 +cons 0 +halibut + +markM 7 +cons 1 +sub +cons 8 +cons 0 +cons 1 +sub +sub +bNE + +markM 8 +cons 1 +cons 13 +bNE + +markM 9 +cons 0 +halibut + +markM 10 +cons 1 +sub + +markM 11 +cons 12 +cons 1 +cons 5 +bNE + +markM 12 +cons 13 +cons 1 +cons 42 +bNE + +markM 13 +cons 1 +cons 2 +halibut +bNE + +markM 14 +inputCS + +markM 15 +cons 0 +halibut +cons 32 +sub + +markM 16 +cons 17 +cons 0 +cons 1 +sub +sub +bNE + +markM 17 +cons 0 +cons 1 +bNE +cons 14 +bNE + +markM 18 +cons 0 +cons 1 +halibut + +markM 19 +cons 48 +sub + +markM 20 +cons 1 +halibut + +markM 21 +cons 10 +cons 22 +cons 1 +cons 42 +bNE +sub +bNE +halibut +moddiv + +markA "21" +cons 22 +moddiv +bNE +inputCS +bNE +moddiv + +markM 22 +cons 0 +cons 1 +halibut + +markM 23 +sub +sub + +markM 24 +inputCS + +markM 25 +cons 0 +halibut +cons 32 +sub +cons 27 +bNE + +markM 26 +cons 1 +cons 30 +bNE + +markM 27 +cons 0 +halibut +cons 10 +sub +cons 29 +bNE + +markM 28 +cons 1 +cons 30 +bNE + +markM 29 +cons 0 +halibut +cons 0 +cons 1 +sub +sub +cons 19 +bNE + +markM 30 +cons 0 +cons 1 +halibut +bNE + +markM 31 +cons 1 +cons 2 +halibut +bNE + +markM 32 +cons 0 +cons 2 +halibut + +markM 33 +cons 0 +halibut + +markM 34 +cons 35 +cons 0 +cons 1 +sub +sub +bNE + +markM 35 +sub +cons 1 +cons 40 +bNE + +markM 36 +cons 10 +moddiv + +markA "36" + +markM 37 +cons 0 +cons 48 +sub +sub + +markM 38 +cons 1 +halibut + +markM 39 +cons 1 +cons 33 +bNE + +markM 40 +cons 41 +cons 1 +cons 58 +bNE + +markM 41 +cons 1 +cons 1 +halibut +bNE + +markM 42 +cons 2 +halibut +cons 2 +halibut + +markM 43 +cons 0 + +markM 44 +cons 2 +halibut + +markM 45 +cons 2 +halibut + +markM 46 +cons 0 +halibut + +markM 47 +cons 48 +cons 0 +cons 1 +sub +sub +bNE + +markM 48 +cons 1 +cons 56 +bNE + +markM 49 +cons 1 +sub + +markM 50 +cons 2 +halibut + +markM 51 +cons 0 +cons 0 +cons 3 +sub +halibut + +markM 52 +sub +sub + +markM 53 +cons 2 +halibut + +markM 54 +cons 2 +halibut + +markM 55 +cons 1 +cons 46 +bNE + +markM 56 +cons 1 +halibut +bNE + +markM 57 +cons 1 +cons 2 +halibut +bNE + +markM 58 +cons 1 +halibut + +markM 59 +cons 0 +halibut + +markM 60 +cons 61 +cons 0 +cons 1 +sub +sub +bNE + +markM 61 +sub +cons 1 +cons 1 +halibut +bNE + +markM 62 +outputCS + +markM 63 +cons 1 +cons 58 +bNE + +markM 64 + +markM 0 +end diff --git a/.output/actual/eta/il/parsed/original/hello.il b/.output/actual/eta/il/parsed/original/hello.il index 2e860d314..16b560000 100644 --- a/.output/actual/eta/il/parsed/original/hello.il +++ b/.output/actual/eta/il/parsed/original/hello.il @@ -1,84 +1,84 @@ -Mark (MNatural 1) -SPure (Cons 21) -SPure (Cons 2) -Labeled LTop (Branch NE) -SPure Halibut -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "1") -SIO OutputChar -SPure (Binaries [Mod,Div]) -Labeled LTop (Branch NE) -SPure (Cons 2) -SIO InputChar -Labeled LTop (Branch NE) -Labeled LTop (Branch NE) -SPure (Binaries [Mod,Div]) -SPure (Cons 4) -Labeled LTop (Branch NE) -SPure (Cons 2) -SIO OutputChar - -Mark (MNatural 2) - -Mark (MNatural 3) -SPure (Cons 32) - -Mark (MNatural 4) -SPure (Cons 44) -SPure (Cons 111) -Labeled (LArtificial "5") Jump - -Mark (MNatural 5) -Labeled LTop (Branch NE) -SPure (Binary Sub) -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "5") - -Mark (MNatural 6) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) - -Mark (MNatural 7) -SPure (Cons 72) -SPure (Cons 0) -SPure (Binary Sub) - -Mark (MNatural 8) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar - -Mark (MNatural 9) -SPure (Cons 10) - -Mark (MNatural 10) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) - -Mark (MNatural 11) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) - -Mark (MNatural 12) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar - -Mark (MNatural 13) - -Mark (MNatural 0) -End +markM 1 +cons 21 +cons 2 +bNE +halibut +moddiv + +markA "1" +outputCS +moddiv +bNE +cons 2 +inputCS +bNE +bNE +moddiv +cons 4 +bNE +cons 2 +outputCS + +markM 2 + +markM 3 +cons 32 + +markM 4 +cons 44 +cons 111 +jumpA "5" + +markM 5 +bNE +sub +moddiv + +markA "5" + +markM 6 +cons 108 +cons 108 +cons 101 + +markM 7 +cons 72 +cons 0 +sub + +markM 8 +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS + +markM 9 +cons 10 + +markM 10 +cons 33 +cons 100 +cons 108 + +markM 11 +cons 114 +cons 111 +cons 119 + +markM 12 +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS + +markM 13 + +markM 0 +end diff --git a/.output/actual/eta/il/parsed/original/hello2.il b/.output/actual/eta/il/parsed/original/hello2.il index d82002f32..f5205a987 100644 --- a/.output/actual/eta/il/parsed/original/hello2.il +++ b/.output/actual/eta/il/parsed/original/hello2.il @@ -1,80 +1,80 @@ -Mark (MNatural 1) -SPure (Cons 0) -SPure (Cons 10) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) -SPure (Cons 32) +markM 1 +cons 0 +cons 10 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 +cons 32 -Mark (MNatural 2) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) -SPure (Cons 3) -SPure (Cons 1) -SPure (Cons 4) -Labeled LTop (Branch NE) +markM 2 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 +cons 3 +cons 1 +cons 4 +bNE -Mark (MNatural 3) -SPure (Cons 1) -SPure (Cons 0) -Labeled LTop (Branch NE) -SPure (Cons 4) -SPure (Cons 22) -Labeled LTop (Branch NE) -SIO InputChar -SPure (Binary Sub) -Labeled LTop (Branch NE) -SIO OutputChar -SIO OutputChar -SPure (Binaries [Mod,Div]) +markM 3 +cons 1 +cons 0 +bNE +cons 4 +cons 22 +bNE +inputCS +sub +bNE +outputCS +outputCS +moddiv -Mark (MArtificial "3") -SPure (Cons 4) -Labeled LTop (Branch NE) -SIO InputChar -SPure (Cons 337) -SPure (Binary Sub) +markA "3" +cons 4 +bNE +inputCS +cons 337 +sub -Mark (MNatural 4) -SPure (Cons 1) -SPure Halibut -SPure (Cons 0) -SPure Halibut -SPure (Cons 5) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) +markM 4 +cons 1 +halibut +cons 0 +halibut +cons 5 +cons 0 +cons 1 +sub +sub +bNE -Mark (MNatural 5) -SPure (Binary Sub) -SPure (Cons 11) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) +markM 5 +sub +cons 11 +cons 1 +halibut +bNE -Mark (MNatural 6) -SIO OutputChar -SPure (Cons 7) -SPure (Cons 4) -Labeled LTop (Branch NE) -SPure (Binary Sub) -SPure (Binary Sub) -SIO InputChar -SPure (Cons 7) -SPure (Cons 0) -Labeled (LArtificial "7") Jump +markM 6 +outputCS +cons 7 +cons 4 +bNE +sub +sub +inputCS +cons 7 +cons 0 +jumpA "7" -Mark (MNatural 7) +markM 7 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/actual/eta/il/parsed/original/pip.il b/.output/actual/eta/il/parsed/original/pip.il index f88e592e6..cfed9a247 100644 --- a/.output/actual/eta/il/parsed/original/pip.il +++ b/.output/actual/eta/il/parsed/original/pip.il @@ -1,41 +1,41 @@ -Mark (MNatural 1) -SIO InputChar - -Mark (MNatural 2) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 3) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) - -Mark (MNatural 4) -SPure (Cons 7) -Labeled LTop (Branch NE) - -Mark (MNatural 5) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 6) -SPure (Cons 1) -SPure (Cons 0) -Labeled LTop (Branch NE) - -Mark (MNatural 7) -SIO OutputChar - -Mark (MNatural 8) -SPure (Cons 1) -SPure (Cons 1) -Labeled LTop (Branch NE) - -Mark (MNatural 9) - -Mark (MNatural 0) -End +markM 1 +inputCS + +markM 2 +cons 0 +halibut + +markM 3 +cons 0 +cons 1 +sub +sub + +markM 4 +cons 7 +bNE + +markM 5 +cons 0 +cons 1 +halibut +bNE + +markM 6 +cons 1 +cons 0 +bNE + +markM 7 +outputCS + +markM 8 +cons 1 +cons 1 +bNE + +markM 9 + +markM 0 +end diff --git a/.output/actual/eta/il/parsed/original/pip2.il b/.output/actual/eta/il/parsed/original/pip2.il index e11bc328c..250a029ac 100644 --- a/.output/actual/eta/il/parsed/original/pip2.il +++ b/.output/actual/eta/il/parsed/original/pip2.il @@ -1,29 +1,29 @@ -Mark (MNatural 1) -SIO InputChar -SPure (Cons 0) -SPure Halibut -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -SPure (Cons 2) -Labeled LTop (Branch NE) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) -SPure (Cons 1) -SPure (Cons 0) -Labeled LTop (Branch NE) +markM 1 +inputCS +cons 0 +halibut +cons 0 +cons 1 +sub +sub +cons 2 +bNE +cons 0 +cons 1 +halibut +bNE +cons 1 +cons 0 +bNE -Mark (MNatural 2) -SIO OutputChar -SPure (Cons 1) -SPure (Cons 1) -Labeled LTop (Branch NE) +markM 2 +outputCS +cons 1 +cons 1 +bNE -Mark (MNatural 3) +markM 3 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/actual/ws/eval/logged/stn/asciiOff/from-wsa/bottles.logged b/.output/actual/ws/eval/logged/stn/asciiOff/from-wsa/bottles.logged index d7cfefc56..86aed333c 100644 --- a/.output/actual/ws/eval/logged/stn/asciiOff/from-wsa/bottles.logged +++ b/.output/actual/ws/eval/logged/stn/asciiOff/from-wsa/bottles.logged @@ -495,8 +495,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "010011000100111101001111010100000011101000110001" ) ( Branch EZ ) + ( Branch + ( BArtificial "010011000100111101001111010100000011101000110001" ) EZ ) , ICF ( Labeled @@ -518,8 +518,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , ICF diff --git a/.output/actual/ws/eval/logged/stn/asciiOff/from-wsa/hello2.logged b/.output/actual/ws/eval/logged/stn/asciiOff/from-wsa/hello2.logged index d1a6d5412..d5df07010 100644 --- a/.output/actual/ws/eval/logged/stn/asciiOff/from-wsa/hello2.logged +++ b/.output/actual/ws/eval/logged/stn/asciiOff/from-wsa/hello2.logged @@ -77,8 +77,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , ICF diff --git a/.output/actual/ws/eval/logged/stn/asciiOff/from-wsa/hello4.logged b/.output/actual/ws/eval/logged/stn/asciiOff/from-wsa/hello4.logged index f522cf884..57822db3c 100644 --- a/.output/actual/ws/eval/logged/stn/asciiOff/from-wsa/hello4.logged +++ b/.output/actual/ws/eval/logged/stn/asciiOff/from-wsa/hello4.logged @@ -73,8 +73,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , ICF diff --git a/.output/actual/ws/eval/logged/stn/asciiOff/from-wsa/prim.logged b/.output/actual/ws/eval/logged/stn/asciiOff/from-wsa/prim.logged index 20d3e249b..eb1e299a8 100644 --- a/.output/actual/ws/eval/logged/stn/asciiOff/from-wsa/prim.logged +++ b/.output/actual/ws/eval/logged/stn/asciiOff/from-wsa/prim.logged @@ -114,8 +114,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110001" ) ( Branch EZ ) + ( Branch + ( BArtificial "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110001" ) EZ ) , IAL ( SPure @@ -170,8 +170,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110010" ) ( Branch EZ ) + ( Branch + ( BArtificial "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110010" ) EZ ) , IAL ( SPure @@ -194,8 +194,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110011" ) ( Branch EZ ) + ( Branch + ( BArtificial "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110011" ) EZ ) , IAL ( SPure @@ -317,8 +317,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110100" ) EZ ) , IAL ( SPure @@ -334,8 +334,8 @@ dump: Memory ) , ILS Load , ICF - ( Labeled - ( LArtificial "011011100110111101100100011100100110000101110111" ) ( Branch EZ ) + ( Branch + ( BArtificial "011011100110111101100100011100100110000101110111" ) EZ ) , IAL ( SPure @@ -395,8 +395,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , ICF diff --git "a/.output/actual/ws/eval/logged/stn/asciiOff/original/calc-1\n.logged" "b/.output/actual/ws/eval/logged/stn/asciiOff/original/calc-1\n.logged" index e9f52c753..17b015ed3 100644 --- "a/.output/actual/ws/eval/logged/stn/asciiOff/original/calc-1\n.logged" +++ "b/.output/actual/ws/eval/logged/stn/asciiOff/original/calc-1\n.logged" @@ -563,8 +563,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "01110000011100100110111101100111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "01110000011100100110111101100111011001010110111001100100" ) EZ ) , IAL ( SPure @@ -637,8 +637,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -689,8 +689,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git a/.output/actual/ws/eval/logged/stn/asciiOff/original/count.logged b/.output/actual/ws/eval/logged/stn/asciiOff/original/count.logged index 651750622..d940ae1c3 100644 --- a/.output/actual/ws/eval/logged/stn/asciiOff/original/count.logged +++ b/.output/actual/ws/eval/logged/stn/asciiOff/original/count.logged @@ -40,8 +40,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "01000101" ) ( Branch EZ ) + ( Branch + ( BArtificial "01000101" ) EZ ) , ICF ( Labeled @@ -78,8 +78,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -130,8 +130,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/actual/ws/eval/logged/stn/asciiOff/original/fact10\n.logged" "b/.output/actual/ws/eval/logged/stn/asciiOff/original/fact10\n.logged" index c4614275d..68e0a53a4 100644 --- "a/.output/actual/ws/eval/logged/stn/asciiOff/original/fact10\n.logged" +++ "b/.output/actual/ws/eval/logged/stn/asciiOff/original/fact10\n.logged" @@ -258,8 +258,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0110011001100001011000110111010001100010011000010111001101100101" ) ( Branch EZ ) + ( Branch + ( BArtificial "0110011001100001011000110111010001100010011000010111001101100101" ) EZ ) , IAL ( SPure @@ -310,8 +310,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -362,8 +362,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git a/.output/actual/ws/eval/logged/stn/asciiOff/original/hWorld.logged b/.output/actual/ws/eval/logged/stn/asciiOff/original/hWorld.logged index fa789ab5a..e97b97208 100644 --- a/.output/actual/ws/eval/logged/stn/asciiOff/original/hWorld.logged +++ b/.output/actual/ws/eval/logged/stn/asciiOff/original/hWorld.logged @@ -255,8 +255,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -307,8 +307,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/actual/ws/eval/logged/stn/asciiOff/original/hanoi1\n.logged" "b/.output/actual/ws/eval/logged/stn/asciiOff/original/hanoi1\n.logged" index 775a9f355..5fa2fc0ba 100644 --- "a/.output/actual/ws/eval/logged/stn/asciiOff/original/hanoi1\n.logged" +++ "b/.output/actual/ws/eval/logged/stn/asciiOff/original/hanoi1\n.logged" @@ -288,8 +288,8 @@ dump: Memory ) , ILS Load , ICF - ( Labeled - ( LArtificial "0110010101101110011001000110100001100001011011100110111101101001" ) ( Branch EZ ) + ( Branch + ( BArtificial "0110010101101110011001000110100001100001011011100110111101101001" ) EZ ) , IAL ( SPure @@ -533,8 +533,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -585,8 +585,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/actual/ws/eval/logged/stn/asciiOff/original/locTest1\n2\n.logged" "b/.output/actual/ws/eval/logged/stn/asciiOff/original/locTest1\n2\n.logged" index 70c9fcfb0..33c819b5e 100644 --- "a/.output/actual/ws/eval/logged/stn/asciiOff/original/locTest1\n2\n.logged" +++ "b/.output/actual/ws/eval/logged/stn/asciiOff/original/locTest1\n2\n.logged" @@ -246,8 +246,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -298,8 +298,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/actual/ws/eval/logged/stn/asciiOff/original/nameWriteOnly\n.logged" "b/.output/actual/ws/eval/logged/stn/asciiOff/original/nameWriteOnly\n.logged" index 70fcbca32..cbdf9e20e 100644 --- "a/.output/actual/ws/eval/logged/stn/asciiOff/original/nameWriteOnly\n.logged" +++ "b/.output/actual/ws/eval/logged/stn/asciiOff/original/nameWriteOnly\n.logged" @@ -351,8 +351,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -403,8 +403,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/actual/ws/eval/logged/stn/asciiOff/original/truthMachine0\n.logged" "b/.output/actual/ws/eval/logged/stn/asciiOff/original/truthMachine0\n.logged" index ea53b5ca6..e22abd913 100644 --- "a/.output/actual/ws/eval/logged/stn/asciiOff/original/truthMachine0\n.logged" +++ "b/.output/actual/ws/eval/logged/stn/asciiOff/original/truthMachine0\n.logged" @@ -12,8 +12,8 @@ dump: Memory , ILS ( MIO InputDec ) , ILS Load , ICF - ( Labeled - ( LArtificial "0" ) ( Branch EZ ) + ( Branch + ( BArtificial "0" ) EZ ) , ICF ( Mark diff --git a/.output/actual/ws/eval/logged/stn/asciiOn/from-wsa/bottles.logged b/.output/actual/ws/eval/logged/stn/asciiOn/from-wsa/bottles.logged index e68672e95..08d0bb2f9 100644 --- a/.output/actual/ws/eval/logged/stn/asciiOn/from-wsa/bottles.logged +++ b/.output/actual/ws/eval/logged/stn/asciiOn/from-wsa/bottles.logged @@ -495,8 +495,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "LOOP:1" ) ( Branch EZ ) + ( Branch + ( BArtificial "LOOP:1" ) EZ ) , ICF ( Labeled @@ -518,8 +518,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "prints_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "prints_end" ) EZ ) , IAL ( SIO OutputChar ) , ICF diff --git a/.output/actual/ws/eval/logged/stn/asciiOn/from-wsa/hello2.logged b/.output/actual/ws/eval/logged/stn/asciiOn/from-wsa/hello2.logged index dfc401116..132af6fa2 100644 --- a/.output/actual/ws/eval/logged/stn/asciiOn/from-wsa/hello2.logged +++ b/.output/actual/ws/eval/logged/stn/asciiOn/from-wsa/hello2.logged @@ -77,8 +77,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "prints_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "prints_end" ) EZ ) , IAL ( SIO OutputChar ) , ICF diff --git a/.output/actual/ws/eval/logged/stn/asciiOn/from-wsa/hello4.logged b/.output/actual/ws/eval/logged/stn/asciiOn/from-wsa/hello4.logged index fbe810fc3..df008cf1c 100644 --- a/.output/actual/ws/eval/logged/stn/asciiOn/from-wsa/hello4.logged +++ b/.output/actual/ws/eval/logged/stn/asciiOn/from-wsa/hello4.logged @@ -73,8 +73,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "prints_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "prints_end" ) EZ ) , IAL ( SIO OutputChar ) , ICF diff --git a/.output/actual/ws/eval/logged/stn/asciiOn/from-wsa/prim.logged b/.output/actual/ws/eval/logged/stn/asciiOn/from-wsa/prim.logged index 0b9033cc2..a07e38426 100644 --- a/.output/actual/ws/eval/logged/stn/asciiOn/from-wsa/prim.logged +++ b/.output/actual/ws/eval/logged/stn/asciiOn/from-wsa/prim.logged @@ -114,8 +114,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "f_finished_1" ) ( Branch EZ ) + ( Branch + ( BArtificial "f_finished_1" ) EZ ) , IAL ( SPure @@ -170,8 +170,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "f_finished_2" ) ( Branch EZ ) + ( Branch + ( BArtificial "f_finished_2" ) EZ ) , IAL ( SPure @@ -194,8 +194,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "f_finished_3" ) ( Branch EZ ) + ( Branch + ( BArtificial "f_finished_3" ) EZ ) , IAL ( SPure @@ -317,8 +317,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "f_finished_4" ) ( Branch EZ ) + ( Branch + ( BArtificial "f_finished_4" ) EZ ) , IAL ( SPure @@ -334,8 +334,8 @@ dump: Memory ) , ILS Load , ICF - ( Labeled - ( LArtificial "nodraw" ) ( Branch EZ ) + ( Branch + ( BArtificial "nodraw" ) EZ ) , IAL ( SPure @@ -395,8 +395,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "prints_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "prints_end" ) EZ ) , IAL ( SIO OutputChar ) , ICF diff --git "a/.output/actual/ws/eval/logged/stn/asciiOn/original/calc-1\n.logged" "b/.output/actual/ws/eval/logged/stn/asciiOn/original/calc-1\n.logged" index 1d797795c..558905ea4 100644 --- "a/.output/actual/ws/eval/logged/stn/asciiOn/original/calc-1\n.logged" +++ "b/.output/actual/ws/eval/logged/stn/asciiOn/original/calc-1\n.logged" @@ -563,8 +563,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "progend" ) ( Branch EZ ) + ( Branch + ( BArtificial "progend" ) EZ ) , IAL ( SPure @@ -637,8 +637,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "write_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "write_end" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -689,8 +689,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "read_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "read_end" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git a/.output/actual/ws/eval/logged/stn/asciiOn/original/count.logged b/.output/actual/ws/eval/logged/stn/asciiOn/original/count.logged index 295a6d24b..56af381e6 100644 --- a/.output/actual/ws/eval/logged/stn/asciiOn/original/count.logged +++ b/.output/actual/ws/eval/logged/stn/asciiOn/original/count.logged @@ -40,8 +40,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "E" ) ( Branch EZ ) + ( Branch + ( BArtificial "E" ) EZ ) , ICF ( Labeled @@ -78,8 +78,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "write_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "write_end" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -130,8 +130,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "read_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "read_end" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/actual/ws/eval/logged/stn/asciiOn/original/fact10\n.logged" "b/.output/actual/ws/eval/logged/stn/asciiOn/original/fact10\n.logged" index d696c8c37..fa445913a 100644 --- "a/.output/actual/ws/eval/logged/stn/asciiOn/original/fact10\n.logged" +++ "b/.output/actual/ws/eval/logged/stn/asciiOn/original/fact10\n.logged" @@ -258,8 +258,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "factbase" ) ( Branch EZ ) + ( Branch + ( BArtificial "factbase" ) EZ ) , IAL ( SPure @@ -310,8 +310,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "write_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "write_end" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -362,8 +362,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "read_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "read_end" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git a/.output/actual/ws/eval/logged/stn/asciiOn/original/hWorld.logged b/.output/actual/ws/eval/logged/stn/asciiOn/original/hWorld.logged index 549c75cd6..600d0f84e 100644 --- a/.output/actual/ws/eval/logged/stn/asciiOn/original/hWorld.logged +++ b/.output/actual/ws/eval/logged/stn/asciiOn/original/hWorld.logged @@ -255,8 +255,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "write_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "write_end" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -307,8 +307,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "read_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "read_end" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/actual/ws/eval/logged/stn/asciiOn/original/hanoi1\n.logged" "b/.output/actual/ws/eval/logged/stn/asciiOn/original/hanoi1\n.logged" index 4261bac29..2d6b058e6 100644 --- "a/.output/actual/ws/eval/logged/stn/asciiOn/original/hanoi1\n.logged" +++ "b/.output/actual/ws/eval/logged/stn/asciiOn/original/hanoi1\n.logged" @@ -288,8 +288,8 @@ dump: Memory ) , ILS Load , ICF - ( Labeled - ( LArtificial "endhanoi" ) ( Branch EZ ) + ( Branch + ( BArtificial "endhanoi" ) EZ ) , IAL ( SPure @@ -533,8 +533,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "write_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "write_end" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -585,8 +585,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "read_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "read_end" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/actual/ws/eval/logged/stn/asciiOn/original/locTest1\n2\n.logged" "b/.output/actual/ws/eval/logged/stn/asciiOn/original/locTest1\n2\n.logged" index 8b88a0eeb..8986dc754 100644 --- "a/.output/actual/ws/eval/logged/stn/asciiOn/original/locTest1\n2\n.logged" +++ "b/.output/actual/ws/eval/logged/stn/asciiOn/original/locTest1\n2\n.logged" @@ -246,8 +246,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "write_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "write_end" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -298,8 +298,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "read_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "read_end" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/actual/ws/eval/logged/stn/asciiOn/original/nameWriteOnly\n.logged" "b/.output/actual/ws/eval/logged/stn/asciiOn/original/nameWriteOnly\n.logged" index d5ea6e6fc..b24ede8c3 100644 --- "a/.output/actual/ws/eval/logged/stn/asciiOn/original/nameWriteOnly\n.logged" +++ "b/.output/actual/ws/eval/logged/stn/asciiOn/original/nameWriteOnly\n.logged" @@ -351,8 +351,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "write_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "write_end" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -403,8 +403,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "read_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "read_end" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/actual/ws/eval/logged/stn/asciiOn/original/truthMachine0\n.logged" "b/.output/actual/ws/eval/logged/stn/asciiOn/original/truthMachine0\n.logged" index 24f88495d..b17749b6b 100644 --- "a/.output/actual/ws/eval/logged/stn/asciiOn/original/truthMachine0\n.logged" +++ "b/.output/actual/ws/eval/logged/stn/asciiOn/original/truthMachine0\n.logged" @@ -12,8 +12,8 @@ dump: Memory , ILS ( MIO InputDec ) , ILS Load , ICF - ( Labeled - ( LArtificial "\x0" ) ( Branch EZ ) + ( Branch + ( BArtificial "\x0" ) EZ ) , ICF ( Mark diff --git "a/.output/actual/ws/eval/logged/ws/asciiOff/original/calc-1\n.logged" "b/.output/actual/ws/eval/logged/ws/asciiOff/original/calc-1\n.logged" index e9f52c753..17b015ed3 100644 --- "a/.output/actual/ws/eval/logged/ws/asciiOff/original/calc-1\n.logged" +++ "b/.output/actual/ws/eval/logged/ws/asciiOff/original/calc-1\n.logged" @@ -563,8 +563,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "01110000011100100110111101100111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "01110000011100100110111101100111011001010110111001100100" ) EZ ) , IAL ( SPure @@ -637,8 +637,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -689,8 +689,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git a/.output/actual/ws/eval/logged/ws/asciiOff/original/count.logged b/.output/actual/ws/eval/logged/ws/asciiOff/original/count.logged index 651750622..d940ae1c3 100644 --- a/.output/actual/ws/eval/logged/ws/asciiOff/original/count.logged +++ b/.output/actual/ws/eval/logged/ws/asciiOff/original/count.logged @@ -40,8 +40,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "01000101" ) ( Branch EZ ) + ( Branch + ( BArtificial "01000101" ) EZ ) , ICF ( Labeled @@ -78,8 +78,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -130,8 +130,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/actual/ws/eval/logged/ws/asciiOff/original/fact10\n.logged" "b/.output/actual/ws/eval/logged/ws/asciiOff/original/fact10\n.logged" index c4614275d..68e0a53a4 100644 --- "a/.output/actual/ws/eval/logged/ws/asciiOff/original/fact10\n.logged" +++ "b/.output/actual/ws/eval/logged/ws/asciiOff/original/fact10\n.logged" @@ -258,8 +258,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0110011001100001011000110111010001100010011000010111001101100101" ) ( Branch EZ ) + ( Branch + ( BArtificial "0110011001100001011000110111010001100010011000010111001101100101" ) EZ ) , IAL ( SPure @@ -310,8 +310,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -362,8 +362,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/actual/ws/eval/logged/ws/asciiOff/original/hanoi1\n.logged" "b/.output/actual/ws/eval/logged/ws/asciiOff/original/hanoi1\n.logged" index 775a9f355..5fa2fc0ba 100644 --- "a/.output/actual/ws/eval/logged/ws/asciiOff/original/hanoi1\n.logged" +++ "b/.output/actual/ws/eval/logged/ws/asciiOff/original/hanoi1\n.logged" @@ -288,8 +288,8 @@ dump: Memory ) , ILS Load , ICF - ( Labeled - ( LArtificial "0110010101101110011001000110100001100001011011100110111101101001" ) ( Branch EZ ) + ( Branch + ( BArtificial "0110010101101110011001000110100001100001011011100110111101101001" ) EZ ) , IAL ( SPure @@ -533,8 +533,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -585,8 +585,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git a/.output/actual/ws/eval/logged/ws/asciiOff/original/hworld.logged b/.output/actual/ws/eval/logged/ws/asciiOff/original/hworld.logged index fa789ab5a..e97b97208 100644 --- a/.output/actual/ws/eval/logged/ws/asciiOff/original/hworld.logged +++ b/.output/actual/ws/eval/logged/ws/asciiOff/original/hworld.logged @@ -255,8 +255,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -307,8 +307,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/actual/ws/eval/logged/ws/asciiOff/original/loctest1\n2\n.logged" "b/.output/actual/ws/eval/logged/ws/asciiOff/original/loctest1\n2\n.logged" index 70c9fcfb0..33c819b5e 100644 --- "a/.output/actual/ws/eval/logged/ws/asciiOff/original/loctest1\n2\n.logged" +++ "b/.output/actual/ws/eval/logged/ws/asciiOff/original/loctest1\n2\n.logged" @@ -246,8 +246,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -298,8 +298,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/actual/ws/eval/logged/ws/asciiOff/original/nameWriteOnly\n.logged" "b/.output/actual/ws/eval/logged/ws/asciiOff/original/nameWriteOnly\n.logged" index 70fcbca32..cbdf9e20e 100644 --- "a/.output/actual/ws/eval/logged/ws/asciiOff/original/nameWriteOnly\n.logged" +++ "b/.output/actual/ws/eval/logged/ws/asciiOff/original/nameWriteOnly\n.logged" @@ -351,8 +351,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -403,8 +403,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/actual/ws/eval/logged/ws/asciiOn/original/calc-1\n.logged" "b/.output/actual/ws/eval/logged/ws/asciiOn/original/calc-1\n.logged" index 1d797795c..558905ea4 100644 --- "a/.output/actual/ws/eval/logged/ws/asciiOn/original/calc-1\n.logged" +++ "b/.output/actual/ws/eval/logged/ws/asciiOn/original/calc-1\n.logged" @@ -563,8 +563,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "progend" ) ( Branch EZ ) + ( Branch + ( BArtificial "progend" ) EZ ) , IAL ( SPure @@ -637,8 +637,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "write_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "write_end" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -689,8 +689,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "read_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "read_end" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git a/.output/actual/ws/eval/logged/ws/asciiOn/original/count.logged b/.output/actual/ws/eval/logged/ws/asciiOn/original/count.logged index 295a6d24b..56af381e6 100644 --- a/.output/actual/ws/eval/logged/ws/asciiOn/original/count.logged +++ b/.output/actual/ws/eval/logged/ws/asciiOn/original/count.logged @@ -40,8 +40,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "E" ) ( Branch EZ ) + ( Branch + ( BArtificial "E" ) EZ ) , ICF ( Labeled @@ -78,8 +78,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "write_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "write_end" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -130,8 +130,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "read_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "read_end" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/actual/ws/eval/logged/ws/asciiOn/original/fact10\n.logged" "b/.output/actual/ws/eval/logged/ws/asciiOn/original/fact10\n.logged" index d696c8c37..fa445913a 100644 --- "a/.output/actual/ws/eval/logged/ws/asciiOn/original/fact10\n.logged" +++ "b/.output/actual/ws/eval/logged/ws/asciiOn/original/fact10\n.logged" @@ -258,8 +258,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "factbase" ) ( Branch EZ ) + ( Branch + ( BArtificial "factbase" ) EZ ) , IAL ( SPure @@ -310,8 +310,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "write_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "write_end" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -362,8 +362,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "read_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "read_end" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/actual/ws/eval/logged/ws/asciiOn/original/hanoi1\n.logged" "b/.output/actual/ws/eval/logged/ws/asciiOn/original/hanoi1\n.logged" index 4261bac29..2d6b058e6 100644 --- "a/.output/actual/ws/eval/logged/ws/asciiOn/original/hanoi1\n.logged" +++ "b/.output/actual/ws/eval/logged/ws/asciiOn/original/hanoi1\n.logged" @@ -288,8 +288,8 @@ dump: Memory ) , ILS Load , ICF - ( Labeled - ( LArtificial "endhanoi" ) ( Branch EZ ) + ( Branch + ( BArtificial "endhanoi" ) EZ ) , IAL ( SPure @@ -533,8 +533,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "write_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "write_end" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -585,8 +585,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "read_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "read_end" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git a/.output/actual/ws/eval/logged/ws/asciiOn/original/hworld.logged b/.output/actual/ws/eval/logged/ws/asciiOn/original/hworld.logged index 549c75cd6..600d0f84e 100644 --- a/.output/actual/ws/eval/logged/ws/asciiOn/original/hworld.logged +++ b/.output/actual/ws/eval/logged/ws/asciiOn/original/hworld.logged @@ -255,8 +255,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "write_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "write_end" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -307,8 +307,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "read_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "read_end" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/actual/ws/eval/logged/ws/asciiOn/original/loctest1\n2\n.logged" "b/.output/actual/ws/eval/logged/ws/asciiOn/original/loctest1\n2\n.logged" index 8b88a0eeb..8986dc754 100644 --- "a/.output/actual/ws/eval/logged/ws/asciiOn/original/loctest1\n2\n.logged" +++ "b/.output/actual/ws/eval/logged/ws/asciiOn/original/loctest1\n2\n.logged" @@ -246,8 +246,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "write_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "write_end" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -298,8 +298,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "read_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "read_end" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/actual/ws/eval/logged/ws/asciiOn/original/nameWriteOnly\n.logged" "b/.output/actual/ws/eval/logged/ws/asciiOn/original/nameWriteOnly\n.logged" index d5ea6e6fc..b24ede8c3 100644 --- "a/.output/actual/ws/eval/logged/ws/asciiOn/original/nameWriteOnly\n.logged" +++ "b/.output/actual/ws/eval/logged/ws/asciiOn/original/nameWriteOnly\n.logged" @@ -351,8 +351,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "write_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "write_end" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -403,8 +403,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "read_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "read_end" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git a/.output/actual/ws/il/optimized/from-wsa/bottles.il b/.output/actual/ws/il/optimized/from-wsa/bottles.il index b62c76af0..2b118b757 100644 --- a/.output/actual/ws/il/optimized/from-wsa/bottles.il +++ b/.output/actual/ws/il/optimized/from-wsa/bottles.il @@ -1,145 +1,145 @@ -SPure (Cons 3) +cons 3 -Mark (MArtificial "LOOP") -SPure (Indexed (IImmediate 0) Copy) -SIO OutputDec -SPure (Cons 0) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 97) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 104) -SPure (Cons 116) -SPure (Cons 32) -SPure (Cons 110) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 114) -SPure (Cons 101) -SPure (Cons 101) -SPure (Cons 98) -SPure (Cons 32) -SPure (Cons 102) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 115) -SPure (Cons 101) -SPure (Cons 108) -SPure (Cons 116) -SPure (Cons 116) -SPure (Cons 111) -SPure (Cons 98) -SPure (Cons 32) -Labeled (LArtificial "prints") Call -SPure (Indexed (IImmediate 0) Copy) -SIO OutputDec -SPure (Cons 0) -SPure (Cons 114) -SPure (Cons 101) -SPure (Cons 101) -SPure (Cons 98) -SPure (Cons 32) -SPure (Cons 102) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 115) -SPure (Cons 101) -SPure (Cons 108) -SPure (Cons 116) -SPure (Cons 116) -SPure (Cons 111) -SPure (Cons 98) -SPure (Cons 32) -Labeled (LArtificial "printsln") Call -SPure (Cons 0) -SPure (Cons 100) -SPure (Cons 110) -SPure (Cons 117) -SPure (Cons 111) -SPure (Cons 114) -SPure (Cons 97) -SPure (Cons 32) -SPure (Cons 116) -SPure (Cons 105) -SPure (Cons 32) -SPure (Cons 115) -SPure (Cons 115) -SPure (Cons 97) -SPure (Cons 112) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 110) -SPure (Cons 119) -SPure (Cons 111) -SPure (Cons 100) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 110) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 107) -SPure (Cons 97) -SPure (Cons 84) -Labeled (LArtificial "printsln") Call -SPure (Unary (UImmediate 1 Sub)) -SPure (Indexed (IImmediate 0) Copy) -SIO OutputDec -SPure (Cons 0) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 97) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 104) -SPure (Cons 116) -SPure (Cons 32) -SPure (Cons 110) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 114) -SPure (Cons 101) -SPure (Cons 101) -SPure (Cons 98) -SPure (Cons 32) -SPure (Cons 102) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 115) -SPure (Cons 101) -SPure (Cons 108) -SPure (Cons 116) -SPure (Cons 116) -SPure (Cons 111) -SPure (Cons 98) -SPure (Cons 32) -Labeled (LArtificial "printsln") Call -SPure (Cons 0) -Labeled (LArtificial "printsln") Call -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "LOOP:1") (Branch EZ) -Labeled (LArtificial "LOOP") Jump +markA "LOOP" +copyI 0 +outputDS +cons 0 +cons 32 +cons 44 +cons 108 +cons 108 +cons 97 +cons 119 +cons 32 +cons 101 +cons 104 +cons 116 +cons 32 +cons 110 +cons 111 +cons 32 +cons 114 +cons 101 +cons 101 +cons 98 +cons 32 +cons 102 +cons 111 +cons 32 +cons 115 +cons 101 +cons 108 +cons 116 +cons 116 +cons 111 +cons 98 +cons 32 +callA "prints" +copyI 0 +outputDS +cons 0 +cons 114 +cons 101 +cons 101 +cons 98 +cons 32 +cons 102 +cons 111 +cons 32 +cons 115 +cons 101 +cons 108 +cons 116 +cons 116 +cons 111 +cons 98 +cons 32 +callA "printsln" +cons 0 +cons 100 +cons 110 +cons 117 +cons 111 +cons 114 +cons 97 +cons 32 +cons 116 +cons 105 +cons 32 +cons 115 +cons 115 +cons 97 +cons 112 +cons 32 +cons 44 +cons 110 +cons 119 +cons 111 +cons 100 +cons 32 +cons 101 +cons 110 +cons 111 +cons 32 +cons 101 +cons 107 +cons 97 +cons 84 +callA "printsln" +subI 1 +copyI 0 +outputDS +cons 0 +cons 108 +cons 108 +cons 97 +cons 119 +cons 32 +cons 101 +cons 104 +cons 116 +cons 32 +cons 110 +cons 111 +cons 32 +cons 114 +cons 101 +cons 101 +cons 98 +cons 32 +cons 102 +cons 111 +cons 32 +cons 115 +cons 101 +cons 108 +cons 116 +cons 116 +cons 111 +cons 98 +cons 32 +callA "printsln" +cons 0 +callA "printsln" +copyI 0 +bEZA "LOOP:1" +jumpA "LOOP" -Mark (MArtificial "LOOP:1") -End +markA "LOOP:1" +end -Mark (MArtificial "prints") -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "prints_end") (Branch EZ) -SIO OutputChar -Labeled (LArtificial "prints") Jump +markA "prints" +copyI 0 +bEZA "prints_end" +outputCS +jumpA "prints" -Mark (MArtificial "prints_end") -SPure Discard -Return +markA "prints_end" +discard +return -Mark (MArtificial "printsln") -Labeled (LArtificial "prints") Call -SPure (Cons 10) -SIO OutputChar -Return +markA "printsln" +callA "prints" +cons 10 +outputCS +return diff --git a/.output/actual/ws/il/optimized/from-wsa/hello.il b/.output/actual/ws/il/optimized/from-wsa/hello.il index 810994ec0..76b02970f 100644 --- a/.output/actual/ws/il/optimized/from-wsa/hello.il +++ b/.output/actual/ws/il/optimized/from-wsa/hello.il @@ -1,29 +1,29 @@ -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SPure (Cons 10) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -End +cons 32 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +cons 10 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +end diff --git a/.output/actual/ws/il/optimized/from-wsa/hello2.il b/.output/actual/ws/il/optimized/from-wsa/hello2.il index 0581fba7e..2419e7827 100644 --- a/.output/actual/ws/il/optimized/from-wsa/hello2.il +++ b/.output/actual/ws/il/optimized/from-wsa/hello2.il @@ -1,33 +1,33 @@ -SPure (Cons 0) -SPure (Cons 10) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) -Labeled (LArtificial "prints") Call -End +cons 0 +cons 10 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 +cons 32 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 +callA "prints" +end -Mark (MArtificial "prints") -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "prints_end") (Branch EZ) -SIO OutputChar -Labeled (LArtificial "prints") Jump +markA "prints" +copyI 0 +bEZA "prints_end" +outputCS +jumpA "prints" -Mark (MArtificial "prints_end") -SPure Discard -Return +markA "prints_end" +discard +return -Mark (MArtificial "printsln") -Labeled (LArtificial "prints") Call -SPure (Cons 10) -SIO OutputChar -Return +markA "printsln" +callA "prints" +cons 10 +outputCS +return diff --git a/.output/actual/ws/il/optimized/from-wsa/hello4.il b/.output/actual/ws/il/optimized/from-wsa/hello4.il index b149339c6..8e42ce9f8 100644 --- a/.output/actual/ws/il/optimized/from-wsa/hello4.il +++ b/.output/actual/ws/il/optimized/from-wsa/hello4.il @@ -1,32 +1,32 @@ -SPure (Cons 0) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) -Labeled (LArtificial "printsln") Call -End +cons 0 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 +cons 32 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 +callA "printsln" +end -Mark (MArtificial "prints") -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "prints_end") (Branch EZ) -SIO OutputChar -Labeled (LArtificial "prints") Jump +markA "prints" +copyI 0 +bEZA "prints_end" +outputCS +jumpA "prints" -Mark (MArtificial "prints_end") -SPure Discard -Return +markA "prints_end" +discard +return -Mark (MArtificial "printsln") -Labeled (LArtificial "prints") Call -SPure (Cons 10) -SIO OutputChar -Return +markA "printsln" +callA "prints" +cons 10 +outputCS +return diff --git a/.output/actual/ws/il/optimized/from-wsa/prim.il b/.output/actual/ws/il/optimized/from-wsa/prim.il index 079896ed6..98e3d2fa5 100644 --- a/.output/actual/ws/il/optimized/from-wsa/prim.il +++ b/.output/actual/ws/il/optimized/from-wsa/prim.il @@ -1,120 +1,120 @@ -Mark (MArtificial "st") -SPure (Cons 0) -SPure (Cons 93) -SPure (Cons 48) -SPure (Cons 48) -SPure (Cons 49) -SPure (Cons 45) -SPure (Cons 50) -SPure (Cons 91) -SPure (Cons 32) -SPure (Cons 115) -SPure (Cons 114) -SPure (Cons 101) -SPure (Cons 98) -SPure (Cons 109) -SPure (Cons 117) -SPure (Cons 110) -SPure (Cons 32) -SPure (Cons 109) -SPure (Cons 105) -SPure (Cons 114) -SPure (Cons 112) -Labeled (LArtificial "printsln") Call -SPure (Cons 0) +markA "st" +cons 0 +cons 93 +cons 48 +cons 48 +cons 49 +cons 45 +cons 50 +cons 91 +cons 32 +cons 115 +cons 114 +cons 101 +cons 98 +cons 109 +cons 117 +cons 110 +cons 32 +cons 109 +cons 105 +cons 114 +cons 112 +callA "printsln" +cons 0 -Mark (MArtificial "f_start_1") -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 100 Sub)) -Labeled (LArtificial "f_finished_1") (Branch EZ) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 100 Add)) -SPure (Cons 1) -Store -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "f_start_1") Jump +markA "f_start_1" +copyI 0 +subI 100 +bEZA "f_finished_1" +copyI 0 +addI 100 +cons 1 +store +addI 1 +jumpA "f_start_1" -Mark (MArtificial "f_finished_1") -SPure Discard -SPure (Cons 2) +markA "f_finished_1" +discard +cons 2 -Mark (MArtificial "f_start_2") -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 11 Sub)) -Labeled (LArtificial "f_finished_2") (Branch EZ) -SPure (Cons 2) +markA "f_start_2" +copyI 0 +subI 11 +bEZA "f_finished_2" +cons 2 -Mark (MArtificial "f_start_3") -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 100 Sub)) -Labeled (LArtificial "f_finished_3") (Branch EZ) -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 1) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Indexed (IImmediate 1) Move) -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 2) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Indexed (IImmediate 1) Move) -SPure (Cons 1) -Load -SPure (Cons 2) -Load -SPure (Binary Mul) -SPure (Unary (UImmediate 100 Add)) -SPure (Cons 0) -Store -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "f_start_3") Jump +markA "f_start_3" +copyI 0 +subI 100 +bEZA "f_finished_3" +copyI 0 +cons 1 +moveI 1 +store +moveI 1 +copyI 0 +cons 2 +moveI 1 +store +moveI 1 +cons 1 +load +cons 2 +load +mul +addI 100 +cons 0 +store +addI 1 +jumpA "f_start_3" -Mark (MArtificial "f_finished_3") -SPure Discard -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "f_start_2") Jump +markA "f_finished_3" +discard +addI 1 +jumpA "f_start_2" -Mark (MArtificial "f_finished_2") -SPure Discard -SPure (Cons 2) +markA "f_finished_2" +discard +cons 2 -Mark (MArtificial "f_start_4") -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 100 Sub)) -Labeled (LArtificial "f_finished_4") (Branch EZ) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 100 Add)) -Load -Labeled (LArtificial "nodraw") (Branch EZ) -SPure (Indexed (IImmediate 0) Copy) -SIO OutputDec -SPure (Cons 0) -SPure (Cons 32) -Labeled (LArtificial "prints") Call +markA "f_start_4" +copyI 0 +subI 100 +bEZA "f_finished_4" +copyI 0 +addI 100 +load +bEZA "nodraw" +copyI 0 +outputDS +cons 0 +cons 32 +callA "prints" -Mark (MArtificial "nodraw") -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "f_start_4") Jump +markA "nodraw" +addI 1 +jumpA "f_start_4" -Mark (MArtificial "f_finished_4") -SPure Discard -SPure (Cons 0) -Labeled (LArtificial "printsln") Call -End +markA "f_finished_4" +discard +cons 0 +callA "printsln" +end -Mark (MArtificial "prints") -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "prints_end") (Branch EZ) -SIO OutputChar -Labeled (LArtificial "prints") Jump +markA "prints" +copyI 0 +bEZA "prints_end" +outputCS +jumpA "prints" -Mark (MArtificial "prints_end") -SPure Discard -Return +markA "prints_end" +discard +return -Mark (MArtificial "printsln") -Labeled (LArtificial "prints") Call -SPure (Cons 10) -SIO OutputChar -Return +markA "printsln" +callA "prints" +cons 10 +outputCS +return diff --git a/.output/actual/ws/il/optimized/from-wsa/true.il b/.output/actual/ws/il/optimized/from-wsa/true.il index 528694d82..a6a9baf65 100644 --- a/.output/actual/ws/il/optimized/from-wsa/true.il +++ b/.output/actual/ws/il/optimized/from-wsa/true.il @@ -1 +1 @@ -End +end diff --git a/.output/actual/ws/il/optimized/original/calc.il b/.output/actual/ws/il/optimized/original/calc.il index ccee63384..05ae665a8 100644 --- a/.output/actual/ws/il/optimized/original/calc.il +++ b/.output/actual/ws/il/optimized/original/calc.il @@ -1,246 +1,246 @@ -SPure (Cons 0) -SPure (Cons 69) -Store -SPure (Cons 1) -SPure (Cons 110) -Store -SPure (Cons 2) -SPure (Cons 116) -Store -SPure (Cons 3) -SPure (Cons 101) -Store -SPure (Cons 4) -SPure (Cons 114) -Store -SPure (Cons 5) -SPure (Cons 32) -Store -SPure (Cons 6) -SPure (Cons 115) -Store -SPure (Cons 7) -SPure (Cons 111) -Store -SPure (Cons 8) -SPure (Cons 109) -Store -SPure (Cons 9) -SPure (Cons 101) -Store -SPure (Cons 10) -SPure (Cons 32) -Store -SPure (Cons 11) -SPure (Cons 110) -Store -SPure (Cons 12) -SPure (Cons 117) -Store -SPure (Cons 13) -SPure (Cons 109) -Store -SPure (Cons 14) -SPure (Cons 98) -Store -SPure (Cons 15) -SPure (Cons 101) -Store -SPure (Cons 16) -SPure (Cons 114) -Store -SPure (Cons 17) -SPure (Cons 115) -Store -SPure (Cons 18) -SPure (Cons 44) -Store -SPure (Cons 19) -SPure (Cons 32) -Store -SPure (Cons 20) -SPure (Cons 116) -Store -SPure (Cons 21) -SPure (Cons 104) -Store -SPure (Cons 22) -SPure (Cons 101) -Store -SPure (Cons 23) -SPure (Cons 110) -Store -SPure (Cons 24) -SPure (Cons 32) -Store -SPure (Cons 25) -SPure (Cons 45) -Store -SPure (Cons 26) -SPure (Cons 49) -Store -SPure (Cons 27) -SPure (Cons 32) -Store -SPure (Cons 28) -SPure (Cons 116) -Store -SPure (Cons 29) -SPure (Cons 111) -Store -SPure (Cons 30) -SPure (Cons 32) -Store -SPure (Cons 31) -SPure (Cons 102) -Store -SPure (Cons 32) -SPure (Cons 105) -Store -SPure (Cons 33) -SPure (Cons 110) -Store -SPure (Cons 34) -SPure (Cons 105) -Store -SPure (Cons 35) -SPure (Cons 115) -Store -SPure (Cons 36) -SPure (Cons 104) -Store -SPure (Cons 37) -SPure (Cons 0) -Store -SPure (Cons 42) -SPure (Cons 78) -Store -SPure (Cons 43) -SPure (Cons 117) -Store -SPure (Cons 44) -SPure (Cons 109) -Store -SPure (Cons 45) -SPure (Cons 98) -Store -SPure (Cons 46) -SPure (Cons 101) -Store -SPure (Cons 47) -SPure (Cons 114) -Store -SPure (Cons 48) -SPure (Cons 58) -Store -SPure (Cons 49) -SPure (Cons 0) -Store -SPure (Cons 60) -SPure (Cons 84) -Store -SPure (Cons 61) -SPure (Cons 111) -Store -SPure (Cons 62) -SPure (Cons 116) -Store -SPure (Cons 63) -SPure (Cons 97) -Store -SPure (Cons 64) -SPure (Cons 108) -Store -SPure (Cons 65) -SPure (Cons 32) -Store -SPure (Cons 66) -SPure (Cons 105) -Store -SPure (Cons 67) -SPure (Cons 115) -Store -SPure (Cons 68) -SPure (Cons 32) -Store -SPure (Cons 69) -SPure (Cons 0) -Store -SPure (Cons 0) -Labeled (LArtificial "write") Call -Labeled (LArtificial "newline") Call -SPure (Cons 100) -SPure (Cons 0) -Store +cons 0 +cons 69 +store +cons 1 +cons 110 +store +cons 2 +cons 116 +store +cons 3 +cons 101 +store +cons 4 +cons 114 +store +cons 5 +cons 32 +store +cons 6 +cons 115 +store +cons 7 +cons 111 +store +cons 8 +cons 109 +store +cons 9 +cons 101 +store +cons 10 +cons 32 +store +cons 11 +cons 110 +store +cons 12 +cons 117 +store +cons 13 +cons 109 +store +cons 14 +cons 98 +store +cons 15 +cons 101 +store +cons 16 +cons 114 +store +cons 17 +cons 115 +store +cons 18 +cons 44 +store +cons 19 +cons 32 +store +cons 20 +cons 116 +store +cons 21 +cons 104 +store +cons 22 +cons 101 +store +cons 23 +cons 110 +store +cons 24 +cons 32 +store +cons 25 +cons 45 +store +cons 26 +cons 49 +store +cons 27 +cons 32 +store +cons 28 +cons 116 +store +cons 29 +cons 111 +store +cons 30 +cons 32 +store +cons 31 +cons 102 +store +cons 32 +cons 105 +store +cons 33 +cons 110 +store +cons 34 +cons 105 +store +cons 35 +cons 115 +store +cons 36 +cons 104 +store +cons 37 +cons 0 +store +cons 42 +cons 78 +store +cons 43 +cons 117 +store +cons 44 +cons 109 +store +cons 45 +cons 98 +store +cons 46 +cons 101 +store +cons 47 +cons 114 +store +cons 48 +cons 58 +store +cons 49 +cons 0 +store +cons 60 +cons 84 +store +cons 61 +cons 111 +store +cons 62 +cons 116 +store +cons 63 +cons 97 +store +cons 64 +cons 108 +store +cons 65 +cons 32 +store +cons 66 +cons 105 +store +cons 67 +cons 115 +store +cons 68 +cons 32 +store +cons 69 +cons 0 +store +cons 0 +callA "write" +callA "newline" +cons 100 +cons 0 +store -Mark (MArtificial "loop") -SPure (Cons 42) -Labeled (LArtificial "write") Call -SPure (Cons 101) -MIO InputDec -SPure (Cons 101) -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate (-1) Sub)) -Labeled (LArtificial "progend") (Branch EZ) -SPure (Cons 100) -Load -SPure (Binary Add) -SPure (Cons 100) -SPure (Indexed (IImmediate 1) Move) -Store -Labeled (LArtificial "loop") Jump +markA "loop" +cons 42 +callA "write" +cons 101 +mio inputdec +cons 101 +load +copyI 0 +subI -1 +bEZA "progend" +cons 100 +load +add +cons 100 +moveI 1 +store +jumpA "loop" -Mark (MArtificial "progend") -SPure Discard -SPure (Cons 60) -Labeled (LArtificial "write") Call -SPure (Cons 100) -Load -SIO OutputDec -Labeled (LArtificial "newline") Call -End +markA "progend" +discard +cons 60 +callA "write" +cons 100 +load +outputDS +callA "newline" +end -Mark (MArtificial "add") -SPure (Binary Add) -Return +markA "add" +add +return -Mark (MArtificial "write") -SPure (Indexed (IImmediate 0) Copy) -Load -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "write_end") (Branch EZ) -SIO OutputChar -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "write") Jump +markA "write" +copyI 0 +load +copyI 0 +bEZA "write_end" +outputCS +addI 1 +jumpA "write" -Mark (MArtificial "write_end") -SPure Discard -SPure Discard -Return +markA "write_end" +discard +discard +return -Mark (MArtificial "read") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 0) Copy) -MIO InputChar -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 10 Sub)) -Labeled (LArtificial "read_end") (Branch EZ) -SPure Discard -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "read") Jump +markA "read" +copyI 0 +copyI 0 +mio inputchar +load +copyI 0 +subI 10 +bEZA "read_end" +discard +addI 1 +jumpA "read" -Mark (MArtificial "read_end") -SPure Discard -SPure (Unary (UImmediate 1 Add)) -SPure (Cons 0) -Store -Return +markA "read_end" +discard +addI 1 +cons 0 +store +return -Mark (MArtificial "newline") -SPure (Cons 10) -SPure (Cons 13) -SIO OutputChar -SIO OutputChar -Return +markA "newline" +cons 10 +cons 13 +outputCS +outputCS +return diff --git a/.output/actual/ws/il/optimized/original/count.il b/.output/actual/ws/il/optimized/original/count.il index 9675b61ad..64fac29ac 100644 --- a/.output/actual/ws/il/optimized/original/count.il +++ b/.output/actual/ws/il/optimized/original/count.il @@ -1,60 +1,60 @@ -SPure (Cons 1) - -Mark (MArtificial "C") -SPure (Indexed (IImmediate 0) Copy) -SIO OutputDec -SPure (Cons 10) -SIO OutputChar -SPure (Unary (UImmediate 1 Add)) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 11 Sub)) -Labeled (LArtificial "E") (Branch EZ) -Labeled (LArtificial "C") Jump - -Mark (MArtificial "E") -SPure Discard -End - -Mark (MArtificial "add") -SPure (Binary Add) -Return - -Mark (MArtificial "write") -SPure (Indexed (IImmediate 0) Copy) -Load -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "write_end") (Branch EZ) -SIO OutputChar -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "write") Jump - -Mark (MArtificial "write_end") -SPure Discard -SPure Discard -Return - -Mark (MArtificial "read") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 0) Copy) -MIO InputChar -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 10 Sub)) -Labeled (LArtificial "read_end") (Branch EZ) -SPure Discard -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "read") Jump - -Mark (MArtificial "read_end") -SPure Discard -SPure (Unary (UImmediate 1 Add)) -SPure (Cons 0) -Store -Return - -Mark (MArtificial "newline") -SPure (Cons 10) -SPure (Cons 13) -SIO OutputChar -SIO OutputChar -Return +cons 1 + +markA "C" +copyI 0 +outputDS +cons 10 +outputCS +addI 1 +copyI 0 +subI 11 +bEZA "E" +jumpA "C" + +markA "E" +discard +end + +markA "add" +add +return + +markA "write" +copyI 0 +load +copyI 0 +bEZA "write_end" +outputCS +addI 1 +jumpA "write" + +markA "write_end" +discard +discard +return + +markA "read" +copyI 0 +copyI 0 +mio inputchar +load +copyI 0 +subI 10 +bEZA "read_end" +discard +addI 1 +jumpA "read" + +markA "read_end" +discard +addI 1 +cons 0 +store +return + +markA "newline" +cons 10 +cons 13 +outputCS +outputCS +return diff --git a/.output/actual/ws/il/optimized/original/fact.il b/.output/actual/ws/il/optimized/original/fact.il index 1d1a66a58..7b6ddac70 100644 --- a/.output/actual/ws/il/optimized/original/fact.il +++ b/.output/actual/ws/il/optimized/original/fact.il @@ -1,138 +1,138 @@ -SPure (Cons 0) -SPure (Cons 69) -Store -SPure (Cons 1) -SPure (Cons 110) -Store -SPure (Cons 2) -SPure (Cons 116) -Store -SPure (Cons 3) -SPure (Cons 101) -Store -SPure (Cons 4) -SPure (Cons 114) -Store -SPure (Cons 5) -SPure (Cons 32) -Store -SPure (Cons 6) -SPure (Cons 97) -Store -SPure (Cons 7) -SPure (Cons 32) -Store -SPure (Cons 8) -SPure (Cons 110) -Store -SPure (Cons 9) -SPure (Cons 117) -Store -SPure (Cons 10) -SPure (Cons 109) -Store -SPure (Cons 11) -SPure (Cons 98) -Store -SPure (Cons 12) -SPure (Cons 101) -Store -SPure (Cons 13) -SPure (Cons 114) -Store -SPure (Cons 14) -SPure (Cons 58) -Store -SPure (Cons 15) -SPure (Cons 32) -Store -SPure (Cons 16) -SPure (Cons 0) -Store -SPure (Cons 20) -SPure (Cons 33) -Store -SPure (Cons 21) -SPure (Cons 32) -Store -SPure (Cons 22) -SPure (Cons 61) -Store -SPure (Cons 23) -SPure (Cons 32) -Store -SPure (Cons 24) -SPure (Cons 0) -Store -SPure (Cons 0) -Labeled (LArtificial "write") Call -SPure (Cons 100) -MIO InputDec -SPure (Cons 100) -Load -Labeled (LArtificial "fact") Call -SPure (Cons 100) -Load -SIO OutputDec -SPure (Cons 20) -Labeled (LArtificial "write") Call -SIO OutputDec -Labeled (LArtificial "newline") Call -End +cons 0 +cons 69 +store +cons 1 +cons 110 +store +cons 2 +cons 116 +store +cons 3 +cons 101 +store +cons 4 +cons 114 +store +cons 5 +cons 32 +store +cons 6 +cons 97 +store +cons 7 +cons 32 +store +cons 8 +cons 110 +store +cons 9 +cons 117 +store +cons 10 +cons 109 +store +cons 11 +cons 98 +store +cons 12 +cons 101 +store +cons 13 +cons 114 +store +cons 14 +cons 58 +store +cons 15 +cons 32 +store +cons 16 +cons 0 +store +cons 20 +cons 33 +store +cons 21 +cons 32 +store +cons 22 +cons 61 +store +cons 23 +cons 32 +store +cons 24 +cons 0 +store +cons 0 +callA "write" +cons 100 +mio inputdec +cons 100 +load +callA "fact" +cons 100 +load +outputDS +cons 20 +callA "write" +outputDS +callA "newline" +end -Mark (MArtificial "fact") -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 1 Sub)) -Labeled (LArtificial "factbase") (Branch EZ) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 1 Sub)) -Labeled (LArtificial "fact") Call -SPure (Binary Mul) -Return +markA "fact" +copyI 0 +subI 1 +bEZA "factbase" +copyI 0 +subI 1 +callA "fact" +mul +return -Mark (MArtificial "factbase") -Return +markA "factbase" +return -Mark (MArtificial "add") -SPure (Binary Add) -Return +markA "add" +add +return -Mark (MArtificial "write") -SPure (Indexed (IImmediate 0) Copy) -Load -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "write_end") (Branch EZ) -SIO OutputChar -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "write") Jump +markA "write" +copyI 0 +load +copyI 0 +bEZA "write_end" +outputCS +addI 1 +jumpA "write" -Mark (MArtificial "write_end") -SPure Discard -SPure Discard -Return +markA "write_end" +discard +discard +return -Mark (MArtificial "read") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 0) Copy) -MIO InputChar -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 10 Sub)) -Labeled (LArtificial "read_end") (Branch EZ) -SPure Discard -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "read") Jump +markA "read" +copyI 0 +copyI 0 +mio inputchar +load +copyI 0 +subI 10 +bEZA "read_end" +discard +addI 1 +jumpA "read" -Mark (MArtificial "read_end") -SPure Discard -SPure (Unary (UImmediate 1 Add)) -SPure (Cons 0) -Store -Return +markA "read_end" +discard +addI 1 +cons 0 +store +return -Mark (MArtificial "newline") -SPure (Cons 10) -SPure (Cons 13) -SIO OutputChar -SIO OutputChar -Return +markA "newline" +cons 10 +cons 13 +outputCS +outputCS +return diff --git a/.output/actual/ws/il/optimized/original/hWorld.il b/.output/actual/ws/il/optimized/original/hWorld.il index 539715d4e..4467da787 100644 --- a/.output/actual/ws/il/optimized/original/hWorld.il +++ b/.output/actual/ws/il/optimized/original/hWorld.il @@ -1,120 +1,120 @@ -SPure (Cons 0) -SPure (Cons 72) -Store -SPure (Cons 1) -SPure (Cons 101) -Store -SPure (Cons 2) -SPure (Cons 108) -Store -SPure (Cons 3) -SPure (Cons 108) -Store -SPure (Cons 4) -SPure (Cons 111) -Store -SPure (Cons 5) -SPure (Cons 44) -Store -SPure (Cons 6) -SPure (Cons 32) -Store -SPure (Cons 7) -SPure (Cons 119) -Store -SPure (Cons 8) -SPure (Cons 111) -Store -SPure (Cons 9) -SPure (Cons 114) -Store -SPure (Cons 10) -SPure (Cons 108) -Store -SPure (Cons 11) -SPure (Cons 100) -Store -SPure (Cons 12) -SPure (Cons 32) -Store -SPure (Cons 13) -SPure (Cons 111) -Store -SPure (Cons 14) -SPure (Cons 102) -Store -SPure (Cons 15) -SPure (Cons 32) -Store -SPure (Cons 16) -SPure (Cons 115) -Store -SPure (Cons 17) -SPure (Cons 112) -Store -SPure (Cons 18) -SPure (Cons 97) -Store -SPure (Cons 19) -SPure (Cons 99) -Store -SPure (Cons 20) -SPure (Cons 101) -Store -SPure (Cons 21) -SPure (Cons 115) -Store -SPure (Cons 22) -SPure (Cons 33) -Store -SPure (Cons 23) -SPure (Cons 0) -Store -SPure (Cons 0) -Labeled (LArtificial "write") Call -Labeled (LArtificial "newline") Call -End +cons 0 +cons 72 +store +cons 1 +cons 101 +store +cons 2 +cons 108 +store +cons 3 +cons 108 +store +cons 4 +cons 111 +store +cons 5 +cons 44 +store +cons 6 +cons 32 +store +cons 7 +cons 119 +store +cons 8 +cons 111 +store +cons 9 +cons 114 +store +cons 10 +cons 108 +store +cons 11 +cons 100 +store +cons 12 +cons 32 +store +cons 13 +cons 111 +store +cons 14 +cons 102 +store +cons 15 +cons 32 +store +cons 16 +cons 115 +store +cons 17 +cons 112 +store +cons 18 +cons 97 +store +cons 19 +cons 99 +store +cons 20 +cons 101 +store +cons 21 +cons 115 +store +cons 22 +cons 33 +store +cons 23 +cons 0 +store +cons 0 +callA "write" +callA "newline" +end -Mark (MArtificial "add") -SPure (Binary Add) -Return +markA "add" +add +return -Mark (MArtificial "write") -SPure (Indexed (IImmediate 0) Copy) -Load -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "write_end") (Branch EZ) -SIO OutputChar -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "write") Jump +markA "write" +copyI 0 +load +copyI 0 +bEZA "write_end" +outputCS +addI 1 +jumpA "write" -Mark (MArtificial "write_end") -SPure Discard -SPure Discard -Return +markA "write_end" +discard +discard +return -Mark (MArtificial "read") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 0) Copy) -MIO InputChar -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 10 Sub)) -Labeled (LArtificial "read_end") (Branch EZ) -SPure Discard -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "read") Jump +markA "read" +copyI 0 +copyI 0 +mio inputchar +load +copyI 0 +subI 10 +bEZA "read_end" +discard +addI 1 +jumpA "read" -Mark (MArtificial "read_end") -SPure Discard -SPure (Unary (UImmediate 1 Add)) -SPure (Cons 0) -Store -Return +markA "read_end" +discard +addI 1 +cons 0 +store +return -Mark (MArtificial "newline") -SPure (Cons 10) -SPure (Cons 13) -SIO OutputChar -SIO OutputChar -Return +markA "newline" +cons 10 +cons 13 +outputCS +outputCS +return diff --git a/.output/actual/ws/il/optimized/original/hanoi.il b/.output/actual/ws/il/optimized/original/hanoi.il index 21cc266fa..6be0b4fa5 100644 --- a/.output/actual/ws/il/optimized/original/hanoi.il +++ b/.output/actual/ws/il/optimized/original/hanoi.il @@ -1,210 +1,210 @@ -SPure (Cons 0) -SPure (Cons 69) -Store -SPure (Cons 1) -SPure (Cons 110) -Store -SPure (Cons 2) -SPure (Cons 116) -Store -SPure (Cons 3) -SPure (Cons 101) -Store -SPure (Cons 4) -SPure (Cons 114) -Store -SPure (Cons 5) -SPure (Cons 32) -Store -SPure (Cons 6) -SPure (Cons 97) -Store -SPure (Cons 7) -SPure (Cons 32) -Store -SPure (Cons 8) -SPure (Cons 110) -Store -SPure (Cons 9) -SPure (Cons 117) -Store -SPure (Cons 10) -SPure (Cons 109) -Store -SPure (Cons 11) -SPure (Cons 98) -Store -SPure (Cons 12) -SPure (Cons 101) -Store -SPure (Cons 13) -SPure (Cons 114) -Store -SPure (Cons 14) -SPure (Cons 58) -Store -SPure (Cons 15) -SPure (Cons 32) -Store -SPure (Cons 16) -SPure (Cons 0) -Store -SPure (Cons 20) -SPure (Cons 32) -Store -SPure (Cons 21) -SPure (Cons 45) -Store -SPure (Cons 22) -SPure (Cons 62) -Store -SPure (Cons 23) -SPure (Cons 32) -Store -SPure (Cons 24) -SPure (Cons 0) -Store -SPure (Cons 0) -Labeled (LArtificial "write") Call -SPure (Cons 100) -MIO InputDec -SPure (Cons 100) -Load -SPure (Cons 1) -SPure (Cons 3) -SPure (Cons 2) -Labeled (LArtificial "hanoi") Call -End +cons 0 +cons 69 +store +cons 1 +cons 110 +store +cons 2 +cons 116 +store +cons 3 +cons 101 +store +cons 4 +cons 114 +store +cons 5 +cons 32 +store +cons 6 +cons 97 +store +cons 7 +cons 32 +store +cons 8 +cons 110 +store +cons 9 +cons 117 +store +cons 10 +cons 109 +store +cons 11 +cons 98 +store +cons 12 +cons 101 +store +cons 13 +cons 114 +store +cons 14 +cons 58 +store +cons 15 +cons 32 +store +cons 16 +cons 0 +store +cons 20 +cons 32 +store +cons 21 +cons 45 +store +cons 22 +cons 62 +store +cons 23 +cons 32 +store +cons 24 +cons 0 +store +cons 0 +callA "write" +cons 100 +mio inputdec +cons 100 +load +cons 1 +cons 3 +cons 2 +callA "hanoi" +end -Mark (MArtificial "hanoi") -SPure (Cons 103) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 102) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 101) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 100) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 100) -Load -Labeled (LArtificial "endhanoi") (Branch EZ) -SPure (Cons 100) -Load -SPure (Cons 101) -Load -SPure (Cons 102) -Load -SPure (Cons 103) -Load -SPure (Cons 100) -Load -SPure (Unary (UImmediate 1 Sub)) -SPure (Cons 101) -Load -SPure (Cons 103) -Load -SPure (Cons 102) -Load -Labeled (LArtificial "hanoi") Call -SPure (Cons 103) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 102) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 101) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 100) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 101) -Load -SIO OutputDec -SPure (Cons 20) -Labeled (LArtificial "write") Call -SPure (Cons 102) -Load -SIO OutputDec -Labeled (LArtificial "newline") Call -SPure (Cons 100) -Load -SPure (Cons 101) -Load -SPure (Cons 102) -Load -SPure (Cons 103) -Load -SPure (Cons 100) -Load -SPure (Unary (UImmediate 1 Sub)) -SPure (Cons 103) -Load -SPure (Cons 102) -Load -SPure (Cons 101) -Load -Labeled (LArtificial "hanoi") Call -SPure (Cons 103) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 102) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 101) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 100) -SPure (Indexed (IImmediate 1) Move) -Store +markA "hanoi" +cons 103 +moveI 1 +store +cons 102 +moveI 1 +store +cons 101 +moveI 1 +store +cons 100 +moveI 1 +store +cons 100 +load +bEZA "endhanoi" +cons 100 +load +cons 101 +load +cons 102 +load +cons 103 +load +cons 100 +load +subI 1 +cons 101 +load +cons 103 +load +cons 102 +load +callA "hanoi" +cons 103 +moveI 1 +store +cons 102 +moveI 1 +store +cons 101 +moveI 1 +store +cons 100 +moveI 1 +store +cons 101 +load +outputDS +cons 20 +callA "write" +cons 102 +load +outputDS +callA "newline" +cons 100 +load +cons 101 +load +cons 102 +load +cons 103 +load +cons 100 +load +subI 1 +cons 103 +load +cons 102 +load +cons 101 +load +callA "hanoi" +cons 103 +moveI 1 +store +cons 102 +moveI 1 +store +cons 101 +moveI 1 +store +cons 100 +moveI 1 +store -Mark (MArtificial "endhanoi") -Return +markA "endhanoi" +return -Mark (MArtificial "add") -SPure (Binary Add) -Return +markA "add" +add +return -Mark (MArtificial "write") -SPure (Indexed (IImmediate 0) Copy) -Load -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "write_end") (Branch EZ) -SIO OutputChar -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "write") Jump +markA "write" +copyI 0 +load +copyI 0 +bEZA "write_end" +outputCS +addI 1 +jumpA "write" -Mark (MArtificial "write_end") -SPure Discard -SPure Discard -Return +markA "write_end" +discard +discard +return -Mark (MArtificial "read") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 0) Copy) -MIO InputChar -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 10 Sub)) -Labeled (LArtificial "read_end") (Branch EZ) -SPure Discard -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "read") Jump +markA "read" +copyI 0 +copyI 0 +mio inputchar +load +copyI 0 +subI 10 +bEZA "read_end" +discard +addI 1 +jumpA "read" -Mark (MArtificial "read_end") -SPure Discard -SPure (Unary (UImmediate 1 Add)) -SPure (Cons 0) -Store -Return +markA "read_end" +discard +addI 1 +cons 0 +store +return -Mark (MArtificial "newline") -SPure (Cons 10) -SPure (Cons 13) -SIO OutputChar -SIO OutputChar -Return +markA "newline" +cons 10 +cons 13 +outputCS +outputCS +return diff --git a/.output/actual/ws/il/optimized/original/helloWorld.il b/.output/actual/ws/il/optimized/original/helloWorld.il index ecdd99958..bffe7c401 100644 --- a/.output/actual/ws/il/optimized/original/helloWorld.il +++ b/.output/actual/ws/il/optimized/original/helloWorld.il @@ -1,25 +1,25 @@ -SPure (Cons 72) -SIO OutputChar -SPure (Cons 101) -SIO OutputChar -SPure (Cons 108) -SIO OutputChar -SPure (Cons 108) -SIO OutputChar -SPure (Cons 111) -SIO OutputChar -SPure (Cons 44) -SIO OutputChar -SPure (Cons 32) -SIO OutputChar -SPure (Cons 119) -SIO OutputChar -SPure (Cons 111) -SIO OutputChar -SPure (Cons 114) -SIO OutputChar -SPure (Cons 108) -SIO OutputChar -SPure (Cons 100) -SIO OutputChar -End +cons 72 +outputCS +cons 101 +outputCS +cons 108 +outputCS +cons 108 +outputCS +cons 111 +outputCS +cons 44 +outputCS +cons 32 +outputCS +cons 119 +outputCS +cons 111 +outputCS +cons 114 +outputCS +cons 108 +outputCS +cons 100 +outputCS +end diff --git a/.output/actual/ws/il/optimized/original/locTest.il b/.output/actual/ws/il/optimized/original/locTest.il index ec8de2a3f..9efa00acd 100644 --- a/.output/actual/ws/il/optimized/original/locTest.il +++ b/.output/actual/ws/il/optimized/original/locTest.il @@ -1,117 +1,117 @@ -SPure (Cons 0) -SPure (Cons 69) -Store -SPure (Cons 1) -SPure (Cons 110) -Store -SPure (Cons 2) -SPure (Cons 116) -Store -SPure (Cons 3) -SPure (Cons 101) -Store -SPure (Cons 4) -SPure (Cons 114) -Store -SPure (Cons 5) -SPure (Cons 32) -Store -SPure (Cons 6) -SPure (Cons 97) -Store -SPure (Cons 7) -SPure (Cons 32) -Store -SPure (Cons 8) -SPure (Cons 110) -Store -SPure (Cons 9) -SPure (Cons 117) -Store -SPure (Cons 10) -SPure (Cons 109) -Store -SPure (Cons 11) -SPure (Cons 98) -Store -SPure (Cons 12) -SPure (Cons 101) -Store -SPure (Cons 13) -SPure (Cons 114) -Store -SPure (Cons 14) -SPure (Cons 58) -Store -SPure (Cons 15) -SPure (Cons 32) -Store -SPure (Cons 16) -SPure (Cons 0) -Store -SPure (Cons 0) -Labeled (LArtificial "write") Call -SPure (Cons 100) -MIO InputDec -SPure (Cons 0) -Labeled (LArtificial "write") Call -SPure (Cons 101) -MIO InputDec -SPure (Cons 100) -Load -SPure (Cons 101) -Load -Labeled (LArtificial "loctest") Call -SIO OutputDec -End +cons 0 +cons 69 +store +cons 1 +cons 110 +store +cons 2 +cons 116 +store +cons 3 +cons 101 +store +cons 4 +cons 114 +store +cons 5 +cons 32 +store +cons 6 +cons 97 +store +cons 7 +cons 32 +store +cons 8 +cons 110 +store +cons 9 +cons 117 +store +cons 10 +cons 109 +store +cons 11 +cons 98 +store +cons 12 +cons 101 +store +cons 13 +cons 114 +store +cons 14 +cons 58 +store +cons 15 +cons 32 +store +cons 16 +cons 0 +store +cons 0 +callA "write" +cons 100 +mio inputdec +cons 0 +callA "write" +cons 101 +mio inputdec +cons 100 +load +cons 101 +load +callA "loctest" +outputDS +end -Mark (MArtificial "loctest") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 2) Copy) -SPure (Binary Add) -SPure (Indexed (IImmediate 2) Slide) -Return +markA "loctest" +copyI 0 +copyI 2 +add +slideI 2 +return -Mark (MArtificial "add") -SPure (Binary Add) -Return +markA "add" +add +return -Mark (MArtificial "write") -SPure (Indexed (IImmediate 0) Copy) -Load -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "write_end") (Branch EZ) -SIO OutputChar -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "write") Jump +markA "write" +copyI 0 +load +copyI 0 +bEZA "write_end" +outputCS +addI 1 +jumpA "write" -Mark (MArtificial "write_end") -SPure Discard -SPure Discard -Return +markA "write_end" +discard +discard +return -Mark (MArtificial "read") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 0) Copy) -MIO InputChar -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 10 Sub)) -Labeled (LArtificial "read_end") (Branch EZ) -SPure Discard -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "read") Jump +markA "read" +copyI 0 +copyI 0 +mio inputchar +load +copyI 0 +subI 10 +bEZA "read_end" +discard +addI 1 +jumpA "read" -Mark (MArtificial "read_end") -SPure Discard -SPure (Unary (UImmediate 1 Add)) -SPure (Cons 0) -Store -Return +markA "read_end" +discard +addI 1 +cons 0 +store +return -Mark (MArtificial "newline") -SPure (Cons 10) -SPure (Cons 13) -SIO OutputChar -SIO OutputChar -Return +markA "newline" +cons 10 +cons 13 +outputCS +outputCS +return diff --git a/.output/actual/ws/il/optimized/original/name.il b/.output/actual/ws/il/optimized/original/name.il index 256994b54..8add91b61 100644 --- a/.output/actual/ws/il/optimized/original/name.il +++ b/.output/actual/ws/il/optimized/original/name.il @@ -1,150 +1,150 @@ -SPure (Cons 0) -SPure (Cons 80) -Store -SPure (Cons 1) -SPure (Cons 108) -Store -SPure (Cons 2) -SPure (Cons 101) -Store -SPure (Cons 3) -SPure (Cons 97) -Store -SPure (Cons 4) -SPure (Cons 115) -Store -SPure (Cons 5) -SPure (Cons 101) -Store -SPure (Cons 6) -SPure (Cons 32) -Store -SPure (Cons 7) -SPure (Cons 101) -Store -SPure (Cons 8) -SPure (Cons 110) -Store -SPure (Cons 9) -SPure (Cons 116) -Store -SPure (Cons 10) -SPure (Cons 101) -Store -SPure (Cons 11) -SPure (Cons 114) -Store -SPure (Cons 12) -SPure (Cons 32) -Store -SPure (Cons 13) -SPure (Cons 121) -Store -SPure (Cons 14) -SPure (Cons 111) -Store -SPure (Cons 15) -SPure (Cons 117) -Store -SPure (Cons 16) -SPure (Cons 114) -Store -SPure (Cons 17) -SPure (Cons 32) -Store -SPure (Cons 18) -SPure (Cons 110) -Store -SPure (Cons 19) -SPure (Cons 97) -Store -SPure (Cons 20) -SPure (Cons 109) -Store -SPure (Cons 21) -SPure (Cons 101) -Store -SPure (Cons 22) -SPure (Cons 58) -Store -SPure (Cons 23) -SPure (Cons 32) -Store -SPure (Cons 24) -SPure (Cons 0) -Store -SPure (Cons 30) -SPure (Cons 72) -Store -SPure (Cons 31) -SPure (Cons 101) -Store -SPure (Cons 32) -SPure (Cons 108) -Store -SPure (Cons 33) -SPure (Cons 108) -Store -SPure (Cons 34) -SPure (Cons 111) -Store -SPure (Cons 35) -SPure (Cons 32) -Store -SPure (Cons 36) -SPure (Cons 0) -Store -SPure (Cons 0) -Labeled (LArtificial "write") Call -SPure (Cons 100) -Labeled (LArtificial "read") Call -SPure (Cons 30) -Labeled (LArtificial "write") Call -SPure (Cons 100) -Labeled (LArtificial "write") Call -Labeled (LArtificial "newline") Call -End +cons 0 +cons 80 +store +cons 1 +cons 108 +store +cons 2 +cons 101 +store +cons 3 +cons 97 +store +cons 4 +cons 115 +store +cons 5 +cons 101 +store +cons 6 +cons 32 +store +cons 7 +cons 101 +store +cons 8 +cons 110 +store +cons 9 +cons 116 +store +cons 10 +cons 101 +store +cons 11 +cons 114 +store +cons 12 +cons 32 +store +cons 13 +cons 121 +store +cons 14 +cons 111 +store +cons 15 +cons 117 +store +cons 16 +cons 114 +store +cons 17 +cons 32 +store +cons 18 +cons 110 +store +cons 19 +cons 97 +store +cons 20 +cons 109 +store +cons 21 +cons 101 +store +cons 22 +cons 58 +store +cons 23 +cons 32 +store +cons 24 +cons 0 +store +cons 30 +cons 72 +store +cons 31 +cons 101 +store +cons 32 +cons 108 +store +cons 33 +cons 108 +store +cons 34 +cons 111 +store +cons 35 +cons 32 +store +cons 36 +cons 0 +store +cons 0 +callA "write" +cons 100 +callA "read" +cons 30 +callA "write" +cons 100 +callA "write" +callA "newline" +end -Mark (MArtificial "add") -SPure (Binary Add) -Return +markA "add" +add +return -Mark (MArtificial "write") -SPure (Indexed (IImmediate 0) Copy) -Load -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "write_end") (Branch EZ) -SIO OutputChar -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "write") Jump +markA "write" +copyI 0 +load +copyI 0 +bEZA "write_end" +outputCS +addI 1 +jumpA "write" -Mark (MArtificial "write_end") -SPure Discard -SPure Discard -Return +markA "write_end" +discard +discard +return -Mark (MArtificial "read") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 0) Copy) -MIO InputChar -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 10 Sub)) -Labeled (LArtificial "read_end") (Branch EZ) -SPure Discard -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "read") Jump +markA "read" +copyI 0 +copyI 0 +mio inputchar +load +copyI 0 +subI 10 +bEZA "read_end" +discard +addI 1 +jumpA "read" -Mark (MArtificial "read_end") -SPure Discard -SPure (Unary (UImmediate 1 Add)) -SPure (Cons 0) -Store -Return +markA "read_end" +discard +addI 1 +cons 0 +store +return -Mark (MArtificial "newline") -SPure (Cons 10) -SPure (Cons 13) -SIO OutputChar -SIO OutputChar -Return +markA "newline" +cons 10 +cons 13 +outputCS +outputCS +return diff --git a/.output/actual/ws/il/optimized/original/truthMachine.il b/.output/actual/ws/il/optimized/original/truthMachine.il index 3674303af..8c28439fd 100644 --- a/.output/actual/ws/il/optimized/original/truthMachine.il +++ b/.output/actual/ws/il/optimized/original/truthMachine.il @@ -1,15 +1,15 @@ -SPure (Cons 0) -SPure (Cons 0) -MIO InputDec -Load -Labeled (LArtificial "\NUL") (Branch EZ) +cons 0 +cons 0 +mio inputdec +load +bEZA "\NUL" -Mark (MArtificial "\SOH") -SPure (Cons 1) -SIO OutputDec -Labeled (LArtificial "\SOH") Jump +markA "\SOH" +cons 1 +outputDS +jumpA "\SOH" -Mark (MArtificial "\NUL") -SPure (Cons 0) -SIO OutputDec -End +markA "\NUL" +cons 0 +outputDS +end diff --git a/.output/actual/ws/il/parsed/from-wsa/bottles.il b/.output/actual/ws/il/parsed/from-wsa/bottles.il index 0d4417f22..1c485d683 100644 --- a/.output/actual/ws/il/parsed/from-wsa/bottles.il +++ b/.output/actual/ws/il/parsed/from-wsa/bottles.il @@ -1,146 +1,146 @@ -SPure (Cons 3) +cons 3 -Mark (MArtificial "LOOP") -SPure (Indexed (IImmediate 0) Copy) -SIO OutputDec -SPure (Cons 0) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 97) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 104) -SPure (Cons 116) -SPure (Cons 32) -SPure (Cons 110) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 114) -SPure (Cons 101) -SPure (Cons 101) -SPure (Cons 98) -SPure (Cons 32) -SPure (Cons 102) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 115) -SPure (Cons 101) -SPure (Cons 108) -SPure (Cons 116) -SPure (Cons 116) -SPure (Cons 111) -SPure (Cons 98) -SPure (Cons 32) -Labeled (LArtificial "prints") Call -SPure (Indexed (IImmediate 0) Copy) -SIO OutputDec -SPure (Cons 0) -SPure (Cons 114) -SPure (Cons 101) -SPure (Cons 101) -SPure (Cons 98) -SPure (Cons 32) -SPure (Cons 102) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 115) -SPure (Cons 101) -SPure (Cons 108) -SPure (Cons 116) -SPure (Cons 116) -SPure (Cons 111) -SPure (Cons 98) -SPure (Cons 32) -Labeled (LArtificial "printsln") Call -SPure (Cons 0) -SPure (Cons 100) -SPure (Cons 110) -SPure (Cons 117) -SPure (Cons 111) -SPure (Cons 114) -SPure (Cons 97) -SPure (Cons 32) -SPure (Cons 116) -SPure (Cons 105) -SPure (Cons 32) -SPure (Cons 115) -SPure (Cons 115) -SPure (Cons 97) -SPure (Cons 112) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 110) -SPure (Cons 119) -SPure (Cons 111) -SPure (Cons 100) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 110) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 107) -SPure (Cons 97) -SPure (Cons 84) -Labeled (LArtificial "printsln") Call -SPure (Cons 1) -SPure (Binary Sub) -SPure (Indexed (IImmediate 0) Copy) -SIO OutputDec -SPure (Cons 0) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 97) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 104) -SPure (Cons 116) -SPure (Cons 32) -SPure (Cons 110) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 114) -SPure (Cons 101) -SPure (Cons 101) -SPure (Cons 98) -SPure (Cons 32) -SPure (Cons 102) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 115) -SPure (Cons 101) -SPure (Cons 108) -SPure (Cons 116) -SPure (Cons 116) -SPure (Cons 111) -SPure (Cons 98) -SPure (Cons 32) -Labeled (LArtificial "printsln") Call -SPure (Cons 0) -Labeled (LArtificial "printsln") Call -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "LOOP:1") (Branch EZ) -Labeled (LArtificial "LOOP") Jump +markA "LOOP" +copyI 0 +outputDS +cons 0 +cons 32 +cons 44 +cons 108 +cons 108 +cons 97 +cons 119 +cons 32 +cons 101 +cons 104 +cons 116 +cons 32 +cons 110 +cons 111 +cons 32 +cons 114 +cons 101 +cons 101 +cons 98 +cons 32 +cons 102 +cons 111 +cons 32 +cons 115 +cons 101 +cons 108 +cons 116 +cons 116 +cons 111 +cons 98 +cons 32 +callA "prints" +copyI 0 +outputDS +cons 0 +cons 114 +cons 101 +cons 101 +cons 98 +cons 32 +cons 102 +cons 111 +cons 32 +cons 115 +cons 101 +cons 108 +cons 116 +cons 116 +cons 111 +cons 98 +cons 32 +callA "printsln" +cons 0 +cons 100 +cons 110 +cons 117 +cons 111 +cons 114 +cons 97 +cons 32 +cons 116 +cons 105 +cons 32 +cons 115 +cons 115 +cons 97 +cons 112 +cons 32 +cons 44 +cons 110 +cons 119 +cons 111 +cons 100 +cons 32 +cons 101 +cons 110 +cons 111 +cons 32 +cons 101 +cons 107 +cons 97 +cons 84 +callA "printsln" +cons 1 +sub +copyI 0 +outputDS +cons 0 +cons 108 +cons 108 +cons 97 +cons 119 +cons 32 +cons 101 +cons 104 +cons 116 +cons 32 +cons 110 +cons 111 +cons 32 +cons 114 +cons 101 +cons 101 +cons 98 +cons 32 +cons 102 +cons 111 +cons 32 +cons 115 +cons 101 +cons 108 +cons 116 +cons 116 +cons 111 +cons 98 +cons 32 +callA "printsln" +cons 0 +callA "printsln" +copyI 0 +bEZA "LOOP:1" +jumpA "LOOP" -Mark (MArtificial "LOOP:1") -End +markA "LOOP:1" +end -Mark (MArtificial "prints") -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "prints_end") (Branch EZ) -SIO OutputChar -Labeled (LArtificial "prints") Jump +markA "prints" +copyI 0 +bEZA "prints_end" +outputCS +jumpA "prints" -Mark (MArtificial "prints_end") -SPure Discard -Return +markA "prints_end" +discard +return -Mark (MArtificial "printsln") -Labeled (LArtificial "prints") Call -SPure (Cons 10) -SIO OutputChar -Return +markA "printsln" +callA "prints" +cons 10 +outputCS +return diff --git a/.output/actual/ws/il/parsed/from-wsa/hello.il b/.output/actual/ws/il/parsed/from-wsa/hello.il index 810994ec0..76b02970f 100644 --- a/.output/actual/ws/il/parsed/from-wsa/hello.il +++ b/.output/actual/ws/il/parsed/from-wsa/hello.il @@ -1,29 +1,29 @@ -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SPure (Cons 10) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -End +cons 32 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +cons 10 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +end diff --git a/.output/actual/ws/il/parsed/from-wsa/hello2.il b/.output/actual/ws/il/parsed/from-wsa/hello2.il index 0581fba7e..2419e7827 100644 --- a/.output/actual/ws/il/parsed/from-wsa/hello2.il +++ b/.output/actual/ws/il/parsed/from-wsa/hello2.il @@ -1,33 +1,33 @@ -SPure (Cons 0) -SPure (Cons 10) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) -Labeled (LArtificial "prints") Call -End +cons 0 +cons 10 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 +cons 32 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 +callA "prints" +end -Mark (MArtificial "prints") -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "prints_end") (Branch EZ) -SIO OutputChar -Labeled (LArtificial "prints") Jump +markA "prints" +copyI 0 +bEZA "prints_end" +outputCS +jumpA "prints" -Mark (MArtificial "prints_end") -SPure Discard -Return +markA "prints_end" +discard +return -Mark (MArtificial "printsln") -Labeled (LArtificial "prints") Call -SPure (Cons 10) -SIO OutputChar -Return +markA "printsln" +callA "prints" +cons 10 +outputCS +return diff --git a/.output/actual/ws/il/parsed/from-wsa/hello4.il b/.output/actual/ws/il/parsed/from-wsa/hello4.il index b149339c6..8e42ce9f8 100644 --- a/.output/actual/ws/il/parsed/from-wsa/hello4.il +++ b/.output/actual/ws/il/parsed/from-wsa/hello4.il @@ -1,32 +1,32 @@ -SPure (Cons 0) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) -Labeled (LArtificial "printsln") Call -End +cons 0 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 +cons 32 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 +callA "printsln" +end -Mark (MArtificial "prints") -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "prints_end") (Branch EZ) -SIO OutputChar -Labeled (LArtificial "prints") Jump +markA "prints" +copyI 0 +bEZA "prints_end" +outputCS +jumpA "prints" -Mark (MArtificial "prints_end") -SPure Discard -Return +markA "prints_end" +discard +return -Mark (MArtificial "printsln") -Labeled (LArtificial "prints") Call -SPure (Cons 10) -SIO OutputChar -Return +markA "printsln" +callA "prints" +cons 10 +outputCS +return diff --git a/.output/actual/ws/il/parsed/from-wsa/prim.il b/.output/actual/ws/il/parsed/from-wsa/prim.il index 72865a7c1..5fb43f14c 100644 --- a/.output/actual/ws/il/parsed/from-wsa/prim.il +++ b/.output/actual/ws/il/parsed/from-wsa/prim.il @@ -1,131 +1,131 @@ -Mark (MArtificial "st") -SPure (Cons 0) -SPure (Cons 93) -SPure (Cons 48) -SPure (Cons 48) -SPure (Cons 49) -SPure (Cons 45) -SPure (Cons 50) -SPure (Cons 91) -SPure (Cons 32) -SPure (Cons 115) -SPure (Cons 114) -SPure (Cons 101) -SPure (Cons 98) -SPure (Cons 109) -SPure (Cons 117) -SPure (Cons 110) -SPure (Cons 32) -SPure (Cons 109) -SPure (Cons 105) -SPure (Cons 114) -SPure (Cons 112) -Labeled (LArtificial "printsln") Call -SPure (Cons 0) +markA "st" +cons 0 +cons 93 +cons 48 +cons 48 +cons 49 +cons 45 +cons 50 +cons 91 +cons 32 +cons 115 +cons 114 +cons 101 +cons 98 +cons 109 +cons 117 +cons 110 +cons 32 +cons 109 +cons 105 +cons 114 +cons 112 +callA "printsln" +cons 0 -Mark (MArtificial "f_start_1") -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 100) -SPure (Binary Sub) -Labeled (LArtificial "f_finished_1") (Branch EZ) -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 100) -SPure (Binary Add) -SPure (Cons 1) -Store -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "f_start_1") Jump +markA "f_start_1" +copyI 0 +cons 100 +sub +bEZA "f_finished_1" +copyI 0 +cons 100 +add +cons 1 +store +cons 1 +add +jumpA "f_start_1" -Mark (MArtificial "f_finished_1") -SPure Discard -SPure (Cons 2) +markA "f_finished_1" +discard +cons 2 -Mark (MArtificial "f_start_2") -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 11) -SPure (Binary Sub) -Labeled (LArtificial "f_finished_2") (Branch EZ) -SPure (Cons 2) +markA "f_start_2" +copyI 0 +cons 11 +sub +bEZA "f_finished_2" +cons 2 -Mark (MArtificial "f_start_3") -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 100) -SPure (Binary Sub) -Labeled (LArtificial "f_finished_3") (Branch EZ) -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 1) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Indexed (IImmediate 1) Move) -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 2) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Indexed (IImmediate 1) Move) -SPure (Cons 1) -Load -SPure (Cons 2) -Load -SPure (Binary Mul) -SPure (Cons 100) -SPure (Binary Add) -SPure (Cons 0) -Store -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "f_start_3") Jump +markA "f_start_3" +copyI 0 +cons 100 +sub +bEZA "f_finished_3" +copyI 0 +cons 1 +moveI 1 +store +moveI 1 +copyI 0 +cons 2 +moveI 1 +store +moveI 1 +cons 1 +load +cons 2 +load +mul +cons 100 +add +cons 0 +store +cons 1 +add +jumpA "f_start_3" -Mark (MArtificial "f_finished_3") -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "f_start_2") Jump +markA "f_finished_3" +discard +cons 1 +add +jumpA "f_start_2" -Mark (MArtificial "f_finished_2") -SPure Discard -SPure (Cons 2) +markA "f_finished_2" +discard +cons 2 -Mark (MArtificial "f_start_4") -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 100) -SPure (Binary Sub) -Labeled (LArtificial "f_finished_4") (Branch EZ) -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 100) -SPure (Binary Add) -Load -Labeled (LArtificial "nodraw") (Branch EZ) -SPure (Indexed (IImmediate 0) Copy) -SIO OutputDec -SPure (Cons 0) -SPure (Cons 32) -Labeled (LArtificial "prints") Call +markA "f_start_4" +copyI 0 +cons 100 +sub +bEZA "f_finished_4" +copyI 0 +cons 100 +add +load +bEZA "nodraw" +copyI 0 +outputDS +cons 0 +cons 32 +callA "prints" -Mark (MArtificial "nodraw") -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "f_start_4") Jump +markA "nodraw" +cons 1 +add +jumpA "f_start_4" -Mark (MArtificial "f_finished_4") -SPure Discard -SPure (Cons 0) -Labeled (LArtificial "printsln") Call -End +markA "f_finished_4" +discard +cons 0 +callA "printsln" +end -Mark (MArtificial "prints") -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "prints_end") (Branch EZ) -SIO OutputChar -Labeled (LArtificial "prints") Jump +markA "prints" +copyI 0 +bEZA "prints_end" +outputCS +jumpA "prints" -Mark (MArtificial "prints_end") -SPure Discard -Return +markA "prints_end" +discard +return -Mark (MArtificial "printsln") -Labeled (LArtificial "prints") Call -SPure (Cons 10) -SIO OutputChar -Return +markA "printsln" +callA "prints" +cons 10 +outputCS +return diff --git a/.output/actual/ws/il/parsed/from-wsa/true.il b/.output/actual/ws/il/parsed/from-wsa/true.il index 528694d82..a6a9baf65 100644 --- a/.output/actual/ws/il/parsed/from-wsa/true.il +++ b/.output/actual/ws/il/parsed/from-wsa/true.il @@ -1 +1 @@ -End +end diff --git a/.output/actual/ws/il/parsed/original/calc.il b/.output/actual/ws/il/parsed/original/calc.il index c8b0cdc0a..05b5c3b58 100644 --- a/.output/actual/ws/il/parsed/original/calc.il +++ b/.output/actual/ws/il/parsed/original/calc.il @@ -1,251 +1,251 @@ -SPure (Cons 0) -SPure (Cons 69) -Store -SPure (Cons 1) -SPure (Cons 110) -Store -SPure (Cons 2) -SPure (Cons 116) -Store -SPure (Cons 3) -SPure (Cons 101) -Store -SPure (Cons 4) -SPure (Cons 114) -Store -SPure (Cons 5) -SPure (Cons 32) -Store -SPure (Cons 6) -SPure (Cons 115) -Store -SPure (Cons 7) -SPure (Cons 111) -Store -SPure (Cons 8) -SPure (Cons 109) -Store -SPure (Cons 9) -SPure (Cons 101) -Store -SPure (Cons 10) -SPure (Cons 32) -Store -SPure (Cons 11) -SPure (Cons 110) -Store -SPure (Cons 12) -SPure (Cons 117) -Store -SPure (Cons 13) -SPure (Cons 109) -Store -SPure (Cons 14) -SPure (Cons 98) -Store -SPure (Cons 15) -SPure (Cons 101) -Store -SPure (Cons 16) -SPure (Cons 114) -Store -SPure (Cons 17) -SPure (Cons 115) -Store -SPure (Cons 18) -SPure (Cons 44) -Store -SPure (Cons 19) -SPure (Cons 32) -Store -SPure (Cons 20) -SPure (Cons 116) -Store -SPure (Cons 21) -SPure (Cons 104) -Store -SPure (Cons 22) -SPure (Cons 101) -Store -SPure (Cons 23) -SPure (Cons 110) -Store -SPure (Cons 24) -SPure (Cons 32) -Store -SPure (Cons 25) -SPure (Cons 45) -Store -SPure (Cons 26) -SPure (Cons 49) -Store -SPure (Cons 27) -SPure (Cons 32) -Store -SPure (Cons 28) -SPure (Cons 116) -Store -SPure (Cons 29) -SPure (Cons 111) -Store -SPure (Cons 30) -SPure (Cons 32) -Store -SPure (Cons 31) -SPure (Cons 102) -Store -SPure (Cons 32) -SPure (Cons 105) -Store -SPure (Cons 33) -SPure (Cons 110) -Store -SPure (Cons 34) -SPure (Cons 105) -Store -SPure (Cons 35) -SPure (Cons 115) -Store -SPure (Cons 36) -SPure (Cons 104) -Store -SPure (Cons 37) -SPure (Cons 0) -Store -SPure (Cons 42) -SPure (Cons 78) -Store -SPure (Cons 43) -SPure (Cons 117) -Store -SPure (Cons 44) -SPure (Cons 109) -Store -SPure (Cons 45) -SPure (Cons 98) -Store -SPure (Cons 46) -SPure (Cons 101) -Store -SPure (Cons 47) -SPure (Cons 114) -Store -SPure (Cons 48) -SPure (Cons 58) -Store -SPure (Cons 49) -SPure (Cons 0) -Store -SPure (Cons 60) -SPure (Cons 84) -Store -SPure (Cons 61) -SPure (Cons 111) -Store -SPure (Cons 62) -SPure (Cons 116) -Store -SPure (Cons 63) -SPure (Cons 97) -Store -SPure (Cons 64) -SPure (Cons 108) -Store -SPure (Cons 65) -SPure (Cons 32) -Store -SPure (Cons 66) -SPure (Cons 105) -Store -SPure (Cons 67) -SPure (Cons 115) -Store -SPure (Cons 68) -SPure (Cons 32) -Store -SPure (Cons 69) -SPure (Cons 0) -Store -SPure (Cons 0) -Labeled (LArtificial "write") Call -Labeled (LArtificial "newline") Call -SPure (Cons 100) -SPure (Cons 0) -Store +cons 0 +cons 69 +store +cons 1 +cons 110 +store +cons 2 +cons 116 +store +cons 3 +cons 101 +store +cons 4 +cons 114 +store +cons 5 +cons 32 +store +cons 6 +cons 115 +store +cons 7 +cons 111 +store +cons 8 +cons 109 +store +cons 9 +cons 101 +store +cons 10 +cons 32 +store +cons 11 +cons 110 +store +cons 12 +cons 117 +store +cons 13 +cons 109 +store +cons 14 +cons 98 +store +cons 15 +cons 101 +store +cons 16 +cons 114 +store +cons 17 +cons 115 +store +cons 18 +cons 44 +store +cons 19 +cons 32 +store +cons 20 +cons 116 +store +cons 21 +cons 104 +store +cons 22 +cons 101 +store +cons 23 +cons 110 +store +cons 24 +cons 32 +store +cons 25 +cons 45 +store +cons 26 +cons 49 +store +cons 27 +cons 32 +store +cons 28 +cons 116 +store +cons 29 +cons 111 +store +cons 30 +cons 32 +store +cons 31 +cons 102 +store +cons 32 +cons 105 +store +cons 33 +cons 110 +store +cons 34 +cons 105 +store +cons 35 +cons 115 +store +cons 36 +cons 104 +store +cons 37 +cons 0 +store +cons 42 +cons 78 +store +cons 43 +cons 117 +store +cons 44 +cons 109 +store +cons 45 +cons 98 +store +cons 46 +cons 101 +store +cons 47 +cons 114 +store +cons 48 +cons 58 +store +cons 49 +cons 0 +store +cons 60 +cons 84 +store +cons 61 +cons 111 +store +cons 62 +cons 116 +store +cons 63 +cons 97 +store +cons 64 +cons 108 +store +cons 65 +cons 32 +store +cons 66 +cons 105 +store +cons 67 +cons 115 +store +cons 68 +cons 32 +store +cons 69 +cons 0 +store +cons 0 +callA "write" +callA "newline" +cons 100 +cons 0 +store -Mark (MArtificial "loop") -SPure (Cons 42) -Labeled (LArtificial "write") Call -SPure (Cons 101) -MIO InputDec -SPure (Cons 101) -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons (-1)) -SPure (Binary Sub) -Labeled (LArtificial "progend") (Branch EZ) -SPure (Cons 100) -Load -SPure (Binary Add) -SPure (Cons 100) -SPure (Indexed (IImmediate 1) Move) -Store -Labeled (LArtificial "loop") Jump +markA "loop" +cons 42 +callA "write" +cons 101 +mio inputdec +cons 101 +load +copyI 0 +cons (-1) +sub +bEZA "progend" +cons 100 +load +add +cons 100 +moveI 1 +store +jumpA "loop" -Mark (MArtificial "progend") -SPure Discard -SPure (Cons 60) -Labeled (LArtificial "write") Call -SPure (Cons 100) -Load -SIO OutputDec -Labeled (LArtificial "newline") Call -End +markA "progend" +discard +cons 60 +callA "write" +cons 100 +load +outputDS +callA "newline" +end -Mark (MArtificial "add") -SPure (Binary Add) -Return +markA "add" +add +return -Mark (MArtificial "write") -SPure (Indexed (IImmediate 0) Copy) -Load -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "write_end") (Branch EZ) -SIO OutputChar -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "write") Jump +markA "write" +copyI 0 +load +copyI 0 +bEZA "write_end" +outputCS +cons 1 +add +jumpA "write" -Mark (MArtificial "write_end") -SPure Discard -SPure Discard -Return +markA "write_end" +discard +discard +return -Mark (MArtificial "read") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 0) Copy) -MIO InputChar -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 10) -SPure (Binary Sub) -Labeled (LArtificial "read_end") (Branch EZ) -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "read") Jump +markA "read" +copyI 0 +copyI 0 +mio inputchar +load +copyI 0 +cons 10 +sub +bEZA "read_end" +discard +cons 1 +add +jumpA "read" -Mark (MArtificial "read_end") -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -SPure (Cons 0) -Store -Return +markA "read_end" +discard +cons 1 +add +cons 0 +store +return -Mark (MArtificial "newline") -SPure (Cons 10) -SPure (Cons 13) -SIO OutputChar -SIO OutputChar -Return +markA "newline" +cons 10 +cons 13 +outputCS +outputCS +return diff --git a/.output/actual/ws/il/parsed/original/count.il b/.output/actual/ws/il/parsed/original/count.il index 92cabbb58..2044999b8 100644 --- a/.output/actual/ws/il/parsed/original/count.il +++ b/.output/actual/ws/il/parsed/original/count.il @@ -1,66 +1,66 @@ -SPure (Cons 1) +cons 1 -Mark (MArtificial "C") -SPure (Indexed (IImmediate 0) Copy) -SIO OutputDec -SPure (Cons 10) -SIO OutputChar -SPure (Cons 1) -SPure (Binary Add) -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 11) -SPure (Binary Sub) -Labeled (LArtificial "E") (Branch EZ) -Labeled (LArtificial "C") Jump +markA "C" +copyI 0 +outputDS +cons 10 +outputCS +cons 1 +add +copyI 0 +cons 11 +sub +bEZA "E" +jumpA "C" -Mark (MArtificial "E") -SPure Discard -End +markA "E" +discard +end -Mark (MArtificial "add") -SPure (Binary Add) -Return +markA "add" +add +return -Mark (MArtificial "write") -SPure (Indexed (IImmediate 0) Copy) -Load -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "write_end") (Branch EZ) -SIO OutputChar -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "write") Jump +markA "write" +copyI 0 +load +copyI 0 +bEZA "write_end" +outputCS +cons 1 +add +jumpA "write" -Mark (MArtificial "write_end") -SPure Discard -SPure Discard -Return +markA "write_end" +discard +discard +return -Mark (MArtificial "read") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 0) Copy) -MIO InputChar -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 10) -SPure (Binary Sub) -Labeled (LArtificial "read_end") (Branch EZ) -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "read") Jump +markA "read" +copyI 0 +copyI 0 +mio inputchar +load +copyI 0 +cons 10 +sub +bEZA "read_end" +discard +cons 1 +add +jumpA "read" -Mark (MArtificial "read_end") -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -SPure (Cons 0) -Store -Return +markA "read_end" +discard +cons 1 +add +cons 0 +store +return -Mark (MArtificial "newline") -SPure (Cons 10) -SPure (Cons 13) -SIO OutputChar -SIO OutputChar -Return +markA "newline" +cons 10 +cons 13 +outputCS +outputCS +return diff --git a/.output/actual/ws/il/parsed/original/fact.il b/.output/actual/ws/il/parsed/original/fact.il index cfc111811..6608c355c 100644 --- a/.output/actual/ws/il/parsed/original/fact.il +++ b/.output/actual/ws/il/parsed/original/fact.il @@ -1,146 +1,146 @@ -SPure (Cons 0) -SPure (Cons 69) -Store -SPure (Cons 1) -SPure (Cons 110) -Store -SPure (Cons 2) -SPure (Cons 116) -Store -SPure (Cons 3) -SPure (Cons 101) -Store -SPure (Cons 4) -SPure (Cons 114) -Store -SPure (Cons 5) -SPure (Cons 32) -Store -SPure (Cons 6) -SPure (Cons 97) -Store -SPure (Cons 7) -SPure (Cons 32) -Store -SPure (Cons 8) -SPure (Cons 110) -Store -SPure (Cons 9) -SPure (Cons 117) -Store -SPure (Cons 10) -SPure (Cons 109) -Store -SPure (Cons 11) -SPure (Cons 98) -Store -SPure (Cons 12) -SPure (Cons 101) -Store -SPure (Cons 13) -SPure (Cons 114) -Store -SPure (Cons 14) -SPure (Cons 58) -Store -SPure (Cons 15) -SPure (Cons 32) -Store -SPure (Cons 16) -SPure (Cons 0) -Store -SPure (Cons 20) -SPure (Cons 33) -Store -SPure (Cons 21) -SPure (Cons 32) -Store -SPure (Cons 22) -SPure (Cons 61) -Store -SPure (Cons 23) -SPure (Cons 32) -Store -SPure (Cons 24) -SPure (Cons 0) -Store -SPure (Cons 0) -Labeled (LArtificial "write") Call -SPure (Cons 100) -MIO InputDec -SPure (Cons 100) -Load -Labeled (LArtificial "fact") Call -SPure (Cons 100) -Load -SIO OutputDec -SPure (Cons 20) -Labeled (LArtificial "write") Call -SIO OutputDec -Labeled (LArtificial "newline") Call -End +cons 0 +cons 69 +store +cons 1 +cons 110 +store +cons 2 +cons 116 +store +cons 3 +cons 101 +store +cons 4 +cons 114 +store +cons 5 +cons 32 +store +cons 6 +cons 97 +store +cons 7 +cons 32 +store +cons 8 +cons 110 +store +cons 9 +cons 117 +store +cons 10 +cons 109 +store +cons 11 +cons 98 +store +cons 12 +cons 101 +store +cons 13 +cons 114 +store +cons 14 +cons 58 +store +cons 15 +cons 32 +store +cons 16 +cons 0 +store +cons 20 +cons 33 +store +cons 21 +cons 32 +store +cons 22 +cons 61 +store +cons 23 +cons 32 +store +cons 24 +cons 0 +store +cons 0 +callA "write" +cons 100 +mio inputdec +cons 100 +load +callA "fact" +cons 100 +load +outputDS +cons 20 +callA "write" +outputDS +callA "newline" +end -Mark (MArtificial "fact") -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 1) -SPure (Binary Sub) -Labeled (LArtificial "factbase") (Branch EZ) -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 1) -SPure (Binary Sub) -Labeled (LArtificial "fact") Call -SPure (Binary Mul) -Return +markA "fact" +copyI 0 +cons 1 +sub +bEZA "factbase" +copyI 0 +cons 1 +sub +callA "fact" +mul +return -Mark (MArtificial "factbase") -SPure (Cons 1) -SPure Discard -Return +markA "factbase" +cons 1 +discard +return -Mark (MArtificial "add") -SPure (Binary Add) -Return +markA "add" +add +return -Mark (MArtificial "write") -SPure (Indexed (IImmediate 0) Copy) -Load -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "write_end") (Branch EZ) -SIO OutputChar -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "write") Jump +markA "write" +copyI 0 +load +copyI 0 +bEZA "write_end" +outputCS +cons 1 +add +jumpA "write" -Mark (MArtificial "write_end") -SPure Discard -SPure Discard -Return +markA "write_end" +discard +discard +return -Mark (MArtificial "read") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 0) Copy) -MIO InputChar -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 10) -SPure (Binary Sub) -Labeled (LArtificial "read_end") (Branch EZ) -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "read") Jump +markA "read" +copyI 0 +copyI 0 +mio inputchar +load +copyI 0 +cons 10 +sub +bEZA "read_end" +discard +cons 1 +add +jumpA "read" -Mark (MArtificial "read_end") -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -SPure (Cons 0) -Store -Return +markA "read_end" +discard +cons 1 +add +cons 0 +store +return -Mark (MArtificial "newline") -SPure (Cons 10) -SPure (Cons 13) -SIO OutputChar -SIO OutputChar -Return +markA "newline" +cons 10 +cons 13 +outputCS +outputCS +return diff --git a/.output/actual/ws/il/parsed/original/hWorld.il b/.output/actual/ws/il/parsed/original/hWorld.il index 39380554a..c5dca3f9a 100644 --- a/.output/actual/ws/il/parsed/original/hWorld.il +++ b/.output/actual/ws/il/parsed/original/hWorld.il @@ -1,124 +1,124 @@ -SPure (Cons 0) -SPure (Cons 72) -Store -SPure (Cons 1) -SPure (Cons 101) -Store -SPure (Cons 2) -SPure (Cons 108) -Store -SPure (Cons 3) -SPure (Cons 108) -Store -SPure (Cons 4) -SPure (Cons 111) -Store -SPure (Cons 5) -SPure (Cons 44) -Store -SPure (Cons 6) -SPure (Cons 32) -Store -SPure (Cons 7) -SPure (Cons 119) -Store -SPure (Cons 8) -SPure (Cons 111) -Store -SPure (Cons 9) -SPure (Cons 114) -Store -SPure (Cons 10) -SPure (Cons 108) -Store -SPure (Cons 11) -SPure (Cons 100) -Store -SPure (Cons 12) -SPure (Cons 32) -Store -SPure (Cons 13) -SPure (Cons 111) -Store -SPure (Cons 14) -SPure (Cons 102) -Store -SPure (Cons 15) -SPure (Cons 32) -Store -SPure (Cons 16) -SPure (Cons 115) -Store -SPure (Cons 17) -SPure (Cons 112) -Store -SPure (Cons 18) -SPure (Cons 97) -Store -SPure (Cons 19) -SPure (Cons 99) -Store -SPure (Cons 20) -SPure (Cons 101) -Store -SPure (Cons 21) -SPure (Cons 115) -Store -SPure (Cons 22) -SPure (Cons 33) -Store -SPure (Cons 23) -SPure (Cons 0) -Store -SPure (Cons 0) -Labeled (LArtificial "write") Call -Labeled (LArtificial "newline") Call -End +cons 0 +cons 72 +store +cons 1 +cons 101 +store +cons 2 +cons 108 +store +cons 3 +cons 108 +store +cons 4 +cons 111 +store +cons 5 +cons 44 +store +cons 6 +cons 32 +store +cons 7 +cons 119 +store +cons 8 +cons 111 +store +cons 9 +cons 114 +store +cons 10 +cons 108 +store +cons 11 +cons 100 +store +cons 12 +cons 32 +store +cons 13 +cons 111 +store +cons 14 +cons 102 +store +cons 15 +cons 32 +store +cons 16 +cons 115 +store +cons 17 +cons 112 +store +cons 18 +cons 97 +store +cons 19 +cons 99 +store +cons 20 +cons 101 +store +cons 21 +cons 115 +store +cons 22 +cons 33 +store +cons 23 +cons 0 +store +cons 0 +callA "write" +callA "newline" +end -Mark (MArtificial "add") -SPure (Binary Add) -Return +markA "add" +add +return -Mark (MArtificial "write") -SPure (Indexed (IImmediate 0) Copy) -Load -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "write_end") (Branch EZ) -SIO OutputChar -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "write") Jump +markA "write" +copyI 0 +load +copyI 0 +bEZA "write_end" +outputCS +cons 1 +add +jumpA "write" -Mark (MArtificial "write_end") -SPure Discard -SPure Discard -Return +markA "write_end" +discard +discard +return -Mark (MArtificial "read") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 0) Copy) -MIO InputChar -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 10) -SPure (Binary Sub) -Labeled (LArtificial "read_end") (Branch EZ) -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "read") Jump +markA "read" +copyI 0 +copyI 0 +mio inputchar +load +copyI 0 +cons 10 +sub +bEZA "read_end" +discard +cons 1 +add +jumpA "read" -Mark (MArtificial "read_end") -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -SPure (Cons 0) -Store -Return +markA "read_end" +discard +cons 1 +add +cons 0 +store +return -Mark (MArtificial "newline") -SPure (Cons 10) -SPure (Cons 13) -SIO OutputChar -SIO OutputChar -Return +markA "newline" +cons 10 +cons 13 +outputCS +outputCS +return diff --git a/.output/actual/ws/il/parsed/original/hanoi.il b/.output/actual/ws/il/parsed/original/hanoi.il index 0042b9aa4..9c0fd0dac 100644 --- a/.output/actual/ws/il/parsed/original/hanoi.il +++ b/.output/actual/ws/il/parsed/original/hanoi.il @@ -1,216 +1,216 @@ -SPure (Cons 0) -SPure (Cons 69) -Store -SPure (Cons 1) -SPure (Cons 110) -Store -SPure (Cons 2) -SPure (Cons 116) -Store -SPure (Cons 3) -SPure (Cons 101) -Store -SPure (Cons 4) -SPure (Cons 114) -Store -SPure (Cons 5) -SPure (Cons 32) -Store -SPure (Cons 6) -SPure (Cons 97) -Store -SPure (Cons 7) -SPure (Cons 32) -Store -SPure (Cons 8) -SPure (Cons 110) -Store -SPure (Cons 9) -SPure (Cons 117) -Store -SPure (Cons 10) -SPure (Cons 109) -Store -SPure (Cons 11) -SPure (Cons 98) -Store -SPure (Cons 12) -SPure (Cons 101) -Store -SPure (Cons 13) -SPure (Cons 114) -Store -SPure (Cons 14) -SPure (Cons 58) -Store -SPure (Cons 15) -SPure (Cons 32) -Store -SPure (Cons 16) -SPure (Cons 0) -Store -SPure (Cons 20) -SPure (Cons 32) -Store -SPure (Cons 21) -SPure (Cons 45) -Store -SPure (Cons 22) -SPure (Cons 62) -Store -SPure (Cons 23) -SPure (Cons 32) -Store -SPure (Cons 24) -SPure (Cons 0) -Store -SPure (Cons 0) -Labeled (LArtificial "write") Call -SPure (Cons 100) -MIO InputDec -SPure (Cons 100) -Load -SPure (Cons 1) -SPure (Cons 3) -SPure (Cons 2) -Labeled (LArtificial "hanoi") Call -End +cons 0 +cons 69 +store +cons 1 +cons 110 +store +cons 2 +cons 116 +store +cons 3 +cons 101 +store +cons 4 +cons 114 +store +cons 5 +cons 32 +store +cons 6 +cons 97 +store +cons 7 +cons 32 +store +cons 8 +cons 110 +store +cons 9 +cons 117 +store +cons 10 +cons 109 +store +cons 11 +cons 98 +store +cons 12 +cons 101 +store +cons 13 +cons 114 +store +cons 14 +cons 58 +store +cons 15 +cons 32 +store +cons 16 +cons 0 +store +cons 20 +cons 32 +store +cons 21 +cons 45 +store +cons 22 +cons 62 +store +cons 23 +cons 32 +store +cons 24 +cons 0 +store +cons 0 +callA "write" +cons 100 +mio inputdec +cons 100 +load +cons 1 +cons 3 +cons 2 +callA "hanoi" +end -Mark (MArtificial "hanoi") -SPure (Cons 103) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 102) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 101) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 100) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 100) -Load -Labeled (LArtificial "endhanoi") (Branch EZ) -SPure (Cons 100) -Load -SPure (Cons 101) -Load -SPure (Cons 102) -Load -SPure (Cons 103) -Load -SPure (Cons 100) -Load -SPure (Cons 1) -SPure (Binary Sub) -SPure (Cons 101) -Load -SPure (Cons 103) -Load -SPure (Cons 102) -Load -Labeled (LArtificial "hanoi") Call -SPure (Cons 103) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 102) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 101) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 100) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 101) -Load -SIO OutputDec -SPure (Cons 20) -Labeled (LArtificial "write") Call -SPure (Cons 102) -Load -SIO OutputDec -Labeled (LArtificial "newline") Call -SPure (Cons 100) -Load -SPure (Cons 101) -Load -SPure (Cons 102) -Load -SPure (Cons 103) -Load -SPure (Cons 100) -Load -SPure (Cons 1) -SPure (Binary Sub) -SPure (Cons 103) -Load -SPure (Cons 102) -Load -SPure (Cons 101) -Load -Labeled (LArtificial "hanoi") Call -SPure (Cons 103) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 102) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 101) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 100) -SPure (Indexed (IImmediate 1) Move) -Store +markA "hanoi" +cons 103 +moveI 1 +store +cons 102 +moveI 1 +store +cons 101 +moveI 1 +store +cons 100 +moveI 1 +store +cons 100 +load +bEZA "endhanoi" +cons 100 +load +cons 101 +load +cons 102 +load +cons 103 +load +cons 100 +load +cons 1 +sub +cons 101 +load +cons 103 +load +cons 102 +load +callA "hanoi" +cons 103 +moveI 1 +store +cons 102 +moveI 1 +store +cons 101 +moveI 1 +store +cons 100 +moveI 1 +store +cons 101 +load +outputDS +cons 20 +callA "write" +cons 102 +load +outputDS +callA "newline" +cons 100 +load +cons 101 +load +cons 102 +load +cons 103 +load +cons 100 +load +cons 1 +sub +cons 103 +load +cons 102 +load +cons 101 +load +callA "hanoi" +cons 103 +moveI 1 +store +cons 102 +moveI 1 +store +cons 101 +moveI 1 +store +cons 100 +moveI 1 +store -Mark (MArtificial "endhanoi") -Return +markA "endhanoi" +return -Mark (MArtificial "add") -SPure (Binary Add) -Return +markA "add" +add +return -Mark (MArtificial "write") -SPure (Indexed (IImmediate 0) Copy) -Load -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "write_end") (Branch EZ) -SIO OutputChar -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "write") Jump +markA "write" +copyI 0 +load +copyI 0 +bEZA "write_end" +outputCS +cons 1 +add +jumpA "write" -Mark (MArtificial "write_end") -SPure Discard -SPure Discard -Return +markA "write_end" +discard +discard +return -Mark (MArtificial "read") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 0) Copy) -MIO InputChar -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 10) -SPure (Binary Sub) -Labeled (LArtificial "read_end") (Branch EZ) -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "read") Jump +markA "read" +copyI 0 +copyI 0 +mio inputchar +load +copyI 0 +cons 10 +sub +bEZA "read_end" +discard +cons 1 +add +jumpA "read" -Mark (MArtificial "read_end") -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -SPure (Cons 0) -Store -Return +markA "read_end" +discard +cons 1 +add +cons 0 +store +return -Mark (MArtificial "newline") -SPure (Cons 10) -SPure (Cons 13) -SIO OutputChar -SIO OutputChar -Return +markA "newline" +cons 10 +cons 13 +outputCS +outputCS +return diff --git a/.output/actual/ws/il/parsed/original/helloWorld.il b/.output/actual/ws/il/parsed/original/helloWorld.il index ecdd99958..bffe7c401 100644 --- a/.output/actual/ws/il/parsed/original/helloWorld.il +++ b/.output/actual/ws/il/parsed/original/helloWorld.il @@ -1,25 +1,25 @@ -SPure (Cons 72) -SIO OutputChar -SPure (Cons 101) -SIO OutputChar -SPure (Cons 108) -SIO OutputChar -SPure (Cons 108) -SIO OutputChar -SPure (Cons 111) -SIO OutputChar -SPure (Cons 44) -SIO OutputChar -SPure (Cons 32) -SIO OutputChar -SPure (Cons 119) -SIO OutputChar -SPure (Cons 111) -SIO OutputChar -SPure (Cons 114) -SIO OutputChar -SPure (Cons 108) -SIO OutputChar -SPure (Cons 100) -SIO OutputChar -End +cons 72 +outputCS +cons 101 +outputCS +cons 108 +outputCS +cons 108 +outputCS +cons 111 +outputCS +cons 44 +outputCS +cons 32 +outputCS +cons 119 +outputCS +cons 111 +outputCS +cons 114 +outputCS +cons 108 +outputCS +cons 100 +outputCS +end diff --git a/.output/actual/ws/il/parsed/original/locTest.il b/.output/actual/ws/il/parsed/original/locTest.il index 470861ea4..2e6dace7b 100644 --- a/.output/actual/ws/il/parsed/original/locTest.il +++ b/.output/actual/ws/il/parsed/original/locTest.il @@ -1,121 +1,121 @@ -SPure (Cons 0) -SPure (Cons 69) -Store -SPure (Cons 1) -SPure (Cons 110) -Store -SPure (Cons 2) -SPure (Cons 116) -Store -SPure (Cons 3) -SPure (Cons 101) -Store -SPure (Cons 4) -SPure (Cons 114) -Store -SPure (Cons 5) -SPure (Cons 32) -Store -SPure (Cons 6) -SPure (Cons 97) -Store -SPure (Cons 7) -SPure (Cons 32) -Store -SPure (Cons 8) -SPure (Cons 110) -Store -SPure (Cons 9) -SPure (Cons 117) -Store -SPure (Cons 10) -SPure (Cons 109) -Store -SPure (Cons 11) -SPure (Cons 98) -Store -SPure (Cons 12) -SPure (Cons 101) -Store -SPure (Cons 13) -SPure (Cons 114) -Store -SPure (Cons 14) -SPure (Cons 58) -Store -SPure (Cons 15) -SPure (Cons 32) -Store -SPure (Cons 16) -SPure (Cons 0) -Store -SPure (Cons 0) -Labeled (LArtificial "write") Call -SPure (Cons 100) -MIO InputDec -SPure (Cons 0) -Labeled (LArtificial "write") Call -SPure (Cons 101) -MIO InputDec -SPure (Cons 100) -Load -SPure (Cons 101) -Load -Labeled (LArtificial "loctest") Call -SIO OutputDec -End +cons 0 +cons 69 +store +cons 1 +cons 110 +store +cons 2 +cons 116 +store +cons 3 +cons 101 +store +cons 4 +cons 114 +store +cons 5 +cons 32 +store +cons 6 +cons 97 +store +cons 7 +cons 32 +store +cons 8 +cons 110 +store +cons 9 +cons 117 +store +cons 10 +cons 109 +store +cons 11 +cons 98 +store +cons 12 +cons 101 +store +cons 13 +cons 114 +store +cons 14 +cons 58 +store +cons 15 +cons 32 +store +cons 16 +cons 0 +store +cons 0 +callA "write" +cons 100 +mio inputdec +cons 0 +callA "write" +cons 101 +mio inputdec +cons 100 +load +cons 101 +load +callA "loctest" +outputDS +end -Mark (MArtificial "loctest") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 2) Copy) -SPure (Binary Add) -SPure (Indexed (IImmediate 2) Slide) -Return +markA "loctest" +copyI 0 +copyI 2 +add +slideI 2 +return -Mark (MArtificial "add") -SPure (Binary Add) -Return +markA "add" +add +return -Mark (MArtificial "write") -SPure (Indexed (IImmediate 0) Copy) -Load -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "write_end") (Branch EZ) -SIO OutputChar -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "write") Jump +markA "write" +copyI 0 +load +copyI 0 +bEZA "write_end" +outputCS +cons 1 +add +jumpA "write" -Mark (MArtificial "write_end") -SPure Discard -SPure Discard -Return +markA "write_end" +discard +discard +return -Mark (MArtificial "read") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 0) Copy) -MIO InputChar -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 10) -SPure (Binary Sub) -Labeled (LArtificial "read_end") (Branch EZ) -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "read") Jump +markA "read" +copyI 0 +copyI 0 +mio inputchar +load +copyI 0 +cons 10 +sub +bEZA "read_end" +discard +cons 1 +add +jumpA "read" -Mark (MArtificial "read_end") -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -SPure (Cons 0) -Store -Return +markA "read_end" +discard +cons 1 +add +cons 0 +store +return -Mark (MArtificial "newline") -SPure (Cons 10) -SPure (Cons 13) -SIO OutputChar -SIO OutputChar -Return +markA "newline" +cons 10 +cons 13 +outputCS +outputCS +return diff --git a/.output/actual/ws/il/parsed/original/name.il b/.output/actual/ws/il/parsed/original/name.il index ec1c152fe..ba122db55 100644 --- a/.output/actual/ws/il/parsed/original/name.il +++ b/.output/actual/ws/il/parsed/original/name.il @@ -1,154 +1,154 @@ -SPure (Cons 0) -SPure (Cons 80) -Store -SPure (Cons 1) -SPure (Cons 108) -Store -SPure (Cons 2) -SPure (Cons 101) -Store -SPure (Cons 3) -SPure (Cons 97) -Store -SPure (Cons 4) -SPure (Cons 115) -Store -SPure (Cons 5) -SPure (Cons 101) -Store -SPure (Cons 6) -SPure (Cons 32) -Store -SPure (Cons 7) -SPure (Cons 101) -Store -SPure (Cons 8) -SPure (Cons 110) -Store -SPure (Cons 9) -SPure (Cons 116) -Store -SPure (Cons 10) -SPure (Cons 101) -Store -SPure (Cons 11) -SPure (Cons 114) -Store -SPure (Cons 12) -SPure (Cons 32) -Store -SPure (Cons 13) -SPure (Cons 121) -Store -SPure (Cons 14) -SPure (Cons 111) -Store -SPure (Cons 15) -SPure (Cons 117) -Store -SPure (Cons 16) -SPure (Cons 114) -Store -SPure (Cons 17) -SPure (Cons 32) -Store -SPure (Cons 18) -SPure (Cons 110) -Store -SPure (Cons 19) -SPure (Cons 97) -Store -SPure (Cons 20) -SPure (Cons 109) -Store -SPure (Cons 21) -SPure (Cons 101) -Store -SPure (Cons 22) -SPure (Cons 58) -Store -SPure (Cons 23) -SPure (Cons 32) -Store -SPure (Cons 24) -SPure (Cons 0) -Store -SPure (Cons 30) -SPure (Cons 72) -Store -SPure (Cons 31) -SPure (Cons 101) -Store -SPure (Cons 32) -SPure (Cons 108) -Store -SPure (Cons 33) -SPure (Cons 108) -Store -SPure (Cons 34) -SPure (Cons 111) -Store -SPure (Cons 35) -SPure (Cons 32) -Store -SPure (Cons 36) -SPure (Cons 0) -Store -SPure (Cons 0) -Labeled (LArtificial "write") Call -SPure (Cons 100) -Labeled (LArtificial "read") Call -SPure (Cons 30) -Labeled (LArtificial "write") Call -SPure (Cons 100) -Labeled (LArtificial "write") Call -Labeled (LArtificial "newline") Call -End +cons 0 +cons 80 +store +cons 1 +cons 108 +store +cons 2 +cons 101 +store +cons 3 +cons 97 +store +cons 4 +cons 115 +store +cons 5 +cons 101 +store +cons 6 +cons 32 +store +cons 7 +cons 101 +store +cons 8 +cons 110 +store +cons 9 +cons 116 +store +cons 10 +cons 101 +store +cons 11 +cons 114 +store +cons 12 +cons 32 +store +cons 13 +cons 121 +store +cons 14 +cons 111 +store +cons 15 +cons 117 +store +cons 16 +cons 114 +store +cons 17 +cons 32 +store +cons 18 +cons 110 +store +cons 19 +cons 97 +store +cons 20 +cons 109 +store +cons 21 +cons 101 +store +cons 22 +cons 58 +store +cons 23 +cons 32 +store +cons 24 +cons 0 +store +cons 30 +cons 72 +store +cons 31 +cons 101 +store +cons 32 +cons 108 +store +cons 33 +cons 108 +store +cons 34 +cons 111 +store +cons 35 +cons 32 +store +cons 36 +cons 0 +store +cons 0 +callA "write" +cons 100 +callA "read" +cons 30 +callA "write" +cons 100 +callA "write" +callA "newline" +end -Mark (MArtificial "add") -SPure (Binary Add) -Return +markA "add" +add +return -Mark (MArtificial "write") -SPure (Indexed (IImmediate 0) Copy) -Load -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "write_end") (Branch EZ) -SIO OutputChar -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "write") Jump +markA "write" +copyI 0 +load +copyI 0 +bEZA "write_end" +outputCS +cons 1 +add +jumpA "write" -Mark (MArtificial "write_end") -SPure Discard -SPure Discard -Return +markA "write_end" +discard +discard +return -Mark (MArtificial "read") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 0) Copy) -MIO InputChar -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 10) -SPure (Binary Sub) -Labeled (LArtificial "read_end") (Branch EZ) -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "read") Jump +markA "read" +copyI 0 +copyI 0 +mio inputchar +load +copyI 0 +cons 10 +sub +bEZA "read_end" +discard +cons 1 +add +jumpA "read" -Mark (MArtificial "read_end") -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -SPure (Cons 0) -Store -Return +markA "read_end" +discard +cons 1 +add +cons 0 +store +return -Mark (MArtificial "newline") -SPure (Cons 10) -SPure (Cons 13) -SIO OutputChar -SIO OutputChar -Return +markA "newline" +cons 10 +cons 13 +outputCS +outputCS +return diff --git a/.output/actual/ws/il/parsed/original/truthMachine.il b/.output/actual/ws/il/parsed/original/truthMachine.il index 2f79514c2..b8d66f29a 100644 --- a/.output/actual/ws/il/parsed/original/truthMachine.il +++ b/.output/actual/ws/il/parsed/original/truthMachine.il @@ -1,15 +1,15 @@ -SPure (Cons 0) -SPure (Indexed (IImmediate 0) Copy) -MIO InputDec -Load -Labeled (LArtificial "\NUL") (Branch EZ) +cons 0 +copyI 0 +mio inputdec +load +bEZA "\NUL" -Mark (MArtificial "\SOH") -SPure (Cons 1) -SIO OutputDec -Labeled (LArtificial "\SOH") Jump +markA "\SOH" +cons 1 +outputDS +jumpA "\SOH" -Mark (MArtificial "\NUL") -SPure (Cons 0) -SIO OutputDec -End +markA "\NUL" +cons 0 +outputDS +end diff --git a/.output/golden/eta/eval/logged/Fast/from-eas/bottles.logged b/.output/golden/eta/eval/logged/Fast/from-eas/bottles.logged index ce8ccd7f9..944365c75 100644 --- a/.output/golden/eta/eval/logged/Fast/from-eas/bottles.logged +++ b/.output/golden/eta/eval/logged/Fast/from-eas/bottles.logged @@ -34,8 +34,8 @@ dump: Memory ( MNatural 4 ) ) , ICF - ( Labeled - ( LImmediate 6 ) ( Branch NE ) + ( Branch + ( BImmediate 6 ) NE ) , ICF ( Mark @@ -82,8 +82,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 11 ) ( Branch NE ) + ( Branch + ( BImmediate 11 ) NE ) , ICF ( Mark @@ -94,8 +94,7 @@ dump: Memory ( Cons 48 ) ) , IAL ( SIO OutputChar ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , ICF ( Labeled LTop Jump ) , ICF ( Mark @@ -112,8 +111,8 @@ dump: Memory ( MNatural 12 ) ) , ICF - ( Labeled - ( LImmediate 14 ) ( Branch NE ) + ( Branch + ( BImmediate 14 ) NE ) , ICF ( Mark @@ -662,16 +661,16 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 32 ) ( Branch NE ) + ( Branch + ( BImmediate 32 ) NE ) , ICF ( Mark ( MNatural 42 ) ) , ICF - ( Labeled - ( LImmediate 0 ) ( Branch NE ) + ( Branch + ( BImmediate 0 ) NE ) , ICF ( Mark diff --git "a/.output/golden/eta/eval/logged/Fast/from-eas/fact0\n.logged" "b/.output/golden/eta/eval/logged/Fast/from-eas/fact0\n.logged" index bb9ab5475..c78338ffd 100644 --- "a/.output/golden/eta/eval/logged/Fast/from-eas/fact0\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/from-eas/fact0\n.logged" @@ -81,8 +81,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 9 ) ( Branch NE ) + ( Branch + ( BImmediate 9 ) NE ) , ICF ( Mark @@ -173,16 +173,16 @@ dump: Memory ( MNatural 16 ) ) , ICF - ( Labeled - ( LImmediate 18 ) ( Branch NE ) + ( Branch + ( BImmediate 18 ) NE ) , ICF ( Mark ( MNatural 17 ) ) , ICF - ( Labeled - ( LImmediate 14 ) ( Branch NE ) + ( Branch + ( BImmediate 14 ) NE ) , ICF ( Mark @@ -276,8 +276,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 27 ) ( Branch NE ) + ( Branch + ( BImmediate 27 ) NE ) , ICF ( Mark @@ -304,8 +304,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 29 ) ( Branch NE ) + ( Branch + ( BImmediate 29 ) NE ) , ICF ( Mark @@ -334,8 +334,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 19 ) ( Branch NE ) + ( Branch + ( BImmediate 19 ) NE ) , ICF ( Mark @@ -378,8 +378,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 35 ) ( Branch NE ) + ( Branch + ( BImmediate 35 ) NE ) , ICF ( Mark @@ -390,8 +390,7 @@ dump: Memory ( Cons 48 ) ) , IAL ( SIO OutputChar ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , ICF ( Labeled LTop Jump ) , ICF ( Mark @@ -408,8 +407,8 @@ dump: Memory ( MNatural 36 ) ) , ICF - ( Labeled - ( LImmediate 38 ) ( Branch NE ) + ( Branch + ( BImmediate 38 ) NE ) , ICF ( Mark @@ -547,8 +546,8 @@ dump: Memory ( MNatural 49 ) ) , ICF - ( Labeled - ( LImmediate 51 ) ( Branch NE ) + ( Branch + ( BImmediate 51 ) NE ) , ICF ( Mark @@ -632,14 +631,7 @@ dump: Memory ( Mark ( MNatural 58 ) ) - , IAL - ( SPure - ( Indexed - ( IImmediate 1 ) Move - ) - ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BSwapped NE ) , ICF ( Mark ( MNatural 59 ) @@ -676,8 +668,8 @@ dump: Memory ( MNatural 62 ) ) , ICF - ( Labeled - ( LImmediate 64 ) ( Branch NE ) + ( Branch + ( BImmediate 64 ) NE ) , ICF ( Mark @@ -709,7 +701,7 @@ dump: Memory ) , End ] - , programCounter = 170 + , programCounter = 169 , returnStack = IS [] } , memoryStack = fromList diff --git "a/.output/golden/eta/eval/logged/Fast/from-eas/fact1\n.logged" "b/.output/golden/eta/eval/logged/Fast/from-eas/fact1\n.logged" index e20f74506..a171ba9b9 100644 --- "a/.output/golden/eta/eval/logged/Fast/from-eas/fact1\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/from-eas/fact1\n.logged" @@ -81,8 +81,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 9 ) ( Branch NE ) + ( Branch + ( BImmediate 9 ) NE ) , ICF ( Mark @@ -173,16 +173,16 @@ dump: Memory ( MNatural 16 ) ) , ICF - ( Labeled - ( LImmediate 18 ) ( Branch NE ) + ( Branch + ( BImmediate 18 ) NE ) , ICF ( Mark ( MNatural 17 ) ) , ICF - ( Labeled - ( LImmediate 14 ) ( Branch NE ) + ( Branch + ( BImmediate 14 ) NE ) , ICF ( Mark @@ -276,8 +276,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 27 ) ( Branch NE ) + ( Branch + ( BImmediate 27 ) NE ) , ICF ( Mark @@ -304,8 +304,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 29 ) ( Branch NE ) + ( Branch + ( BImmediate 29 ) NE ) , ICF ( Mark @@ -334,8 +334,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 19 ) ( Branch NE ) + ( Branch + ( BImmediate 19 ) NE ) , ICF ( Mark @@ -378,8 +378,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 35 ) ( Branch NE ) + ( Branch + ( BImmediate 35 ) NE ) , ICF ( Mark @@ -390,8 +390,7 @@ dump: Memory ( Cons 48 ) ) , IAL ( SIO OutputChar ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , ICF ( Labeled LTop Jump ) , ICF ( Mark @@ -408,8 +407,8 @@ dump: Memory ( MNatural 36 ) ) , ICF - ( Labeled - ( LImmediate 38 ) ( Branch NE ) + ( Branch + ( BImmediate 38 ) NE ) , ICF ( Mark @@ -547,8 +546,8 @@ dump: Memory ( MNatural 49 ) ) , ICF - ( Labeled - ( LImmediate 51 ) ( Branch NE ) + ( Branch + ( BImmediate 51 ) NE ) , ICF ( Mark @@ -632,14 +631,7 @@ dump: Memory ( Mark ( MNatural 58 ) ) - , IAL - ( SPure - ( Indexed - ( IImmediate 1 ) Move - ) - ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BSwapped NE ) , ICF ( Mark ( MNatural 59 ) @@ -676,8 +668,8 @@ dump: Memory ( MNatural 62 ) ) , ICF - ( Labeled - ( LImmediate 64 ) ( Branch NE ) + ( Branch + ( BImmediate 64 ) NE ) , ICF ( Mark @@ -709,7 +701,7 @@ dump: Memory ) , End ] - , programCounter = 170 + , programCounter = 169 , returnStack = IS [] } , memoryStack = fromList diff --git "a/.output/golden/eta/eval/logged/Fast/from-eas/fact10\n.logged" "b/.output/golden/eta/eval/logged/Fast/from-eas/fact10\n.logged" new file mode 100644 index 000000000..2c647be5a --- /dev/null +++ "b/.output/golden/eta/eval/logged/Fast/from-eas/fact10\n.logged" @@ -0,0 +1,717 @@ + [Undefined label 506] +CPM.labeledIImmediateInstruction +CPM.labeledITopInstruction + [i ICF (Labeled LTop Jump)] [Automaton.nextState Memory + { memoryCM = CM + { program = + [ ICF + ( Mark + ( MNatural 1 ) + ) + , IAL + ( SPure + ( Cons 2 ) + ) + , ICF + ( Labeled + ( LImmediate 14 ) Jump + ) + , ICF + ( Mark + ( MNatural 2 ) + ) + , IAL + ( SPure + ( Cons 3 ) + ) + , ICF + ( Labeled + ( LImmediate 5 ) Jump + ) + , ICF + ( Mark + ( MNatural 3 ) + ) + , IAL + ( SPure + ( Cons 4 ) + ) + , ICF + ( Labeled + ( LImmediate 32 ) Jump + ) + , ICF + ( Mark + ( MNatural 4 ) + ) + , IAL + ( SPure + ( Cons 10 ) + ) + , IAL ( SIO OutputChar ) + , ICF + ( Labeled + ( LImmediate 0 ) Jump + ) + , ICF + ( Mark + ( MNatural 5 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 1 ) Move + ) + ) + , ICF + ( Mark + ( MNatural 6 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 0 ) Copy + ) + ) + , ICF + ( Mark + ( MNatural 7 ) + ) + , IAL + ( SPure + ( Unary + ( UImmediate 1 Sub ) + ) + ) + , ICF + ( Branch + ( BImmediate 9 ) NE + ) + , ICF + ( Mark + ( MNatural 8 ) + ) + , ICF + ( Labeled + ( LImmediate 13 ) Jump + ) + , ICF + ( Mark + ( MNatural 9 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 0 ) Copy + ) + ) + , ICF + ( Mark + ( MNatural 10 ) + ) + , IAL + ( SPure + ( Unary + ( UImmediate 1 Sub ) + ) + ) + , ICF + ( Mark + ( MNatural 11 ) + ) + , IAL + ( SPure + ( Cons 12 ) + ) + , ICF + ( Labeled + ( LImmediate 5 ) Jump + ) + , ICF + ( Mark + ( MNatural 12 ) + ) + , IAL + ( SPure + ( Cons 13 ) + ) + , ICF + ( Labeled + ( LImmediate 44 ) Jump + ) + , ICF + ( Mark + ( MNatural 13 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 1 ) Move + ) + ) + , ICF ( Labeled LTop Jump ) + , ICF + ( Mark + ( MNatural 14 ) + ) + , IAL ( SIO InputChar ) + , ICF + ( Mark + ( MNatural 15 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 0 ) Copy + ) + ) + , IAL + ( SPure + ( Unary + ( UImmediate 32 Sub ) + ) + ) + , ICF + ( Mark + ( MNatural 16 ) + ) + , ICF + ( Branch + ( BImmediate 18 ) NE + ) + , ICF + ( Mark + ( MNatural 17 ) + ) + , ICF + ( Branch + ( BImmediate 14 ) NE + ) + , ICF + ( Mark + ( MNatural 18 ) + ) + , IAL + ( SPure + ( Cons 0 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 1 ) Move + ) + ) + , ICF + ( Mark + ( MNatural 19 ) + ) + , IAL + ( SPure + ( Cons 16 ) + ) + , ICF + ( Mark + ( MNatural 20 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 1 ) Move + ) + ) + , ICF + ( Mark + ( MNatural 21 ) + ) + , IAL + ( SPure + ( Cons 10 ) + ) + , IAL + ( SPure + ( Cons 22 ) + ) + , ICF + ( Labeled + ( LImmediate 44 ) Jump + ) + , ICF + ( Mark + ( MNatural 22 ) + ) + , IAL + ( SPure + ( Cons 0 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 1 ) Move + ) + ) + , ICF + ( Mark + ( MNatural 23 ) + ) + , IAL + ( SPure ( Binary Sub ) ) + , IAL + ( SPure ( Binary Sub ) ) + , ICF + ( Mark + ( MNatural 24 ) + ) + , IAL ( SIO InputChar ) + , ICF + ( Mark + ( MNatural 25 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 0 ) Copy + ) + ) + , IAL + ( SPure + ( Unary + ( UImmediate 32 Sub ) + ) + ) + , ICF + ( Branch + ( BImmediate 27 ) NE + ) + , ICF + ( Mark + ( MNatural 26 ) + ) + , ICF + ( Labeled + ( LImmediate 30 ) Jump + ) + , ICF + ( Mark + ( MNatural 27 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 0 ) Copy + ) + ) + , IAL + ( SPure + ( Unary + ( UImmediate 10 Sub ) + ) + ) + , ICF + ( Branch + ( BImmediate 29 ) NE + ) + , ICF + ( Mark + ( MNatural 28 ) + ) + , ICF + ( Labeled + ( LImmediate 30 ) Jump + ) + , ICF + ( Mark + ( MNatural 29 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 0 ) Copy + ) + ) + , IAL + ( SPure + ( Unary + ( UImmediate + ( -1 ) Sub + ) + ) + ) + , ICF + ( Branch + ( BImmediate 19 ) NE + ) + , ICF + ( Mark + ( MNatural 30 ) + ) + , IAL ( SPure Discard ) + , ICF + ( Mark + ( MNatural 31 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 1 ) Move + ) + ) + , ICF ( Labeled LTop Jump ) + , ICF + ( Mark + ( MNatural 32 ) + ) + , IAL + ( SPure + ( Cons 0 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 2 ) Move + ) + ) + , ICF + ( Mark + ( MNatural 33 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 0 ) Copy + ) + ) + , ICF + ( Branch + ( BImmediate 35 ) NE + ) + , ICF + ( Mark + ( MNatural 34 ) + ) + , IAL + ( SPure + ( Cons 48 ) + ) + , IAL ( SIO OutputChar ) + , ICF ( Branch BTop NE ) + , ICF ( Labeled LTop Jump ) + , ICF + ( Mark + ( MNatural 35 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 0 ) Copy + ) + ) + , ICF + ( Mark + ( MNatural 36 ) + ) + , ICF + ( Branch + ( BImmediate 38 ) NE + ) + , ICF + ( Mark + ( MNatural 37 ) + ) + , IAL + ( SPure ( Binary Sub ) ) + , ICF + ( Labeled + ( LImmediate 42 ) Jump + ) + , ICF + ( Mark + ( MNatural 38 ) + ) + , IAL + ( SPure + ( Cons 10 ) + ) + , IAL + ( SPure + ( Binaries + [ Mod + , Div + ] + ) + ) + , ICF + ( Mark + ( MArtificial "38" ) + ) + , ICF + ( Mark + ( MNatural 39 ) + ) + , IAL + ( SPure + ( Unary + ( UImmediate + ( -48 ) Sub + ) + ) + ) + , ICF + ( Mark + ( MNatural 40 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 1 ) Move + ) + ) + , ICF + ( Mark + ( MNatural 41 ) + ) + , ICF + ( Labeled + ( LImmediate 35 ) Jump + ) + , ICF + ( Mark + ( MNatural 42 ) + ) + , IAL + ( SPure + ( Cons 43 ) + ) + , ICF + ( Labeled + ( LImmediate 60 ) Jump + ) + , ICF + ( Mark + ( MNatural 43 ) + ) + , ICF ( Labeled LTop Jump ) + , ICF + ( Mark + ( MNatural 44 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 2 ) Move + ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 2 ) Move + ) + ) + , ICF + ( Mark + ( MNatural 45 ) + ) + , IAL + ( SPure + ( Cons 0 ) + ) + , ICF + ( Mark + ( MNatural 46 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 2 ) Move + ) + ) + , ICF + ( Mark + ( MNatural 47 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 2 ) Move + ) + ) + , ICF + ( Mark + ( MNatural 48 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 0 ) Copy + ) + ) + , ICF + ( Mark + ( MNatural 49 ) + ) + , ICF + ( Branch + ( BImmediate 51 ) NE + ) + , ICF + ( Mark + ( MNatural 50 ) + ) + , ICF + ( Labeled + ( LImmediate 58 ) Jump + ) + , ICF + ( Mark + ( MNatural 51 ) + ) + , IAL + ( SPure + ( Unary + ( UImmediate 1 Sub ) + ) + ) + , ICF + ( Mark + ( MNatural 52 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 2 ) Move + ) + ) + , ICF + ( Mark + ( MNatural 53 ) + ) + , IAL + ( SPure + ( Cons 0 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 3 ) Copy + ) + ) + , ICF + ( Mark + ( MNatural 54 ) + ) + , IAL + ( SPure ( Binary Sub ) ) + , IAL + ( SPure ( Binary Sub ) ) + , ICF + ( Mark + ( MNatural 55 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 2 ) Move + ) + ) + , ICF + ( Mark + ( MNatural 56 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 2 ) Move + ) + ) + , ICF + ( Mark + ( MNatural 57 ) + ) + , ICF + ( Labeled + ( LImmediate 48 ) Jump + ) + , ICF + ( Mark + ( MNatural 58 ) + ) + , ICF ( Branch BSwapped NE ) + , ICF + ( Mark + ( MNatural 59 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 1 ) Move + ) + ) + , ICF ( Labeled LTop Jump ) + , ICF + ( Mark + ( MNatural 60 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 1 ) Move + ) + ) + , ICF + ( Mark + ( MNatural 61 ) + ) + , IAL + ( SPure + ( Indexed + ( IImmediate 0 ) Copy + ) + ) + , ICF + ( Mark + ( MNatural 62 ) + ) + , ICF + ( Branch + ( BImmediate 64 ) NE + ) + , ICF + ( Mark + ( MNatural 63 ) + ) + , IAL + ( SPure ( Binary Sub ) ) + , ICF ( Labeled LTop Jump ) + , ICF + ( Mark + ( MNatural 64 ) + ) + , IAL ( SIO OutputChar ) + , ICF + ( Mark + ( MNatural 65 ) + ) + , ICF + ( Labeled + ( LImmediate 60 ) Jump + ) + , ICF + ( Mark + ( MNatural 66 ) + ) + , ICF + ( Mark + ( MNatural 0 ) + ) + , End + ] + , programCounter = 83 + , returnStack = IS [] + } + , memoryStack = fromList + [ 506 + , 496 + , 0 + , 2 + ] + , memoryRAM = [] + }] diff --git "a/.output/golden/eta/eval/logged/Fast/from-eas/fact9\n.logged" "b/.output/golden/eta/eval/logged/Fast/from-eas/fact9\n.logged" index 29d095b3a..80a0b0430 100644 --- "a/.output/golden/eta/eval/logged/Fast/from-eas/fact9\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/from-eas/fact9\n.logged" @@ -81,8 +81,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 9 ) ( Branch NE ) + ( Branch + ( BImmediate 9 ) NE ) , ICF ( Mark @@ -173,16 +173,16 @@ dump: Memory ( MNatural 16 ) ) , ICF - ( Labeled - ( LImmediate 18 ) ( Branch NE ) + ( Branch + ( BImmediate 18 ) NE ) , ICF ( Mark ( MNatural 17 ) ) , ICF - ( Labeled - ( LImmediate 14 ) ( Branch NE ) + ( Branch + ( BImmediate 14 ) NE ) , ICF ( Mark @@ -276,8 +276,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 27 ) ( Branch NE ) + ( Branch + ( BImmediate 27 ) NE ) , ICF ( Mark @@ -304,8 +304,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 29 ) ( Branch NE ) + ( Branch + ( BImmediate 29 ) NE ) , ICF ( Mark @@ -334,8 +334,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 19 ) ( Branch NE ) + ( Branch + ( BImmediate 19 ) NE ) , ICF ( Mark @@ -378,8 +378,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 35 ) ( Branch NE ) + ( Branch + ( BImmediate 35 ) NE ) , ICF ( Mark @@ -390,8 +390,7 @@ dump: Memory ( Cons 48 ) ) , IAL ( SIO OutputChar ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , ICF ( Labeled LTop Jump ) , ICF ( Mark @@ -408,8 +407,8 @@ dump: Memory ( MNatural 36 ) ) , ICF - ( Labeled - ( LImmediate 38 ) ( Branch NE ) + ( Branch + ( BImmediate 38 ) NE ) , ICF ( Mark @@ -547,8 +546,8 @@ dump: Memory ( MNatural 49 ) ) , ICF - ( Labeled - ( LImmediate 51 ) ( Branch NE ) + ( Branch + ( BImmediate 51 ) NE ) , ICF ( Mark @@ -632,14 +631,7 @@ dump: Memory ( Mark ( MNatural 58 ) ) - , IAL - ( SPure - ( Indexed - ( IImmediate 1 ) Move - ) - ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BSwapped NE ) , ICF ( Mark ( MNatural 59 ) @@ -676,8 +668,8 @@ dump: Memory ( MNatural 62 ) ) , ICF - ( Labeled - ( LImmediate 64 ) ( Branch NE ) + ( Branch + ( BImmediate 64 ) NE ) , ICF ( Mark @@ -709,7 +701,7 @@ dump: Memory ) , End ] - , programCounter = 170 + , programCounter = 169 , returnStack = IS [] } , memoryStack = fromList diff --git a/.output/golden/eta/eval/logged/Fast/from-eas/hello2.logged b/.output/golden/eta/eval/logged/Fast/from-eas/hello2.logged index 9b5000b57..d2788ff52 100644 --- a/.output/golden/eta/eval/logged/Fast/from-eas/hello2.logged +++ b/.output/golden/eta/eval/logged/Fast/from-eas/hello2.logged @@ -110,8 +110,8 @@ dump: Memory ( MNatural 6 ) ) , ICF - ( Labeled - ( LImmediate 8 ) ( Branch NE ) + ( Branch + ( BImmediate 8 ) NE ) , ICF ( Mark diff --git a/.output/golden/eta/eval/logged/Fast/from-eas/hello3.logged b/.output/golden/eta/eval/logged/Fast/from-eas/hello3.logged index 9b5000b57..d2788ff52 100644 --- a/.output/golden/eta/eval/logged/Fast/from-eas/hello3.logged +++ b/.output/golden/eta/eval/logged/Fast/from-eas/hello3.logged @@ -110,8 +110,8 @@ dump: Memory ( MNatural 6 ) ) , ICF - ( Labeled - ( LImmediate 8 ) ( Branch NE ) + ( Branch + ( BImmediate 8 ) NE ) , ICF ( Mark diff --git a/.output/golden/eta/eval/logged/Fast/from-eas/hello4.logged b/.output/golden/eta/eval/logged/Fast/from-eas/hello4.logged index 9b5000b57..d2788ff52 100644 --- a/.output/golden/eta/eval/logged/Fast/from-eas/hello4.logged +++ b/.output/golden/eta/eval/logged/Fast/from-eas/hello4.logged @@ -110,8 +110,8 @@ dump: Memory ( MNatural 6 ) ) , ICF - ( Labeled - ( LImmediate 8 ) ( Branch NE ) + ( Branch + ( BImmediate 8 ) NE ) , ICF ( Mark diff --git "a/.output/golden/eta/eval/logged/Fast/from-eas/readnum0\n.logged" "b/.output/golden/eta/eval/logged/Fast/from-eas/readnum0\n.logged" index 2454d32a4..2b483ba9e 100644 --- "a/.output/golden/eta/eval/logged/Fast/from-eas/readnum0\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/from-eas/readnum0\n.logged" @@ -28,16 +28,16 @@ ALU.move index must be less then lenght [i 1] [ll 1] ( MNatural 3 ) ) , ICF - ( Labeled - ( LImmediate 5 ) ( Branch NE ) + ( Branch + ( BImmediate 5 ) NE ) , ICF ( Mark ( MNatural 4 ) ) , ICF - ( Labeled - ( LImmediate 1 ) ( Branch NE ) + ( Branch + ( BImmediate 1 ) NE ) , ICF ( Mark @@ -133,8 +133,8 @@ ALU.move index must be less then lenght [i 1] [ll 1] ) ) , ICF - ( Labeled - ( LImmediate 14 ) ( Branch NE ) + ( Branch + ( BImmediate 14 ) NE ) , ICF ( Mark @@ -161,8 +161,8 @@ ALU.move index must be less then lenght [i 1] [ll 1] ) ) , ICF - ( Labeled - ( LImmediate 16 ) ( Branch NE ) + ( Branch + ( BImmediate 16 ) NE ) , ICF ( Mark @@ -191,8 +191,8 @@ ALU.move index must be less then lenght [i 1] [ll 1] ) ) , ICF - ( Labeled - ( LImmediate 6 ) ( Branch NE ) + ( Branch + ( BImmediate 6 ) NE ) , ICF ( Mark @@ -269,8 +269,8 @@ ALU.move index must be less then lenght [i 1] [ll 1] ( MNatural 24 ) ) , ICF - ( Labeled - ( LImmediate 26 ) ( Branch NE ) + ( Branch + ( BImmediate 26 ) NE ) , ICF ( Mark @@ -354,14 +354,7 @@ ALU.move index must be less then lenght [i 1] [ll 1] ( Mark ( MNatural 33 ) ) - , IAL - ( SPure - ( Indexed - ( IImmediate 1 ) Move - ) - ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BSwapped NE ) , ICF ( Mark ( MNatural 34 ) diff --git "a/.output/golden/eta/eval/logged/Fast/from-eas/readnum1\n.logged" "b/.output/golden/eta/eval/logged/Fast/from-eas/readnum1\n.logged" index f6c37e591..e0f41de15 100644 --- "a/.output/golden/eta/eval/logged/Fast/from-eas/readnum1\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/from-eas/readnum1\n.logged" @@ -28,16 +28,16 @@ ALU.move index must be less then lenght [i 1] [ll 1] ( MNatural 3 ) ) , ICF - ( Labeled - ( LImmediate 5 ) ( Branch NE ) + ( Branch + ( BImmediate 5 ) NE ) , ICF ( Mark ( MNatural 4 ) ) , ICF - ( Labeled - ( LImmediate 1 ) ( Branch NE ) + ( Branch + ( BImmediate 1 ) NE ) , ICF ( Mark @@ -133,8 +133,8 @@ ALU.move index must be less then lenght [i 1] [ll 1] ) ) , ICF - ( Labeled - ( LImmediate 14 ) ( Branch NE ) + ( Branch + ( BImmediate 14 ) NE ) , ICF ( Mark @@ -161,8 +161,8 @@ ALU.move index must be less then lenght [i 1] [ll 1] ) ) , ICF - ( Labeled - ( LImmediate 16 ) ( Branch NE ) + ( Branch + ( BImmediate 16 ) NE ) , ICF ( Mark @@ -191,8 +191,8 @@ ALU.move index must be less then lenght [i 1] [ll 1] ) ) , ICF - ( Labeled - ( LImmediate 6 ) ( Branch NE ) + ( Branch + ( BImmediate 6 ) NE ) , ICF ( Mark @@ -269,8 +269,8 @@ ALU.move index must be less then lenght [i 1] [ll 1] ( MNatural 24 ) ) , ICF - ( Labeled - ( LImmediate 26 ) ( Branch NE ) + ( Branch + ( BImmediate 26 ) NE ) , ICF ( Mark @@ -354,14 +354,7 @@ ALU.move index must be less then lenght [i 1] [ll 1] ( Mark ( MNatural 33 ) ) - , IAL - ( SPure - ( Indexed - ( IImmediate 1 ) Move - ) - ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BSwapped NE ) , ICF ( Mark ( MNatural 34 ) diff --git a/.output/golden/eta/eval/logged/Fast/original/bottles.logged b/.output/golden/eta/eval/logged/Fast/original/bottles.logged index feb3faacb..68c7bb2c7 100644 --- a/.output/golden/eta/eval/logged/Fast/original/bottles.logged +++ b/.output/golden/eta/eval/logged/Fast/original/bottles.logged @@ -13,17 +13,14 @@ dump: Memory ( Mark ( MArtificial "1" ) ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , IAL ( SPure ( Cons 2 ) ) , IAL ( SIO InputChar ) - , ICF - ( Labeled LTop ( Branch NE ) ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) + , ICF ( Branch BTop NE ) , IAL ( SPure ( Binaries @@ -33,8 +30,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 4 ) ( Branch NE ) + ( Branch + ( BImmediate 4 ) NE ) , IAL ( SPure @@ -70,8 +67,7 @@ dump: Memory ) ) , IAL ( SIO InputChar ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , IAL ( SPure ( Binary Sub ) ) , IAL ( SPure Halibut ) @@ -99,13 +95,11 @@ dump: Memory ) , IAL ( SPure ( Binary Sub ) ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , IAL ( SPure ( Binary Sub ) ) , IAL ( SIO InputChar ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , IAL ( SPure ( Binary Sub ) ) , IAL @@ -121,8 +115,8 @@ dump: Memory ( MNatural 4 ) ) , ICF - ( Labeled - ( LImmediate 6 ) ( Branch NE ) + ( Branch + ( BImmediate 6 ) NE ) , ICF ( Mark @@ -169,8 +163,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 11 ) ( Branch NE ) + ( Branch + ( BImmediate 11 ) NE ) , ICF ( Mark @@ -181,8 +175,7 @@ dump: Memory ( Cons 48 ) ) , IAL ( SIO OutputChar ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , ICF ( Labeled LTop Jump ) , ICF ( Mark @@ -199,8 +192,8 @@ dump: Memory ( MNatural 12 ) ) , ICF - ( Labeled - ( LImmediate 14 ) ( Branch NE ) + ( Branch + ( BImmediate 14 ) NE ) , ICF ( Mark @@ -516,8 +509,8 @@ dump: Memory , IAL ( SPure ( Binary Sub ) ) , ICF - ( Labeled - ( LImmediate 32 ) ( Branch NE ) + ( Branch + ( BImmediate 32 ) NE ) , IAL ( SPure @@ -825,16 +818,16 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 33 ) ( Branch NE ) + ( Branch + ( BImmediate 33 ) NE ) , ICF ( Mark ( MNatural 47 ) ) , ICF - ( Labeled - ( LImmediate 0 ) ( Branch NE ) + ( Branch + ( BImmediate 0 ) NE ) , ICF ( Mark diff --git "a/.output/golden/eta/eval/logged/Fast/original/fact1\n.logged" "b/.output/golden/eta/eval/logged/Fast/original/fact1\n.logged" index 624e498d1..33e02cc97 100644 --- "a/.output/golden/eta/eval/logged/Fast/original/fact1\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/original/fact1\n.logged" @@ -81,8 +81,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 9 ) ( Branch NE ) + ( Branch + ( BImmediate 9 ) NE ) , ICF ( Mark @@ -173,16 +173,16 @@ dump: Memory ( MNatural 16 ) ) , ICF - ( Labeled - ( LImmediate 18 ) ( Branch NE ) + ( Branch + ( BImmediate 18 ) NE ) , ICF ( Mark ( MNatural 17 ) ) , ICF - ( Labeled - ( LImmediate 14 ) ( Branch NE ) + ( Branch + ( BImmediate 14 ) NE ) , ICF ( Mark @@ -250,11 +250,9 @@ dump: Memory ] ) ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , IAL ( SIO InputChar ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , IAL ( SPure ( Binaries @@ -307,8 +305,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 27 ) ( Branch NE ) + ( Branch + ( BImmediate 27 ) NE ) , ICF ( Mark @@ -335,8 +333,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 29 ) ( Branch NE ) + ( Branch + ( BImmediate 29 ) NE ) , ICF ( Mark @@ -365,8 +363,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 19 ) ( Branch NE ) + ( Branch + ( BImmediate 19 ) NE ) , ICF ( Mark @@ -413,8 +411,8 @@ dump: Memory ( MNatural 34 ) ) , ICF - ( Labeled - ( LImmediate 36 ) ( Branch NE ) + ( Branch + ( BImmediate 36 ) NE ) , ICF ( Mark @@ -552,8 +550,8 @@ dump: Memory ( MNatural 47 ) ) , ICF - ( Labeled - ( LImmediate 49 ) ( Branch NE ) + ( Branch + ( BImmediate 49 ) NE ) , ICF ( Mark @@ -637,14 +635,7 @@ dump: Memory ( Mark ( MNatural 56 ) ) - , IAL - ( SPure - ( Indexed - ( IImmediate 1 ) Move - ) - ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BSwapped NE ) , ICF ( Mark ( MNatural 57 ) @@ -681,8 +672,8 @@ dump: Memory ( MNatural 60 ) ) , ICF - ( Labeled - ( LImmediate 62 ) ( Branch NE ) + ( Branch + ( BImmediate 62 ) NE ) , ICF ( Mark @@ -714,7 +705,7 @@ dump: Memory ) , End ] - , programCounter = 169 + , programCounter = 168 , returnStack = IS [] } , memoryStack = fromList [] diff --git "a/.output/golden/eta/eval/logged/Fast/original/fact9\n.logged" "b/.output/golden/eta/eval/logged/Fast/original/fact9\n.logged" index 624e498d1..33e02cc97 100644 --- "a/.output/golden/eta/eval/logged/Fast/original/fact9\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/original/fact9\n.logged" @@ -81,8 +81,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 9 ) ( Branch NE ) + ( Branch + ( BImmediate 9 ) NE ) , ICF ( Mark @@ -173,16 +173,16 @@ dump: Memory ( MNatural 16 ) ) , ICF - ( Labeled - ( LImmediate 18 ) ( Branch NE ) + ( Branch + ( BImmediate 18 ) NE ) , ICF ( Mark ( MNatural 17 ) ) , ICF - ( Labeled - ( LImmediate 14 ) ( Branch NE ) + ( Branch + ( BImmediate 14 ) NE ) , ICF ( Mark @@ -250,11 +250,9 @@ dump: Memory ] ) ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , IAL ( SIO InputChar ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , IAL ( SPure ( Binaries @@ -307,8 +305,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 27 ) ( Branch NE ) + ( Branch + ( BImmediate 27 ) NE ) , ICF ( Mark @@ -335,8 +333,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 29 ) ( Branch NE ) + ( Branch + ( BImmediate 29 ) NE ) , ICF ( Mark @@ -365,8 +363,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 19 ) ( Branch NE ) + ( Branch + ( BImmediate 19 ) NE ) , ICF ( Mark @@ -413,8 +411,8 @@ dump: Memory ( MNatural 34 ) ) , ICF - ( Labeled - ( LImmediate 36 ) ( Branch NE ) + ( Branch + ( BImmediate 36 ) NE ) , ICF ( Mark @@ -552,8 +550,8 @@ dump: Memory ( MNatural 47 ) ) , ICF - ( Labeled - ( LImmediate 49 ) ( Branch NE ) + ( Branch + ( BImmediate 49 ) NE ) , ICF ( Mark @@ -637,14 +635,7 @@ dump: Memory ( Mark ( MNatural 56 ) ) - , IAL - ( SPure - ( Indexed - ( IImmediate 1 ) Move - ) - ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BSwapped NE ) , ICF ( Mark ( MNatural 57 ) @@ -681,8 +672,8 @@ dump: Memory ( MNatural 60 ) ) , ICF - ( Labeled - ( LImmediate 62 ) ( Branch NE ) + ( Branch + ( BImmediate 62 ) NE ) , ICF ( Mark @@ -714,7 +705,7 @@ dump: Memory ) , End ] - , programCounter = 169 + , programCounter = 168 , returnStack = IS [] } , memoryStack = fromList [] diff --git a/.output/golden/eta/eval/logged/Fast/original/hello.logged b/.output/golden/eta/eval/logged/Fast/original/hello.logged index 44fc3aea1..1358cb686 100644 --- a/.output/golden/eta/eval/logged/Fast/original/hello.logged +++ b/.output/golden/eta/eval/logged/Fast/original/hello.logged @@ -22,17 +22,14 @@ dump: Memory ] ) ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , IAL ( SPure ( Cons 2 ) ) , IAL ( SIO InputChar ) - , ICF - ( Labeled LTop ( Branch NE ) ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) + , ICF ( Branch BTop NE ) , IAL ( SPure ( Binaries @@ -42,8 +39,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 4 ) ( Branch NE ) + ( Branch + ( BImmediate 4 ) NE ) , IAL ( SPure @@ -82,8 +79,7 @@ dump: Memory ( Mark ( MNatural 5 ) ) - , ICF - ( Labeled LTop ( Branch NE ) ) + , ICF ( Branch BTop NE ) , IAL ( SPure ( Binary Sub ) ) , IAL diff --git a/.output/golden/eta/eval/logged/Fast/original/hello2.logged b/.output/golden/eta/eval/logged/Fast/original/hello2.logged index bdbd3a91f..34f2feaa1 100644 --- a/.output/golden/eta/eval/logged/Fast/original/hello2.logged +++ b/.output/golden/eta/eval/logged/Fast/original/hello2.logged @@ -90,8 +90,8 @@ dump: Memory ( MArtificial "3" ) ) , ICF - ( Labeled - ( LImmediate 4 ) ( Branch NE ) + ( Branch + ( BImmediate 4 ) NE ) , IAL ( SIO InputChar ) , IAL @@ -117,8 +117,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LImmediate 6 ) ( Branch NE ) + ( Branch + ( BImmediate 6 ) NE ) , ICF ( Mark diff --git "a/.output/golden/eta/eval/output/Fast/from-eas/fact10\n.output" "b/.output/golden/eta/eval/output/Fast/from-eas/fact10\n.output" new file mode 100644 index 000000000..e69de29bb diff --git a/.output/golden/eta/il/optimized/from-eas/bottles.il b/.output/golden/eta/il/optimized/from-eas/bottles.il index eaead5bfc..e21878ef5 100644 --- a/.output/golden/eta/il/optimized/from-eas/bottles.il +++ b/.output/golden/eta/il/optimized/from-eas/bottles.il @@ -1,218 +1,218 @@ -Mark (MNatural 1) -Labeled (LImmediate 31) Jump +markM 1 +jumpI 31 -Mark (MNatural 2) -SPure (Indexed (IImmediate 1) Move) +markM 2 +moveI 1 -Mark (MNatural 3) -SPure (Indexed (IImmediate 0) Copy) +markM 3 +copyI 0 -Mark (MNatural 4) -Labeled (LImmediate 6) (Branch NE) +markM 4 +bNEI 6 -Mark (MNatural 5) -SPure (Binary Sub) -Labeled LTop Jump - -Mark (MNatural 6) -SIO OutputChar - -Mark (MNatural 7) -Labeled (LImmediate 2) Jump - -Mark (MNatural 8) -SPure (Cons 0) -SPure (Indexed (IImmediate 2) Move) - -Mark (MNatural 9) -SPure (Indexed (IImmediate 0) Copy) -Labeled (LImmediate 11) (Branch NE) - -Mark (MNatural 10) -SPure (Cons 48) -SIO OutputChar -Labeled LTop (Branch NE) -Labeled LTop Jump - -Mark (MNatural 11) -SPure (Indexed (IImmediate 0) Copy) - -Mark (MNatural 12) -Labeled (LImmediate 14) (Branch NE) - -Mark (MNatural 13) -SPure (Binary Sub) -Labeled (LImmediate 18) Jump - -Mark (MNatural 14) -SPure (Cons 10) -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "14") - -Mark (MNatural 15) -SPure (Unary (UImmediate (-48) Sub)) - -Mark (MNatural 16) -SPure (Indexed (IImmediate 1) Move) - -Mark (MNatural 17) -Labeled (LImmediate 11) Jump - -Mark (MNatural 18) -SPure (Cons 19) -Labeled (LImmediate 2) Jump - -Mark (MNatural 19) -Labeled LTop Jump - -Mark (MNatural 20) - -Mark (MNatural 21) -SPure (Indexed (IImmediate 1) Move) - -Mark (MNatural 22) -SPure (Cons 23) -Labeled (LImmediate 8) Jump - -Mark (MNatural 23) -SPure (Cons 0) -SPure (Cons 114) -SPure (Cons 101) -SPure (Cons 101) -SPure (Cons 98) -SPure (Cons 32) -SPure (Cons 102) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 115) -SPure (Cons 101) -SPure (Cons 108) -SPure (Cons 116) -SPure (Cons 116) -SPure (Cons 111) -SPure (Cons 98) -SPure (Cons 32) - -Mark (MNatural 24) -SPure (Cons 25) -Labeled (LImmediate 2) Jump - -Mark (MNatural 25) -Labeled LTop Jump - -Mark (MNatural 26) -SPure (Indexed (IImmediate 1) Move) - -Mark (MNatural 27) -SPure (Cons 28) -Labeled (LImmediate 21) Jump - -Mark (MNatural 28) -SPure (Cons 0) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 97) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 104) -SPure (Cons 116) -SPure (Cons 32) -SPure (Cons 110) -SPure (Cons 111) -SPure (Cons 32) - -Mark (MNatural 29) -SPure (Cons 30) -Labeled (LImmediate 2) Jump - -Mark (MNatural 30) -Labeled LTop Jump - -Mark (MNatural 31) -SPure (Cons 3) - -Mark (MNatural 32) -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 33) -Labeled (LImmediate 26) Jump - -Mark (MNatural 33) -SPure (Cons 44) -SIO OutputChar -SPure (Cons 32) -SIO OutputChar - -Mark (MNatural 34) -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 35) -Labeled (LImmediate 21) Jump - -Mark (MNatural 35) -SPure (Cons 10) -SIO OutputChar - -Mark (MNatural 36) -SPure (Cons 0) -SPure (Cons 10) -SPure (Cons 100) -SPure (Cons 110) -SPure (Cons 117) -SPure (Cons 111) -SPure (Cons 114) -SPure (Cons 97) -SPure (Cons 32) -SPure (Cons 116) -SPure (Cons 105) -SPure (Cons 32) -SPure (Cons 115) -SPure (Cons 115) -SPure (Cons 97) -SPure (Cons 112) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 110) -SPure (Cons 119) -SPure (Cons 111) -SPure (Cons 100) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 110) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 107) -SPure (Cons 97) -SPure (Cons 84) - -Mark (MNatural 37) -SPure (Cons 38) -Labeled (LImmediate 2) Jump - -Mark (MNatural 38) -SPure (Unary (UImmediate 1 Sub)) - -Mark (MNatural 39) -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 40) -Labeled (LImmediate 26) Jump - -Mark (MNatural 40) -SPure (Cons 10) -SPure (Cons 10) -SIO OutputChar -SIO OutputChar - -Mark (MNatural 41) -SPure (Indexed (IImmediate 0) Copy) -Labeled (LImmediate 32) (Branch NE) - -Mark (MNatural 42) -Labeled (LImmediate 0) (Branch NE) - -Mark (MNatural 43) - -Mark (MNatural 0) -End +markM 5 +sub +jump + +markM 6 +outputCS + +markM 7 +jumpI 2 + +markM 8 +cons 0 +moveI 2 + +markM 9 +copyI 0 +bNEI 11 + +markM 10 +cons 48 +outputCS +bNE +jump + +markM 11 +copyI 0 + +markM 12 +bNEI 14 + +markM 13 +sub +jumpI 18 + +markM 14 +cons 10 +moddiv + +markA "14" + +markM 15 +subI -48 + +markM 16 +moveI 1 + +markM 17 +jumpI 11 + +markM 18 +cons 19 +jumpI 2 + +markM 19 +jump + +markM 20 + +markM 21 +moveI 1 + +markM 22 +cons 23 +jumpI 8 + +markM 23 +cons 0 +cons 114 +cons 101 +cons 101 +cons 98 +cons 32 +cons 102 +cons 111 +cons 32 +cons 115 +cons 101 +cons 108 +cons 116 +cons 116 +cons 111 +cons 98 +cons 32 + +markM 24 +cons 25 +jumpI 2 + +markM 25 +jump + +markM 26 +moveI 1 + +markM 27 +cons 28 +jumpI 21 + +markM 28 +cons 0 +cons 108 +cons 108 +cons 97 +cons 119 +cons 32 +cons 101 +cons 104 +cons 116 +cons 32 +cons 110 +cons 111 +cons 32 + +markM 29 +cons 30 +jumpI 2 + +markM 30 +jump + +markM 31 +cons 3 + +markM 32 +copyI 0 +cons 33 +jumpI 26 + +markM 33 +cons 44 +outputCS +cons 32 +outputCS + +markM 34 +copyI 0 +cons 35 +jumpI 21 + +markM 35 +cons 10 +outputCS + +markM 36 +cons 0 +cons 10 +cons 100 +cons 110 +cons 117 +cons 111 +cons 114 +cons 97 +cons 32 +cons 116 +cons 105 +cons 32 +cons 115 +cons 115 +cons 97 +cons 112 +cons 32 +cons 44 +cons 110 +cons 119 +cons 111 +cons 100 +cons 32 +cons 101 +cons 110 +cons 111 +cons 32 +cons 101 +cons 107 +cons 97 +cons 84 + +markM 37 +cons 38 +jumpI 2 + +markM 38 +subI 1 + +markM 39 +copyI 0 +cons 40 +jumpI 26 + +markM 40 +cons 10 +cons 10 +outputCS +outputCS + +markM 41 +copyI 0 +bNEI 32 + +markM 42 +bNEI 0 + +markM 43 + +markM 0 +end diff --git a/.output/golden/eta/il/optimized/from-eas/euclid.il b/.output/golden/eta/il/optimized/from-eas/euclid.il index 435af23fa..d52b286fd 100644 --- a/.output/golden/eta/il/optimized/from-eas/euclid.il +++ b/.output/golden/eta/il/optimized/from-eas/euclid.il @@ -1,46 +1,46 @@ -Mark (MNatural 1) -SPure (Indexed (IImmediate 2) Move) -SPure (Indexed (IImmediate 2) Move) +markM 1 +moveI 2 +moveI 2 -Mark (MNatural 2) -SPure (Indexed (IImmediate 0) Copy) +markM 2 +copyI 0 -Mark (MNatural 3) -Labeled (LImmediate 5) (Branch NE) +markM 3 +bNEI 5 -Mark (MNatural 4) -Labeled (LImmediate 10) Jump +markM 4 +jumpI 10 -Mark (MNatural 5) -SPure (Indexed (IImmediate 1) Copy) +markM 5 +copyI 1 -Mark (MNatural 6) -SPure (Binaries [Mod,Div]) +markM 6 +moddiv -Mark (MArtificial "6") +markA "6" -Mark (MNatural 7) -SPure (Indexed (IImmediate 1) Move) -SPure Discard +markM 7 +moveI 1 +discard -Mark (MNatural 8) -SPure (Indexed (IImmediate 1) Move) +markM 8 +moveI 1 -Mark (MNatural 9) -Labeled (LImmediate 2) Jump +markM 9 +jumpI 2 -Mark (MNatural 10) -Labeled (LImmediate 0) (Branch NE) +markM 10 +bNEI 0 -Mark (MNatural 11) -SPure (Cons 1) -SPure (Indexed (IImmediate 2) Move) +markM 11 +cons 1 +moveI 2 -Mark (MNatural 12) -Labeled LTop (Branch NE) +markM 12 +bNE -Mark (MNatural 13) +markM 13 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/golden/eta/il/optimized/from-eas/fact.il b/.output/golden/eta/il/optimized/from-eas/fact.il index 998a9f6b2..8ce517f12 100644 --- a/.output/golden/eta/il/optimized/from-eas/fact.il +++ b/.output/golden/eta/il/optimized/from-eas/fact.il @@ -1,238 +1,237 @@ -Mark (MNatural 1) -SPure (Cons 2) -Labeled (LImmediate 14) Jump +markM 1 +cons 2 +jumpI 14 -Mark (MNatural 2) -SPure (Cons 3) -Labeled (LImmediate 5) Jump +markM 2 +cons 3 +jumpI 5 -Mark (MNatural 3) -SPure (Cons 4) -Labeled (LImmediate 32) Jump +markM 3 +cons 4 +jumpI 32 -Mark (MNatural 4) -SPure (Cons 10) -SIO OutputChar -Labeled (LImmediate 0) Jump +markM 4 +cons 10 +outputCS +jumpI 0 -Mark (MNatural 5) -SPure (Indexed (IImmediate 1) Move) +markM 5 +moveI 1 -Mark (MNatural 6) -SPure (Indexed (IImmediate 0) Copy) +markM 6 +copyI 0 -Mark (MNatural 7) -SPure (Unary (UImmediate 1 Sub)) -Labeled (LImmediate 9) (Branch NE) +markM 7 +subI 1 +bNEI 9 -Mark (MNatural 8) -Labeled (LImmediate 13) Jump +markM 8 +jumpI 13 -Mark (MNatural 9) -SPure (Indexed (IImmediate 0) Copy) +markM 9 +copyI 0 -Mark (MNatural 10) -SPure (Unary (UImmediate 1 Sub)) +markM 10 +subI 1 -Mark (MNatural 11) -SPure (Cons 12) -Labeled (LImmediate 5) Jump +markM 11 +cons 12 +jumpI 5 -Mark (MNatural 12) -SPure (Cons 13) -Labeled (LImmediate 44) Jump +markM 12 +cons 13 +jumpI 44 -Mark (MNatural 13) -SPure (Indexed (IImmediate 1) Move) -Labeled LTop Jump +markM 13 +moveI 1 +jump -Mark (MNatural 14) -SIO InputChar +markM 14 +inputCS -Mark (MNatural 15) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 32 Sub)) +markM 15 +copyI 0 +subI 32 -Mark (MNatural 16) -Labeled (LImmediate 18) (Branch NE) +markM 16 +bNEI 18 -Mark (MNatural 17) -Labeled (LImmediate 14) (Branch NE) +markM 17 +bNEI 14 -Mark (MNatural 18) -SPure (Cons 0) -SPure (Indexed (IImmediate 1) Move) +markM 18 +cons 0 +moveI 1 -Mark (MNatural 19) -SPure (Cons 16) +markM 19 +cons 16 -Mark (MNatural 20) -SPure (Indexed (IImmediate 1) Move) +markM 20 +moveI 1 -Mark (MNatural 21) -SPure (Cons 10) -SPure (Cons 22) -Labeled (LImmediate 44) Jump +markM 21 +cons 10 +cons 22 +jumpI 44 -Mark (MNatural 22) -SPure (Cons 0) -SPure (Indexed (IImmediate 1) Move) +markM 22 +cons 0 +moveI 1 -Mark (MNatural 23) -SPure (Binary Sub) -SPure (Binary Sub) +markM 23 +sub +sub -Mark (MNatural 24) -SIO InputChar +markM 24 +inputCS -Mark (MNatural 25) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 32 Sub)) -Labeled (LImmediate 27) (Branch NE) +markM 25 +copyI 0 +subI 32 +bNEI 27 -Mark (MNatural 26) -Labeled (LImmediate 30) Jump +markM 26 +jumpI 30 -Mark (MNatural 27) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 10 Sub)) -Labeled (LImmediate 29) (Branch NE) +markM 27 +copyI 0 +subI 10 +bNEI 29 -Mark (MNatural 28) -Labeled (LImmediate 30) Jump +markM 28 +jumpI 30 -Mark (MNatural 29) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate (-1) Sub)) -Labeled (LImmediate 19) (Branch NE) +markM 29 +copyI 0 +subI -1 +bNEI 19 -Mark (MNatural 30) -SPure Discard +markM 30 +discard -Mark (MNatural 31) -SPure (Indexed (IImmediate 1) Move) -Labeled LTop Jump +markM 31 +moveI 1 +jump -Mark (MNatural 32) -SPure (Cons 0) -SPure (Indexed (IImmediate 2) Move) +markM 32 +cons 0 +moveI 2 -Mark (MNatural 33) -SPure (Indexed (IImmediate 0) Copy) -Labeled (LImmediate 35) (Branch NE) +markM 33 +copyI 0 +bNEI 35 -Mark (MNatural 34) -SPure (Cons 48) -SIO OutputChar -Labeled LTop (Branch NE) -Labeled LTop Jump +markM 34 +cons 48 +outputCS +bNE +jump -Mark (MNatural 35) -SPure (Indexed (IImmediate 0) Copy) +markM 35 +copyI 0 -Mark (MNatural 36) -Labeled (LImmediate 38) (Branch NE) +markM 36 +bNEI 38 -Mark (MNatural 37) -SPure (Binary Sub) -Labeled (LImmediate 42) Jump +markM 37 +sub +jumpI 42 -Mark (MNatural 38) -SPure (Cons 10) -SPure (Binaries [Mod,Div]) +markM 38 +cons 10 +moddiv -Mark (MArtificial "38") +markA "38" -Mark (MNatural 39) -SPure (Unary (UImmediate (-48) Sub)) +markM 39 +subI -48 -Mark (MNatural 40) -SPure (Indexed (IImmediate 1) Move) +markM 40 +moveI 1 -Mark (MNatural 41) -Labeled (LImmediate 35) Jump +markM 41 +jumpI 35 -Mark (MNatural 42) -SPure (Cons 43) -Labeled (LImmediate 60) Jump +markM 42 +cons 43 +jumpI 60 -Mark (MNatural 43) -Labeled LTop Jump +markM 43 +jump -Mark (MNatural 44) -SPure (Indexed (IImmediate 2) Move) -SPure (Indexed (IImmediate 2) Move) +markM 44 +moveI 2 +moveI 2 -Mark (MNatural 45) -SPure (Cons 0) +markM 45 +cons 0 -Mark (MNatural 46) -SPure (Indexed (IImmediate 2) Move) +markM 46 +moveI 2 -Mark (MNatural 47) -SPure (Indexed (IImmediate 2) Move) +markM 47 +moveI 2 -Mark (MNatural 48) -SPure (Indexed (IImmediate 0) Copy) +markM 48 +copyI 0 -Mark (MNatural 49) -Labeled (LImmediate 51) (Branch NE) +markM 49 +bNEI 51 -Mark (MNatural 50) -Labeled (LImmediate 58) Jump +markM 50 +jumpI 58 -Mark (MNatural 51) -SPure (Unary (UImmediate 1 Sub)) +markM 51 +subI 1 -Mark (MNatural 52) -SPure (Indexed (IImmediate 2) Move) +markM 52 +moveI 2 -Mark (MNatural 53) -SPure (Cons 0) -SPure (Indexed (IImmediate 3) Copy) +markM 53 +cons 0 +copyI 3 -Mark (MNatural 54) -SPure (Binary Sub) -SPure (Binary Sub) +markM 54 +sub +sub -Mark (MNatural 55) -SPure (Indexed (IImmediate 2) Move) +markM 55 +moveI 2 -Mark (MNatural 56) -SPure (Indexed (IImmediate 2) Move) +markM 56 +moveI 2 -Mark (MNatural 57) -Labeled (LImmediate 48) Jump +markM 57 +jumpI 48 -Mark (MNatural 58) -SPure (Indexed (IImmediate 1) Move) -Labeled LTop (Branch NE) +markM 58 +bNES -Mark (MNatural 59) -SPure (Indexed (IImmediate 1) Move) -Labeled LTop Jump +markM 59 +moveI 1 +jump -Mark (MNatural 60) -SPure (Indexed (IImmediate 1) Move) +markM 60 +moveI 1 -Mark (MNatural 61) -SPure (Indexed (IImmediate 0) Copy) +markM 61 +copyI 0 -Mark (MNatural 62) -Labeled (LImmediate 64) (Branch NE) +markM 62 +bNEI 64 -Mark (MNatural 63) -SPure (Binary Sub) -Labeled LTop Jump +markM 63 +sub +jump -Mark (MNatural 64) -SIO OutputChar +markM 64 +outputCS -Mark (MNatural 65) -Labeled (LImmediate 60) Jump +markM 65 +jumpI 60 -Mark (MNatural 66) +markM 66 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/golden/eta/il/optimized/from-eas/function.il b/.output/golden/eta/il/optimized/from-eas/function.il index 80fe55795..37b182451 100644 --- a/.output/golden/eta/il/optimized/from-eas/function.il +++ b/.output/golden/eta/il/optimized/from-eas/function.il @@ -1,32 +1,32 @@ -Mark (MNatural 1) -SPure (Indexed (IImmediate 2) Move) +markM 1 +moveI 2 -Mark (MNatural 2) -SPure (Indexed (IImmediate 2) Move) +markM 2 +moveI 2 -Mark (MNatural 3) -SPure (Cons 0) +markM 3 +cons 0 -Mark (MNatural 4) -SPure (Indexed (IImmediate 1) Move) +markM 4 +moveI 1 -Mark (MNatural 5) -SPure (Binary Sub) +markM 5 +sub -Mark (MNatural 6) -SPure (Binary Sub) +markM 6 +sub -Mark (MNatural 7) -SPure (Cons 1) +markM 7 +cons 1 -Mark (MNatural 8) -SPure (Indexed (IImmediate 2) Move) +markM 8 +moveI 2 -Mark (MNatural 9) -Labeled LTop (Branch NE) +markM 9 +bNE -Mark (MNatural 10) +markM 10 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/golden/eta/il/optimized/from-eas/hello.il b/.output/golden/eta/il/optimized/from-eas/hello.il index cc8950b8a..d8b88a64a 100644 --- a/.output/golden/eta/il/optimized/from-eas/hello.il +++ b/.output/golden/eta/il/optimized/from-eas/hello.il @@ -1,45 +1,45 @@ -Mark (MNatural 1) -SPure (Cons 32) - -Mark (MNatural 2) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) - -Mark (MNatural 3) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar - -Mark (MNatural 4) -SPure (Cons 10) - -Mark (MNatural 5) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) - -Mark (MNatural 6) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar - -Mark (MNatural 7) - -Mark (MNatural 0) -End +markM 1 +cons 32 + +markM 2 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 + +markM 3 +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS + +markM 4 +cons 10 + +markM 5 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 + +markM 6 +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS + +markM 7 + +markM 0 +end diff --git a/.output/golden/eta/il/optimized/from-eas/hello2.il b/.output/golden/eta/il/optimized/from-eas/hello2.il index d8e6e9bdc..044511ff5 100644 --- a/.output/golden/eta/il/optimized/from-eas/hello2.il +++ b/.output/golden/eta/il/optimized/from-eas/hello2.il @@ -1,48 +1,48 @@ -Mark (MNatural 1) -SPure (Cons 0) -SPure (Cons 10) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) - -Mark (MNatural 2) -SPure (Cons 3) -Labeled (LImmediate 4) Jump - -Mark (MNatural 3) -Labeled (LImmediate 0) Jump - -Mark (MNatural 4) -SPure (Indexed (IImmediate 1) Move) - -Mark (MNatural 5) -SPure (Indexed (IImmediate 0) Copy) - -Mark (MNatural 6) -Labeled (LImmediate 8) (Branch NE) - -Mark (MNatural 7) -SPure (Binary Sub) -Labeled LTop Jump - -Mark (MNatural 8) -SIO OutputChar - -Mark (MNatural 9) -Labeled (LImmediate 4) Jump - -Mark (MNatural 10) - -Mark (MNatural 0) -End +markM 1 +cons 0 +cons 10 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 +cons 32 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 + +markM 2 +cons 3 +jumpI 4 + +markM 3 +jumpI 0 + +markM 4 +moveI 1 + +markM 5 +copyI 0 + +markM 6 +bNEI 8 + +markM 7 +sub +jump + +markM 8 +outputCS + +markM 9 +jumpI 4 + +markM 10 + +markM 0 +end diff --git a/.output/golden/eta/il/optimized/from-eas/hello3.il b/.output/golden/eta/il/optimized/from-eas/hello3.il index d8e6e9bdc..044511ff5 100644 --- a/.output/golden/eta/il/optimized/from-eas/hello3.il +++ b/.output/golden/eta/il/optimized/from-eas/hello3.il @@ -1,48 +1,48 @@ -Mark (MNatural 1) -SPure (Cons 0) -SPure (Cons 10) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) - -Mark (MNatural 2) -SPure (Cons 3) -Labeled (LImmediate 4) Jump - -Mark (MNatural 3) -Labeled (LImmediate 0) Jump - -Mark (MNatural 4) -SPure (Indexed (IImmediate 1) Move) - -Mark (MNatural 5) -SPure (Indexed (IImmediate 0) Copy) - -Mark (MNatural 6) -Labeled (LImmediate 8) (Branch NE) - -Mark (MNatural 7) -SPure (Binary Sub) -Labeled LTop Jump - -Mark (MNatural 8) -SIO OutputChar - -Mark (MNatural 9) -Labeled (LImmediate 4) Jump - -Mark (MNatural 10) - -Mark (MNatural 0) -End +markM 1 +cons 0 +cons 10 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 +cons 32 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 + +markM 2 +cons 3 +jumpI 4 + +markM 3 +jumpI 0 + +markM 4 +moveI 1 + +markM 5 +copyI 0 + +markM 6 +bNEI 8 + +markM 7 +sub +jump + +markM 8 +outputCS + +markM 9 +jumpI 4 + +markM 10 + +markM 0 +end diff --git a/.output/golden/eta/il/optimized/from-eas/hello4.il b/.output/golden/eta/il/optimized/from-eas/hello4.il index d8e6e9bdc..044511ff5 100644 --- a/.output/golden/eta/il/optimized/from-eas/hello4.il +++ b/.output/golden/eta/il/optimized/from-eas/hello4.il @@ -1,48 +1,48 @@ -Mark (MNatural 1) -SPure (Cons 0) -SPure (Cons 10) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) - -Mark (MNatural 2) -SPure (Cons 3) -Labeled (LImmediate 4) Jump - -Mark (MNatural 3) -Labeled (LImmediate 0) Jump - -Mark (MNatural 4) -SPure (Indexed (IImmediate 1) Move) - -Mark (MNatural 5) -SPure (Indexed (IImmediate 0) Copy) - -Mark (MNatural 6) -Labeled (LImmediate 8) (Branch NE) - -Mark (MNatural 7) -SPure (Binary Sub) -Labeled LTop Jump - -Mark (MNatural 8) -SIO OutputChar - -Mark (MNatural 9) -Labeled (LImmediate 4) Jump - -Mark (MNatural 10) - -Mark (MNatural 0) -End +markM 1 +cons 0 +cons 10 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 +cons 32 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 + +markM 2 +cons 3 +jumpI 4 + +markM 3 +jumpI 0 + +markM 4 +moveI 1 + +markM 5 +copyI 0 + +markM 6 +bNEI 8 + +markM 7 +sub +jump + +markM 8 +outputCS + +markM 9 +jumpI 4 + +markM 10 + +markM 0 +end diff --git a/.output/golden/eta/il/optimized/from-eas/multiply.il b/.output/golden/eta/il/optimized/from-eas/multiply.il index baf1464fb..ce1a7907b 100644 --- a/.output/golden/eta/il/optimized/from-eas/multiply.il +++ b/.output/golden/eta/il/optimized/from-eas/multiply.il @@ -1,58 +1,57 @@ -Mark (MNatural 1) -SPure (Indexed (IImmediate 2) Move) -SPure (Indexed (IImmediate 2) Move) +markM 1 +moveI 2 +moveI 2 -Mark (MNatural 2) -SPure (Cons 0) +markM 2 +cons 0 -Mark (MNatural 3) -SPure (Indexed (IImmediate 2) Move) +markM 3 +moveI 2 -Mark (MNatural 4) -SPure (Indexed (IImmediate 2) Move) +markM 4 +moveI 2 -Mark (MNatural 5) -SPure (Indexed (IImmediate 0) Copy) +markM 5 +copyI 0 -Mark (MNatural 6) -Labeled (LImmediate 8) (Branch NE) +markM 6 +bNEI 8 -Mark (MNatural 7) -Labeled (LImmediate 15) Jump +markM 7 +jumpI 15 -Mark (MNatural 8) -SPure (Unary (UImmediate 1 Sub)) +markM 8 +subI 1 -Mark (MNatural 9) -SPure (Indexed (IImmediate 2) Move) +markM 9 +moveI 2 -Mark (MNatural 10) -SPure (Cons 0) -SPure (Indexed (IImmediate 3) Copy) +markM 10 +cons 0 +copyI 3 -Mark (MNatural 11) -SPure (Binary Sub) -SPure (Binary Sub) +markM 11 +sub +sub -Mark (MNatural 12) -SPure (Indexed (IImmediate 2) Move) +markM 12 +moveI 2 -Mark (MNatural 13) -SPure (Indexed (IImmediate 2) Move) +markM 13 +moveI 2 -Mark (MNatural 14) -Labeled (LImmediate 5) Jump +markM 14 +jumpI 5 -Mark (MNatural 15) -SPure (Indexed (IImmediate 1) Move) -Labeled LTop (Branch NE) +markM 15 +bNES -Mark (MNatural 16) -SPure (Indexed (IImmediate 1) Move) -Labeled LTop Jump +markM 16 +moveI 1 +jump -Mark (MNatural 17) +markM 17 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/golden/eta/il/optimized/from-eas/pip.il b/.output/golden/eta/il/optimized/from-eas/pip.il index 5fc3b2fed..cc6d670e4 100644 --- a/.output/golden/eta/il/optimized/from-eas/pip.il +++ b/.output/golden/eta/il/optimized/from-eas/pip.il @@ -1,29 +1,29 @@ -Mark (MNatural 1) -SIO InputChar +markM 1 +inputCS -Mark (MNatural 2) -SPure (Indexed (IImmediate 0) Copy) +markM 2 +copyI 0 -Mark (MNatural 3) -SPure (Unary (UImmediate (-1) Sub)) +markM 3 +subI -1 -Mark (MNatural 4) -Labeled (LImmediate 7) (Branch NE) +markM 4 +bNEI 7 -Mark (MNatural 5) -SPure Discard +markM 5 +discard -Mark (MNatural 6) -Labeled (LImmediate 0) Jump +markM 6 +jumpI 0 -Mark (MNatural 7) -SIO OutputChar +markM 7 +outputCS -Mark (MNatural 8) -Labeled (LImmediate 1) Jump +markM 8 +jumpI 1 -Mark (MNatural 9) +markM 9 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/golden/eta/il/optimized/from-eas/pip2.il b/.output/golden/eta/il/optimized/from-eas/pip2.il index 4ea0059ee..7b205707f 100644 --- a/.output/golden/eta/il/optimized/from-eas/pip2.il +++ b/.output/golden/eta/il/optimized/from-eas/pip2.il @@ -1,17 +1,17 @@ -Mark (MNatural 1) -SIO InputChar -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate (-1) Sub)) -Labeled (LImmediate 2) (Branch NE) -SPure Discard -Labeled (LImmediate 0) Jump +markM 1 +inputCS +copyI 0 +subI -1 +bNEI 2 +discard +jumpI 0 -Mark (MNatural 2) -SIO OutputChar -Labeled (LImmediate 1) Jump +markM 2 +outputCS +jumpI 1 -Mark (MNatural 3) +markM 3 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/golden/eta/il/optimized/from-eas/readnum.il b/.output/golden/eta/il/optimized/from-eas/readnum.il index 233f81908..f42eec909 100644 --- a/.output/golden/eta/il/optimized/from-eas/readnum.il +++ b/.output/golden/eta/il/optimized/from-eas/readnum.il @@ -1,123 +1,122 @@ -Mark (MNatural 1) -SIO InputChar +markM 1 +inputCS -Mark (MNatural 2) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 32 Sub)) +markM 2 +copyI 0 +subI 32 -Mark (MNatural 3) -Labeled (LImmediate 5) (Branch NE) +markM 3 +bNEI 5 -Mark (MNatural 4) -Labeled (LImmediate 1) (Branch NE) +markM 4 +bNEI 1 -Mark (MNatural 5) -SPure (Cons 0) -SPure (Indexed (IImmediate 1) Move) +markM 5 +cons 0 +moveI 1 -Mark (MNatural 6) -SPure (Unary (UImmediate 48 Sub)) +markM 6 +subI 48 -Mark (MNatural 7) -SPure (Indexed (IImmediate 1) Move) +markM 7 +moveI 1 -Mark (MNatural 8) -SPure (Cons 10) -SPure (Cons 9) -Labeled (LImmediate 19) Jump +markM 8 +cons 10 +cons 9 +jumpI 19 -Mark (MNatural 9) -SPure (Cons 0) -SPure (Indexed (IImmediate 1) Move) +markM 9 +cons 0 +moveI 1 -Mark (MNatural 10) -SPure (Binary Sub) -SPure (Binary Sub) +markM 10 +sub +sub -Mark (MNatural 11) -SIO InputChar +markM 11 +inputCS -Mark (MNatural 12) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 32 Sub)) -Labeled (LImmediate 14) (Branch NE) +markM 12 +copyI 0 +subI 32 +bNEI 14 -Mark (MNatural 13) -Labeled (LImmediate 17) Jump +markM 13 +jumpI 17 -Mark (MNatural 14) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 10 Sub)) -Labeled (LImmediate 16) (Branch NE) +markM 14 +copyI 0 +subI 10 +bNEI 16 -Mark (MNatural 15) -Labeled (LImmediate 17) Jump +markM 15 +jumpI 17 -Mark (MNatural 16) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate (-1) Sub)) -Labeled (LImmediate 6) (Branch NE) +markM 16 +copyI 0 +subI -1 +bNEI 6 -Mark (MNatural 17) -SPure Discard +markM 17 +discard -Mark (MNatural 18) -SPure (Indexed (IImmediate 1) Move) -Labeled LTop Jump +markM 18 +moveI 1 +jump -Mark (MNatural 19) -SPure (Indexed (IImmediate 2) Move) -SPure (Indexed (IImmediate 2) Move) +markM 19 +moveI 2 +moveI 2 -Mark (MNatural 20) -SPure (Cons 0) +markM 20 +cons 0 -Mark (MNatural 21) -SPure (Indexed (IImmediate 2) Move) +markM 21 +moveI 2 -Mark (MNatural 22) -SPure (Indexed (IImmediate 2) Move) +markM 22 +moveI 2 -Mark (MNatural 23) -SPure (Indexed (IImmediate 0) Copy) +markM 23 +copyI 0 -Mark (MNatural 24) -Labeled (LImmediate 26) (Branch NE) +markM 24 +bNEI 26 -Mark (MNatural 25) -Labeled (LImmediate 33) Jump +markM 25 +jumpI 33 -Mark (MNatural 26) -SPure (Unary (UImmediate 1 Sub)) +markM 26 +subI 1 -Mark (MNatural 27) -SPure (Indexed (IImmediate 2) Move) +markM 27 +moveI 2 -Mark (MNatural 28) -SPure (Cons 0) -SPure (Indexed (IImmediate 3) Copy) +markM 28 +cons 0 +copyI 3 -Mark (MNatural 29) -SPure (Binary Sub) -SPure (Binary Sub) +markM 29 +sub +sub -Mark (MNatural 30) -SPure (Indexed (IImmediate 2) Move) +markM 30 +moveI 2 -Mark (MNatural 31) -SPure (Indexed (IImmediate 2) Move) +markM 31 +moveI 2 -Mark (MNatural 32) -Labeled (LImmediate 23) Jump +markM 32 +jumpI 23 -Mark (MNatural 33) -SPure (Indexed (IImmediate 1) Move) -Labeled LTop (Branch NE) +markM 33 +bNES -Mark (MNatural 34) -SPure (Indexed (IImmediate 1) Move) -Labeled LTop Jump +markM 34 +moveI 1 +jump -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/golden/eta/il/optimized/from-eas/reverse.il b/.output/golden/eta/il/optimized/from-eas/reverse.il index ea26e1041..d8e4a57a9 100644 --- a/.output/golden/eta/il/optimized/from-eas/reverse.il +++ b/.output/golden/eta/il/optimized/from-eas/reverse.il @@ -1,32 +1,32 @@ -Mark (MNatural 1) -SPure (Cons (-1)) +markM 1 +cons (-1) -Mark (MNatural 2) -SIO InputChar +markM 2 +inputCS -Mark (MNatural 3) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate (-1) Sub)) -Labeled (LImmediate 2) (Branch NE) +markM 3 +copyI 0 +subI -1 +bNEI 2 -Mark (MNatural 4) -SPure Discard +markM 4 +discard -Mark (MNatural 5) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate (-1) Sub)) -Labeled (LImmediate 7) (Branch NE) +markM 5 +copyI 0 +subI -1 +bNEI 7 -Mark (MNatural 6) -SPure Discard -Labeled (LImmediate 0) Jump +markM 6 +discard +jumpI 0 -Mark (MNatural 7) -SIO OutputChar -Labeled (LImmediate 5) Jump +markM 7 +outputCS +jumpI 5 -Mark (MNatural 8) +markM 8 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/golden/eta/il/optimized/from-eas/true.il b/.output/golden/eta/il/optimized/from-eas/true.il index 1dba14281..9dbe29fbb 100644 --- a/.output/golden/eta/il/optimized/from-eas/true.il +++ b/.output/golden/eta/il/optimized/from-eas/true.il @@ -1,5 +1,5 @@ -Mark (MNatural 1) +markM 1 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/golden/eta/il/optimized/from-eas/writenum.il b/.output/golden/eta/il/optimized/from-eas/writenum.il index a09fa4321..b2a4688fe 100644 --- a/.output/golden/eta/il/optimized/from-eas/writenum.il +++ b/.output/golden/eta/il/optimized/from-eas/writenum.il @@ -1,70 +1,70 @@ -Mark (MNatural 1) -SPure (Cons 0) -SPure (Indexed (IImmediate 2) Move) +markM 1 +cons 0 +moveI 2 -Mark (MNatural 2) -SPure (Indexed (IImmediate 0) Copy) -Labeled (LImmediate 4) (Branch NE) +markM 2 +copyI 0 +bNEI 4 -Mark (MNatural 3) -SPure (Cons 48) -SIO OutputChar -Labeled LTop (Branch NE) -Labeled LTop Jump +markM 3 +cons 48 +outputCS +bNE +jump -Mark (MNatural 4) -SPure (Indexed (IImmediate 0) Copy) +markM 4 +copyI 0 -Mark (MNatural 5) -Labeled (LImmediate 7) (Branch NE) +markM 5 +bNEI 7 -Mark (MNatural 6) -SPure (Binary Sub) -Labeled (LImmediate 11) Jump +markM 6 +sub +jumpI 11 -Mark (MNatural 7) -SPure (Cons 10) -SPure (Binaries [Mod,Div]) +markM 7 +cons 10 +moddiv -Mark (MArtificial "7") +markA "7" -Mark (MNatural 8) -SPure (Unary (UImmediate (-48) Sub)) +markM 8 +subI -48 -Mark (MNatural 9) -SPure (Indexed (IImmediate 1) Move) +markM 9 +moveI 1 -Mark (MNatural 10) -Labeled (LImmediate 4) Jump +markM 10 +jumpI 4 -Mark (MNatural 11) -SPure (Cons 12) -Labeled (LImmediate 13) Jump +markM 11 +cons 12 +jumpI 13 -Mark (MNatural 12) -Labeled LTop Jump +markM 12 +jump -Mark (MNatural 13) -SPure (Indexed (IImmediate 1) Move) +markM 13 +moveI 1 -Mark (MNatural 14) -SPure (Indexed (IImmediate 0) Copy) +markM 14 +copyI 0 -Mark (MNatural 15) -Labeled (LImmediate 17) (Branch NE) +markM 15 +bNEI 17 -Mark (MNatural 16) -SPure (Binary Sub) -Labeled LTop Jump +markM 16 +sub +jump -Mark (MNatural 17) -SIO OutputChar +markM 17 +outputCS -Mark (MNatural 18) -Labeled (LImmediate 13) Jump +markM 18 +jumpI 13 -Mark (MNatural 19) +markM 19 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/golden/eta/il/optimized/from-eas/writestr.il b/.output/golden/eta/il/optimized/from-eas/writestr.il index 37c5fc29c..b428457c9 100644 --- a/.output/golden/eta/il/optimized/from-eas/writestr.il +++ b/.output/golden/eta/il/optimized/from-eas/writestr.il @@ -1,24 +1,24 @@ -Mark (MNatural 1) -SPure (Indexed (IImmediate 1) Move) +markM 1 +moveI 1 -Mark (MNatural 2) -SPure (Indexed (IImmediate 0) Copy) +markM 2 +copyI 0 -Mark (MNatural 3) -Labeled (LImmediate 5) (Branch NE) +markM 3 +bNEI 5 -Mark (MNatural 4) -SPure (Binary Sub) -Labeled LTop Jump +markM 4 +sub +jump -Mark (MNatural 5) -SIO OutputChar +markM 5 +outputCS -Mark (MNatural 6) -Labeled (LImmediate 1) Jump +markM 6 +jumpI 1 -Mark (MNatural 7) +markM 7 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/golden/eta/il/optimized/original/bottles.il b/.output/golden/eta/il/optimized/original/bottles.il index 617024100..ae610f644 100644 --- a/.output/golden/eta/il/optimized/original/bottles.il +++ b/.output/golden/eta/il/optimized/original/bottles.il @@ -1,276 +1,276 @@ -Mark (MNatural 1) -Labeled (LImmediate 32) Jump - -Mark (MArtificial "1") -Labeled LTop (Branch NE) -SPure (Cons 2) -SIO InputChar -Labeled LTop (Branch NE) -Labeled LTop (Branch NE) -SPure (Binaries [Mod,Div]) -Labeled (LImmediate 4) (Branch NE) -SPure (Cons 2) -SIO OutputChar - -Mark (MNatural 2) -SPure (Indexed (IImmediate 1) Move) -Labeled (LImmediate 3) Jump - -Mark (MArtificial "2") -SIO InputChar -SIO OutputChar -SPure (Binaries [Mod,Div]) -SIO InputChar -Labeled LTop (Branch NE) -SPure (Binary Sub) -SPure Halibut -Labeled (LImmediate 3) Jump - -Mark (MNatural 3) -SPure (Indexed (IImmediate 0) Copy) -Labeled (LImmediate 4) Jump - -Mark (MArtificial "3") -SPure (Binary Sub) -Labeled LTop (Branch NE) -SPure (Binary Sub) -SIO InputChar -Labeled LTop (Branch NE) -SPure (Binary Sub) -SPure (Cons 18828800) -SPure (Cons 4) - -Mark (MNatural 4) -Labeled (LImmediate 6) (Branch NE) - -Mark (MNatural 5) -SPure (Binary Sub) -Labeled LTop Jump - -Mark (MNatural 6) -SIO OutputChar - -Mark (MNatural 7) -Labeled (LImmediate 2) Jump - -Mark (MNatural 8) -SPure (Cons 0) -SPure (Indexed (IImmediate 2) Move) - -Mark (MNatural 9) -SPure (Indexed (IImmediate 0) Copy) -Labeled (LImmediate 11) (Branch NE) - -Mark (MNatural 10) -SPure (Cons 48) -SIO OutputChar -Labeled LTop (Branch NE) -Labeled LTop Jump - -Mark (MNatural 11) -SPure (Indexed (IImmediate 0) Copy) - -Mark (MNatural 12) -Labeled (LImmediate 14) (Branch NE) - -Mark (MNatural 13) -SPure (Binary Sub) -Labeled (LImmediate 18) Jump - -Mark (MNatural 14) -SPure (Cons 10) -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "14") - -Mark (MNatural 15) -SPure (Unary (UImmediate (-48) Sub)) - -Mark (MNatural 16) -SPure (Indexed (IImmediate 1) Move) - -Mark (MNatural 17) -Labeled (LImmediate 11) Jump - -Mark (MNatural 18) -SPure (Cons 19) -Labeled (LImmediate 2) Jump - -Mark (MNatural 19) -Labeled LTop Jump - -Mark (MNatural 20) -SPure (Indexed (IImmediate 1) Move) - -Mark (MNatural 21) -SPure (Cons 22) -Labeled (LImmediate 8) Jump - -Mark (MNatural 22) -SPure (Cons 0) -SPure (Cons 114) -SPure (Cons 101) -SPure (Cons 101) -SPure (Cons 98) -SPure (Cons 32) -SPure (Cons 102) -SPure (Cons 111) -SPure (Cons 32) -Labeled (LImmediate 23) Jump - -Mark (MNatural 23) -SPure (Cons 115) -SPure (Cons 101) -SPure (Cons 108) -SPure (Cons 116) -SPure (Cons 116) -SPure (Cons 111) -SPure (Cons 98) -SPure (Cons 32) -Labeled (LImmediate 24) Jump - -Mark (MNatural 24) -SPure (Cons 25) -Labeled (LImmediate 2) Jump - -Mark (MNatural 25) -Labeled LTop Jump - -Mark (MNatural 26) -SPure (Indexed (IImmediate 1) Move) - -Mark (MNatural 27) -SPure (Cons 28) -Labeled (LImmediate 20) Jump - -Mark (MNatural 28) -SPure (Cons 0) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 97) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 101) -Labeled (LImmediate 29) Jump - -Mark (MNatural 29) -SPure (Cons 104) -SPure (Cons 116) -SPure (Cons 32) -SPure (Cons 110) -SPure (Cons 111) -SPure (Cons 32) -Labeled (LImmediate 30) Jump - -Mark (MNatural 30) -SPure (Cons 31) -Labeled (LImmediate 2) Jump - -Mark (MNatural 31) -Labeled LTop Jump - -Mark (MArtificial "31") -SPure (Binary Sub) -Labeled (LImmediate 32) (Branch NE) -SPure (Binaries [Mod,Div]) -SIO InputChar -SPure (Cons 402523) -SPure (Binaries [Mod,Div]) -SIO InputChar -SPure (Cons 1814) -Labeled (LArtificial "32") Jump - -Mark (MNatural 32) -SPure (Cons 99) - -Mark (MNatural 33) -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 34) -Labeled (LImmediate 26) Jump - -Mark (MNatural 34) -SPure (Cons 44) -SIO OutputChar -SPure (Cons 32) -SIO OutputChar - -Mark (MNatural 35) -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 36) -Labeled (LImmediate 20) Jump - -Mark (MNatural 36) -SPure (Cons 10) -SIO OutputChar - -Mark (MNatural 37) -SPure (Cons 0) -SPure (Cons 10) -SPure (Cons 100) -SPure (Cons 110) -SPure (Cons 117) -SPure (Cons 111) - -Mark (MNatural 38) -SPure (Cons 114) -SPure (Cons 97) -SPure (Cons 32) -SPure (Cons 116) -SPure (Cons 105) -SPure (Cons 32) - -Mark (MNatural 39) -SPure (Cons 115) -SPure (Cons 115) -SPure (Cons 97) -SPure (Cons 112) -SPure (Cons 32) -SPure (Cons 44) - -Mark (MNatural 40) -SPure (Cons 110) -SPure (Cons 119) -SPure (Cons 111) -SPure (Cons 100) -SPure (Cons 32) -SPure (Cons 101) - -Mark (MNatural 41) -SPure (Cons 110) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 107) -SPure (Cons 97) -SPure (Cons 84) - -Mark (MNatural 42) -SPure (Cons 43) -Labeled (LImmediate 2) Jump - -Mark (MNatural 43) -SPure (Unary (UImmediate 1 Sub)) - -Mark (MNatural 44) -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 45) -Labeled (LImmediate 26) Jump - -Mark (MNatural 45) -SPure (Cons 10) -SPure (Cons 10) -SIO OutputChar -SIO OutputChar - -Mark (MNatural 46) -SPure (Indexed (IImmediate 0) Copy) -Labeled (LImmediate 33) (Branch NE) - -Mark (MNatural 47) -Labeled (LImmediate 0) (Branch NE) - -Mark (MNatural 48) - -Mark (MNatural 0) -End +markM 1 +jumpI 32 + +markA "1" +bNE +cons 2 +inputCS +bNE +bNE +moddiv +bNEI 4 +cons 2 +outputCS + +markM 2 +moveI 1 +jumpI 3 + +markA "2" +inputCS +outputCS +moddiv +inputCS +bNE +sub +halibut +jumpI 3 + +markM 3 +copyI 0 +jumpI 4 + +markA "3" +sub +bNE +sub +inputCS +bNE +sub +cons 18828800 +cons 4 + +markM 4 +bNEI 6 + +markM 5 +sub +jump + +markM 6 +outputCS + +markM 7 +jumpI 2 + +markM 8 +cons 0 +moveI 2 + +markM 9 +copyI 0 +bNEI 11 + +markM 10 +cons 48 +outputCS +bNE +jump + +markM 11 +copyI 0 + +markM 12 +bNEI 14 + +markM 13 +sub +jumpI 18 + +markM 14 +cons 10 +moddiv + +markA "14" + +markM 15 +subI -48 + +markM 16 +moveI 1 + +markM 17 +jumpI 11 + +markM 18 +cons 19 +jumpI 2 + +markM 19 +jump + +markM 20 +moveI 1 + +markM 21 +cons 22 +jumpI 8 + +markM 22 +cons 0 +cons 114 +cons 101 +cons 101 +cons 98 +cons 32 +cons 102 +cons 111 +cons 32 +jumpI 23 + +markM 23 +cons 115 +cons 101 +cons 108 +cons 116 +cons 116 +cons 111 +cons 98 +cons 32 +jumpI 24 + +markM 24 +cons 25 +jumpI 2 + +markM 25 +jump + +markM 26 +moveI 1 + +markM 27 +cons 28 +jumpI 20 + +markM 28 +cons 0 +cons 108 +cons 108 +cons 97 +cons 119 +cons 32 +cons 101 +jumpI 29 + +markM 29 +cons 104 +cons 116 +cons 32 +cons 110 +cons 111 +cons 32 +jumpI 30 + +markM 30 +cons 31 +jumpI 2 + +markM 31 +jump + +markA "31" +sub +bNEI 32 +moddiv +inputCS +cons 402523 +moddiv +inputCS +cons 1814 +jumpA "32" + +markM 32 +cons 99 + +markM 33 +copyI 0 +cons 34 +jumpI 26 + +markM 34 +cons 44 +outputCS +cons 32 +outputCS + +markM 35 +copyI 0 +cons 36 +jumpI 20 + +markM 36 +cons 10 +outputCS + +markM 37 +cons 0 +cons 10 +cons 100 +cons 110 +cons 117 +cons 111 + +markM 38 +cons 114 +cons 97 +cons 32 +cons 116 +cons 105 +cons 32 + +markM 39 +cons 115 +cons 115 +cons 97 +cons 112 +cons 32 +cons 44 + +markM 40 +cons 110 +cons 119 +cons 111 +cons 100 +cons 32 +cons 101 + +markM 41 +cons 110 +cons 111 +cons 32 +cons 101 +cons 107 +cons 97 +cons 84 + +markM 42 +cons 43 +jumpI 2 + +markM 43 +subI 1 + +markM 44 +copyI 0 +cons 45 +jumpI 26 + +markM 45 +cons 10 +cons 10 +outputCS +outputCS + +markM 46 +copyI 0 +bNEI 33 + +markM 47 +bNEI 0 + +markM 48 + +markM 0 +end diff --git a/.output/golden/eta/il/optimized/original/crlf.il b/.output/golden/eta/il/optimized/original/crlf.il index ed648a532..b5d61461a 100644 --- a/.output/golden/eta/il/optimized/original/crlf.il +++ b/.output/golden/eta/il/optimized/original/crlf.il @@ -1,43 +1,43 @@ -Mark (MNatural 1) -Labeled (LImmediate 3) Jump +markM 1 +jumpI 3 -Mark (MNatural 2) -SPure (Cons 10) -SPure (Cons 49) -SPure (Cons 68) -SPure (Cons 65) -SPure (Cons 66) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -Labeled (LImmediate 0) Jump +markM 2 +cons 10 +cons 49 +cons 68 +cons 65 +cons 66 +outputCS +outputCS +outputCS +outputCS +outputCS +jumpI 0 -Mark (MNatural 3) -SPure (Cons 10) -SPure (Cons 75) -SPure (Cons 79) -SIO OutputChar -SIO OutputChar -SIO OutputChar -Labeled (LImmediate 0) Jump +markM 3 +cons 10 +cons 75 +cons 79 +outputCS +outputCS +outputCS +jumpI 0 -Mark (MNatural 4) -SPure (Cons 10) -SPure (Cons 50) -SPure (Cons 68) -SPure (Cons 65) -SPure (Cons 66) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -Labeled (LImmediate 0) Jump +markM 4 +cons 10 +cons 50 +cons 68 +cons 65 +cons 66 +outputCS +outputCS +outputCS +outputCS +outputCS +jumpI 0 -Mark (MNatural 5) +markM 5 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/golden/eta/il/optimized/original/fact.il b/.output/golden/eta/il/optimized/original/fact.il index 259d0e23a..9914d0bd3 100644 --- a/.output/golden/eta/il/optimized/original/fact.il +++ b/.output/golden/eta/il/optimized/original/fact.il @@ -1,236 +1,235 @@ -Mark (MNatural 1) -SPure (Cons 2) -Labeled (LImmediate 14) Jump +markM 1 +cons 2 +jumpI 14 -Mark (MNatural 2) -SPure (Cons 3) -Labeled (LImmediate 5) Jump +markM 2 +cons 3 +jumpI 5 -Mark (MNatural 3) -SPure (Cons 4) -Labeled (LImmediate 32) Jump +markM 3 +cons 4 +jumpI 32 -Mark (MNatural 4) -SPure (Cons 10) -SIO OutputChar -Labeled (LImmediate 0) Jump +markM 4 +cons 10 +outputCS +jumpI 0 -Mark (MNatural 5) -SPure (Indexed (IImmediate 1) Move) +markM 5 +moveI 1 -Mark (MNatural 6) -SPure (Indexed (IImmediate 0) Copy) +markM 6 +copyI 0 -Mark (MNatural 7) -SPure (Unary (UImmediate 1 Sub)) -Labeled (LImmediate 9) (Branch NE) +markM 7 +subI 1 +bNEI 9 -Mark (MNatural 8) -Labeled (LImmediate 13) Jump +markM 8 +jumpI 13 -Mark (MNatural 9) -SPure (Indexed (IImmediate 0) Copy) +markM 9 +copyI 0 -Mark (MNatural 10) -SPure (Unary (UImmediate 1 Sub)) +markM 10 +subI 1 -Mark (MNatural 11) -SPure (Cons 12) -Labeled (LImmediate 5) Jump +markM 11 +cons 12 +jumpI 5 -Mark (MNatural 12) -SPure (Cons 13) -Labeled (LImmediate 42) Jump +markM 12 +cons 13 +jumpI 42 -Mark (MNatural 13) -SPure (Indexed (IImmediate 1) Move) -Labeled LTop Jump +markM 13 +moveI 1 +jump -Mark (MNatural 14) -SIO InputChar +markM 14 +inputCS -Mark (MNatural 15) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 32 Sub)) +markM 15 +copyI 0 +subI 32 -Mark (MNatural 16) -Labeled (LImmediate 18) (Branch NE) +markM 16 +bNEI 18 -Mark (MNatural 17) -Labeled (LImmediate 14) (Branch NE) +markM 17 +bNEI 14 -Mark (MNatural 18) -SPure (Cons 0) -SPure (Indexed (IImmediate 1) Move) +markM 18 +cons 0 +moveI 1 -Mark (MNatural 19) -SPure (Unary (UImmediate 48 Sub)) +markM 19 +subI 48 -Mark (MNatural 20) -SPure (Indexed (IImmediate 1) Move) +markM 20 +moveI 1 -Mark (MNatural 21) -SPure (Cons 10) -SPure (Cons 22) -Labeled (LImmediate 42) Jump +markM 21 +cons 10 +cons 22 +jumpI 42 -Mark (MArtificial "21") -SPure (Cons 22) -SPure (Binaries [Mod,Div]) -Labeled LTop (Branch NE) -SIO InputChar -Labeled LTop (Branch NE) -SPure (Binaries [Mod,Div]) +markA "21" +cons 22 +moddiv +bNE +inputCS +bNE +moddiv -Mark (MNatural 22) -SPure (Cons 0) -SPure (Indexed (IImmediate 1) Move) +markM 22 +cons 0 +moveI 1 -Mark (MNatural 23) -SPure (Binary Sub) -SPure (Binary Sub) +markM 23 +sub +sub -Mark (MNatural 24) -SIO InputChar +markM 24 +inputCS -Mark (MNatural 25) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 32 Sub)) -Labeled (LImmediate 27) (Branch NE) +markM 25 +copyI 0 +subI 32 +bNEI 27 -Mark (MNatural 26) -Labeled (LImmediate 30) Jump +markM 26 +jumpI 30 -Mark (MNatural 27) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 10 Sub)) -Labeled (LImmediate 29) (Branch NE) +markM 27 +copyI 0 +subI 10 +bNEI 29 -Mark (MNatural 28) -Labeled (LImmediate 30) Jump +markM 28 +jumpI 30 -Mark (MNatural 29) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate (-1) Sub)) -Labeled (LImmediate 19) (Branch NE) +markM 29 +copyI 0 +subI -1 +bNEI 19 -Mark (MNatural 30) -SPure Discard +markM 30 +discard -Mark (MNatural 31) -SPure (Indexed (IImmediate 1) Move) -Labeled LTop Jump +markM 31 +moveI 1 +jump -Mark (MNatural 32) -SPure (Cons 0) -SPure (Indexed (IImmediate 2) Move) +markM 32 +cons 0 +moveI 2 -Mark (MNatural 33) -SPure (Indexed (IImmediate 0) Copy) +markM 33 +copyI 0 -Mark (MNatural 34) -Labeled (LImmediate 36) (Branch NE) +markM 34 +bNEI 36 -Mark (MNatural 35) -SPure (Binary Sub) -Labeled (LImmediate 40) Jump +markM 35 +sub +jumpI 40 -Mark (MNatural 36) -SPure (Cons 10) -SPure (Binaries [Mod,Div]) +markM 36 +cons 10 +moddiv -Mark (MArtificial "36") +markA "36" -Mark (MNatural 37) -SPure (Unary (UImmediate (-48) Sub)) +markM 37 +subI -48 -Mark (MNatural 38) -SPure (Indexed (IImmediate 1) Move) +markM 38 +moveI 1 -Mark (MNatural 39) -Labeled (LImmediate 33) Jump +markM 39 +jumpI 33 -Mark (MNatural 40) -SPure (Cons 41) -Labeled (LImmediate 58) Jump +markM 40 +cons 41 +jumpI 58 -Mark (MNatural 41) -Labeled LTop Jump +markM 41 +jump -Mark (MNatural 42) -SPure (Indexed (IImmediate 2) Move) -SPure (Indexed (IImmediate 2) Move) +markM 42 +moveI 2 +moveI 2 -Mark (MNatural 43) -SPure (Cons 0) +markM 43 +cons 0 -Mark (MNatural 44) -SPure (Indexed (IImmediate 2) Move) +markM 44 +moveI 2 -Mark (MNatural 45) -SPure (Indexed (IImmediate 2) Move) +markM 45 +moveI 2 -Mark (MNatural 46) -SPure (Indexed (IImmediate 0) Copy) +markM 46 +copyI 0 -Mark (MNatural 47) -Labeled (LImmediate 49) (Branch NE) +markM 47 +bNEI 49 -Mark (MNatural 48) -Labeled (LImmediate 56) Jump +markM 48 +jumpI 56 -Mark (MNatural 49) -SPure (Unary (UImmediate 1 Sub)) +markM 49 +subI 1 -Mark (MNatural 50) -SPure (Indexed (IImmediate 2) Move) +markM 50 +moveI 2 -Mark (MNatural 51) -SPure (Cons 0) -SPure (Indexed (IImmediate 3) Copy) +markM 51 +cons 0 +copyI 3 -Mark (MNatural 52) -SPure (Binary Sub) -SPure (Binary Sub) +markM 52 +sub +sub -Mark (MNatural 53) -SPure (Indexed (IImmediate 2) Move) +markM 53 +moveI 2 -Mark (MNatural 54) -SPure (Indexed (IImmediate 2) Move) +markM 54 +moveI 2 -Mark (MNatural 55) -Labeled (LImmediate 46) Jump +markM 55 +jumpI 46 -Mark (MNatural 56) -SPure (Indexed (IImmediate 1) Move) -Labeled LTop (Branch NE) +markM 56 +bNES -Mark (MNatural 57) -SPure (Indexed (IImmediate 1) Move) -Labeled LTop Jump +markM 57 +moveI 1 +jump -Mark (MNatural 58) -SPure (Indexed (IImmediate 1) Move) +markM 58 +moveI 1 -Mark (MNatural 59) -SPure (Indexed (IImmediate 0) Copy) +markM 59 +copyI 0 -Mark (MNatural 60) -Labeled (LImmediate 62) (Branch NE) +markM 60 +bNEI 62 -Mark (MNatural 61) -SPure (Binary Sub) -Labeled LTop Jump +markM 61 +sub +jump -Mark (MNatural 62) -SIO OutputChar +markM 62 +outputCS -Mark (MNatural 63) -Labeled (LImmediate 58) Jump +markM 63 +jumpI 58 -Mark (MNatural 64) +markM 64 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/golden/eta/il/optimized/original/hello.il b/.output/golden/eta/il/optimized/original/hello.il index 411b20f32..5cea6c2fb 100644 --- a/.output/golden/eta/il/optimized/original/hello.il +++ b/.output/golden/eta/il/optimized/original/hello.il @@ -1,77 +1,77 @@ -Mark (MNatural 1) -Labeled (LImmediate 2) Jump - -Mark (MArtificial "1") -SIO OutputChar -SPure (Binaries [Mod,Div]) -Labeled LTop (Branch NE) -SPure (Cons 2) -SIO InputChar -Labeled LTop (Branch NE) -Labeled LTop (Branch NE) -SPure (Binaries [Mod,Div]) -Labeled (LImmediate 4) (Branch NE) -SPure (Cons 2) -SIO OutputChar - -Mark (MNatural 2) - -Mark (MNatural 3) -SPure (Cons 32) - -Mark (MNatural 4) -SPure (Cons 44) -SPure (Cons 111) -Labeled (LArtificial "5") Jump - -Mark (MNatural 5) -Labeled LTop (Branch NE) -SPure (Binary Sub) -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "5") - -Mark (MNatural 6) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) - -Mark (MNatural 7) -SPure (Cons 72) - -Mark (MNatural 8) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar - -Mark (MNatural 9) -SPure (Cons 10) - -Mark (MNatural 10) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) - -Mark (MNatural 11) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) - -Mark (MNatural 12) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar - -Mark (MNatural 13) - -Mark (MNatural 0) -End +markM 1 +jumpI 2 + +markA "1" +outputCS +moddiv +bNE +cons 2 +inputCS +bNE +bNE +moddiv +bNEI 4 +cons 2 +outputCS + +markM 2 + +markM 3 +cons 32 + +markM 4 +cons 44 +cons 111 +jumpA "5" + +markM 5 +bNE +sub +moddiv + +markA "5" + +markM 6 +cons 108 +cons 108 +cons 101 + +markM 7 +cons 72 + +markM 8 +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS + +markM 9 +cons 10 + +markM 10 +cons 33 +cons 100 +cons 108 + +markM 11 +cons 114 +cons 111 +cons 119 + +markM 12 +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS + +markM 13 + +markM 0 +end diff --git a/.output/golden/eta/il/optimized/original/hello2.il b/.output/golden/eta/il/optimized/original/hello2.il index 10c422a79..0b1d81747 100644 --- a/.output/golden/eta/il/optimized/original/hello2.il +++ b/.output/golden/eta/il/optimized/original/hello2.il @@ -1,47 +1,47 @@ -Mark (MNatural 1) -SPure (Cons 0) -SPure (Cons 10) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) -SPure (Cons 32) - -Mark (MNatural 2) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) -SPure (Cons 3) -Labeled (LImmediate 4) Jump - -Mark (MNatural 3) -Labeled (LImmediate 0) Jump - -Mark (MArtificial "3") -Labeled (LImmediate 4) (Branch NE) -SIO InputChar -SPure (Unary (UImmediate 337 Sub)) - -Mark (MNatural 4) -SPure (Indexed (IImmediate 1) Move) -SPure (Indexed (IImmediate 0) Copy) -Labeled (LImmediate 6) (Branch NE) - -Mark (MNatural 5) -SPure (Binary Sub) -Labeled LTop Jump - -Mark (MNatural 6) -SIO OutputChar -Labeled (LImmediate 4) Jump - -Mark (MNatural 7) - -Mark (MNatural 0) -End +markM 1 +cons 0 +cons 10 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 +cons 32 + +markM 2 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 +cons 3 +jumpI 4 + +markM 3 +jumpI 0 + +markA "3" +bNEI 4 +inputCS +subI 337 + +markM 4 +moveI 1 +copyI 0 +bNEI 6 + +markM 5 +sub +jump + +markM 6 +outputCS +jumpI 4 + +markM 7 + +markM 0 +end diff --git a/.output/golden/eta/il/optimized/original/pip.il b/.output/golden/eta/il/optimized/original/pip.il index 5fc3b2fed..cc6d670e4 100644 --- a/.output/golden/eta/il/optimized/original/pip.il +++ b/.output/golden/eta/il/optimized/original/pip.il @@ -1,29 +1,29 @@ -Mark (MNatural 1) -SIO InputChar +markM 1 +inputCS -Mark (MNatural 2) -SPure (Indexed (IImmediate 0) Copy) +markM 2 +copyI 0 -Mark (MNatural 3) -SPure (Unary (UImmediate (-1) Sub)) +markM 3 +subI -1 -Mark (MNatural 4) -Labeled (LImmediate 7) (Branch NE) +markM 4 +bNEI 7 -Mark (MNatural 5) -SPure Discard +markM 5 +discard -Mark (MNatural 6) -Labeled (LImmediate 0) Jump +markM 6 +jumpI 0 -Mark (MNatural 7) -SIO OutputChar +markM 7 +outputCS -Mark (MNatural 8) -Labeled (LImmediate 1) Jump +markM 8 +jumpI 1 -Mark (MNatural 9) +markM 9 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/golden/eta/il/optimized/original/pip2.il b/.output/golden/eta/il/optimized/original/pip2.il index 4ea0059ee..7b205707f 100644 --- a/.output/golden/eta/il/optimized/original/pip2.il +++ b/.output/golden/eta/il/optimized/original/pip2.il @@ -1,17 +1,17 @@ -Mark (MNatural 1) -SIO InputChar -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate (-1) Sub)) -Labeled (LImmediate 2) (Branch NE) -SPure Discard -Labeled (LImmediate 0) Jump +markM 1 +inputCS +copyI 0 +subI -1 +bNEI 2 +discard +jumpI 0 -Mark (MNatural 2) -SIO OutputChar -Labeled (LImmediate 1) Jump +markM 2 +outputCS +jumpI 1 -Mark (MNatural 3) +markM 3 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/golden/eta/il/parsed/from-eas/bottles.il b/.output/golden/eta/il/parsed/from-eas/bottles.il index 8a32f0e9f..f41facdae 100644 --- a/.output/golden/eta/il/parsed/from-eas/bottles.il +++ b/.output/golden/eta/il/parsed/from-eas/bottles.il @@ -1,292 +1,292 @@ -Mark (MNatural 1) -SPure (Cons 1) -SPure (Cons 31) -Labeled LTop (Branch NE) - -Mark (MNatural 2) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 3) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 4) -SPure (Cons 5) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 5) -SPure (Binary Sub) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 6) -SIO OutputChar - -Mark (MNatural 7) -SPure (Cons 1) -SPure (Cons 2) -Labeled LTop (Branch NE) - -Mark (MNatural 8) -SPure (Cons 0) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 9) -SPure (Cons 0) -SPure Halibut -SPure (Cons 10) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 10) -SPure (Cons 48) -SIO OutputChar -Labeled LTop (Branch NE) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 11) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 12) -SPure (Cons 13) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 13) -SPure (Binary Sub) -SPure (Cons 1) -SPure (Cons 18) -Labeled LTop (Branch NE) - -Mark (MNatural 14) -SPure (Cons 10) -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "14") - -Mark (MNatural 15) -SPure (Cons 0) -SPure (Cons 48) -SPure (Binary Sub) -SPure (Binary Sub) - -Mark (MNatural 16) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 17) -SPure (Cons 1) -SPure (Cons 11) -Labeled LTop (Branch NE) - -Mark (MNatural 18) -SPure (Cons 19) -SPure (Cons 1) -SPure (Cons 2) -Labeled LTop (Branch NE) - -Mark (MNatural 19) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 20) - -Mark (MNatural 21) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 22) -SPure (Cons 23) -SPure (Cons 1) -SPure (Cons 8) -Labeled LTop (Branch NE) - -Mark (MNatural 23) -SPure (Cons 0) -SPure (Cons 114) -SPure (Cons 101) -SPure (Cons 101) -SPure (Cons 98) -SPure (Cons 32) -SPure (Cons 102) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 115) -SPure (Cons 101) -SPure (Cons 108) -SPure (Cons 116) -SPure (Cons 116) -SPure (Cons 111) -SPure (Cons 98) -SPure (Cons 32) - -Mark (MNatural 24) -SPure (Cons 25) -SPure (Cons 1) -SPure (Cons 2) -Labeled LTop (Branch NE) - -Mark (MNatural 25) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 26) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 27) -SPure (Cons 28) -SPure (Cons 1) -SPure (Cons 21) -Labeled LTop (Branch NE) - -Mark (MNatural 28) -SPure (Cons 0) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 97) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 104) -SPure (Cons 116) -SPure (Cons 32) -SPure (Cons 110) -SPure (Cons 111) -SPure (Cons 32) - -Mark (MNatural 29) -SPure (Cons 30) -SPure (Cons 1) -SPure (Cons 2) -Labeled LTop (Branch NE) - -Mark (MNatural 30) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 31) -SPure (Cons 3) - -Mark (MNatural 32) -SPure (Cons 0) -SPure Halibut -SPure (Cons 33) -SPure (Cons 1) -SPure (Cons 26) -Labeled LTop (Branch NE) - -Mark (MNatural 33) -SPure (Cons 44) -SIO OutputChar -SPure (Cons 32) -SIO OutputChar - -Mark (MNatural 34) -SPure (Cons 0) -SPure Halibut -SPure (Cons 35) -SPure (Cons 1) -SPure (Cons 21) -Labeled LTop (Branch NE) - -Mark (MNatural 35) -SPure (Cons 10) -SIO OutputChar - -Mark (MNatural 36) -SPure (Cons 0) -SPure (Cons 10) -SPure (Cons 100) -SPure (Cons 110) -SPure (Cons 117) -SPure (Cons 111) -SPure (Cons 114) -SPure (Cons 97) -SPure (Cons 32) -SPure (Cons 116) -SPure (Cons 105) -SPure (Cons 32) -SPure (Cons 115) -SPure (Cons 115) -SPure (Cons 97) -SPure (Cons 112) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 110) -SPure (Cons 119) -SPure (Cons 111) -SPure (Cons 100) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 110) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 107) -SPure (Cons 97) -SPure (Cons 84) - -Mark (MNatural 37) -SPure (Cons 38) -SPure (Cons 1) -SPure (Cons 2) -Labeled LTop (Branch NE) - -Mark (MNatural 38) -SPure (Cons 1) -SPure (Binary Sub) - -Mark (MNatural 39) -SPure (Cons 0) -SPure Halibut -SPure (Cons 40) -SPure (Cons 1) -SPure (Cons 26) -Labeled LTop (Branch NE) - -Mark (MNatural 40) -SPure (Cons 10) -SPure (Cons 10) -SIO OutputChar -SIO OutputChar - -Mark (MNatural 41) -SPure (Cons 0) -SPure Halibut -SPure (Cons 32) -Labeled LTop (Branch NE) - -Mark (MNatural 42) -SPure (Cons 0) -Labeled LTop (Branch NE) - -Mark (MNatural 43) - -Mark (MNatural 0) -End +markM 1 +cons 1 +cons 31 +bNE + +markM 2 +cons 1 +halibut + +markM 3 +cons 0 +halibut + +markM 4 +cons 5 +cons 0 +cons 1 +sub +sub +bNE + +markM 5 +sub +cons 1 +cons 1 +halibut +bNE + +markM 6 +outputCS + +markM 7 +cons 1 +cons 2 +bNE + +markM 8 +cons 0 +cons 2 +halibut + +markM 9 +cons 0 +halibut +cons 10 +cons 0 +cons 1 +sub +sub +bNE + +markM 10 +cons 48 +outputCS +bNE +cons 1 +cons 1 +halibut +bNE + +markM 11 +cons 0 +halibut + +markM 12 +cons 13 +cons 0 +cons 1 +sub +sub +bNE + +markM 13 +sub +cons 1 +cons 18 +bNE + +markM 14 +cons 10 +moddiv + +markA "14" + +markM 15 +cons 0 +cons 48 +sub +sub + +markM 16 +cons 1 +halibut + +markM 17 +cons 1 +cons 11 +bNE + +markM 18 +cons 19 +cons 1 +cons 2 +bNE + +markM 19 +cons 1 +cons 1 +halibut +bNE + +markM 20 + +markM 21 +cons 1 +halibut + +markM 22 +cons 23 +cons 1 +cons 8 +bNE + +markM 23 +cons 0 +cons 114 +cons 101 +cons 101 +cons 98 +cons 32 +cons 102 +cons 111 +cons 32 +cons 115 +cons 101 +cons 108 +cons 116 +cons 116 +cons 111 +cons 98 +cons 32 + +markM 24 +cons 25 +cons 1 +cons 2 +bNE + +markM 25 +cons 1 +cons 1 +halibut +bNE + +markM 26 +cons 1 +halibut + +markM 27 +cons 28 +cons 1 +cons 21 +bNE + +markM 28 +cons 0 +cons 108 +cons 108 +cons 97 +cons 119 +cons 32 +cons 101 +cons 104 +cons 116 +cons 32 +cons 110 +cons 111 +cons 32 + +markM 29 +cons 30 +cons 1 +cons 2 +bNE + +markM 30 +cons 1 +cons 1 +halibut +bNE + +markM 31 +cons 3 + +markM 32 +cons 0 +halibut +cons 33 +cons 1 +cons 26 +bNE + +markM 33 +cons 44 +outputCS +cons 32 +outputCS + +markM 34 +cons 0 +halibut +cons 35 +cons 1 +cons 21 +bNE + +markM 35 +cons 10 +outputCS + +markM 36 +cons 0 +cons 10 +cons 100 +cons 110 +cons 117 +cons 111 +cons 114 +cons 97 +cons 32 +cons 116 +cons 105 +cons 32 +cons 115 +cons 115 +cons 97 +cons 112 +cons 32 +cons 44 +cons 110 +cons 119 +cons 111 +cons 100 +cons 32 +cons 101 +cons 110 +cons 111 +cons 32 +cons 101 +cons 107 +cons 97 +cons 84 + +markM 37 +cons 38 +cons 1 +cons 2 +bNE + +markM 38 +cons 1 +sub + +markM 39 +cons 0 +halibut +cons 40 +cons 1 +cons 26 +bNE + +markM 40 +cons 10 +cons 10 +outputCS +outputCS + +markM 41 +cons 0 +halibut +cons 32 +bNE + +markM 42 +cons 0 +bNE + +markM 43 + +markM 0 +end diff --git a/.output/golden/eta/il/parsed/from-eas/euclid.il b/.output/golden/eta/il/parsed/from-eas/euclid.il index 3500ea5c0..2e9ae629c 100644 --- a/.output/golden/eta/il/parsed/from-eas/euclid.il +++ b/.output/golden/eta/il/parsed/from-eas/euclid.il @@ -1,66 +1,66 @@ -Mark (MNatural 1) -SPure (Cons 2) -SPure Halibut -SPure (Cons 2) -SPure Halibut +markM 1 +cons 2 +halibut +cons 2 +halibut -Mark (MNatural 2) -SPure (Cons 0) -SPure Halibut +markM 2 +cons 0 +halibut -Mark (MNatural 3) -SPure (Cons 4) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) +markM 3 +cons 4 +cons 0 +cons 1 +sub +sub +bNE -Mark (MNatural 4) -SPure (Cons 1) -SPure (Cons 10) -Labeled LTop (Branch NE) +markM 4 +cons 1 +cons 10 +bNE -Mark (MNatural 5) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure Halibut +markM 5 +cons 0 +cons 1 +sub +halibut -Mark (MNatural 6) -SPure (Binaries [Mod,Div]) +markM 6 +moddiv -Mark (MArtificial "6") +markA "6" -Mark (MNatural 7) -SPure (Cons 0) -SPure (Cons 2) -SPure Halibut -Labeled LTop (Branch NE) +markM 7 +cons 0 +cons 2 +halibut +bNE -Mark (MNatural 8) -SPure (Cons 1) -SPure Halibut +markM 8 +cons 1 +halibut -Mark (MNatural 9) -SPure (Cons 1) -SPure (Cons 2) -Labeled LTop (Branch NE) +markM 9 +cons 1 +cons 2 +bNE -Mark (MNatural 10) -SPure (Cons 0) -Labeled LTop (Branch NE) +markM 10 +cons 0 +bNE -Mark (MNatural 11) -SPure (Cons 1) -SPure (Cons 2) -SPure Halibut +markM 11 +cons 1 +cons 2 +halibut -Mark (MNatural 12) -Labeled LTop (Branch NE) +markM 12 +bNE -Mark (MNatural 13) +markM 13 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/golden/eta/il/parsed/from-eas/fact.il b/.output/golden/eta/il/parsed/from-eas/fact.il index 1e8144aaf..53995b229 100644 --- a/.output/golden/eta/il/parsed/from-eas/fact.il +++ b/.output/golden/eta/il/parsed/from-eas/fact.il @@ -1,367 +1,367 @@ -Mark (MNatural 1) -SPure (Cons 2) -SPure (Cons 1) -SPure (Cons 14) -Labeled LTop (Branch NE) - -Mark (MNatural 2) -SPure (Cons 3) -SPure (Cons 1) -SPure (Cons 5) -Labeled LTop (Branch NE) - -Mark (MNatural 3) -SPure (Cons 4) -SPure (Cons 1) -SPure (Cons 32) -Labeled LTop (Branch NE) - -Mark (MNatural 4) -SPure (Cons 10) -SIO OutputChar -SPure (Cons 1) -SPure (Cons 0) -Labeled LTop (Branch NE) - -Mark (MNatural 5) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 6) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 7) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Cons 8) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 8) -SPure (Cons 1) -SPure (Cons 13) -Labeled LTop (Branch NE) - -Mark (MNatural 9) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 10) -SPure (Cons 1) -SPure (Binary Sub) - -Mark (MNatural 11) -SPure (Cons 12) -SPure (Cons 1) -SPure (Cons 5) -Labeled LTop (Branch NE) - -Mark (MNatural 12) -SPure (Cons 13) -SPure (Cons 1) -SPure (Cons 44) -Labeled LTop (Branch NE) - -Mark (MNatural 13) -SPure (Cons 1) -SPure (Cons 2) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 14) -SIO InputChar - -Mark (MNatural 15) -SPure (Cons 0) -SPure Halibut -SPure (Cons 32) -SPure (Binary Sub) - -Mark (MNatural 16) -SPure (Cons 17) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 17) -SPure (Cons 0) -SPure (Cons 1) -Labeled LTop (Branch NE) -SPure (Cons 14) -Labeled LTop (Branch NE) - -Mark (MNatural 18) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 19) -SPure (Cons 48) -SPure (Cons 32) -SPure (Binary Sub) - -Mark (MNatural 20) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 21) -SPure (Cons 10) -SPure (Cons 22) -SPure (Cons 1) -SPure (Cons 44) -Labeled LTop (Branch NE) - -Mark (MNatural 22) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 23) -SPure (Binary Sub) -SPure (Binary Sub) - -Mark (MNatural 24) -SIO InputChar - -Mark (MNatural 25) -SPure (Cons 0) -SPure Halibut -SPure (Cons 32) -SPure (Binary Sub) -SPure (Cons 27) -Labeled LTop (Branch NE) - -Mark (MNatural 26) -SPure (Cons 1) -SPure (Cons 30) -Labeled LTop (Branch NE) - -Mark (MNatural 27) -SPure (Cons 0) -SPure Halibut -SPure (Cons 10) -SPure (Binary Sub) -SPure (Cons 29) -Labeled LTop (Branch NE) - -Mark (MNatural 28) -SPure (Cons 1) -SPure (Cons 30) -Labeled LTop (Branch NE) - -Mark (MNatural 29) -SPure (Cons 0) -SPure Halibut -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -SPure (Cons 19) -Labeled LTop (Branch NE) - -Mark (MNatural 30) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 31) -SPure (Cons 1) -SPure (Cons 2) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 32) -SPure (Cons 0) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 33) -SPure (Cons 0) -SPure Halibut -SPure (Cons 34) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 34) -SPure (Cons 48) -SIO OutputChar -Labeled LTop (Branch NE) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 35) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 36) -SPure (Cons 37) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 37) -SPure (Binary Sub) -SPure (Cons 1) -SPure (Cons 42) -Labeled LTop (Branch NE) - -Mark (MNatural 38) -SPure (Cons 10) -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "38") - -Mark (MNatural 39) -SPure (Cons 0) -SPure (Cons 48) -SPure (Binary Sub) -SPure (Binary Sub) - -Mark (MNatural 40) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 41) -SPure (Cons 1) -SPure (Cons 35) -Labeled LTop (Branch NE) - -Mark (MNatural 42) -SPure (Cons 43) -SPure (Cons 1) -SPure (Cons 60) -Labeled LTop (Branch NE) - -Mark (MNatural 43) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 44) -SPure (Cons 2) -SPure Halibut -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 45) -SPure (Cons 0) - -Mark (MNatural 46) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 47) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 48) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 49) -SPure (Cons 50) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 50) -SPure (Cons 1) -SPure (Cons 58) -Labeled LTop (Branch NE) - -Mark (MNatural 51) -SPure (Cons 1) -SPure (Binary Sub) - -Mark (MNatural 52) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 53) -SPure (Cons 0) -SPure (Cons 0) -SPure (Cons 3) -SPure (Binary Sub) -SPure Halibut - -Mark (MNatural 54) -SPure (Binary Sub) -SPure (Binary Sub) - -Mark (MNatural 55) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 56) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 57) -SPure (Cons 1) -SPure (Cons 48) -Labeled LTop (Branch NE) - -Mark (MNatural 58) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 59) -SPure (Cons 1) -SPure (Cons 2) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 60) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 61) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 62) -SPure (Cons 63) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 63) -SPure (Binary Sub) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 64) -SIO OutputChar - -Mark (MNatural 65) -SPure (Cons 1) -SPure (Cons 60) -Labeled LTop (Branch NE) - -Mark (MNatural 66) - -Mark (MNatural 0) -End +markM 1 +cons 2 +cons 1 +cons 14 +bNE + +markM 2 +cons 3 +cons 1 +cons 5 +bNE + +markM 3 +cons 4 +cons 1 +cons 32 +bNE + +markM 4 +cons 10 +outputCS +cons 1 +cons 0 +bNE + +markM 5 +cons 1 +halibut + +markM 6 +cons 0 +halibut + +markM 7 +cons 1 +sub +cons 8 +cons 0 +cons 1 +sub +sub +bNE + +markM 8 +cons 1 +cons 13 +bNE + +markM 9 +cons 0 +halibut + +markM 10 +cons 1 +sub + +markM 11 +cons 12 +cons 1 +cons 5 +bNE + +markM 12 +cons 13 +cons 1 +cons 44 +bNE + +markM 13 +cons 1 +cons 2 +halibut +bNE + +markM 14 +inputCS + +markM 15 +cons 0 +halibut +cons 32 +sub + +markM 16 +cons 17 +cons 0 +cons 1 +sub +sub +bNE + +markM 17 +cons 0 +cons 1 +bNE +cons 14 +bNE + +markM 18 +cons 0 +cons 1 +halibut + +markM 19 +cons 48 +cons 32 +sub + +markM 20 +cons 1 +halibut + +markM 21 +cons 10 +cons 22 +cons 1 +cons 44 +bNE + +markM 22 +cons 0 +cons 1 +halibut + +markM 23 +sub +sub + +markM 24 +inputCS + +markM 25 +cons 0 +halibut +cons 32 +sub +cons 27 +bNE + +markM 26 +cons 1 +cons 30 +bNE + +markM 27 +cons 0 +halibut +cons 10 +sub +cons 29 +bNE + +markM 28 +cons 1 +cons 30 +bNE + +markM 29 +cons 0 +halibut +cons 0 +cons 1 +sub +sub +cons 19 +bNE + +markM 30 +cons 0 +cons 1 +halibut +bNE + +markM 31 +cons 1 +cons 2 +halibut +bNE + +markM 32 +cons 0 +cons 2 +halibut + +markM 33 +cons 0 +halibut +cons 34 +cons 0 +cons 1 +sub +sub +bNE + +markM 34 +cons 48 +outputCS +bNE +cons 1 +cons 1 +halibut +bNE + +markM 35 +cons 0 +halibut + +markM 36 +cons 37 +cons 0 +cons 1 +sub +sub +bNE + +markM 37 +sub +cons 1 +cons 42 +bNE + +markM 38 +cons 10 +moddiv + +markA "38" + +markM 39 +cons 0 +cons 48 +sub +sub + +markM 40 +cons 1 +halibut + +markM 41 +cons 1 +cons 35 +bNE + +markM 42 +cons 43 +cons 1 +cons 60 +bNE + +markM 43 +cons 1 +cons 1 +halibut +bNE + +markM 44 +cons 2 +halibut +cons 2 +halibut + +markM 45 +cons 0 + +markM 46 +cons 2 +halibut + +markM 47 +cons 2 +halibut + +markM 48 +cons 0 +halibut + +markM 49 +cons 50 +cons 0 +cons 1 +sub +sub +bNE + +markM 50 +cons 1 +cons 58 +bNE + +markM 51 +cons 1 +sub + +markM 52 +cons 2 +halibut + +markM 53 +cons 0 +cons 0 +cons 3 +sub +halibut + +markM 54 +sub +sub + +markM 55 +cons 2 +halibut + +markM 56 +cons 2 +halibut + +markM 57 +cons 1 +cons 48 +bNE + +markM 58 +cons 1 +halibut +bNE + +markM 59 +cons 1 +cons 2 +halibut +bNE + +markM 60 +cons 1 +halibut + +markM 61 +cons 0 +halibut + +markM 62 +cons 63 +cons 0 +cons 1 +sub +sub +bNE + +markM 63 +sub +cons 1 +cons 1 +halibut +bNE + +markM 64 +outputCS + +markM 65 +cons 1 +cons 60 +bNE + +markM 66 + +markM 0 +end diff --git a/.output/golden/eta/il/parsed/from-eas/function.il b/.output/golden/eta/il/parsed/from-eas/function.il index ff12ba76e..f334a373a 100644 --- a/.output/golden/eta/il/parsed/from-eas/function.il +++ b/.output/golden/eta/il/parsed/from-eas/function.il @@ -1,36 +1,36 @@ -Mark (MNatural 1) -SPure (Cons 2) -SPure Halibut +markM 1 +cons 2 +halibut -Mark (MNatural 2) -SPure (Cons 2) -SPure Halibut +markM 2 +cons 2 +halibut -Mark (MNatural 3) -SPure (Cons 0) +markM 3 +cons 0 -Mark (MNatural 4) -SPure (Cons 1) -SPure Halibut +markM 4 +cons 1 +halibut -Mark (MNatural 5) -SPure (Binary Sub) +markM 5 +sub -Mark (MNatural 6) -SPure (Binary Sub) +markM 6 +sub -Mark (MNatural 7) -SPure (Cons 1) +markM 7 +cons 1 -Mark (MNatural 8) -SPure (Cons 2) -SPure Halibut +markM 8 +cons 2 +halibut -Mark (MNatural 9) -Labeled LTop (Branch NE) +markM 9 +bNE -Mark (MNatural 10) +markM 10 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/golden/eta/il/parsed/from-eas/hello.il b/.output/golden/eta/il/parsed/from-eas/hello.il index cc8950b8a..d8b88a64a 100644 --- a/.output/golden/eta/il/parsed/from-eas/hello.il +++ b/.output/golden/eta/il/parsed/from-eas/hello.il @@ -1,45 +1,45 @@ -Mark (MNatural 1) -SPure (Cons 32) - -Mark (MNatural 2) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) - -Mark (MNatural 3) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar - -Mark (MNatural 4) -SPure (Cons 10) - -Mark (MNatural 5) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) - -Mark (MNatural 6) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar - -Mark (MNatural 7) - -Mark (MNatural 0) -End +markM 1 +cons 32 + +markM 2 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 + +markM 3 +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS + +markM 4 +cons 10 + +markM 5 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 + +markM 6 +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS + +markM 7 + +markM 0 +end diff --git a/.output/golden/eta/il/parsed/from-eas/hello2.il b/.output/golden/eta/il/parsed/from-eas/hello2.il index d348d0a6d..4e611db06 100644 --- a/.output/golden/eta/il/parsed/from-eas/hello2.il +++ b/.output/golden/eta/il/parsed/from-eas/hello2.il @@ -1,64 +1,64 @@ -Mark (MNatural 1) -SPure (Cons 0) -SPure (Cons 10) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) +markM 1 +cons 0 +cons 10 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 +cons 32 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 -Mark (MNatural 2) -SPure (Cons 3) -SPure (Cons 1) -SPure (Cons 4) -Labeled LTop (Branch NE) +markM 2 +cons 3 +cons 1 +cons 4 +bNE -Mark (MNatural 3) -SPure (Cons 1) -SPure (Cons 0) -Labeled LTop (Branch NE) +markM 3 +cons 1 +cons 0 +bNE -Mark (MNatural 4) -SPure (Cons 1) -SPure Halibut +markM 4 +cons 1 +halibut -Mark (MNatural 5) -SPure (Cons 0) -SPure Halibut +markM 5 +cons 0 +halibut -Mark (MNatural 6) -SPure (Cons 7) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) +markM 6 +cons 7 +cons 0 +cons 1 +sub +sub +bNE -Mark (MNatural 7) -SPure (Binary Sub) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) +markM 7 +sub +cons 1 +cons 1 +halibut +bNE -Mark (MNatural 8) -SIO OutputChar +markM 8 +outputCS -Mark (MNatural 9) -SPure (Cons 1) -SPure (Cons 4) -Labeled LTop (Branch NE) +markM 9 +cons 1 +cons 4 +bNE -Mark (MNatural 10) +markM 10 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/golden/eta/il/parsed/from-eas/hello3.il b/.output/golden/eta/il/parsed/from-eas/hello3.il index d348d0a6d..4e611db06 100644 --- a/.output/golden/eta/il/parsed/from-eas/hello3.il +++ b/.output/golden/eta/il/parsed/from-eas/hello3.il @@ -1,64 +1,64 @@ -Mark (MNatural 1) -SPure (Cons 0) -SPure (Cons 10) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) +markM 1 +cons 0 +cons 10 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 +cons 32 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 -Mark (MNatural 2) -SPure (Cons 3) -SPure (Cons 1) -SPure (Cons 4) -Labeled LTop (Branch NE) +markM 2 +cons 3 +cons 1 +cons 4 +bNE -Mark (MNatural 3) -SPure (Cons 1) -SPure (Cons 0) -Labeled LTop (Branch NE) +markM 3 +cons 1 +cons 0 +bNE -Mark (MNatural 4) -SPure (Cons 1) -SPure Halibut +markM 4 +cons 1 +halibut -Mark (MNatural 5) -SPure (Cons 0) -SPure Halibut +markM 5 +cons 0 +halibut -Mark (MNatural 6) -SPure (Cons 7) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) +markM 6 +cons 7 +cons 0 +cons 1 +sub +sub +bNE -Mark (MNatural 7) -SPure (Binary Sub) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) +markM 7 +sub +cons 1 +cons 1 +halibut +bNE -Mark (MNatural 8) -SIO OutputChar +markM 8 +outputCS -Mark (MNatural 9) -SPure (Cons 1) -SPure (Cons 4) -Labeled LTop (Branch NE) +markM 9 +cons 1 +cons 4 +bNE -Mark (MNatural 10) +markM 10 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/golden/eta/il/parsed/from-eas/hello4.il b/.output/golden/eta/il/parsed/from-eas/hello4.il index d348d0a6d..4e611db06 100644 --- a/.output/golden/eta/il/parsed/from-eas/hello4.il +++ b/.output/golden/eta/il/parsed/from-eas/hello4.il @@ -1,64 +1,64 @@ -Mark (MNatural 1) -SPure (Cons 0) -SPure (Cons 10) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) +markM 1 +cons 0 +cons 10 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 +cons 32 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 -Mark (MNatural 2) -SPure (Cons 3) -SPure (Cons 1) -SPure (Cons 4) -Labeled LTop (Branch NE) +markM 2 +cons 3 +cons 1 +cons 4 +bNE -Mark (MNatural 3) -SPure (Cons 1) -SPure (Cons 0) -Labeled LTop (Branch NE) +markM 3 +cons 1 +cons 0 +bNE -Mark (MNatural 4) -SPure (Cons 1) -SPure Halibut +markM 4 +cons 1 +halibut -Mark (MNatural 5) -SPure (Cons 0) -SPure Halibut +markM 5 +cons 0 +halibut -Mark (MNatural 6) -SPure (Cons 7) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) +markM 6 +cons 7 +cons 0 +cons 1 +sub +sub +bNE -Mark (MNatural 7) -SPure (Binary Sub) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) +markM 7 +sub +cons 1 +cons 1 +halibut +bNE -Mark (MNatural 8) -SIO OutputChar +markM 8 +outputCS -Mark (MNatural 9) -SPure (Cons 1) -SPure (Cons 4) -Labeled LTop (Branch NE) +markM 9 +cons 1 +cons 4 +bNE -Mark (MNatural 10) +markM 10 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/golden/eta/il/parsed/from-eas/multiply.il b/.output/golden/eta/il/parsed/from-eas/multiply.il index 5430b0af9..ffe9e355c 100644 --- a/.output/golden/eta/il/parsed/from-eas/multiply.il +++ b/.output/golden/eta/il/parsed/from-eas/multiply.il @@ -1,82 +1,82 @@ -Mark (MNatural 1) -SPure (Cons 2) -SPure Halibut -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 2) -SPure (Cons 0) - -Mark (MNatural 3) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 4) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 5) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 6) -SPure (Cons 7) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 7) -SPure (Cons 1) -SPure (Cons 15) -Labeled LTop (Branch NE) - -Mark (MNatural 8) -SPure (Cons 1) -SPure (Binary Sub) - -Mark (MNatural 9) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 10) -SPure (Cons 0) -SPure (Cons 0) -SPure (Cons 3) -SPure (Binary Sub) -SPure Halibut - -Mark (MNatural 11) -SPure (Binary Sub) -SPure (Binary Sub) - -Mark (MNatural 12) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 13) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 14) -SPure (Cons 1) -SPure (Cons 5) -Labeled LTop (Branch NE) - -Mark (MNatural 15) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 16) -SPure (Cons 1) -SPure (Cons 2) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 17) - -Mark (MNatural 0) -End +markM 1 +cons 2 +halibut +cons 2 +halibut + +markM 2 +cons 0 + +markM 3 +cons 2 +halibut + +markM 4 +cons 2 +halibut + +markM 5 +cons 0 +halibut + +markM 6 +cons 7 +cons 0 +cons 1 +sub +sub +bNE + +markM 7 +cons 1 +cons 15 +bNE + +markM 8 +cons 1 +sub + +markM 9 +cons 2 +halibut + +markM 10 +cons 0 +cons 0 +cons 3 +sub +halibut + +markM 11 +sub +sub + +markM 12 +cons 2 +halibut + +markM 13 +cons 2 +halibut + +markM 14 +cons 1 +cons 5 +bNE + +markM 15 +cons 1 +halibut +bNE + +markM 16 +cons 1 +cons 2 +halibut +bNE + +markM 17 + +markM 0 +end diff --git a/.output/golden/eta/il/parsed/from-eas/pip.il b/.output/golden/eta/il/parsed/from-eas/pip.il index f88e592e6..cfed9a247 100644 --- a/.output/golden/eta/il/parsed/from-eas/pip.il +++ b/.output/golden/eta/il/parsed/from-eas/pip.il @@ -1,41 +1,41 @@ -Mark (MNatural 1) -SIO InputChar - -Mark (MNatural 2) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 3) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) - -Mark (MNatural 4) -SPure (Cons 7) -Labeled LTop (Branch NE) - -Mark (MNatural 5) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 6) -SPure (Cons 1) -SPure (Cons 0) -Labeled LTop (Branch NE) - -Mark (MNatural 7) -SIO OutputChar - -Mark (MNatural 8) -SPure (Cons 1) -SPure (Cons 1) -Labeled LTop (Branch NE) - -Mark (MNatural 9) - -Mark (MNatural 0) -End +markM 1 +inputCS + +markM 2 +cons 0 +halibut + +markM 3 +cons 0 +cons 1 +sub +sub + +markM 4 +cons 7 +bNE + +markM 5 +cons 0 +cons 1 +halibut +bNE + +markM 6 +cons 1 +cons 0 +bNE + +markM 7 +outputCS + +markM 8 +cons 1 +cons 1 +bNE + +markM 9 + +markM 0 +end diff --git a/.output/golden/eta/il/parsed/from-eas/pip2.il b/.output/golden/eta/il/parsed/from-eas/pip2.il index e11bc328c..250a029ac 100644 --- a/.output/golden/eta/il/parsed/from-eas/pip2.il +++ b/.output/golden/eta/il/parsed/from-eas/pip2.il @@ -1,29 +1,29 @@ -Mark (MNatural 1) -SIO InputChar -SPure (Cons 0) -SPure Halibut -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -SPure (Cons 2) -Labeled LTop (Branch NE) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) -SPure (Cons 1) -SPure (Cons 0) -Labeled LTop (Branch NE) +markM 1 +inputCS +cons 0 +halibut +cons 0 +cons 1 +sub +sub +cons 2 +bNE +cons 0 +cons 1 +halibut +bNE +cons 1 +cons 0 +bNE -Mark (MNatural 2) -SIO OutputChar -SPure (Cons 1) -SPure (Cons 1) -Labeled LTop (Branch NE) +markM 2 +outputCS +cons 1 +cons 1 +bNE -Mark (MNatural 3) +markM 3 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/golden/eta/il/parsed/from-eas/readnum.il b/.output/golden/eta/il/parsed/from-eas/readnum.il index 00ea65045..94ba518b4 100644 --- a/.output/golden/eta/il/parsed/from-eas/readnum.il +++ b/.output/golden/eta/il/parsed/from-eas/readnum.il @@ -1,184 +1,184 @@ -Mark (MNatural 1) -SIO InputChar - -Mark (MNatural 2) -SPure (Cons 0) -SPure Halibut -SPure (Cons 32) -SPure (Binary Sub) - -Mark (MNatural 3) -SPure (Cons 4) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 4) -SPure (Cons 0) -SPure (Cons 1) -Labeled LTop (Branch NE) -SPure (Cons 1) -Labeled LTop (Branch NE) - -Mark (MNatural 5) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 6) -SPure (Cons 48) -SPure (Binary Sub) - -Mark (MNatural 7) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 8) -SPure (Cons 10) -SPure (Cons 9) -SPure (Cons 1) -SPure (Cons 19) -Labeled LTop (Branch NE) - -Mark (MNatural 9) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 10) -SPure (Binary Sub) -SPure (Binary Sub) - -Mark (MNatural 11) -SIO InputChar - -Mark (MNatural 12) -SPure (Cons 0) -SPure Halibut -SPure (Cons 32) -SPure (Binary Sub) -SPure (Cons 14) -Labeled LTop (Branch NE) - -Mark (MNatural 13) -SPure (Cons 1) -SPure (Cons 17) -Labeled LTop (Branch NE) - -Mark (MNatural 14) -SPure (Cons 0) -SPure Halibut -SPure (Cons 10) -SPure (Binary Sub) -SPure (Cons 16) -Labeled LTop (Branch NE) - -Mark (MNatural 15) -SPure (Cons 1) -SPure (Cons 17) -Labeled LTop (Branch NE) - -Mark (MNatural 16) -SPure (Cons 0) -SPure Halibut -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -SPure (Cons 6) -Labeled LTop (Branch NE) - -Mark (MNatural 17) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 18) -SPure (Cons 1) -SPure (Cons 2) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 19) -SPure (Cons 2) -SPure Halibut -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 20) -SPure (Cons 0) - -Mark (MNatural 21) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 22) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 23) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 24) -SPure (Cons 25) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 25) -SPure (Cons 1) -SPure (Cons 33) -Labeled LTop (Branch NE) - -Mark (MNatural 26) -SPure (Cons 1) -SPure (Binary Sub) - -Mark (MNatural 27) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 28) -SPure (Cons 0) -SPure (Cons 0) -SPure (Cons 3) -SPure (Binary Sub) -SPure Halibut - -Mark (MNatural 29) -SPure (Binary Sub) -SPure (Binary Sub) - -Mark (MNatural 30) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 31) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 32) -SPure (Cons 1) -SPure (Cons 23) -Labeled LTop (Branch NE) - -Mark (MNatural 33) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 34) -SPure (Cons 1) -SPure (Cons 2) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 0) -End +markM 1 +inputCS + +markM 2 +cons 0 +halibut +cons 32 +sub + +markM 3 +cons 4 +cons 0 +cons 1 +sub +sub +bNE + +markM 4 +cons 0 +cons 1 +bNE +cons 1 +bNE + +markM 5 +cons 0 +cons 1 +halibut + +markM 6 +cons 48 +sub + +markM 7 +cons 1 +halibut + +markM 8 +cons 10 +cons 9 +cons 1 +cons 19 +bNE + +markM 9 +cons 0 +cons 1 +halibut + +markM 10 +sub +sub + +markM 11 +inputCS + +markM 12 +cons 0 +halibut +cons 32 +sub +cons 14 +bNE + +markM 13 +cons 1 +cons 17 +bNE + +markM 14 +cons 0 +halibut +cons 10 +sub +cons 16 +bNE + +markM 15 +cons 1 +cons 17 +bNE + +markM 16 +cons 0 +halibut +cons 0 +cons 1 +sub +sub +cons 6 +bNE + +markM 17 +cons 0 +cons 1 +halibut +bNE + +markM 18 +cons 1 +cons 2 +halibut +bNE + +markM 19 +cons 2 +halibut +cons 2 +halibut + +markM 20 +cons 0 + +markM 21 +cons 2 +halibut + +markM 22 +cons 2 +halibut + +markM 23 +cons 0 +halibut + +markM 24 +cons 25 +cons 0 +cons 1 +sub +sub +bNE + +markM 25 +cons 1 +cons 33 +bNE + +markM 26 +cons 1 +sub + +markM 27 +cons 2 +halibut + +markM 28 +cons 0 +cons 0 +cons 3 +sub +halibut + +markM 29 +sub +sub + +markM 30 +cons 2 +halibut + +markM 31 +cons 2 +halibut + +markM 32 +cons 1 +cons 23 +bNE + +markM 33 +cons 1 +halibut +bNE + +markM 34 +cons 1 +cons 2 +halibut +bNE + +markM 0 +end diff --git a/.output/golden/eta/il/parsed/from-eas/reverse.il b/.output/golden/eta/il/parsed/from-eas/reverse.il index def8d566a..424808821 100644 --- a/.output/golden/eta/il/parsed/from-eas/reverse.il +++ b/.output/golden/eta/il/parsed/from-eas/reverse.il @@ -1,58 +1,58 @@ -Mark (MNatural 1) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) - -Mark (MNatural 2) -SIO InputChar - -Mark (MNatural 3) -SPure (Cons 0) -SPure Halibut -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -SPure (Cons 2) -Labeled LTop (Branch NE) - -Mark (MNatural 4) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 5) -SPure (Cons 0) -SPure Halibut -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -SPure (Cons 6) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 6) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) -SPure (Cons 1) -SPure (Cons 0) -Labeled LTop (Branch NE) - -Mark (MNatural 7) -SIO OutputChar -SPure (Cons 1) -SPure (Cons 5) -Labeled LTop (Branch NE) - -Mark (MNatural 8) - -Mark (MNatural 0) -End +markM 1 +cons 0 +cons 1 +sub + +markM 2 +inputCS + +markM 3 +cons 0 +halibut +cons 0 +cons 1 +sub +sub +cons 2 +bNE + +markM 4 +cons 0 +cons 1 +halibut +bNE + +markM 5 +cons 0 +halibut +cons 0 +cons 1 +sub +sub +cons 6 +cons 0 +cons 1 +sub +sub +bNE + +markM 6 +cons 0 +cons 1 +halibut +bNE +cons 1 +cons 0 +bNE + +markM 7 +outputCS +cons 1 +cons 5 +bNE + +markM 8 + +markM 0 +end diff --git a/.output/golden/eta/il/parsed/from-eas/true.il b/.output/golden/eta/il/parsed/from-eas/true.il index 1dba14281..9dbe29fbb 100644 --- a/.output/golden/eta/il/parsed/from-eas/true.il +++ b/.output/golden/eta/il/parsed/from-eas/true.il @@ -1,5 +1,5 @@ -Mark (MNatural 1) +markM 1 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/golden/eta/il/parsed/from-eas/writenum.il b/.output/golden/eta/il/parsed/from-eas/writenum.il index 10bae4d99..7001339ea 100644 --- a/.output/golden/eta/il/parsed/from-eas/writenum.il +++ b/.output/golden/eta/il/parsed/from-eas/writenum.il @@ -1,111 +1,111 @@ -Mark (MNatural 1) -SPure (Cons 0) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 2) -SPure (Cons 0) -SPure Halibut -SPure (Cons 3) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 3) -SPure (Cons 48) -SIO OutputChar -Labeled LTop (Branch NE) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 4) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 5) -SPure (Cons 6) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 6) -SPure (Binary Sub) -SPure (Cons 1) -SPure (Cons 11) -Labeled LTop (Branch NE) - -Mark (MNatural 7) -SPure (Cons 10) -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "7") - -Mark (MNatural 8) -SPure (Cons 0) -SPure (Cons 48) -SPure (Binary Sub) -SPure (Binary Sub) - -Mark (MNatural 9) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 10) -SPure (Cons 1) -SPure (Cons 4) -Labeled LTop (Branch NE) - -Mark (MNatural 11) -SPure (Cons 12) -SPure (Cons 1) -SPure (Cons 13) -Labeled LTop (Branch NE) - -Mark (MNatural 12) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 13) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 14) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 15) -SPure (Cons 16) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 16) -SPure (Binary Sub) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 17) -SIO OutputChar - -Mark (MNatural 18) -SPure (Cons 1) -SPure (Cons 13) -Labeled LTop (Branch NE) - -Mark (MNatural 19) - -Mark (MNatural 0) -End +markM 1 +cons 0 +cons 2 +halibut + +markM 2 +cons 0 +halibut +cons 3 +cons 0 +cons 1 +sub +sub +bNE + +markM 3 +cons 48 +outputCS +bNE +cons 1 +cons 1 +halibut +bNE + +markM 4 +cons 0 +halibut + +markM 5 +cons 6 +cons 0 +cons 1 +sub +sub +bNE + +markM 6 +sub +cons 1 +cons 11 +bNE + +markM 7 +cons 10 +moddiv + +markA "7" + +markM 8 +cons 0 +cons 48 +sub +sub + +markM 9 +cons 1 +halibut + +markM 10 +cons 1 +cons 4 +bNE + +markM 11 +cons 12 +cons 1 +cons 13 +bNE + +markM 12 +cons 1 +cons 1 +halibut +bNE + +markM 13 +cons 1 +halibut + +markM 14 +cons 0 +halibut + +markM 15 +cons 16 +cons 0 +cons 1 +sub +sub +bNE + +markM 16 +sub +cons 1 +cons 1 +halibut +bNE + +markM 17 +outputCS + +markM 18 +cons 1 +cons 13 +bNE + +markM 19 + +markM 0 +end diff --git a/.output/golden/eta/il/parsed/from-eas/writestr.il b/.output/golden/eta/il/parsed/from-eas/writestr.il index c9a375218..683f571b4 100644 --- a/.output/golden/eta/il/parsed/from-eas/writestr.il +++ b/.output/golden/eta/il/parsed/from-eas/writestr.il @@ -1,36 +1,36 @@ -Mark (MNatural 1) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 2) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 3) -SPure (Cons 4) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 4) -SPure (Binary Sub) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 5) -SIO OutputChar - -Mark (MNatural 6) -SPure (Cons 1) -SPure (Cons 1) -Labeled LTop (Branch NE) - -Mark (MNatural 7) - -Mark (MNatural 0) -End +markM 1 +cons 1 +halibut + +markM 2 +cons 0 +halibut + +markM 3 +cons 4 +cons 0 +cons 1 +sub +sub +bNE + +markM 4 +sub +cons 1 +cons 1 +halibut +bNE + +markM 5 +outputCS + +markM 6 +cons 1 +cons 1 +bNE + +markM 7 + +markM 0 +end diff --git a/.output/golden/eta/il/parsed/original/bottles.il b/.output/golden/eta/il/parsed/original/bottles.il index 7d2744f4a..6e705bafd 100644 --- a/.output/golden/eta/il/parsed/original/bottles.il +++ b/.output/golden/eta/il/parsed/original/bottles.il @@ -1,402 +1,402 @@ -Mark (MNatural 1) -SPure (Cons 141) -SPure (Cons 32) -Labeled LTop (Branch NE) -SIO OutputChar -SPure (Cons 155) -SPure (Binary Sub) -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "1") -Labeled LTop (Branch NE) -SPure (Cons 2) -SIO InputChar -Labeled LTop (Branch NE) -Labeled LTop (Branch NE) -SPure (Binaries [Mod,Div]) -SPure (Cons 4) -Labeled LTop (Branch NE) -SPure (Cons 2) -SIO OutputChar - -Mark (MNatural 2) -SPure (Cons 1) -SPure Halibut -SPure (Cons 1) -SPure (Cons 3) -Labeled LTop (Branch NE) -SPure (Binary Sub) -SPure (Cons 3) -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "2") -SIO InputChar -SIO OutputChar -SPure (Binaries [Mod,Div]) -SIO InputChar -Labeled LTop (Branch NE) -SPure (Binary Sub) -SPure Halibut -SPure (Cons 3) -SPure (Cons 3) -Labeled LTop (Branch NE) -SPure (Binaries [Mod,Div]) -SIO InputChar -SPure (Binary Sub) -Labeled LTop (Branch NE) -SIO InputChar -SIO OutputChar -SIO OutputChar - -Mark (MNatural 3) -SPure (Cons 0) -SPure Halibut -SPure (Cons 1) -SPure (Cons 4) -Labeled LTop (Branch NE) -SPure (Binary Sub) -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "3") -SPure (Binary Sub) -Labeled LTop (Branch NE) -SPure (Binary Sub) -SIO InputChar -Labeled LTop (Branch NE) -SPure (Binary Sub) -SPure (Cons 18828800) -SPure (Cons 4) - -Mark (MNatural 4) -SPure (Cons 5) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 5) -SPure (Binary Sub) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 6) -SIO OutputChar - -Mark (MNatural 7) -SPure (Cons 1) -SPure (Cons 2) -Labeled LTop (Branch NE) - -Mark (MNatural 8) -SPure (Cons 0) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 9) -SPure (Cons 0) -SPure Halibut -SPure (Cons 10) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 10) -SPure (Cons 48) -SIO OutputChar -Labeled LTop (Branch NE) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 11) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 12) -SPure (Cons 13) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 13) -SPure (Binary Sub) -SPure (Cons 1) -SPure (Cons 18) -Labeled LTop (Branch NE) - -Mark (MNatural 14) -SPure (Cons 10) -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "14") - -Mark (MNatural 15) -SPure (Cons 0) -SPure (Cons 48) -SPure (Binary Sub) -SPure (Binary Sub) - -Mark (MNatural 16) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 17) -SPure (Cons 1) -SPure (Cons 11) -Labeled LTop (Branch NE) -SPure (Cons 18) -SPure (Cons 11) -SPure (Cons 18) -SPure (Cons 13128773) -SPure (Cons 1) -SPure Halibut -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 18) -SPure (Cons 19) -SPure (Cons 1) -SPure (Cons 2) -Labeled LTop (Branch NE) - -Mark (MNatural 19) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 20) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 21) -SPure (Cons 22) -SPure (Cons 1) -SPure (Cons 8) -Labeled LTop (Branch NE) - -Mark (MNatural 22) -SPure (Cons 0) -SPure (Cons 114) -SPure (Cons 101) -SPure (Cons 101) -SPure (Cons 98) -SPure (Cons 32) -SPure (Cons 102) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 1) -SPure (Cons 23) -Labeled LTop (Branch NE) -SPure (Cons 2348471754576) -Labeled (LArtificial "23") Jump - -Mark (MNatural 23) -SPure (Cons 115) -SPure (Cons 101) -SPure (Cons 108) -SPure (Cons 116) -SPure (Cons 116) -SPure (Cons 111) -SPure (Cons 98) -SPure (Cons 32) -SPure (Cons 1) -SPure (Cons 24) -Labeled LTop (Branch NE) -SPure (Cons 335495964812) -Labeled (LArtificial "24") Jump - -Mark (MNatural 24) -SPure (Cons 25) -SPure (Cons 1) -SPure (Cons 2) -Labeled LTop (Branch NE) - -Mark (MNatural 25) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 26) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 27) -SPure (Cons 28) -SPure (Cons 1) -SPure (Cons 20) -Labeled LTop (Branch NE) - -Mark (MNatural 28) -SPure (Cons 0) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 97) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 1) -SPure (Cons 29) -Labeled LTop (Branch NE) -SPure (Cons 2348471754565) -Labeled (LArtificial "29") Jump - -Mark (MNatural 29) -SPure (Cons 104) -SPure (Cons 116) -SPure (Cons 32) -SPure (Cons 110) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 1) -SPure (Cons 30) -Labeled LTop (Branch NE) -SPure (Cons 335495964812) -Labeled (LArtificial "30") Jump - -Mark (MNatural 30) -SPure (Cons 31) -SPure (Cons 1) -SPure (Cons 2) -Labeled LTop (Branch NE) - -Mark (MNatural 31) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) -SIO InputChar -Labeled LTop (Branch NE) -SPure (Cons 0) -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "31") -SPure (Binary Sub) -SPure (Cons 32) -Labeled LTop (Branch NE) -SPure (Binaries [Mod,Div]) -SIO InputChar -SPure (Cons 402523) -SPure (Binaries [Mod,Div]) -SIO InputChar -SPure (Cons 1814) -Labeled (LArtificial "32") Jump - -Mark (MNatural 32) -SPure (Cons 99) - -Mark (MNatural 33) -SPure (Cons 0) -SPure Halibut -SPure (Cons 34) -SPure (Cons 1) -SPure (Cons 26) -Labeled LTop (Branch NE) - -Mark (MNatural 34) -SPure (Cons 44) -SIO OutputChar -SPure (Cons 32) -SIO OutputChar - -Mark (MNatural 35) -SPure (Cons 0) -SPure Halibut -SPure (Cons 36) -SPure (Cons 1) -SPure (Cons 20) -Labeled LTop (Branch NE) - -Mark (MNatural 36) -SPure (Cons 10) -SIO OutputChar - -Mark (MNatural 37) -SPure (Cons 0) -SPure (Cons 10) -SPure (Cons 100) -SPure (Cons 110) -SPure (Cons 117) -SPure (Cons 111) - -Mark (MNatural 38) -SPure (Cons 114) -SPure (Cons 97) -SPure (Cons 32) -SPure (Cons 116) -SPure (Cons 105) -SPure (Cons 32) - -Mark (MNatural 39) -SPure (Cons 115) -SPure (Cons 115) -SPure (Cons 97) -SPure (Cons 112) -SPure (Cons 32) -SPure (Cons 44) - -Mark (MNatural 40) -SPure (Cons 110) -SPure (Cons 119) -SPure (Cons 111) -SPure (Cons 100) -SPure (Cons 32) -SPure (Cons 101) - -Mark (MNatural 41) -SPure (Cons 110) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 107) -SPure (Cons 97) -SPure (Cons 84) - -Mark (MNatural 42) -SPure (Cons 43) -SPure (Cons 1) -SPure (Cons 2) -Labeled LTop (Branch NE) - -Mark (MNatural 43) -SPure (Cons 1) -SPure (Binary Sub) - -Mark (MNatural 44) -SPure (Cons 0) -SPure Halibut -SPure (Cons 45) -SPure (Cons 1) -SPure (Cons 26) -Labeled LTop (Branch NE) - -Mark (MNatural 45) -SPure (Cons 10) -SPure (Cons 10) -SIO OutputChar -SIO OutputChar - -Mark (MNatural 46) -SPure (Cons 0) -SPure Halibut -SPure (Cons 33) -Labeled LTop (Branch NE) - -Mark (MNatural 47) -SPure (Cons 0) -Labeled LTop (Branch NE) - -Mark (MNatural 48) - -Mark (MNatural 0) -End +markM 1 +cons 141 +cons 32 +bNE +outputCS +cons 155 +sub +moddiv + +markA "1" +bNE +cons 2 +inputCS +bNE +bNE +moddiv +cons 4 +bNE +cons 2 +outputCS + +markM 2 +cons 1 +halibut +cons 1 +cons 3 +bNE +sub +cons 3 +moddiv + +markA "2" +inputCS +outputCS +moddiv +inputCS +bNE +sub +halibut +cons 3 +cons 3 +bNE +moddiv +inputCS +sub +bNE +inputCS +outputCS +outputCS + +markM 3 +cons 0 +halibut +cons 1 +cons 4 +bNE +sub +moddiv + +markA "3" +sub +bNE +sub +inputCS +bNE +sub +cons 18828800 +cons 4 + +markM 4 +cons 5 +cons 0 +cons 1 +sub +sub +bNE + +markM 5 +sub +cons 1 +cons 1 +halibut +bNE + +markM 6 +outputCS + +markM 7 +cons 1 +cons 2 +bNE + +markM 8 +cons 0 +cons 2 +halibut + +markM 9 +cons 0 +halibut +cons 10 +cons 0 +cons 1 +sub +sub +bNE + +markM 10 +cons 48 +outputCS +bNE +cons 1 +cons 1 +halibut +bNE + +markM 11 +cons 0 +halibut + +markM 12 +cons 13 +cons 0 +cons 1 +sub +sub +bNE + +markM 13 +sub +cons 1 +cons 18 +bNE + +markM 14 +cons 10 +moddiv + +markA "14" + +markM 15 +cons 0 +cons 48 +sub +sub + +markM 16 +cons 1 +halibut + +markM 17 +cons 1 +cons 11 +bNE +cons 18 +cons 11 +cons 18 +cons 13128773 +cons 1 +halibut +sub +bNE + +markM 18 +cons 19 +cons 1 +cons 2 +bNE + +markM 19 +cons 1 +cons 1 +halibut +bNE + +markM 20 +cons 1 +halibut + +markM 21 +cons 22 +cons 1 +cons 8 +bNE + +markM 22 +cons 0 +cons 114 +cons 101 +cons 101 +cons 98 +cons 32 +cons 102 +cons 111 +cons 32 +cons 1 +cons 23 +bNE +cons 2348471754576 +jumpA "23" + +markM 23 +cons 115 +cons 101 +cons 108 +cons 116 +cons 116 +cons 111 +cons 98 +cons 32 +cons 1 +cons 24 +bNE +cons 335495964812 +jumpA "24" + +markM 24 +cons 25 +cons 1 +cons 2 +bNE + +markM 25 +cons 1 +cons 1 +halibut +bNE + +markM 26 +cons 1 +halibut + +markM 27 +cons 28 +cons 1 +cons 20 +bNE + +markM 28 +cons 0 +cons 108 +cons 108 +cons 97 +cons 119 +cons 32 +cons 101 +cons 1 +cons 29 +bNE +cons 2348471754565 +jumpA "29" + +markM 29 +cons 104 +cons 116 +cons 32 +cons 110 +cons 111 +cons 32 +cons 1 +cons 30 +bNE +cons 335495964812 +jumpA "30" + +markM 30 +cons 31 +cons 1 +cons 2 +bNE + +markM 31 +cons 1 +cons 1 +halibut +bNE +inputCS +bNE +cons 0 +moddiv + +markA "31" +sub +cons 32 +bNE +moddiv +inputCS +cons 402523 +moddiv +inputCS +cons 1814 +jumpA "32" + +markM 32 +cons 99 + +markM 33 +cons 0 +halibut +cons 34 +cons 1 +cons 26 +bNE + +markM 34 +cons 44 +outputCS +cons 32 +outputCS + +markM 35 +cons 0 +halibut +cons 36 +cons 1 +cons 20 +bNE + +markM 36 +cons 10 +outputCS + +markM 37 +cons 0 +cons 10 +cons 100 +cons 110 +cons 117 +cons 111 + +markM 38 +cons 114 +cons 97 +cons 32 +cons 116 +cons 105 +cons 32 + +markM 39 +cons 115 +cons 115 +cons 97 +cons 112 +cons 32 +cons 44 + +markM 40 +cons 110 +cons 119 +cons 111 +cons 100 +cons 32 +cons 101 + +markM 41 +cons 110 +cons 111 +cons 32 +cons 101 +cons 107 +cons 97 +cons 84 + +markM 42 +cons 43 +cons 1 +cons 2 +bNE + +markM 43 +cons 1 +sub + +markM 44 +cons 0 +halibut +cons 45 +cons 1 +cons 26 +bNE + +markM 45 +cons 10 +cons 10 +outputCS +outputCS + +markM 46 +cons 0 +halibut +cons 33 +bNE + +markM 47 +cons 0 +bNE + +markM 48 + +markM 0 +end diff --git a/.output/golden/eta/il/parsed/original/crlf.il b/.output/golden/eta/il/parsed/original/crlf.il index b6267aaa6..f972991ea 100644 --- a/.output/golden/eta/il/parsed/original/crlf.il +++ b/.output/golden/eta/il/parsed/original/crlf.il @@ -1,51 +1,51 @@ -Mark (MNatural 1) -SPure (Cons 1) -SPure (Cons 3) -Labeled LTop (Branch NE) +markM 1 +cons 1 +cons 3 +bNE -Mark (MNatural 2) -SPure (Cons 10) -SPure (Cons 49) -SPure (Cons 68) -SPure (Cons 65) -SPure (Cons 66) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SPure (Cons 1) -SPure (Cons 0) -Labeled LTop (Branch NE) +markM 2 +cons 10 +cons 49 +cons 68 +cons 65 +cons 66 +outputCS +outputCS +outputCS +outputCS +outputCS +cons 1 +cons 0 +bNE -Mark (MNatural 3) -SPure (Cons 10) -SPure (Cons 75) -SPure (Cons 79) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SPure (Cons 1) -SPure (Cons 0) -Labeled LTop (Branch NE) +markM 3 +cons 10 +cons 75 +cons 79 +outputCS +outputCS +outputCS +cons 1 +cons 0 +bNE -Mark (MNatural 4) -SPure (Cons 10) -SPure (Cons 50) -SPure (Cons 68) -SPure (Cons 65) -SPure (Cons 66) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SPure (Cons 1) -SPure (Cons 0) -Labeled LTop (Branch NE) +markM 4 +cons 10 +cons 50 +cons 68 +cons 65 +cons 66 +outputCS +outputCS +outputCS +outputCS +outputCS +cons 1 +cons 0 +bNE -Mark (MNatural 5) +markM 5 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/golden/eta/il/parsed/original/fact.il b/.output/golden/eta/il/parsed/original/fact.il index 5a4ec05e1..53fd62add 100644 --- a/.output/golden/eta/il/parsed/original/fact.il +++ b/.output/golden/eta/il/parsed/original/fact.il @@ -1,359 +1,359 @@ -Mark (MNatural 1) -SPure (Cons 2) -SPure (Cons 1) -SPure (Cons 14) -Labeled LTop (Branch NE) - -Mark (MNatural 2) -SPure (Cons 3) -SPure (Cons 1) -SPure (Cons 5) -Labeled LTop (Branch NE) - -Mark (MNatural 3) -SPure (Cons 4) -SPure (Cons 1) -SPure (Cons 32) -Labeled LTop (Branch NE) - -Mark (MNatural 4) -SPure (Cons 10) -SIO OutputChar -SPure (Cons 1) -SPure (Cons 0) -Labeled LTop (Branch NE) - -Mark (MNatural 5) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 6) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 7) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Cons 8) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 8) -SPure (Cons 1) -SPure (Cons 13) -Labeled LTop (Branch NE) - -Mark (MNatural 9) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 10) -SPure (Cons 1) -SPure (Binary Sub) - -Mark (MNatural 11) -SPure (Cons 12) -SPure (Cons 1) -SPure (Cons 5) -Labeled LTop (Branch NE) - -Mark (MNatural 12) -SPure (Cons 13) -SPure (Cons 1) -SPure (Cons 42) -Labeled LTop (Branch NE) - -Mark (MNatural 13) -SPure (Cons 1) -SPure (Cons 2) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 14) -SIO InputChar - -Mark (MNatural 15) -SPure (Cons 0) -SPure Halibut -SPure (Cons 32) -SPure (Binary Sub) - -Mark (MNatural 16) -SPure (Cons 17) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 17) -SPure (Cons 0) -SPure (Cons 1) -Labeled LTop (Branch NE) -SPure (Cons 14) -Labeled LTop (Branch NE) - -Mark (MNatural 18) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 19) -SPure (Cons 48) -SPure (Binary Sub) - -Mark (MNatural 20) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 21) -SPure (Cons 10) -SPure (Cons 22) -SPure (Cons 1) -SPure (Cons 42) -Labeled LTop (Branch NE) -SPure (Binary Sub) -Labeled LTop (Branch NE) -SPure Halibut -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "21") -SPure (Cons 22) -SPure (Binaries [Mod,Div]) -Labeled LTop (Branch NE) -SIO InputChar -Labeled LTop (Branch NE) -SPure (Binaries [Mod,Div]) - -Mark (MNatural 22) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 23) -SPure (Binary Sub) -SPure (Binary Sub) - -Mark (MNatural 24) -SIO InputChar - -Mark (MNatural 25) -SPure (Cons 0) -SPure Halibut -SPure (Cons 32) -SPure (Binary Sub) -SPure (Cons 27) -Labeled LTop (Branch NE) - -Mark (MNatural 26) -SPure (Cons 1) -SPure (Cons 30) -Labeled LTop (Branch NE) - -Mark (MNatural 27) -SPure (Cons 0) -SPure Halibut -SPure (Cons 10) -SPure (Binary Sub) -SPure (Cons 29) -Labeled LTop (Branch NE) - -Mark (MNatural 28) -SPure (Cons 1) -SPure (Cons 30) -Labeled LTop (Branch NE) - -Mark (MNatural 29) -SPure (Cons 0) -SPure Halibut -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -SPure (Cons 19) -Labeled LTop (Branch NE) - -Mark (MNatural 30) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 31) -SPure (Cons 1) -SPure (Cons 2) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 32) -SPure (Cons 0) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 33) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 34) -SPure (Cons 35) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 35) -SPure (Binary Sub) -SPure (Cons 1) -SPure (Cons 40) -Labeled LTop (Branch NE) - -Mark (MNatural 36) -SPure (Cons 10) -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "36") - -Mark (MNatural 37) -SPure (Cons 0) -SPure (Cons 48) -SPure (Binary Sub) -SPure (Binary Sub) - -Mark (MNatural 38) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 39) -SPure (Cons 1) -SPure (Cons 33) -Labeled LTop (Branch NE) - -Mark (MNatural 40) -SPure (Cons 41) -SPure (Cons 1) -SPure (Cons 58) -Labeled LTop (Branch NE) - -Mark (MNatural 41) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 42) -SPure (Cons 2) -SPure Halibut -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 43) -SPure (Cons 0) - -Mark (MNatural 44) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 45) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 46) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 47) -SPure (Cons 48) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 48) -SPure (Cons 1) -SPure (Cons 56) -Labeled LTop (Branch NE) - -Mark (MNatural 49) -SPure (Cons 1) -SPure (Binary Sub) - -Mark (MNatural 50) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 51) -SPure (Cons 0) -SPure (Cons 0) -SPure (Cons 3) -SPure (Binary Sub) -SPure Halibut - -Mark (MNatural 52) -SPure (Binary Sub) -SPure (Binary Sub) - -Mark (MNatural 53) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 54) -SPure (Cons 2) -SPure Halibut - -Mark (MNatural 55) -SPure (Cons 1) -SPure (Cons 46) -Labeled LTop (Branch NE) - -Mark (MNatural 56) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 57) -SPure (Cons 1) -SPure (Cons 2) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 58) -SPure (Cons 1) -SPure Halibut - -Mark (MNatural 59) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 60) -SPure (Cons 61) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) - -Mark (MNatural 61) -SPure (Binary Sub) -SPure (Cons 1) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 62) -SIO OutputChar - -Mark (MNatural 63) -SPure (Cons 1) -SPure (Cons 58) -Labeled LTop (Branch NE) - -Mark (MNatural 64) - -Mark (MNatural 0) -End +markM 1 +cons 2 +cons 1 +cons 14 +bNE + +markM 2 +cons 3 +cons 1 +cons 5 +bNE + +markM 3 +cons 4 +cons 1 +cons 32 +bNE + +markM 4 +cons 10 +outputCS +cons 1 +cons 0 +bNE + +markM 5 +cons 1 +halibut + +markM 6 +cons 0 +halibut + +markM 7 +cons 1 +sub +cons 8 +cons 0 +cons 1 +sub +sub +bNE + +markM 8 +cons 1 +cons 13 +bNE + +markM 9 +cons 0 +halibut + +markM 10 +cons 1 +sub + +markM 11 +cons 12 +cons 1 +cons 5 +bNE + +markM 12 +cons 13 +cons 1 +cons 42 +bNE + +markM 13 +cons 1 +cons 2 +halibut +bNE + +markM 14 +inputCS + +markM 15 +cons 0 +halibut +cons 32 +sub + +markM 16 +cons 17 +cons 0 +cons 1 +sub +sub +bNE + +markM 17 +cons 0 +cons 1 +bNE +cons 14 +bNE + +markM 18 +cons 0 +cons 1 +halibut + +markM 19 +cons 48 +sub + +markM 20 +cons 1 +halibut + +markM 21 +cons 10 +cons 22 +cons 1 +cons 42 +bNE +sub +bNE +halibut +moddiv + +markA "21" +cons 22 +moddiv +bNE +inputCS +bNE +moddiv + +markM 22 +cons 0 +cons 1 +halibut + +markM 23 +sub +sub + +markM 24 +inputCS + +markM 25 +cons 0 +halibut +cons 32 +sub +cons 27 +bNE + +markM 26 +cons 1 +cons 30 +bNE + +markM 27 +cons 0 +halibut +cons 10 +sub +cons 29 +bNE + +markM 28 +cons 1 +cons 30 +bNE + +markM 29 +cons 0 +halibut +cons 0 +cons 1 +sub +sub +cons 19 +bNE + +markM 30 +cons 0 +cons 1 +halibut +bNE + +markM 31 +cons 1 +cons 2 +halibut +bNE + +markM 32 +cons 0 +cons 2 +halibut + +markM 33 +cons 0 +halibut + +markM 34 +cons 35 +cons 0 +cons 1 +sub +sub +bNE + +markM 35 +sub +cons 1 +cons 40 +bNE + +markM 36 +cons 10 +moddiv + +markA "36" + +markM 37 +cons 0 +cons 48 +sub +sub + +markM 38 +cons 1 +halibut + +markM 39 +cons 1 +cons 33 +bNE + +markM 40 +cons 41 +cons 1 +cons 58 +bNE + +markM 41 +cons 1 +cons 1 +halibut +bNE + +markM 42 +cons 2 +halibut +cons 2 +halibut + +markM 43 +cons 0 + +markM 44 +cons 2 +halibut + +markM 45 +cons 2 +halibut + +markM 46 +cons 0 +halibut + +markM 47 +cons 48 +cons 0 +cons 1 +sub +sub +bNE + +markM 48 +cons 1 +cons 56 +bNE + +markM 49 +cons 1 +sub + +markM 50 +cons 2 +halibut + +markM 51 +cons 0 +cons 0 +cons 3 +sub +halibut + +markM 52 +sub +sub + +markM 53 +cons 2 +halibut + +markM 54 +cons 2 +halibut + +markM 55 +cons 1 +cons 46 +bNE + +markM 56 +cons 1 +halibut +bNE + +markM 57 +cons 1 +cons 2 +halibut +bNE + +markM 58 +cons 1 +halibut + +markM 59 +cons 0 +halibut + +markM 60 +cons 61 +cons 0 +cons 1 +sub +sub +bNE + +markM 61 +sub +cons 1 +cons 1 +halibut +bNE + +markM 62 +outputCS + +markM 63 +cons 1 +cons 58 +bNE + +markM 64 + +markM 0 +end diff --git a/.output/golden/eta/il/parsed/original/hello.il b/.output/golden/eta/il/parsed/original/hello.il index 2e860d314..16b560000 100644 --- a/.output/golden/eta/il/parsed/original/hello.il +++ b/.output/golden/eta/il/parsed/original/hello.il @@ -1,84 +1,84 @@ -Mark (MNatural 1) -SPure (Cons 21) -SPure (Cons 2) -Labeled LTop (Branch NE) -SPure Halibut -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "1") -SIO OutputChar -SPure (Binaries [Mod,Div]) -Labeled LTop (Branch NE) -SPure (Cons 2) -SIO InputChar -Labeled LTop (Branch NE) -Labeled LTop (Branch NE) -SPure (Binaries [Mod,Div]) -SPure (Cons 4) -Labeled LTop (Branch NE) -SPure (Cons 2) -SIO OutputChar - -Mark (MNatural 2) - -Mark (MNatural 3) -SPure (Cons 32) - -Mark (MNatural 4) -SPure (Cons 44) -SPure (Cons 111) -Labeled (LArtificial "5") Jump - -Mark (MNatural 5) -Labeled LTop (Branch NE) -SPure (Binary Sub) -SPure (Binaries [Mod,Div]) - -Mark (MArtificial "5") - -Mark (MNatural 6) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) - -Mark (MNatural 7) -SPure (Cons 72) -SPure (Cons 0) -SPure (Binary Sub) - -Mark (MNatural 8) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar - -Mark (MNatural 9) -SPure (Cons 10) - -Mark (MNatural 10) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) - -Mark (MNatural 11) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) - -Mark (MNatural 12) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar - -Mark (MNatural 13) - -Mark (MNatural 0) -End +markM 1 +cons 21 +cons 2 +bNE +halibut +moddiv + +markA "1" +outputCS +moddiv +bNE +cons 2 +inputCS +bNE +bNE +moddiv +cons 4 +bNE +cons 2 +outputCS + +markM 2 + +markM 3 +cons 32 + +markM 4 +cons 44 +cons 111 +jumpA "5" + +markM 5 +bNE +sub +moddiv + +markA "5" + +markM 6 +cons 108 +cons 108 +cons 101 + +markM 7 +cons 72 +cons 0 +sub + +markM 8 +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS + +markM 9 +cons 10 + +markM 10 +cons 33 +cons 100 +cons 108 + +markM 11 +cons 114 +cons 111 +cons 119 + +markM 12 +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS + +markM 13 + +markM 0 +end diff --git a/.output/golden/eta/il/parsed/original/hello2.il b/.output/golden/eta/il/parsed/original/hello2.il index d82002f32..f5205a987 100644 --- a/.output/golden/eta/il/parsed/original/hello2.il +++ b/.output/golden/eta/il/parsed/original/hello2.il @@ -1,80 +1,80 @@ -Mark (MNatural 1) -SPure (Cons 0) -SPure (Cons 10) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) -SPure (Cons 32) +markM 1 +cons 0 +cons 10 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 +cons 32 -Mark (MNatural 2) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) -SPure (Cons 3) -SPure (Cons 1) -SPure (Cons 4) -Labeled LTop (Branch NE) +markM 2 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 +cons 3 +cons 1 +cons 4 +bNE -Mark (MNatural 3) -SPure (Cons 1) -SPure (Cons 0) -Labeled LTop (Branch NE) -SPure (Cons 4) -SPure (Cons 22) -Labeled LTop (Branch NE) -SIO InputChar -SPure (Binary Sub) -Labeled LTop (Branch NE) -SIO OutputChar -SIO OutputChar -SPure (Binaries [Mod,Div]) +markM 3 +cons 1 +cons 0 +bNE +cons 4 +cons 22 +bNE +inputCS +sub +bNE +outputCS +outputCS +moddiv -Mark (MArtificial "3") -SPure (Cons 4) -Labeled LTop (Branch NE) -SIO InputChar -SPure (Cons 337) -SPure (Binary Sub) +markA "3" +cons 4 +bNE +inputCS +cons 337 +sub -Mark (MNatural 4) -SPure (Cons 1) -SPure Halibut -SPure (Cons 0) -SPure Halibut -SPure (Cons 5) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -Labeled LTop (Branch NE) +markM 4 +cons 1 +halibut +cons 0 +halibut +cons 5 +cons 0 +cons 1 +sub +sub +bNE -Mark (MNatural 5) -SPure (Binary Sub) -SPure (Cons 11) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) +markM 5 +sub +cons 11 +cons 1 +halibut +bNE -Mark (MNatural 6) -SIO OutputChar -SPure (Cons 7) -SPure (Cons 4) -Labeled LTop (Branch NE) -SPure (Binary Sub) -SPure (Binary Sub) -SIO InputChar -SPure (Cons 7) -SPure (Cons 0) -Labeled (LArtificial "7") Jump +markM 6 +outputCS +cons 7 +cons 4 +bNE +sub +sub +inputCS +cons 7 +cons 0 +jumpA "7" -Mark (MNatural 7) +markM 7 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/golden/eta/il/parsed/original/pip.il b/.output/golden/eta/il/parsed/original/pip.il index f88e592e6..cfed9a247 100644 --- a/.output/golden/eta/il/parsed/original/pip.il +++ b/.output/golden/eta/il/parsed/original/pip.il @@ -1,41 +1,41 @@ -Mark (MNatural 1) -SIO InputChar - -Mark (MNatural 2) -SPure (Cons 0) -SPure Halibut - -Mark (MNatural 3) -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) - -Mark (MNatural 4) -SPure (Cons 7) -Labeled LTop (Branch NE) - -Mark (MNatural 5) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) - -Mark (MNatural 6) -SPure (Cons 1) -SPure (Cons 0) -Labeled LTop (Branch NE) - -Mark (MNatural 7) -SIO OutputChar - -Mark (MNatural 8) -SPure (Cons 1) -SPure (Cons 1) -Labeled LTop (Branch NE) - -Mark (MNatural 9) - -Mark (MNatural 0) -End +markM 1 +inputCS + +markM 2 +cons 0 +halibut + +markM 3 +cons 0 +cons 1 +sub +sub + +markM 4 +cons 7 +bNE + +markM 5 +cons 0 +cons 1 +halibut +bNE + +markM 6 +cons 1 +cons 0 +bNE + +markM 7 +outputCS + +markM 8 +cons 1 +cons 1 +bNE + +markM 9 + +markM 0 +end diff --git a/.output/golden/eta/il/parsed/original/pip2.il b/.output/golden/eta/il/parsed/original/pip2.il index e11bc328c..250a029ac 100644 --- a/.output/golden/eta/il/parsed/original/pip2.il +++ b/.output/golden/eta/il/parsed/original/pip2.il @@ -1,29 +1,29 @@ -Mark (MNatural 1) -SIO InputChar -SPure (Cons 0) -SPure Halibut -SPure (Cons 0) -SPure (Cons 1) -SPure (Binary Sub) -SPure (Binary Sub) -SPure (Cons 2) -Labeled LTop (Branch NE) -SPure (Cons 0) -SPure (Cons 1) -SPure Halibut -Labeled LTop (Branch NE) -SPure (Cons 1) -SPure (Cons 0) -Labeled LTop (Branch NE) +markM 1 +inputCS +cons 0 +halibut +cons 0 +cons 1 +sub +sub +cons 2 +bNE +cons 0 +cons 1 +halibut +bNE +cons 1 +cons 0 +bNE -Mark (MNatural 2) -SIO OutputChar -SPure (Cons 1) -SPure (Cons 1) -Labeled LTop (Branch NE) +markM 2 +outputCS +cons 1 +cons 1 +bNE -Mark (MNatural 3) +markM 3 -Mark (MNatural 0) -End +markM 0 +end diff --git a/.output/golden/ws/eval/logged/stn/asciiOff/from-wsa/bottles.logged b/.output/golden/ws/eval/logged/stn/asciiOff/from-wsa/bottles.logged index d7cfefc56..86aed333c 100644 --- a/.output/golden/ws/eval/logged/stn/asciiOff/from-wsa/bottles.logged +++ b/.output/golden/ws/eval/logged/stn/asciiOff/from-wsa/bottles.logged @@ -495,8 +495,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "010011000100111101001111010100000011101000110001" ) ( Branch EZ ) + ( Branch + ( BArtificial "010011000100111101001111010100000011101000110001" ) EZ ) , ICF ( Labeled @@ -518,8 +518,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , ICF diff --git a/.output/golden/ws/eval/logged/stn/asciiOff/from-wsa/hello2.logged b/.output/golden/ws/eval/logged/stn/asciiOff/from-wsa/hello2.logged index d1a6d5412..d5df07010 100644 --- a/.output/golden/ws/eval/logged/stn/asciiOff/from-wsa/hello2.logged +++ b/.output/golden/ws/eval/logged/stn/asciiOff/from-wsa/hello2.logged @@ -77,8 +77,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , ICF diff --git a/.output/golden/ws/eval/logged/stn/asciiOff/from-wsa/hello4.logged b/.output/golden/ws/eval/logged/stn/asciiOff/from-wsa/hello4.logged index f522cf884..57822db3c 100644 --- a/.output/golden/ws/eval/logged/stn/asciiOff/from-wsa/hello4.logged +++ b/.output/golden/ws/eval/logged/stn/asciiOff/from-wsa/hello4.logged @@ -73,8 +73,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , ICF diff --git a/.output/golden/ws/eval/logged/stn/asciiOff/from-wsa/prim.logged b/.output/golden/ws/eval/logged/stn/asciiOff/from-wsa/prim.logged index 20d3e249b..eb1e299a8 100644 --- a/.output/golden/ws/eval/logged/stn/asciiOff/from-wsa/prim.logged +++ b/.output/golden/ws/eval/logged/stn/asciiOff/from-wsa/prim.logged @@ -114,8 +114,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110001" ) ( Branch EZ ) + ( Branch + ( BArtificial "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110001" ) EZ ) , IAL ( SPure @@ -170,8 +170,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110010" ) ( Branch EZ ) + ( Branch + ( BArtificial "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110010" ) EZ ) , IAL ( SPure @@ -194,8 +194,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110011" ) ( Branch EZ ) + ( Branch + ( BArtificial "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110011" ) EZ ) , IAL ( SPure @@ -317,8 +317,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110100" ) EZ ) , IAL ( SPure @@ -334,8 +334,8 @@ dump: Memory ) , ILS Load , ICF - ( Labeled - ( LArtificial "011011100110111101100100011100100110000101110111" ) ( Branch EZ ) + ( Branch + ( BArtificial "011011100110111101100100011100100110000101110111" ) EZ ) , IAL ( SPure @@ -395,8 +395,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , ICF diff --git "a/.output/golden/ws/eval/logged/stn/asciiOff/original/calc-1\n.logged" "b/.output/golden/ws/eval/logged/stn/asciiOff/original/calc-1\n.logged" index e9f52c753..17b015ed3 100644 --- "a/.output/golden/ws/eval/logged/stn/asciiOff/original/calc-1\n.logged" +++ "b/.output/golden/ws/eval/logged/stn/asciiOff/original/calc-1\n.logged" @@ -563,8 +563,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "01110000011100100110111101100111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "01110000011100100110111101100111011001010110111001100100" ) EZ ) , IAL ( SPure @@ -637,8 +637,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -689,8 +689,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git a/.output/golden/ws/eval/logged/stn/asciiOff/original/count.logged b/.output/golden/ws/eval/logged/stn/asciiOff/original/count.logged index 651750622..d940ae1c3 100644 --- a/.output/golden/ws/eval/logged/stn/asciiOff/original/count.logged +++ b/.output/golden/ws/eval/logged/stn/asciiOff/original/count.logged @@ -40,8 +40,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "01000101" ) ( Branch EZ ) + ( Branch + ( BArtificial "01000101" ) EZ ) , ICF ( Labeled @@ -78,8 +78,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -130,8 +130,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/golden/ws/eval/logged/stn/asciiOff/original/fact10\n.logged" "b/.output/golden/ws/eval/logged/stn/asciiOff/original/fact10\n.logged" index c4614275d..68e0a53a4 100644 --- "a/.output/golden/ws/eval/logged/stn/asciiOff/original/fact10\n.logged" +++ "b/.output/golden/ws/eval/logged/stn/asciiOff/original/fact10\n.logged" @@ -258,8 +258,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0110011001100001011000110111010001100010011000010111001101100101" ) ( Branch EZ ) + ( Branch + ( BArtificial "0110011001100001011000110111010001100010011000010111001101100101" ) EZ ) , IAL ( SPure @@ -310,8 +310,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -362,8 +362,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git a/.output/golden/ws/eval/logged/stn/asciiOff/original/hWorld.logged b/.output/golden/ws/eval/logged/stn/asciiOff/original/hWorld.logged index fa789ab5a..e97b97208 100644 --- a/.output/golden/ws/eval/logged/stn/asciiOff/original/hWorld.logged +++ b/.output/golden/ws/eval/logged/stn/asciiOff/original/hWorld.logged @@ -255,8 +255,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -307,8 +307,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/golden/ws/eval/logged/stn/asciiOff/original/hanoi1\n.logged" "b/.output/golden/ws/eval/logged/stn/asciiOff/original/hanoi1\n.logged" index 775a9f355..5fa2fc0ba 100644 --- "a/.output/golden/ws/eval/logged/stn/asciiOff/original/hanoi1\n.logged" +++ "b/.output/golden/ws/eval/logged/stn/asciiOff/original/hanoi1\n.logged" @@ -288,8 +288,8 @@ dump: Memory ) , ILS Load , ICF - ( Labeled - ( LArtificial "0110010101101110011001000110100001100001011011100110111101101001" ) ( Branch EZ ) + ( Branch + ( BArtificial "0110010101101110011001000110100001100001011011100110111101101001" ) EZ ) , IAL ( SPure @@ -533,8 +533,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -585,8 +585,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/golden/ws/eval/logged/stn/asciiOff/original/locTest1\n2\n.logged" "b/.output/golden/ws/eval/logged/stn/asciiOff/original/locTest1\n2\n.logged" index 70c9fcfb0..33c819b5e 100644 --- "a/.output/golden/ws/eval/logged/stn/asciiOff/original/locTest1\n2\n.logged" +++ "b/.output/golden/ws/eval/logged/stn/asciiOff/original/locTest1\n2\n.logged" @@ -246,8 +246,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -298,8 +298,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/golden/ws/eval/logged/stn/asciiOff/original/nameWriteOnly\n.logged" "b/.output/golden/ws/eval/logged/stn/asciiOff/original/nameWriteOnly\n.logged" index 70fcbca32..cbdf9e20e 100644 --- "a/.output/golden/ws/eval/logged/stn/asciiOff/original/nameWriteOnly\n.logged" +++ "b/.output/golden/ws/eval/logged/stn/asciiOff/original/nameWriteOnly\n.logged" @@ -351,8 +351,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -403,8 +403,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/golden/ws/eval/logged/stn/asciiOff/original/truthMachine0\n.logged" "b/.output/golden/ws/eval/logged/stn/asciiOff/original/truthMachine0\n.logged" index ea53b5ca6..e22abd913 100644 --- "a/.output/golden/ws/eval/logged/stn/asciiOff/original/truthMachine0\n.logged" +++ "b/.output/golden/ws/eval/logged/stn/asciiOff/original/truthMachine0\n.logged" @@ -12,8 +12,8 @@ dump: Memory , ILS ( MIO InputDec ) , ILS Load , ICF - ( Labeled - ( LArtificial "0" ) ( Branch EZ ) + ( Branch + ( BArtificial "0" ) EZ ) , ICF ( Mark diff --git a/.output/golden/ws/eval/logged/stn/asciiOn/from-wsa/bottles.logged b/.output/golden/ws/eval/logged/stn/asciiOn/from-wsa/bottles.logged index e68672e95..08d0bb2f9 100644 --- a/.output/golden/ws/eval/logged/stn/asciiOn/from-wsa/bottles.logged +++ b/.output/golden/ws/eval/logged/stn/asciiOn/from-wsa/bottles.logged @@ -495,8 +495,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "LOOP:1" ) ( Branch EZ ) + ( Branch + ( BArtificial "LOOP:1" ) EZ ) , ICF ( Labeled @@ -518,8 +518,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "prints_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "prints_end" ) EZ ) , IAL ( SIO OutputChar ) , ICF diff --git a/.output/golden/ws/eval/logged/stn/asciiOn/from-wsa/hello2.logged b/.output/golden/ws/eval/logged/stn/asciiOn/from-wsa/hello2.logged index dfc401116..132af6fa2 100644 --- a/.output/golden/ws/eval/logged/stn/asciiOn/from-wsa/hello2.logged +++ b/.output/golden/ws/eval/logged/stn/asciiOn/from-wsa/hello2.logged @@ -77,8 +77,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "prints_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "prints_end" ) EZ ) , IAL ( SIO OutputChar ) , ICF diff --git a/.output/golden/ws/eval/logged/stn/asciiOn/from-wsa/hello4.logged b/.output/golden/ws/eval/logged/stn/asciiOn/from-wsa/hello4.logged index fbe810fc3..df008cf1c 100644 --- a/.output/golden/ws/eval/logged/stn/asciiOn/from-wsa/hello4.logged +++ b/.output/golden/ws/eval/logged/stn/asciiOn/from-wsa/hello4.logged @@ -73,8 +73,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "prints_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "prints_end" ) EZ ) , IAL ( SIO OutputChar ) , ICF diff --git a/.output/golden/ws/eval/logged/stn/asciiOn/from-wsa/prim.logged b/.output/golden/ws/eval/logged/stn/asciiOn/from-wsa/prim.logged index 0b9033cc2..a07e38426 100644 --- a/.output/golden/ws/eval/logged/stn/asciiOn/from-wsa/prim.logged +++ b/.output/golden/ws/eval/logged/stn/asciiOn/from-wsa/prim.logged @@ -114,8 +114,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "f_finished_1" ) ( Branch EZ ) + ( Branch + ( BArtificial "f_finished_1" ) EZ ) , IAL ( SPure @@ -170,8 +170,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "f_finished_2" ) ( Branch EZ ) + ( Branch + ( BArtificial "f_finished_2" ) EZ ) , IAL ( SPure @@ -194,8 +194,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "f_finished_3" ) ( Branch EZ ) + ( Branch + ( BArtificial "f_finished_3" ) EZ ) , IAL ( SPure @@ -317,8 +317,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "f_finished_4" ) ( Branch EZ ) + ( Branch + ( BArtificial "f_finished_4" ) EZ ) , IAL ( SPure @@ -334,8 +334,8 @@ dump: Memory ) , ILS Load , ICF - ( Labeled - ( LArtificial "nodraw" ) ( Branch EZ ) + ( Branch + ( BArtificial "nodraw" ) EZ ) , IAL ( SPure @@ -395,8 +395,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "prints_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "prints_end" ) EZ ) , IAL ( SIO OutputChar ) , ICF diff --git "a/.output/golden/ws/eval/logged/stn/asciiOn/original/calc-1\n.logged" "b/.output/golden/ws/eval/logged/stn/asciiOn/original/calc-1\n.logged" index 1d797795c..558905ea4 100644 --- "a/.output/golden/ws/eval/logged/stn/asciiOn/original/calc-1\n.logged" +++ "b/.output/golden/ws/eval/logged/stn/asciiOn/original/calc-1\n.logged" @@ -563,8 +563,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "progend" ) ( Branch EZ ) + ( Branch + ( BArtificial "progend" ) EZ ) , IAL ( SPure @@ -637,8 +637,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "write_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "write_end" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -689,8 +689,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "read_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "read_end" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git a/.output/golden/ws/eval/logged/stn/asciiOn/original/count.logged b/.output/golden/ws/eval/logged/stn/asciiOn/original/count.logged index 295a6d24b..56af381e6 100644 --- a/.output/golden/ws/eval/logged/stn/asciiOn/original/count.logged +++ b/.output/golden/ws/eval/logged/stn/asciiOn/original/count.logged @@ -40,8 +40,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "E" ) ( Branch EZ ) + ( Branch + ( BArtificial "E" ) EZ ) , ICF ( Labeled @@ -78,8 +78,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "write_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "write_end" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -130,8 +130,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "read_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "read_end" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/golden/ws/eval/logged/stn/asciiOn/original/fact10\n.logged" "b/.output/golden/ws/eval/logged/stn/asciiOn/original/fact10\n.logged" index d696c8c37..fa445913a 100644 --- "a/.output/golden/ws/eval/logged/stn/asciiOn/original/fact10\n.logged" +++ "b/.output/golden/ws/eval/logged/stn/asciiOn/original/fact10\n.logged" @@ -258,8 +258,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "factbase" ) ( Branch EZ ) + ( Branch + ( BArtificial "factbase" ) EZ ) , IAL ( SPure @@ -310,8 +310,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "write_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "write_end" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -362,8 +362,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "read_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "read_end" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git a/.output/golden/ws/eval/logged/stn/asciiOn/original/hWorld.logged b/.output/golden/ws/eval/logged/stn/asciiOn/original/hWorld.logged index 549c75cd6..600d0f84e 100644 --- a/.output/golden/ws/eval/logged/stn/asciiOn/original/hWorld.logged +++ b/.output/golden/ws/eval/logged/stn/asciiOn/original/hWorld.logged @@ -255,8 +255,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "write_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "write_end" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -307,8 +307,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "read_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "read_end" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/golden/ws/eval/logged/stn/asciiOn/original/hanoi1\n.logged" "b/.output/golden/ws/eval/logged/stn/asciiOn/original/hanoi1\n.logged" index 4261bac29..2d6b058e6 100644 --- "a/.output/golden/ws/eval/logged/stn/asciiOn/original/hanoi1\n.logged" +++ "b/.output/golden/ws/eval/logged/stn/asciiOn/original/hanoi1\n.logged" @@ -288,8 +288,8 @@ dump: Memory ) , ILS Load , ICF - ( Labeled - ( LArtificial "endhanoi" ) ( Branch EZ ) + ( Branch + ( BArtificial "endhanoi" ) EZ ) , IAL ( SPure @@ -533,8 +533,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "write_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "write_end" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -585,8 +585,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "read_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "read_end" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/golden/ws/eval/logged/stn/asciiOn/original/locTest1\n2\n.logged" "b/.output/golden/ws/eval/logged/stn/asciiOn/original/locTest1\n2\n.logged" index 8b88a0eeb..8986dc754 100644 --- "a/.output/golden/ws/eval/logged/stn/asciiOn/original/locTest1\n2\n.logged" +++ "b/.output/golden/ws/eval/logged/stn/asciiOn/original/locTest1\n2\n.logged" @@ -246,8 +246,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "write_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "write_end" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -298,8 +298,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "read_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "read_end" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/golden/ws/eval/logged/stn/asciiOn/original/nameWriteOnly\n.logged" "b/.output/golden/ws/eval/logged/stn/asciiOn/original/nameWriteOnly\n.logged" index d5ea6e6fc..b24ede8c3 100644 --- "a/.output/golden/ws/eval/logged/stn/asciiOn/original/nameWriteOnly\n.logged" +++ "b/.output/golden/ws/eval/logged/stn/asciiOn/original/nameWriteOnly\n.logged" @@ -351,8 +351,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "write_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "write_end" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -403,8 +403,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "read_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "read_end" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/golden/ws/eval/logged/stn/asciiOn/original/truthMachine0\n.logged" "b/.output/golden/ws/eval/logged/stn/asciiOn/original/truthMachine0\n.logged" index 24f88495d..b17749b6b 100644 --- "a/.output/golden/ws/eval/logged/stn/asciiOn/original/truthMachine0\n.logged" +++ "b/.output/golden/ws/eval/logged/stn/asciiOn/original/truthMachine0\n.logged" @@ -12,8 +12,8 @@ dump: Memory , ILS ( MIO InputDec ) , ILS Load , ICF - ( Labeled - ( LArtificial "\x0" ) ( Branch EZ ) + ( Branch + ( BArtificial "\x0" ) EZ ) , ICF ( Mark diff --git "a/.output/golden/ws/eval/logged/ws/asciiOff/original/calc-1\n.logged" "b/.output/golden/ws/eval/logged/ws/asciiOff/original/calc-1\n.logged" index e9f52c753..17b015ed3 100644 --- "a/.output/golden/ws/eval/logged/ws/asciiOff/original/calc-1\n.logged" +++ "b/.output/golden/ws/eval/logged/ws/asciiOff/original/calc-1\n.logged" @@ -563,8 +563,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "01110000011100100110111101100111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "01110000011100100110111101100111011001010110111001100100" ) EZ ) , IAL ( SPure @@ -637,8 +637,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -689,8 +689,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git a/.output/golden/ws/eval/logged/ws/asciiOff/original/count.logged b/.output/golden/ws/eval/logged/ws/asciiOff/original/count.logged index 651750622..d940ae1c3 100644 --- a/.output/golden/ws/eval/logged/ws/asciiOff/original/count.logged +++ b/.output/golden/ws/eval/logged/ws/asciiOff/original/count.logged @@ -40,8 +40,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "01000101" ) ( Branch EZ ) + ( Branch + ( BArtificial "01000101" ) EZ ) , ICF ( Labeled @@ -78,8 +78,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -130,8 +130,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/golden/ws/eval/logged/ws/asciiOff/original/fact10\n.logged" "b/.output/golden/ws/eval/logged/ws/asciiOff/original/fact10\n.logged" index c4614275d..68e0a53a4 100644 --- "a/.output/golden/ws/eval/logged/ws/asciiOff/original/fact10\n.logged" +++ "b/.output/golden/ws/eval/logged/ws/asciiOff/original/fact10\n.logged" @@ -258,8 +258,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0110011001100001011000110111010001100010011000010111001101100101" ) ( Branch EZ ) + ( Branch + ( BArtificial "0110011001100001011000110111010001100010011000010111001101100101" ) EZ ) , IAL ( SPure @@ -310,8 +310,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -362,8 +362,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/golden/ws/eval/logged/ws/asciiOff/original/hanoi1\n.logged" "b/.output/golden/ws/eval/logged/ws/asciiOff/original/hanoi1\n.logged" index 775a9f355..5fa2fc0ba 100644 --- "a/.output/golden/ws/eval/logged/ws/asciiOff/original/hanoi1\n.logged" +++ "b/.output/golden/ws/eval/logged/ws/asciiOff/original/hanoi1\n.logged" @@ -288,8 +288,8 @@ dump: Memory ) , ILS Load , ICF - ( Labeled - ( LArtificial "0110010101101110011001000110100001100001011011100110111101101001" ) ( Branch EZ ) + ( Branch + ( BArtificial "0110010101101110011001000110100001100001011011100110111101101001" ) EZ ) , IAL ( SPure @@ -533,8 +533,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -585,8 +585,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git a/.output/golden/ws/eval/logged/ws/asciiOff/original/hworld.logged b/.output/golden/ws/eval/logged/ws/asciiOff/original/hworld.logged index fa789ab5a..e97b97208 100644 --- a/.output/golden/ws/eval/logged/ws/asciiOff/original/hworld.logged +++ b/.output/golden/ws/eval/logged/ws/asciiOff/original/hworld.logged @@ -255,8 +255,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -307,8 +307,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/golden/ws/eval/logged/ws/asciiOff/original/loctest1\n2\n.logged" "b/.output/golden/ws/eval/logged/ws/asciiOff/original/loctest1\n2\n.logged" index 70c9fcfb0..33c819b5e 100644 --- "a/.output/golden/ws/eval/logged/ws/asciiOff/original/loctest1\n2\n.logged" +++ "b/.output/golden/ws/eval/logged/ws/asciiOff/original/loctest1\n2\n.logged" @@ -246,8 +246,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -298,8 +298,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/golden/ws/eval/logged/ws/asciiOff/original/nameWriteOnly\n.logged" "b/.output/golden/ws/eval/logged/ws/asciiOff/original/nameWriteOnly\n.logged" index 70fcbca32..cbdf9e20e 100644 --- "a/.output/golden/ws/eval/logged/ws/asciiOff/original/nameWriteOnly\n.logged" +++ "b/.output/golden/ws/eval/logged/ws/asciiOff/original/nameWriteOnly\n.logged" @@ -351,8 +351,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "011101110111001001101001011101000110010101011111011001010110111001100100" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -403,8 +403,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) ( Branch EZ ) + ( Branch + ( BArtificial "0111001001100101011000010110010001011111011001010110111001100100" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/golden/ws/eval/logged/ws/asciiOn/original/calc-1\n.logged" "b/.output/golden/ws/eval/logged/ws/asciiOn/original/calc-1\n.logged" index 1d797795c..558905ea4 100644 --- "a/.output/golden/ws/eval/logged/ws/asciiOn/original/calc-1\n.logged" +++ "b/.output/golden/ws/eval/logged/ws/asciiOn/original/calc-1\n.logged" @@ -563,8 +563,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "progend" ) ( Branch EZ ) + ( Branch + ( BArtificial "progend" ) EZ ) , IAL ( SPure @@ -637,8 +637,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "write_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "write_end" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -689,8 +689,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "read_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "read_end" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git a/.output/golden/ws/eval/logged/ws/asciiOn/original/count.logged b/.output/golden/ws/eval/logged/ws/asciiOn/original/count.logged index 295a6d24b..56af381e6 100644 --- a/.output/golden/ws/eval/logged/ws/asciiOn/original/count.logged +++ b/.output/golden/ws/eval/logged/ws/asciiOn/original/count.logged @@ -40,8 +40,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "E" ) ( Branch EZ ) + ( Branch + ( BArtificial "E" ) EZ ) , ICF ( Labeled @@ -78,8 +78,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "write_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "write_end" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -130,8 +130,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "read_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "read_end" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/golden/ws/eval/logged/ws/asciiOn/original/fact10\n.logged" "b/.output/golden/ws/eval/logged/ws/asciiOn/original/fact10\n.logged" index d696c8c37..fa445913a 100644 --- "a/.output/golden/ws/eval/logged/ws/asciiOn/original/fact10\n.logged" +++ "b/.output/golden/ws/eval/logged/ws/asciiOn/original/fact10\n.logged" @@ -258,8 +258,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "factbase" ) ( Branch EZ ) + ( Branch + ( BArtificial "factbase" ) EZ ) , IAL ( SPure @@ -310,8 +310,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "write_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "write_end" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -362,8 +362,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "read_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "read_end" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/golden/ws/eval/logged/ws/asciiOn/original/hanoi1\n.logged" "b/.output/golden/ws/eval/logged/ws/asciiOn/original/hanoi1\n.logged" index 4261bac29..2d6b058e6 100644 --- "a/.output/golden/ws/eval/logged/ws/asciiOn/original/hanoi1\n.logged" +++ "b/.output/golden/ws/eval/logged/ws/asciiOn/original/hanoi1\n.logged" @@ -288,8 +288,8 @@ dump: Memory ) , ILS Load , ICF - ( Labeled - ( LArtificial "endhanoi" ) ( Branch EZ ) + ( Branch + ( BArtificial "endhanoi" ) EZ ) , IAL ( SPure @@ -533,8 +533,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "write_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "write_end" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -585,8 +585,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "read_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "read_end" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git a/.output/golden/ws/eval/logged/ws/asciiOn/original/hworld.logged b/.output/golden/ws/eval/logged/ws/asciiOn/original/hworld.logged index 549c75cd6..600d0f84e 100644 --- a/.output/golden/ws/eval/logged/ws/asciiOn/original/hworld.logged +++ b/.output/golden/ws/eval/logged/ws/asciiOn/original/hworld.logged @@ -255,8 +255,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "write_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "write_end" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -307,8 +307,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "read_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "read_end" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/golden/ws/eval/logged/ws/asciiOn/original/loctest1\n2\n.logged" "b/.output/golden/ws/eval/logged/ws/asciiOn/original/loctest1\n2\n.logged" index 8b88a0eeb..8986dc754 100644 --- "a/.output/golden/ws/eval/logged/ws/asciiOn/original/loctest1\n2\n.logged" +++ "b/.output/golden/ws/eval/logged/ws/asciiOn/original/loctest1\n2\n.logged" @@ -246,8 +246,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "write_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "write_end" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -298,8 +298,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "read_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "read_end" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git "a/.output/golden/ws/eval/logged/ws/asciiOn/original/nameWriteOnly\n.logged" "b/.output/golden/ws/eval/logged/ws/asciiOn/original/nameWriteOnly\n.logged" index d5ea6e6fc..b24ede8c3 100644 --- "a/.output/golden/ws/eval/logged/ws/asciiOn/original/nameWriteOnly\n.logged" +++ "b/.output/golden/ws/eval/logged/ws/asciiOn/original/nameWriteOnly\n.logged" @@ -351,8 +351,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "write_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "write_end" ) EZ ) , IAL ( SIO OutputChar ) , IAL @@ -403,8 +403,8 @@ dump: Memory ) ) , ICF - ( Labeled - ( LArtificial "read_end" ) ( Branch EZ ) + ( Branch + ( BArtificial "read_end" ) EZ ) , IAL ( SPure Discard ) , IAL diff --git a/.output/golden/ws/il/optimized/from-wsa/bottles.il b/.output/golden/ws/il/optimized/from-wsa/bottles.il index b62c76af0..2b118b757 100644 --- a/.output/golden/ws/il/optimized/from-wsa/bottles.il +++ b/.output/golden/ws/il/optimized/from-wsa/bottles.il @@ -1,145 +1,145 @@ -SPure (Cons 3) +cons 3 -Mark (MArtificial "LOOP") -SPure (Indexed (IImmediate 0) Copy) -SIO OutputDec -SPure (Cons 0) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 97) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 104) -SPure (Cons 116) -SPure (Cons 32) -SPure (Cons 110) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 114) -SPure (Cons 101) -SPure (Cons 101) -SPure (Cons 98) -SPure (Cons 32) -SPure (Cons 102) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 115) -SPure (Cons 101) -SPure (Cons 108) -SPure (Cons 116) -SPure (Cons 116) -SPure (Cons 111) -SPure (Cons 98) -SPure (Cons 32) -Labeled (LArtificial "prints") Call -SPure (Indexed (IImmediate 0) Copy) -SIO OutputDec -SPure (Cons 0) -SPure (Cons 114) -SPure (Cons 101) -SPure (Cons 101) -SPure (Cons 98) -SPure (Cons 32) -SPure (Cons 102) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 115) -SPure (Cons 101) -SPure (Cons 108) -SPure (Cons 116) -SPure (Cons 116) -SPure (Cons 111) -SPure (Cons 98) -SPure (Cons 32) -Labeled (LArtificial "printsln") Call -SPure (Cons 0) -SPure (Cons 100) -SPure (Cons 110) -SPure (Cons 117) -SPure (Cons 111) -SPure (Cons 114) -SPure (Cons 97) -SPure (Cons 32) -SPure (Cons 116) -SPure (Cons 105) -SPure (Cons 32) -SPure (Cons 115) -SPure (Cons 115) -SPure (Cons 97) -SPure (Cons 112) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 110) -SPure (Cons 119) -SPure (Cons 111) -SPure (Cons 100) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 110) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 107) -SPure (Cons 97) -SPure (Cons 84) -Labeled (LArtificial "printsln") Call -SPure (Unary (UImmediate 1 Sub)) -SPure (Indexed (IImmediate 0) Copy) -SIO OutputDec -SPure (Cons 0) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 97) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 104) -SPure (Cons 116) -SPure (Cons 32) -SPure (Cons 110) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 114) -SPure (Cons 101) -SPure (Cons 101) -SPure (Cons 98) -SPure (Cons 32) -SPure (Cons 102) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 115) -SPure (Cons 101) -SPure (Cons 108) -SPure (Cons 116) -SPure (Cons 116) -SPure (Cons 111) -SPure (Cons 98) -SPure (Cons 32) -Labeled (LArtificial "printsln") Call -SPure (Cons 0) -Labeled (LArtificial "printsln") Call -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "LOOP:1") (Branch EZ) -Labeled (LArtificial "LOOP") Jump +markA "LOOP" +copyI 0 +outputDS +cons 0 +cons 32 +cons 44 +cons 108 +cons 108 +cons 97 +cons 119 +cons 32 +cons 101 +cons 104 +cons 116 +cons 32 +cons 110 +cons 111 +cons 32 +cons 114 +cons 101 +cons 101 +cons 98 +cons 32 +cons 102 +cons 111 +cons 32 +cons 115 +cons 101 +cons 108 +cons 116 +cons 116 +cons 111 +cons 98 +cons 32 +callA "prints" +copyI 0 +outputDS +cons 0 +cons 114 +cons 101 +cons 101 +cons 98 +cons 32 +cons 102 +cons 111 +cons 32 +cons 115 +cons 101 +cons 108 +cons 116 +cons 116 +cons 111 +cons 98 +cons 32 +callA "printsln" +cons 0 +cons 100 +cons 110 +cons 117 +cons 111 +cons 114 +cons 97 +cons 32 +cons 116 +cons 105 +cons 32 +cons 115 +cons 115 +cons 97 +cons 112 +cons 32 +cons 44 +cons 110 +cons 119 +cons 111 +cons 100 +cons 32 +cons 101 +cons 110 +cons 111 +cons 32 +cons 101 +cons 107 +cons 97 +cons 84 +callA "printsln" +subI 1 +copyI 0 +outputDS +cons 0 +cons 108 +cons 108 +cons 97 +cons 119 +cons 32 +cons 101 +cons 104 +cons 116 +cons 32 +cons 110 +cons 111 +cons 32 +cons 114 +cons 101 +cons 101 +cons 98 +cons 32 +cons 102 +cons 111 +cons 32 +cons 115 +cons 101 +cons 108 +cons 116 +cons 116 +cons 111 +cons 98 +cons 32 +callA "printsln" +cons 0 +callA "printsln" +copyI 0 +bEZA "LOOP:1" +jumpA "LOOP" -Mark (MArtificial "LOOP:1") -End +markA "LOOP:1" +end -Mark (MArtificial "prints") -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "prints_end") (Branch EZ) -SIO OutputChar -Labeled (LArtificial "prints") Jump +markA "prints" +copyI 0 +bEZA "prints_end" +outputCS +jumpA "prints" -Mark (MArtificial "prints_end") -SPure Discard -Return +markA "prints_end" +discard +return -Mark (MArtificial "printsln") -Labeled (LArtificial "prints") Call -SPure (Cons 10) -SIO OutputChar -Return +markA "printsln" +callA "prints" +cons 10 +outputCS +return diff --git a/.output/golden/ws/il/optimized/from-wsa/hello.il b/.output/golden/ws/il/optimized/from-wsa/hello.il index 810994ec0..76b02970f 100644 --- a/.output/golden/ws/il/optimized/from-wsa/hello.il +++ b/.output/golden/ws/il/optimized/from-wsa/hello.il @@ -1,29 +1,29 @@ -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SPure (Cons 10) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -End +cons 32 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +cons 10 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +end diff --git a/.output/golden/ws/il/optimized/from-wsa/hello2.il b/.output/golden/ws/il/optimized/from-wsa/hello2.il index 0581fba7e..2419e7827 100644 --- a/.output/golden/ws/il/optimized/from-wsa/hello2.il +++ b/.output/golden/ws/il/optimized/from-wsa/hello2.il @@ -1,33 +1,33 @@ -SPure (Cons 0) -SPure (Cons 10) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) -Labeled (LArtificial "prints") Call -End +cons 0 +cons 10 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 +cons 32 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 +callA "prints" +end -Mark (MArtificial "prints") -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "prints_end") (Branch EZ) -SIO OutputChar -Labeled (LArtificial "prints") Jump +markA "prints" +copyI 0 +bEZA "prints_end" +outputCS +jumpA "prints" -Mark (MArtificial "prints_end") -SPure Discard -Return +markA "prints_end" +discard +return -Mark (MArtificial "printsln") -Labeled (LArtificial "prints") Call -SPure (Cons 10) -SIO OutputChar -Return +markA "printsln" +callA "prints" +cons 10 +outputCS +return diff --git a/.output/golden/ws/il/optimized/from-wsa/hello4.il b/.output/golden/ws/il/optimized/from-wsa/hello4.il index b149339c6..8e42ce9f8 100644 --- a/.output/golden/ws/il/optimized/from-wsa/hello4.il +++ b/.output/golden/ws/il/optimized/from-wsa/hello4.il @@ -1,32 +1,32 @@ -SPure (Cons 0) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) -Labeled (LArtificial "printsln") Call -End +cons 0 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 +cons 32 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 +callA "printsln" +end -Mark (MArtificial "prints") -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "prints_end") (Branch EZ) -SIO OutputChar -Labeled (LArtificial "prints") Jump +markA "prints" +copyI 0 +bEZA "prints_end" +outputCS +jumpA "prints" -Mark (MArtificial "prints_end") -SPure Discard -Return +markA "prints_end" +discard +return -Mark (MArtificial "printsln") -Labeled (LArtificial "prints") Call -SPure (Cons 10) -SIO OutputChar -Return +markA "printsln" +callA "prints" +cons 10 +outputCS +return diff --git a/.output/golden/ws/il/optimized/from-wsa/prim.il b/.output/golden/ws/il/optimized/from-wsa/prim.il index 079896ed6..98e3d2fa5 100644 --- a/.output/golden/ws/il/optimized/from-wsa/prim.il +++ b/.output/golden/ws/il/optimized/from-wsa/prim.il @@ -1,120 +1,120 @@ -Mark (MArtificial "st") -SPure (Cons 0) -SPure (Cons 93) -SPure (Cons 48) -SPure (Cons 48) -SPure (Cons 49) -SPure (Cons 45) -SPure (Cons 50) -SPure (Cons 91) -SPure (Cons 32) -SPure (Cons 115) -SPure (Cons 114) -SPure (Cons 101) -SPure (Cons 98) -SPure (Cons 109) -SPure (Cons 117) -SPure (Cons 110) -SPure (Cons 32) -SPure (Cons 109) -SPure (Cons 105) -SPure (Cons 114) -SPure (Cons 112) -Labeled (LArtificial "printsln") Call -SPure (Cons 0) +markA "st" +cons 0 +cons 93 +cons 48 +cons 48 +cons 49 +cons 45 +cons 50 +cons 91 +cons 32 +cons 115 +cons 114 +cons 101 +cons 98 +cons 109 +cons 117 +cons 110 +cons 32 +cons 109 +cons 105 +cons 114 +cons 112 +callA "printsln" +cons 0 -Mark (MArtificial "f_start_1") -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 100 Sub)) -Labeled (LArtificial "f_finished_1") (Branch EZ) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 100 Add)) -SPure (Cons 1) -Store -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "f_start_1") Jump +markA "f_start_1" +copyI 0 +subI 100 +bEZA "f_finished_1" +copyI 0 +addI 100 +cons 1 +store +addI 1 +jumpA "f_start_1" -Mark (MArtificial "f_finished_1") -SPure Discard -SPure (Cons 2) +markA "f_finished_1" +discard +cons 2 -Mark (MArtificial "f_start_2") -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 11 Sub)) -Labeled (LArtificial "f_finished_2") (Branch EZ) -SPure (Cons 2) +markA "f_start_2" +copyI 0 +subI 11 +bEZA "f_finished_2" +cons 2 -Mark (MArtificial "f_start_3") -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 100 Sub)) -Labeled (LArtificial "f_finished_3") (Branch EZ) -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 1) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Indexed (IImmediate 1) Move) -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 2) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Indexed (IImmediate 1) Move) -SPure (Cons 1) -Load -SPure (Cons 2) -Load -SPure (Binary Mul) -SPure (Unary (UImmediate 100 Add)) -SPure (Cons 0) -Store -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "f_start_3") Jump +markA "f_start_3" +copyI 0 +subI 100 +bEZA "f_finished_3" +copyI 0 +cons 1 +moveI 1 +store +moveI 1 +copyI 0 +cons 2 +moveI 1 +store +moveI 1 +cons 1 +load +cons 2 +load +mul +addI 100 +cons 0 +store +addI 1 +jumpA "f_start_3" -Mark (MArtificial "f_finished_3") -SPure Discard -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "f_start_2") Jump +markA "f_finished_3" +discard +addI 1 +jumpA "f_start_2" -Mark (MArtificial "f_finished_2") -SPure Discard -SPure (Cons 2) +markA "f_finished_2" +discard +cons 2 -Mark (MArtificial "f_start_4") -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 100 Sub)) -Labeled (LArtificial "f_finished_4") (Branch EZ) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 100 Add)) -Load -Labeled (LArtificial "nodraw") (Branch EZ) -SPure (Indexed (IImmediate 0) Copy) -SIO OutputDec -SPure (Cons 0) -SPure (Cons 32) -Labeled (LArtificial "prints") Call +markA "f_start_4" +copyI 0 +subI 100 +bEZA "f_finished_4" +copyI 0 +addI 100 +load +bEZA "nodraw" +copyI 0 +outputDS +cons 0 +cons 32 +callA "prints" -Mark (MArtificial "nodraw") -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "f_start_4") Jump +markA "nodraw" +addI 1 +jumpA "f_start_4" -Mark (MArtificial "f_finished_4") -SPure Discard -SPure (Cons 0) -Labeled (LArtificial "printsln") Call -End +markA "f_finished_4" +discard +cons 0 +callA "printsln" +end -Mark (MArtificial "prints") -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "prints_end") (Branch EZ) -SIO OutputChar -Labeled (LArtificial "prints") Jump +markA "prints" +copyI 0 +bEZA "prints_end" +outputCS +jumpA "prints" -Mark (MArtificial "prints_end") -SPure Discard -Return +markA "prints_end" +discard +return -Mark (MArtificial "printsln") -Labeled (LArtificial "prints") Call -SPure (Cons 10) -SIO OutputChar -Return +markA "printsln" +callA "prints" +cons 10 +outputCS +return diff --git a/.output/golden/ws/il/optimized/from-wsa/true.il b/.output/golden/ws/il/optimized/from-wsa/true.il index 528694d82..a6a9baf65 100644 --- a/.output/golden/ws/il/optimized/from-wsa/true.il +++ b/.output/golden/ws/il/optimized/from-wsa/true.il @@ -1 +1 @@ -End +end diff --git a/.output/golden/ws/il/optimized/original/calc.il b/.output/golden/ws/il/optimized/original/calc.il index ccee63384..05ae665a8 100644 --- a/.output/golden/ws/il/optimized/original/calc.il +++ b/.output/golden/ws/il/optimized/original/calc.il @@ -1,246 +1,246 @@ -SPure (Cons 0) -SPure (Cons 69) -Store -SPure (Cons 1) -SPure (Cons 110) -Store -SPure (Cons 2) -SPure (Cons 116) -Store -SPure (Cons 3) -SPure (Cons 101) -Store -SPure (Cons 4) -SPure (Cons 114) -Store -SPure (Cons 5) -SPure (Cons 32) -Store -SPure (Cons 6) -SPure (Cons 115) -Store -SPure (Cons 7) -SPure (Cons 111) -Store -SPure (Cons 8) -SPure (Cons 109) -Store -SPure (Cons 9) -SPure (Cons 101) -Store -SPure (Cons 10) -SPure (Cons 32) -Store -SPure (Cons 11) -SPure (Cons 110) -Store -SPure (Cons 12) -SPure (Cons 117) -Store -SPure (Cons 13) -SPure (Cons 109) -Store -SPure (Cons 14) -SPure (Cons 98) -Store -SPure (Cons 15) -SPure (Cons 101) -Store -SPure (Cons 16) -SPure (Cons 114) -Store -SPure (Cons 17) -SPure (Cons 115) -Store -SPure (Cons 18) -SPure (Cons 44) -Store -SPure (Cons 19) -SPure (Cons 32) -Store -SPure (Cons 20) -SPure (Cons 116) -Store -SPure (Cons 21) -SPure (Cons 104) -Store -SPure (Cons 22) -SPure (Cons 101) -Store -SPure (Cons 23) -SPure (Cons 110) -Store -SPure (Cons 24) -SPure (Cons 32) -Store -SPure (Cons 25) -SPure (Cons 45) -Store -SPure (Cons 26) -SPure (Cons 49) -Store -SPure (Cons 27) -SPure (Cons 32) -Store -SPure (Cons 28) -SPure (Cons 116) -Store -SPure (Cons 29) -SPure (Cons 111) -Store -SPure (Cons 30) -SPure (Cons 32) -Store -SPure (Cons 31) -SPure (Cons 102) -Store -SPure (Cons 32) -SPure (Cons 105) -Store -SPure (Cons 33) -SPure (Cons 110) -Store -SPure (Cons 34) -SPure (Cons 105) -Store -SPure (Cons 35) -SPure (Cons 115) -Store -SPure (Cons 36) -SPure (Cons 104) -Store -SPure (Cons 37) -SPure (Cons 0) -Store -SPure (Cons 42) -SPure (Cons 78) -Store -SPure (Cons 43) -SPure (Cons 117) -Store -SPure (Cons 44) -SPure (Cons 109) -Store -SPure (Cons 45) -SPure (Cons 98) -Store -SPure (Cons 46) -SPure (Cons 101) -Store -SPure (Cons 47) -SPure (Cons 114) -Store -SPure (Cons 48) -SPure (Cons 58) -Store -SPure (Cons 49) -SPure (Cons 0) -Store -SPure (Cons 60) -SPure (Cons 84) -Store -SPure (Cons 61) -SPure (Cons 111) -Store -SPure (Cons 62) -SPure (Cons 116) -Store -SPure (Cons 63) -SPure (Cons 97) -Store -SPure (Cons 64) -SPure (Cons 108) -Store -SPure (Cons 65) -SPure (Cons 32) -Store -SPure (Cons 66) -SPure (Cons 105) -Store -SPure (Cons 67) -SPure (Cons 115) -Store -SPure (Cons 68) -SPure (Cons 32) -Store -SPure (Cons 69) -SPure (Cons 0) -Store -SPure (Cons 0) -Labeled (LArtificial "write") Call -Labeled (LArtificial "newline") Call -SPure (Cons 100) -SPure (Cons 0) -Store +cons 0 +cons 69 +store +cons 1 +cons 110 +store +cons 2 +cons 116 +store +cons 3 +cons 101 +store +cons 4 +cons 114 +store +cons 5 +cons 32 +store +cons 6 +cons 115 +store +cons 7 +cons 111 +store +cons 8 +cons 109 +store +cons 9 +cons 101 +store +cons 10 +cons 32 +store +cons 11 +cons 110 +store +cons 12 +cons 117 +store +cons 13 +cons 109 +store +cons 14 +cons 98 +store +cons 15 +cons 101 +store +cons 16 +cons 114 +store +cons 17 +cons 115 +store +cons 18 +cons 44 +store +cons 19 +cons 32 +store +cons 20 +cons 116 +store +cons 21 +cons 104 +store +cons 22 +cons 101 +store +cons 23 +cons 110 +store +cons 24 +cons 32 +store +cons 25 +cons 45 +store +cons 26 +cons 49 +store +cons 27 +cons 32 +store +cons 28 +cons 116 +store +cons 29 +cons 111 +store +cons 30 +cons 32 +store +cons 31 +cons 102 +store +cons 32 +cons 105 +store +cons 33 +cons 110 +store +cons 34 +cons 105 +store +cons 35 +cons 115 +store +cons 36 +cons 104 +store +cons 37 +cons 0 +store +cons 42 +cons 78 +store +cons 43 +cons 117 +store +cons 44 +cons 109 +store +cons 45 +cons 98 +store +cons 46 +cons 101 +store +cons 47 +cons 114 +store +cons 48 +cons 58 +store +cons 49 +cons 0 +store +cons 60 +cons 84 +store +cons 61 +cons 111 +store +cons 62 +cons 116 +store +cons 63 +cons 97 +store +cons 64 +cons 108 +store +cons 65 +cons 32 +store +cons 66 +cons 105 +store +cons 67 +cons 115 +store +cons 68 +cons 32 +store +cons 69 +cons 0 +store +cons 0 +callA "write" +callA "newline" +cons 100 +cons 0 +store -Mark (MArtificial "loop") -SPure (Cons 42) -Labeled (LArtificial "write") Call -SPure (Cons 101) -MIO InputDec -SPure (Cons 101) -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate (-1) Sub)) -Labeled (LArtificial "progend") (Branch EZ) -SPure (Cons 100) -Load -SPure (Binary Add) -SPure (Cons 100) -SPure (Indexed (IImmediate 1) Move) -Store -Labeled (LArtificial "loop") Jump +markA "loop" +cons 42 +callA "write" +cons 101 +mio inputdec +cons 101 +load +copyI 0 +subI -1 +bEZA "progend" +cons 100 +load +add +cons 100 +moveI 1 +store +jumpA "loop" -Mark (MArtificial "progend") -SPure Discard -SPure (Cons 60) -Labeled (LArtificial "write") Call -SPure (Cons 100) -Load -SIO OutputDec -Labeled (LArtificial "newline") Call -End +markA "progend" +discard +cons 60 +callA "write" +cons 100 +load +outputDS +callA "newline" +end -Mark (MArtificial "add") -SPure (Binary Add) -Return +markA "add" +add +return -Mark (MArtificial "write") -SPure (Indexed (IImmediate 0) Copy) -Load -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "write_end") (Branch EZ) -SIO OutputChar -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "write") Jump +markA "write" +copyI 0 +load +copyI 0 +bEZA "write_end" +outputCS +addI 1 +jumpA "write" -Mark (MArtificial "write_end") -SPure Discard -SPure Discard -Return +markA "write_end" +discard +discard +return -Mark (MArtificial "read") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 0) Copy) -MIO InputChar -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 10 Sub)) -Labeled (LArtificial "read_end") (Branch EZ) -SPure Discard -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "read") Jump +markA "read" +copyI 0 +copyI 0 +mio inputchar +load +copyI 0 +subI 10 +bEZA "read_end" +discard +addI 1 +jumpA "read" -Mark (MArtificial "read_end") -SPure Discard -SPure (Unary (UImmediate 1 Add)) -SPure (Cons 0) -Store -Return +markA "read_end" +discard +addI 1 +cons 0 +store +return -Mark (MArtificial "newline") -SPure (Cons 10) -SPure (Cons 13) -SIO OutputChar -SIO OutputChar -Return +markA "newline" +cons 10 +cons 13 +outputCS +outputCS +return diff --git a/.output/golden/ws/il/optimized/original/count.il b/.output/golden/ws/il/optimized/original/count.il index 9675b61ad..64fac29ac 100644 --- a/.output/golden/ws/il/optimized/original/count.il +++ b/.output/golden/ws/il/optimized/original/count.il @@ -1,60 +1,60 @@ -SPure (Cons 1) - -Mark (MArtificial "C") -SPure (Indexed (IImmediate 0) Copy) -SIO OutputDec -SPure (Cons 10) -SIO OutputChar -SPure (Unary (UImmediate 1 Add)) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 11 Sub)) -Labeled (LArtificial "E") (Branch EZ) -Labeled (LArtificial "C") Jump - -Mark (MArtificial "E") -SPure Discard -End - -Mark (MArtificial "add") -SPure (Binary Add) -Return - -Mark (MArtificial "write") -SPure (Indexed (IImmediate 0) Copy) -Load -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "write_end") (Branch EZ) -SIO OutputChar -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "write") Jump - -Mark (MArtificial "write_end") -SPure Discard -SPure Discard -Return - -Mark (MArtificial "read") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 0) Copy) -MIO InputChar -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 10 Sub)) -Labeled (LArtificial "read_end") (Branch EZ) -SPure Discard -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "read") Jump - -Mark (MArtificial "read_end") -SPure Discard -SPure (Unary (UImmediate 1 Add)) -SPure (Cons 0) -Store -Return - -Mark (MArtificial "newline") -SPure (Cons 10) -SPure (Cons 13) -SIO OutputChar -SIO OutputChar -Return +cons 1 + +markA "C" +copyI 0 +outputDS +cons 10 +outputCS +addI 1 +copyI 0 +subI 11 +bEZA "E" +jumpA "C" + +markA "E" +discard +end + +markA "add" +add +return + +markA "write" +copyI 0 +load +copyI 0 +bEZA "write_end" +outputCS +addI 1 +jumpA "write" + +markA "write_end" +discard +discard +return + +markA "read" +copyI 0 +copyI 0 +mio inputchar +load +copyI 0 +subI 10 +bEZA "read_end" +discard +addI 1 +jumpA "read" + +markA "read_end" +discard +addI 1 +cons 0 +store +return + +markA "newline" +cons 10 +cons 13 +outputCS +outputCS +return diff --git a/.output/golden/ws/il/optimized/original/fact.il b/.output/golden/ws/il/optimized/original/fact.il index 1d1a66a58..7b6ddac70 100644 --- a/.output/golden/ws/il/optimized/original/fact.il +++ b/.output/golden/ws/il/optimized/original/fact.il @@ -1,138 +1,138 @@ -SPure (Cons 0) -SPure (Cons 69) -Store -SPure (Cons 1) -SPure (Cons 110) -Store -SPure (Cons 2) -SPure (Cons 116) -Store -SPure (Cons 3) -SPure (Cons 101) -Store -SPure (Cons 4) -SPure (Cons 114) -Store -SPure (Cons 5) -SPure (Cons 32) -Store -SPure (Cons 6) -SPure (Cons 97) -Store -SPure (Cons 7) -SPure (Cons 32) -Store -SPure (Cons 8) -SPure (Cons 110) -Store -SPure (Cons 9) -SPure (Cons 117) -Store -SPure (Cons 10) -SPure (Cons 109) -Store -SPure (Cons 11) -SPure (Cons 98) -Store -SPure (Cons 12) -SPure (Cons 101) -Store -SPure (Cons 13) -SPure (Cons 114) -Store -SPure (Cons 14) -SPure (Cons 58) -Store -SPure (Cons 15) -SPure (Cons 32) -Store -SPure (Cons 16) -SPure (Cons 0) -Store -SPure (Cons 20) -SPure (Cons 33) -Store -SPure (Cons 21) -SPure (Cons 32) -Store -SPure (Cons 22) -SPure (Cons 61) -Store -SPure (Cons 23) -SPure (Cons 32) -Store -SPure (Cons 24) -SPure (Cons 0) -Store -SPure (Cons 0) -Labeled (LArtificial "write") Call -SPure (Cons 100) -MIO InputDec -SPure (Cons 100) -Load -Labeled (LArtificial "fact") Call -SPure (Cons 100) -Load -SIO OutputDec -SPure (Cons 20) -Labeled (LArtificial "write") Call -SIO OutputDec -Labeled (LArtificial "newline") Call -End +cons 0 +cons 69 +store +cons 1 +cons 110 +store +cons 2 +cons 116 +store +cons 3 +cons 101 +store +cons 4 +cons 114 +store +cons 5 +cons 32 +store +cons 6 +cons 97 +store +cons 7 +cons 32 +store +cons 8 +cons 110 +store +cons 9 +cons 117 +store +cons 10 +cons 109 +store +cons 11 +cons 98 +store +cons 12 +cons 101 +store +cons 13 +cons 114 +store +cons 14 +cons 58 +store +cons 15 +cons 32 +store +cons 16 +cons 0 +store +cons 20 +cons 33 +store +cons 21 +cons 32 +store +cons 22 +cons 61 +store +cons 23 +cons 32 +store +cons 24 +cons 0 +store +cons 0 +callA "write" +cons 100 +mio inputdec +cons 100 +load +callA "fact" +cons 100 +load +outputDS +cons 20 +callA "write" +outputDS +callA "newline" +end -Mark (MArtificial "fact") -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 1 Sub)) -Labeled (LArtificial "factbase") (Branch EZ) -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 1 Sub)) -Labeled (LArtificial "fact") Call -SPure (Binary Mul) -Return +markA "fact" +copyI 0 +subI 1 +bEZA "factbase" +copyI 0 +subI 1 +callA "fact" +mul +return -Mark (MArtificial "factbase") -Return +markA "factbase" +return -Mark (MArtificial "add") -SPure (Binary Add) -Return +markA "add" +add +return -Mark (MArtificial "write") -SPure (Indexed (IImmediate 0) Copy) -Load -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "write_end") (Branch EZ) -SIO OutputChar -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "write") Jump +markA "write" +copyI 0 +load +copyI 0 +bEZA "write_end" +outputCS +addI 1 +jumpA "write" -Mark (MArtificial "write_end") -SPure Discard -SPure Discard -Return +markA "write_end" +discard +discard +return -Mark (MArtificial "read") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 0) Copy) -MIO InputChar -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 10 Sub)) -Labeled (LArtificial "read_end") (Branch EZ) -SPure Discard -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "read") Jump +markA "read" +copyI 0 +copyI 0 +mio inputchar +load +copyI 0 +subI 10 +bEZA "read_end" +discard +addI 1 +jumpA "read" -Mark (MArtificial "read_end") -SPure Discard -SPure (Unary (UImmediate 1 Add)) -SPure (Cons 0) -Store -Return +markA "read_end" +discard +addI 1 +cons 0 +store +return -Mark (MArtificial "newline") -SPure (Cons 10) -SPure (Cons 13) -SIO OutputChar -SIO OutputChar -Return +markA "newline" +cons 10 +cons 13 +outputCS +outputCS +return diff --git a/.output/golden/ws/il/optimized/original/hWorld.il b/.output/golden/ws/il/optimized/original/hWorld.il index 539715d4e..4467da787 100644 --- a/.output/golden/ws/il/optimized/original/hWorld.il +++ b/.output/golden/ws/il/optimized/original/hWorld.il @@ -1,120 +1,120 @@ -SPure (Cons 0) -SPure (Cons 72) -Store -SPure (Cons 1) -SPure (Cons 101) -Store -SPure (Cons 2) -SPure (Cons 108) -Store -SPure (Cons 3) -SPure (Cons 108) -Store -SPure (Cons 4) -SPure (Cons 111) -Store -SPure (Cons 5) -SPure (Cons 44) -Store -SPure (Cons 6) -SPure (Cons 32) -Store -SPure (Cons 7) -SPure (Cons 119) -Store -SPure (Cons 8) -SPure (Cons 111) -Store -SPure (Cons 9) -SPure (Cons 114) -Store -SPure (Cons 10) -SPure (Cons 108) -Store -SPure (Cons 11) -SPure (Cons 100) -Store -SPure (Cons 12) -SPure (Cons 32) -Store -SPure (Cons 13) -SPure (Cons 111) -Store -SPure (Cons 14) -SPure (Cons 102) -Store -SPure (Cons 15) -SPure (Cons 32) -Store -SPure (Cons 16) -SPure (Cons 115) -Store -SPure (Cons 17) -SPure (Cons 112) -Store -SPure (Cons 18) -SPure (Cons 97) -Store -SPure (Cons 19) -SPure (Cons 99) -Store -SPure (Cons 20) -SPure (Cons 101) -Store -SPure (Cons 21) -SPure (Cons 115) -Store -SPure (Cons 22) -SPure (Cons 33) -Store -SPure (Cons 23) -SPure (Cons 0) -Store -SPure (Cons 0) -Labeled (LArtificial "write") Call -Labeled (LArtificial "newline") Call -End +cons 0 +cons 72 +store +cons 1 +cons 101 +store +cons 2 +cons 108 +store +cons 3 +cons 108 +store +cons 4 +cons 111 +store +cons 5 +cons 44 +store +cons 6 +cons 32 +store +cons 7 +cons 119 +store +cons 8 +cons 111 +store +cons 9 +cons 114 +store +cons 10 +cons 108 +store +cons 11 +cons 100 +store +cons 12 +cons 32 +store +cons 13 +cons 111 +store +cons 14 +cons 102 +store +cons 15 +cons 32 +store +cons 16 +cons 115 +store +cons 17 +cons 112 +store +cons 18 +cons 97 +store +cons 19 +cons 99 +store +cons 20 +cons 101 +store +cons 21 +cons 115 +store +cons 22 +cons 33 +store +cons 23 +cons 0 +store +cons 0 +callA "write" +callA "newline" +end -Mark (MArtificial "add") -SPure (Binary Add) -Return +markA "add" +add +return -Mark (MArtificial "write") -SPure (Indexed (IImmediate 0) Copy) -Load -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "write_end") (Branch EZ) -SIO OutputChar -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "write") Jump +markA "write" +copyI 0 +load +copyI 0 +bEZA "write_end" +outputCS +addI 1 +jumpA "write" -Mark (MArtificial "write_end") -SPure Discard -SPure Discard -Return +markA "write_end" +discard +discard +return -Mark (MArtificial "read") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 0) Copy) -MIO InputChar -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 10 Sub)) -Labeled (LArtificial "read_end") (Branch EZ) -SPure Discard -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "read") Jump +markA "read" +copyI 0 +copyI 0 +mio inputchar +load +copyI 0 +subI 10 +bEZA "read_end" +discard +addI 1 +jumpA "read" -Mark (MArtificial "read_end") -SPure Discard -SPure (Unary (UImmediate 1 Add)) -SPure (Cons 0) -Store -Return +markA "read_end" +discard +addI 1 +cons 0 +store +return -Mark (MArtificial "newline") -SPure (Cons 10) -SPure (Cons 13) -SIO OutputChar -SIO OutputChar -Return +markA "newline" +cons 10 +cons 13 +outputCS +outputCS +return diff --git a/.output/golden/ws/il/optimized/original/hanoi.il b/.output/golden/ws/il/optimized/original/hanoi.il index 21cc266fa..6be0b4fa5 100644 --- a/.output/golden/ws/il/optimized/original/hanoi.il +++ b/.output/golden/ws/il/optimized/original/hanoi.il @@ -1,210 +1,210 @@ -SPure (Cons 0) -SPure (Cons 69) -Store -SPure (Cons 1) -SPure (Cons 110) -Store -SPure (Cons 2) -SPure (Cons 116) -Store -SPure (Cons 3) -SPure (Cons 101) -Store -SPure (Cons 4) -SPure (Cons 114) -Store -SPure (Cons 5) -SPure (Cons 32) -Store -SPure (Cons 6) -SPure (Cons 97) -Store -SPure (Cons 7) -SPure (Cons 32) -Store -SPure (Cons 8) -SPure (Cons 110) -Store -SPure (Cons 9) -SPure (Cons 117) -Store -SPure (Cons 10) -SPure (Cons 109) -Store -SPure (Cons 11) -SPure (Cons 98) -Store -SPure (Cons 12) -SPure (Cons 101) -Store -SPure (Cons 13) -SPure (Cons 114) -Store -SPure (Cons 14) -SPure (Cons 58) -Store -SPure (Cons 15) -SPure (Cons 32) -Store -SPure (Cons 16) -SPure (Cons 0) -Store -SPure (Cons 20) -SPure (Cons 32) -Store -SPure (Cons 21) -SPure (Cons 45) -Store -SPure (Cons 22) -SPure (Cons 62) -Store -SPure (Cons 23) -SPure (Cons 32) -Store -SPure (Cons 24) -SPure (Cons 0) -Store -SPure (Cons 0) -Labeled (LArtificial "write") Call -SPure (Cons 100) -MIO InputDec -SPure (Cons 100) -Load -SPure (Cons 1) -SPure (Cons 3) -SPure (Cons 2) -Labeled (LArtificial "hanoi") Call -End +cons 0 +cons 69 +store +cons 1 +cons 110 +store +cons 2 +cons 116 +store +cons 3 +cons 101 +store +cons 4 +cons 114 +store +cons 5 +cons 32 +store +cons 6 +cons 97 +store +cons 7 +cons 32 +store +cons 8 +cons 110 +store +cons 9 +cons 117 +store +cons 10 +cons 109 +store +cons 11 +cons 98 +store +cons 12 +cons 101 +store +cons 13 +cons 114 +store +cons 14 +cons 58 +store +cons 15 +cons 32 +store +cons 16 +cons 0 +store +cons 20 +cons 32 +store +cons 21 +cons 45 +store +cons 22 +cons 62 +store +cons 23 +cons 32 +store +cons 24 +cons 0 +store +cons 0 +callA "write" +cons 100 +mio inputdec +cons 100 +load +cons 1 +cons 3 +cons 2 +callA "hanoi" +end -Mark (MArtificial "hanoi") -SPure (Cons 103) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 102) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 101) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 100) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 100) -Load -Labeled (LArtificial "endhanoi") (Branch EZ) -SPure (Cons 100) -Load -SPure (Cons 101) -Load -SPure (Cons 102) -Load -SPure (Cons 103) -Load -SPure (Cons 100) -Load -SPure (Unary (UImmediate 1 Sub)) -SPure (Cons 101) -Load -SPure (Cons 103) -Load -SPure (Cons 102) -Load -Labeled (LArtificial "hanoi") Call -SPure (Cons 103) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 102) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 101) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 100) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 101) -Load -SIO OutputDec -SPure (Cons 20) -Labeled (LArtificial "write") Call -SPure (Cons 102) -Load -SIO OutputDec -Labeled (LArtificial "newline") Call -SPure (Cons 100) -Load -SPure (Cons 101) -Load -SPure (Cons 102) -Load -SPure (Cons 103) -Load -SPure (Cons 100) -Load -SPure (Unary (UImmediate 1 Sub)) -SPure (Cons 103) -Load -SPure (Cons 102) -Load -SPure (Cons 101) -Load -Labeled (LArtificial "hanoi") Call -SPure (Cons 103) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 102) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 101) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 100) -SPure (Indexed (IImmediate 1) Move) -Store +markA "hanoi" +cons 103 +moveI 1 +store +cons 102 +moveI 1 +store +cons 101 +moveI 1 +store +cons 100 +moveI 1 +store +cons 100 +load +bEZA "endhanoi" +cons 100 +load +cons 101 +load +cons 102 +load +cons 103 +load +cons 100 +load +subI 1 +cons 101 +load +cons 103 +load +cons 102 +load +callA "hanoi" +cons 103 +moveI 1 +store +cons 102 +moveI 1 +store +cons 101 +moveI 1 +store +cons 100 +moveI 1 +store +cons 101 +load +outputDS +cons 20 +callA "write" +cons 102 +load +outputDS +callA "newline" +cons 100 +load +cons 101 +load +cons 102 +load +cons 103 +load +cons 100 +load +subI 1 +cons 103 +load +cons 102 +load +cons 101 +load +callA "hanoi" +cons 103 +moveI 1 +store +cons 102 +moveI 1 +store +cons 101 +moveI 1 +store +cons 100 +moveI 1 +store -Mark (MArtificial "endhanoi") -Return +markA "endhanoi" +return -Mark (MArtificial "add") -SPure (Binary Add) -Return +markA "add" +add +return -Mark (MArtificial "write") -SPure (Indexed (IImmediate 0) Copy) -Load -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "write_end") (Branch EZ) -SIO OutputChar -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "write") Jump +markA "write" +copyI 0 +load +copyI 0 +bEZA "write_end" +outputCS +addI 1 +jumpA "write" -Mark (MArtificial "write_end") -SPure Discard -SPure Discard -Return +markA "write_end" +discard +discard +return -Mark (MArtificial "read") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 0) Copy) -MIO InputChar -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 10 Sub)) -Labeled (LArtificial "read_end") (Branch EZ) -SPure Discard -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "read") Jump +markA "read" +copyI 0 +copyI 0 +mio inputchar +load +copyI 0 +subI 10 +bEZA "read_end" +discard +addI 1 +jumpA "read" -Mark (MArtificial "read_end") -SPure Discard -SPure (Unary (UImmediate 1 Add)) -SPure (Cons 0) -Store -Return +markA "read_end" +discard +addI 1 +cons 0 +store +return -Mark (MArtificial "newline") -SPure (Cons 10) -SPure (Cons 13) -SIO OutputChar -SIO OutputChar -Return +markA "newline" +cons 10 +cons 13 +outputCS +outputCS +return diff --git a/.output/golden/ws/il/optimized/original/helloWorld.il b/.output/golden/ws/il/optimized/original/helloWorld.il index ecdd99958..bffe7c401 100644 --- a/.output/golden/ws/il/optimized/original/helloWorld.il +++ b/.output/golden/ws/il/optimized/original/helloWorld.il @@ -1,25 +1,25 @@ -SPure (Cons 72) -SIO OutputChar -SPure (Cons 101) -SIO OutputChar -SPure (Cons 108) -SIO OutputChar -SPure (Cons 108) -SIO OutputChar -SPure (Cons 111) -SIO OutputChar -SPure (Cons 44) -SIO OutputChar -SPure (Cons 32) -SIO OutputChar -SPure (Cons 119) -SIO OutputChar -SPure (Cons 111) -SIO OutputChar -SPure (Cons 114) -SIO OutputChar -SPure (Cons 108) -SIO OutputChar -SPure (Cons 100) -SIO OutputChar -End +cons 72 +outputCS +cons 101 +outputCS +cons 108 +outputCS +cons 108 +outputCS +cons 111 +outputCS +cons 44 +outputCS +cons 32 +outputCS +cons 119 +outputCS +cons 111 +outputCS +cons 114 +outputCS +cons 108 +outputCS +cons 100 +outputCS +end diff --git a/.output/golden/ws/il/optimized/original/locTest.il b/.output/golden/ws/il/optimized/original/locTest.il index ec8de2a3f..9efa00acd 100644 --- a/.output/golden/ws/il/optimized/original/locTest.il +++ b/.output/golden/ws/il/optimized/original/locTest.il @@ -1,117 +1,117 @@ -SPure (Cons 0) -SPure (Cons 69) -Store -SPure (Cons 1) -SPure (Cons 110) -Store -SPure (Cons 2) -SPure (Cons 116) -Store -SPure (Cons 3) -SPure (Cons 101) -Store -SPure (Cons 4) -SPure (Cons 114) -Store -SPure (Cons 5) -SPure (Cons 32) -Store -SPure (Cons 6) -SPure (Cons 97) -Store -SPure (Cons 7) -SPure (Cons 32) -Store -SPure (Cons 8) -SPure (Cons 110) -Store -SPure (Cons 9) -SPure (Cons 117) -Store -SPure (Cons 10) -SPure (Cons 109) -Store -SPure (Cons 11) -SPure (Cons 98) -Store -SPure (Cons 12) -SPure (Cons 101) -Store -SPure (Cons 13) -SPure (Cons 114) -Store -SPure (Cons 14) -SPure (Cons 58) -Store -SPure (Cons 15) -SPure (Cons 32) -Store -SPure (Cons 16) -SPure (Cons 0) -Store -SPure (Cons 0) -Labeled (LArtificial "write") Call -SPure (Cons 100) -MIO InputDec -SPure (Cons 0) -Labeled (LArtificial "write") Call -SPure (Cons 101) -MIO InputDec -SPure (Cons 100) -Load -SPure (Cons 101) -Load -Labeled (LArtificial "loctest") Call -SIO OutputDec -End +cons 0 +cons 69 +store +cons 1 +cons 110 +store +cons 2 +cons 116 +store +cons 3 +cons 101 +store +cons 4 +cons 114 +store +cons 5 +cons 32 +store +cons 6 +cons 97 +store +cons 7 +cons 32 +store +cons 8 +cons 110 +store +cons 9 +cons 117 +store +cons 10 +cons 109 +store +cons 11 +cons 98 +store +cons 12 +cons 101 +store +cons 13 +cons 114 +store +cons 14 +cons 58 +store +cons 15 +cons 32 +store +cons 16 +cons 0 +store +cons 0 +callA "write" +cons 100 +mio inputdec +cons 0 +callA "write" +cons 101 +mio inputdec +cons 100 +load +cons 101 +load +callA "loctest" +outputDS +end -Mark (MArtificial "loctest") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 2) Copy) -SPure (Binary Add) -SPure (Indexed (IImmediate 2) Slide) -Return +markA "loctest" +copyI 0 +copyI 2 +add +slideI 2 +return -Mark (MArtificial "add") -SPure (Binary Add) -Return +markA "add" +add +return -Mark (MArtificial "write") -SPure (Indexed (IImmediate 0) Copy) -Load -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "write_end") (Branch EZ) -SIO OutputChar -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "write") Jump +markA "write" +copyI 0 +load +copyI 0 +bEZA "write_end" +outputCS +addI 1 +jumpA "write" -Mark (MArtificial "write_end") -SPure Discard -SPure Discard -Return +markA "write_end" +discard +discard +return -Mark (MArtificial "read") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 0) Copy) -MIO InputChar -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 10 Sub)) -Labeled (LArtificial "read_end") (Branch EZ) -SPure Discard -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "read") Jump +markA "read" +copyI 0 +copyI 0 +mio inputchar +load +copyI 0 +subI 10 +bEZA "read_end" +discard +addI 1 +jumpA "read" -Mark (MArtificial "read_end") -SPure Discard -SPure (Unary (UImmediate 1 Add)) -SPure (Cons 0) -Store -Return +markA "read_end" +discard +addI 1 +cons 0 +store +return -Mark (MArtificial "newline") -SPure (Cons 10) -SPure (Cons 13) -SIO OutputChar -SIO OutputChar -Return +markA "newline" +cons 10 +cons 13 +outputCS +outputCS +return diff --git a/.output/golden/ws/il/optimized/original/name.il b/.output/golden/ws/il/optimized/original/name.il index 256994b54..8add91b61 100644 --- a/.output/golden/ws/il/optimized/original/name.il +++ b/.output/golden/ws/il/optimized/original/name.il @@ -1,150 +1,150 @@ -SPure (Cons 0) -SPure (Cons 80) -Store -SPure (Cons 1) -SPure (Cons 108) -Store -SPure (Cons 2) -SPure (Cons 101) -Store -SPure (Cons 3) -SPure (Cons 97) -Store -SPure (Cons 4) -SPure (Cons 115) -Store -SPure (Cons 5) -SPure (Cons 101) -Store -SPure (Cons 6) -SPure (Cons 32) -Store -SPure (Cons 7) -SPure (Cons 101) -Store -SPure (Cons 8) -SPure (Cons 110) -Store -SPure (Cons 9) -SPure (Cons 116) -Store -SPure (Cons 10) -SPure (Cons 101) -Store -SPure (Cons 11) -SPure (Cons 114) -Store -SPure (Cons 12) -SPure (Cons 32) -Store -SPure (Cons 13) -SPure (Cons 121) -Store -SPure (Cons 14) -SPure (Cons 111) -Store -SPure (Cons 15) -SPure (Cons 117) -Store -SPure (Cons 16) -SPure (Cons 114) -Store -SPure (Cons 17) -SPure (Cons 32) -Store -SPure (Cons 18) -SPure (Cons 110) -Store -SPure (Cons 19) -SPure (Cons 97) -Store -SPure (Cons 20) -SPure (Cons 109) -Store -SPure (Cons 21) -SPure (Cons 101) -Store -SPure (Cons 22) -SPure (Cons 58) -Store -SPure (Cons 23) -SPure (Cons 32) -Store -SPure (Cons 24) -SPure (Cons 0) -Store -SPure (Cons 30) -SPure (Cons 72) -Store -SPure (Cons 31) -SPure (Cons 101) -Store -SPure (Cons 32) -SPure (Cons 108) -Store -SPure (Cons 33) -SPure (Cons 108) -Store -SPure (Cons 34) -SPure (Cons 111) -Store -SPure (Cons 35) -SPure (Cons 32) -Store -SPure (Cons 36) -SPure (Cons 0) -Store -SPure (Cons 0) -Labeled (LArtificial "write") Call -SPure (Cons 100) -Labeled (LArtificial "read") Call -SPure (Cons 30) -Labeled (LArtificial "write") Call -SPure (Cons 100) -Labeled (LArtificial "write") Call -Labeled (LArtificial "newline") Call -End +cons 0 +cons 80 +store +cons 1 +cons 108 +store +cons 2 +cons 101 +store +cons 3 +cons 97 +store +cons 4 +cons 115 +store +cons 5 +cons 101 +store +cons 6 +cons 32 +store +cons 7 +cons 101 +store +cons 8 +cons 110 +store +cons 9 +cons 116 +store +cons 10 +cons 101 +store +cons 11 +cons 114 +store +cons 12 +cons 32 +store +cons 13 +cons 121 +store +cons 14 +cons 111 +store +cons 15 +cons 117 +store +cons 16 +cons 114 +store +cons 17 +cons 32 +store +cons 18 +cons 110 +store +cons 19 +cons 97 +store +cons 20 +cons 109 +store +cons 21 +cons 101 +store +cons 22 +cons 58 +store +cons 23 +cons 32 +store +cons 24 +cons 0 +store +cons 30 +cons 72 +store +cons 31 +cons 101 +store +cons 32 +cons 108 +store +cons 33 +cons 108 +store +cons 34 +cons 111 +store +cons 35 +cons 32 +store +cons 36 +cons 0 +store +cons 0 +callA "write" +cons 100 +callA "read" +cons 30 +callA "write" +cons 100 +callA "write" +callA "newline" +end -Mark (MArtificial "add") -SPure (Binary Add) -Return +markA "add" +add +return -Mark (MArtificial "write") -SPure (Indexed (IImmediate 0) Copy) -Load -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "write_end") (Branch EZ) -SIO OutputChar -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "write") Jump +markA "write" +copyI 0 +load +copyI 0 +bEZA "write_end" +outputCS +addI 1 +jumpA "write" -Mark (MArtificial "write_end") -SPure Discard -SPure Discard -Return +markA "write_end" +discard +discard +return -Mark (MArtificial "read") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 0) Copy) -MIO InputChar -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Unary (UImmediate 10 Sub)) -Labeled (LArtificial "read_end") (Branch EZ) -SPure Discard -SPure (Unary (UImmediate 1 Add)) -Labeled (LArtificial "read") Jump +markA "read" +copyI 0 +copyI 0 +mio inputchar +load +copyI 0 +subI 10 +bEZA "read_end" +discard +addI 1 +jumpA "read" -Mark (MArtificial "read_end") -SPure Discard -SPure (Unary (UImmediate 1 Add)) -SPure (Cons 0) -Store -Return +markA "read_end" +discard +addI 1 +cons 0 +store +return -Mark (MArtificial "newline") -SPure (Cons 10) -SPure (Cons 13) -SIO OutputChar -SIO OutputChar -Return +markA "newline" +cons 10 +cons 13 +outputCS +outputCS +return diff --git a/.output/golden/ws/il/optimized/original/truthMachine.il b/.output/golden/ws/il/optimized/original/truthMachine.il index 3674303af..8c28439fd 100644 --- a/.output/golden/ws/il/optimized/original/truthMachine.il +++ b/.output/golden/ws/il/optimized/original/truthMachine.il @@ -1,15 +1,15 @@ -SPure (Cons 0) -SPure (Cons 0) -MIO InputDec -Load -Labeled (LArtificial "\NUL") (Branch EZ) +cons 0 +cons 0 +mio inputdec +load +bEZA "\NUL" -Mark (MArtificial "\SOH") -SPure (Cons 1) -SIO OutputDec -Labeled (LArtificial "\SOH") Jump +markA "\SOH" +cons 1 +outputDS +jumpA "\SOH" -Mark (MArtificial "\NUL") -SPure (Cons 0) -SIO OutputDec -End +markA "\NUL" +cons 0 +outputDS +end diff --git a/.output/golden/ws/il/parsed/from-wsa/bottles.il b/.output/golden/ws/il/parsed/from-wsa/bottles.il index 0d4417f22..1c485d683 100644 --- a/.output/golden/ws/il/parsed/from-wsa/bottles.il +++ b/.output/golden/ws/il/parsed/from-wsa/bottles.il @@ -1,146 +1,146 @@ -SPure (Cons 3) +cons 3 -Mark (MArtificial "LOOP") -SPure (Indexed (IImmediate 0) Copy) -SIO OutputDec -SPure (Cons 0) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 97) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 104) -SPure (Cons 116) -SPure (Cons 32) -SPure (Cons 110) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 114) -SPure (Cons 101) -SPure (Cons 101) -SPure (Cons 98) -SPure (Cons 32) -SPure (Cons 102) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 115) -SPure (Cons 101) -SPure (Cons 108) -SPure (Cons 116) -SPure (Cons 116) -SPure (Cons 111) -SPure (Cons 98) -SPure (Cons 32) -Labeled (LArtificial "prints") Call -SPure (Indexed (IImmediate 0) Copy) -SIO OutputDec -SPure (Cons 0) -SPure (Cons 114) -SPure (Cons 101) -SPure (Cons 101) -SPure (Cons 98) -SPure (Cons 32) -SPure (Cons 102) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 115) -SPure (Cons 101) -SPure (Cons 108) -SPure (Cons 116) -SPure (Cons 116) -SPure (Cons 111) -SPure (Cons 98) -SPure (Cons 32) -Labeled (LArtificial "printsln") Call -SPure (Cons 0) -SPure (Cons 100) -SPure (Cons 110) -SPure (Cons 117) -SPure (Cons 111) -SPure (Cons 114) -SPure (Cons 97) -SPure (Cons 32) -SPure (Cons 116) -SPure (Cons 105) -SPure (Cons 32) -SPure (Cons 115) -SPure (Cons 115) -SPure (Cons 97) -SPure (Cons 112) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 110) -SPure (Cons 119) -SPure (Cons 111) -SPure (Cons 100) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 110) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 107) -SPure (Cons 97) -SPure (Cons 84) -Labeled (LArtificial "printsln") Call -SPure (Cons 1) -SPure (Binary Sub) -SPure (Indexed (IImmediate 0) Copy) -SIO OutputDec -SPure (Cons 0) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 97) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 101) -SPure (Cons 104) -SPure (Cons 116) -SPure (Cons 32) -SPure (Cons 110) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 114) -SPure (Cons 101) -SPure (Cons 101) -SPure (Cons 98) -SPure (Cons 32) -SPure (Cons 102) -SPure (Cons 111) -SPure (Cons 32) -SPure (Cons 115) -SPure (Cons 101) -SPure (Cons 108) -SPure (Cons 116) -SPure (Cons 116) -SPure (Cons 111) -SPure (Cons 98) -SPure (Cons 32) -Labeled (LArtificial "printsln") Call -SPure (Cons 0) -Labeled (LArtificial "printsln") Call -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "LOOP:1") (Branch EZ) -Labeled (LArtificial "LOOP") Jump +markA "LOOP" +copyI 0 +outputDS +cons 0 +cons 32 +cons 44 +cons 108 +cons 108 +cons 97 +cons 119 +cons 32 +cons 101 +cons 104 +cons 116 +cons 32 +cons 110 +cons 111 +cons 32 +cons 114 +cons 101 +cons 101 +cons 98 +cons 32 +cons 102 +cons 111 +cons 32 +cons 115 +cons 101 +cons 108 +cons 116 +cons 116 +cons 111 +cons 98 +cons 32 +callA "prints" +copyI 0 +outputDS +cons 0 +cons 114 +cons 101 +cons 101 +cons 98 +cons 32 +cons 102 +cons 111 +cons 32 +cons 115 +cons 101 +cons 108 +cons 116 +cons 116 +cons 111 +cons 98 +cons 32 +callA "printsln" +cons 0 +cons 100 +cons 110 +cons 117 +cons 111 +cons 114 +cons 97 +cons 32 +cons 116 +cons 105 +cons 32 +cons 115 +cons 115 +cons 97 +cons 112 +cons 32 +cons 44 +cons 110 +cons 119 +cons 111 +cons 100 +cons 32 +cons 101 +cons 110 +cons 111 +cons 32 +cons 101 +cons 107 +cons 97 +cons 84 +callA "printsln" +cons 1 +sub +copyI 0 +outputDS +cons 0 +cons 108 +cons 108 +cons 97 +cons 119 +cons 32 +cons 101 +cons 104 +cons 116 +cons 32 +cons 110 +cons 111 +cons 32 +cons 114 +cons 101 +cons 101 +cons 98 +cons 32 +cons 102 +cons 111 +cons 32 +cons 115 +cons 101 +cons 108 +cons 116 +cons 116 +cons 111 +cons 98 +cons 32 +callA "printsln" +cons 0 +callA "printsln" +copyI 0 +bEZA "LOOP:1" +jumpA "LOOP" -Mark (MArtificial "LOOP:1") -End +markA "LOOP:1" +end -Mark (MArtificial "prints") -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "prints_end") (Branch EZ) -SIO OutputChar -Labeled (LArtificial "prints") Jump +markA "prints" +copyI 0 +bEZA "prints_end" +outputCS +jumpA "prints" -Mark (MArtificial "prints_end") -SPure Discard -Return +markA "prints_end" +discard +return -Mark (MArtificial "printsln") -Labeled (LArtificial "prints") Call -SPure (Cons 10) -SIO OutputChar -Return +markA "printsln" +callA "prints" +cons 10 +outputCS +return diff --git a/.output/golden/ws/il/parsed/from-wsa/hello.il b/.output/golden/ws/il/parsed/from-wsa/hello.il index 810994ec0..76b02970f 100644 --- a/.output/golden/ws/il/parsed/from-wsa/hello.il +++ b/.output/golden/ws/il/parsed/from-wsa/hello.il @@ -1,29 +1,29 @@ -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SPure (Cons 10) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -SIO OutputChar -End +cons 32 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +cons 10 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +outputCS +end diff --git a/.output/golden/ws/il/parsed/from-wsa/hello2.il b/.output/golden/ws/il/parsed/from-wsa/hello2.il index 0581fba7e..2419e7827 100644 --- a/.output/golden/ws/il/parsed/from-wsa/hello2.il +++ b/.output/golden/ws/il/parsed/from-wsa/hello2.il @@ -1,33 +1,33 @@ -SPure (Cons 0) -SPure (Cons 10) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) -Labeled (LArtificial "prints") Call -End +cons 0 +cons 10 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 +cons 32 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 +callA "prints" +end -Mark (MArtificial "prints") -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "prints_end") (Branch EZ) -SIO OutputChar -Labeled (LArtificial "prints") Jump +markA "prints" +copyI 0 +bEZA "prints_end" +outputCS +jumpA "prints" -Mark (MArtificial "prints_end") -SPure Discard -Return +markA "prints_end" +discard +return -Mark (MArtificial "printsln") -Labeled (LArtificial "prints") Call -SPure (Cons 10) -SIO OutputChar -Return +markA "printsln" +callA "prints" +cons 10 +outputCS +return diff --git a/.output/golden/ws/il/parsed/from-wsa/hello4.il b/.output/golden/ws/il/parsed/from-wsa/hello4.il index b149339c6..8e42ce9f8 100644 --- a/.output/golden/ws/il/parsed/from-wsa/hello4.il +++ b/.output/golden/ws/il/parsed/from-wsa/hello4.il @@ -1,32 +1,32 @@ -SPure (Cons 0) -SPure (Cons 33) -SPure (Cons 100) -SPure (Cons 108) -SPure (Cons 114) -SPure (Cons 111) -SPure (Cons 119) -SPure (Cons 32) -SPure (Cons 44) -SPure (Cons 111) -SPure (Cons 108) -SPure (Cons 108) -SPure (Cons 101) -SPure (Cons 72) -Labeled (LArtificial "printsln") Call -End +cons 0 +cons 33 +cons 100 +cons 108 +cons 114 +cons 111 +cons 119 +cons 32 +cons 44 +cons 111 +cons 108 +cons 108 +cons 101 +cons 72 +callA "printsln" +end -Mark (MArtificial "prints") -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "prints_end") (Branch EZ) -SIO OutputChar -Labeled (LArtificial "prints") Jump +markA "prints" +copyI 0 +bEZA "prints_end" +outputCS +jumpA "prints" -Mark (MArtificial "prints_end") -SPure Discard -Return +markA "prints_end" +discard +return -Mark (MArtificial "printsln") -Labeled (LArtificial "prints") Call -SPure (Cons 10) -SIO OutputChar -Return +markA "printsln" +callA "prints" +cons 10 +outputCS +return diff --git a/.output/golden/ws/il/parsed/from-wsa/prim.il b/.output/golden/ws/il/parsed/from-wsa/prim.il index 72865a7c1..5fb43f14c 100644 --- a/.output/golden/ws/il/parsed/from-wsa/prim.il +++ b/.output/golden/ws/il/parsed/from-wsa/prim.il @@ -1,131 +1,131 @@ -Mark (MArtificial "st") -SPure (Cons 0) -SPure (Cons 93) -SPure (Cons 48) -SPure (Cons 48) -SPure (Cons 49) -SPure (Cons 45) -SPure (Cons 50) -SPure (Cons 91) -SPure (Cons 32) -SPure (Cons 115) -SPure (Cons 114) -SPure (Cons 101) -SPure (Cons 98) -SPure (Cons 109) -SPure (Cons 117) -SPure (Cons 110) -SPure (Cons 32) -SPure (Cons 109) -SPure (Cons 105) -SPure (Cons 114) -SPure (Cons 112) -Labeled (LArtificial "printsln") Call -SPure (Cons 0) +markA "st" +cons 0 +cons 93 +cons 48 +cons 48 +cons 49 +cons 45 +cons 50 +cons 91 +cons 32 +cons 115 +cons 114 +cons 101 +cons 98 +cons 109 +cons 117 +cons 110 +cons 32 +cons 109 +cons 105 +cons 114 +cons 112 +callA "printsln" +cons 0 -Mark (MArtificial "f_start_1") -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 100) -SPure (Binary Sub) -Labeled (LArtificial "f_finished_1") (Branch EZ) -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 100) -SPure (Binary Add) -SPure (Cons 1) -Store -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "f_start_1") Jump +markA "f_start_1" +copyI 0 +cons 100 +sub +bEZA "f_finished_1" +copyI 0 +cons 100 +add +cons 1 +store +cons 1 +add +jumpA "f_start_1" -Mark (MArtificial "f_finished_1") -SPure Discard -SPure (Cons 2) +markA "f_finished_1" +discard +cons 2 -Mark (MArtificial "f_start_2") -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 11) -SPure (Binary Sub) -Labeled (LArtificial "f_finished_2") (Branch EZ) -SPure (Cons 2) +markA "f_start_2" +copyI 0 +cons 11 +sub +bEZA "f_finished_2" +cons 2 -Mark (MArtificial "f_start_3") -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 100) -SPure (Binary Sub) -Labeled (LArtificial "f_finished_3") (Branch EZ) -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 1) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Indexed (IImmediate 1) Move) -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 2) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Indexed (IImmediate 1) Move) -SPure (Cons 1) -Load -SPure (Cons 2) -Load -SPure (Binary Mul) -SPure (Cons 100) -SPure (Binary Add) -SPure (Cons 0) -Store -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "f_start_3") Jump +markA "f_start_3" +copyI 0 +cons 100 +sub +bEZA "f_finished_3" +copyI 0 +cons 1 +moveI 1 +store +moveI 1 +copyI 0 +cons 2 +moveI 1 +store +moveI 1 +cons 1 +load +cons 2 +load +mul +cons 100 +add +cons 0 +store +cons 1 +add +jumpA "f_start_3" -Mark (MArtificial "f_finished_3") -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "f_start_2") Jump +markA "f_finished_3" +discard +cons 1 +add +jumpA "f_start_2" -Mark (MArtificial "f_finished_2") -SPure Discard -SPure (Cons 2) +markA "f_finished_2" +discard +cons 2 -Mark (MArtificial "f_start_4") -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 100) -SPure (Binary Sub) -Labeled (LArtificial "f_finished_4") (Branch EZ) -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 100) -SPure (Binary Add) -Load -Labeled (LArtificial "nodraw") (Branch EZ) -SPure (Indexed (IImmediate 0) Copy) -SIO OutputDec -SPure (Cons 0) -SPure (Cons 32) -Labeled (LArtificial "prints") Call +markA "f_start_4" +copyI 0 +cons 100 +sub +bEZA "f_finished_4" +copyI 0 +cons 100 +add +load +bEZA "nodraw" +copyI 0 +outputDS +cons 0 +cons 32 +callA "prints" -Mark (MArtificial "nodraw") -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "f_start_4") Jump +markA "nodraw" +cons 1 +add +jumpA "f_start_4" -Mark (MArtificial "f_finished_4") -SPure Discard -SPure (Cons 0) -Labeled (LArtificial "printsln") Call -End +markA "f_finished_4" +discard +cons 0 +callA "printsln" +end -Mark (MArtificial "prints") -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "prints_end") (Branch EZ) -SIO OutputChar -Labeled (LArtificial "prints") Jump +markA "prints" +copyI 0 +bEZA "prints_end" +outputCS +jumpA "prints" -Mark (MArtificial "prints_end") -SPure Discard -Return +markA "prints_end" +discard +return -Mark (MArtificial "printsln") -Labeled (LArtificial "prints") Call -SPure (Cons 10) -SIO OutputChar -Return +markA "printsln" +callA "prints" +cons 10 +outputCS +return diff --git a/.output/golden/ws/il/parsed/from-wsa/true.il b/.output/golden/ws/il/parsed/from-wsa/true.il index 528694d82..a6a9baf65 100644 --- a/.output/golden/ws/il/parsed/from-wsa/true.il +++ b/.output/golden/ws/il/parsed/from-wsa/true.il @@ -1 +1 @@ -End +end diff --git a/.output/golden/ws/il/parsed/original/calc.il b/.output/golden/ws/il/parsed/original/calc.il index c8b0cdc0a..05b5c3b58 100644 --- a/.output/golden/ws/il/parsed/original/calc.il +++ b/.output/golden/ws/il/parsed/original/calc.il @@ -1,251 +1,251 @@ -SPure (Cons 0) -SPure (Cons 69) -Store -SPure (Cons 1) -SPure (Cons 110) -Store -SPure (Cons 2) -SPure (Cons 116) -Store -SPure (Cons 3) -SPure (Cons 101) -Store -SPure (Cons 4) -SPure (Cons 114) -Store -SPure (Cons 5) -SPure (Cons 32) -Store -SPure (Cons 6) -SPure (Cons 115) -Store -SPure (Cons 7) -SPure (Cons 111) -Store -SPure (Cons 8) -SPure (Cons 109) -Store -SPure (Cons 9) -SPure (Cons 101) -Store -SPure (Cons 10) -SPure (Cons 32) -Store -SPure (Cons 11) -SPure (Cons 110) -Store -SPure (Cons 12) -SPure (Cons 117) -Store -SPure (Cons 13) -SPure (Cons 109) -Store -SPure (Cons 14) -SPure (Cons 98) -Store -SPure (Cons 15) -SPure (Cons 101) -Store -SPure (Cons 16) -SPure (Cons 114) -Store -SPure (Cons 17) -SPure (Cons 115) -Store -SPure (Cons 18) -SPure (Cons 44) -Store -SPure (Cons 19) -SPure (Cons 32) -Store -SPure (Cons 20) -SPure (Cons 116) -Store -SPure (Cons 21) -SPure (Cons 104) -Store -SPure (Cons 22) -SPure (Cons 101) -Store -SPure (Cons 23) -SPure (Cons 110) -Store -SPure (Cons 24) -SPure (Cons 32) -Store -SPure (Cons 25) -SPure (Cons 45) -Store -SPure (Cons 26) -SPure (Cons 49) -Store -SPure (Cons 27) -SPure (Cons 32) -Store -SPure (Cons 28) -SPure (Cons 116) -Store -SPure (Cons 29) -SPure (Cons 111) -Store -SPure (Cons 30) -SPure (Cons 32) -Store -SPure (Cons 31) -SPure (Cons 102) -Store -SPure (Cons 32) -SPure (Cons 105) -Store -SPure (Cons 33) -SPure (Cons 110) -Store -SPure (Cons 34) -SPure (Cons 105) -Store -SPure (Cons 35) -SPure (Cons 115) -Store -SPure (Cons 36) -SPure (Cons 104) -Store -SPure (Cons 37) -SPure (Cons 0) -Store -SPure (Cons 42) -SPure (Cons 78) -Store -SPure (Cons 43) -SPure (Cons 117) -Store -SPure (Cons 44) -SPure (Cons 109) -Store -SPure (Cons 45) -SPure (Cons 98) -Store -SPure (Cons 46) -SPure (Cons 101) -Store -SPure (Cons 47) -SPure (Cons 114) -Store -SPure (Cons 48) -SPure (Cons 58) -Store -SPure (Cons 49) -SPure (Cons 0) -Store -SPure (Cons 60) -SPure (Cons 84) -Store -SPure (Cons 61) -SPure (Cons 111) -Store -SPure (Cons 62) -SPure (Cons 116) -Store -SPure (Cons 63) -SPure (Cons 97) -Store -SPure (Cons 64) -SPure (Cons 108) -Store -SPure (Cons 65) -SPure (Cons 32) -Store -SPure (Cons 66) -SPure (Cons 105) -Store -SPure (Cons 67) -SPure (Cons 115) -Store -SPure (Cons 68) -SPure (Cons 32) -Store -SPure (Cons 69) -SPure (Cons 0) -Store -SPure (Cons 0) -Labeled (LArtificial "write") Call -Labeled (LArtificial "newline") Call -SPure (Cons 100) -SPure (Cons 0) -Store +cons 0 +cons 69 +store +cons 1 +cons 110 +store +cons 2 +cons 116 +store +cons 3 +cons 101 +store +cons 4 +cons 114 +store +cons 5 +cons 32 +store +cons 6 +cons 115 +store +cons 7 +cons 111 +store +cons 8 +cons 109 +store +cons 9 +cons 101 +store +cons 10 +cons 32 +store +cons 11 +cons 110 +store +cons 12 +cons 117 +store +cons 13 +cons 109 +store +cons 14 +cons 98 +store +cons 15 +cons 101 +store +cons 16 +cons 114 +store +cons 17 +cons 115 +store +cons 18 +cons 44 +store +cons 19 +cons 32 +store +cons 20 +cons 116 +store +cons 21 +cons 104 +store +cons 22 +cons 101 +store +cons 23 +cons 110 +store +cons 24 +cons 32 +store +cons 25 +cons 45 +store +cons 26 +cons 49 +store +cons 27 +cons 32 +store +cons 28 +cons 116 +store +cons 29 +cons 111 +store +cons 30 +cons 32 +store +cons 31 +cons 102 +store +cons 32 +cons 105 +store +cons 33 +cons 110 +store +cons 34 +cons 105 +store +cons 35 +cons 115 +store +cons 36 +cons 104 +store +cons 37 +cons 0 +store +cons 42 +cons 78 +store +cons 43 +cons 117 +store +cons 44 +cons 109 +store +cons 45 +cons 98 +store +cons 46 +cons 101 +store +cons 47 +cons 114 +store +cons 48 +cons 58 +store +cons 49 +cons 0 +store +cons 60 +cons 84 +store +cons 61 +cons 111 +store +cons 62 +cons 116 +store +cons 63 +cons 97 +store +cons 64 +cons 108 +store +cons 65 +cons 32 +store +cons 66 +cons 105 +store +cons 67 +cons 115 +store +cons 68 +cons 32 +store +cons 69 +cons 0 +store +cons 0 +callA "write" +callA "newline" +cons 100 +cons 0 +store -Mark (MArtificial "loop") -SPure (Cons 42) -Labeled (LArtificial "write") Call -SPure (Cons 101) -MIO InputDec -SPure (Cons 101) -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons (-1)) -SPure (Binary Sub) -Labeled (LArtificial "progend") (Branch EZ) -SPure (Cons 100) -Load -SPure (Binary Add) -SPure (Cons 100) -SPure (Indexed (IImmediate 1) Move) -Store -Labeled (LArtificial "loop") Jump +markA "loop" +cons 42 +callA "write" +cons 101 +mio inputdec +cons 101 +load +copyI 0 +cons (-1) +sub +bEZA "progend" +cons 100 +load +add +cons 100 +moveI 1 +store +jumpA "loop" -Mark (MArtificial "progend") -SPure Discard -SPure (Cons 60) -Labeled (LArtificial "write") Call -SPure (Cons 100) -Load -SIO OutputDec -Labeled (LArtificial "newline") Call -End +markA "progend" +discard +cons 60 +callA "write" +cons 100 +load +outputDS +callA "newline" +end -Mark (MArtificial "add") -SPure (Binary Add) -Return +markA "add" +add +return -Mark (MArtificial "write") -SPure (Indexed (IImmediate 0) Copy) -Load -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "write_end") (Branch EZ) -SIO OutputChar -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "write") Jump +markA "write" +copyI 0 +load +copyI 0 +bEZA "write_end" +outputCS +cons 1 +add +jumpA "write" -Mark (MArtificial "write_end") -SPure Discard -SPure Discard -Return +markA "write_end" +discard +discard +return -Mark (MArtificial "read") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 0) Copy) -MIO InputChar -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 10) -SPure (Binary Sub) -Labeled (LArtificial "read_end") (Branch EZ) -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "read") Jump +markA "read" +copyI 0 +copyI 0 +mio inputchar +load +copyI 0 +cons 10 +sub +bEZA "read_end" +discard +cons 1 +add +jumpA "read" -Mark (MArtificial "read_end") -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -SPure (Cons 0) -Store -Return +markA "read_end" +discard +cons 1 +add +cons 0 +store +return -Mark (MArtificial "newline") -SPure (Cons 10) -SPure (Cons 13) -SIO OutputChar -SIO OutputChar -Return +markA "newline" +cons 10 +cons 13 +outputCS +outputCS +return diff --git a/.output/golden/ws/il/parsed/original/count.il b/.output/golden/ws/il/parsed/original/count.il index 92cabbb58..2044999b8 100644 --- a/.output/golden/ws/il/parsed/original/count.il +++ b/.output/golden/ws/il/parsed/original/count.il @@ -1,66 +1,66 @@ -SPure (Cons 1) +cons 1 -Mark (MArtificial "C") -SPure (Indexed (IImmediate 0) Copy) -SIO OutputDec -SPure (Cons 10) -SIO OutputChar -SPure (Cons 1) -SPure (Binary Add) -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 11) -SPure (Binary Sub) -Labeled (LArtificial "E") (Branch EZ) -Labeled (LArtificial "C") Jump +markA "C" +copyI 0 +outputDS +cons 10 +outputCS +cons 1 +add +copyI 0 +cons 11 +sub +bEZA "E" +jumpA "C" -Mark (MArtificial "E") -SPure Discard -End +markA "E" +discard +end -Mark (MArtificial "add") -SPure (Binary Add) -Return +markA "add" +add +return -Mark (MArtificial "write") -SPure (Indexed (IImmediate 0) Copy) -Load -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "write_end") (Branch EZ) -SIO OutputChar -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "write") Jump +markA "write" +copyI 0 +load +copyI 0 +bEZA "write_end" +outputCS +cons 1 +add +jumpA "write" -Mark (MArtificial "write_end") -SPure Discard -SPure Discard -Return +markA "write_end" +discard +discard +return -Mark (MArtificial "read") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 0) Copy) -MIO InputChar -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 10) -SPure (Binary Sub) -Labeled (LArtificial "read_end") (Branch EZ) -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "read") Jump +markA "read" +copyI 0 +copyI 0 +mio inputchar +load +copyI 0 +cons 10 +sub +bEZA "read_end" +discard +cons 1 +add +jumpA "read" -Mark (MArtificial "read_end") -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -SPure (Cons 0) -Store -Return +markA "read_end" +discard +cons 1 +add +cons 0 +store +return -Mark (MArtificial "newline") -SPure (Cons 10) -SPure (Cons 13) -SIO OutputChar -SIO OutputChar -Return +markA "newline" +cons 10 +cons 13 +outputCS +outputCS +return diff --git a/.output/golden/ws/il/parsed/original/fact.il b/.output/golden/ws/il/parsed/original/fact.il index cfc111811..6608c355c 100644 --- a/.output/golden/ws/il/parsed/original/fact.il +++ b/.output/golden/ws/il/parsed/original/fact.il @@ -1,146 +1,146 @@ -SPure (Cons 0) -SPure (Cons 69) -Store -SPure (Cons 1) -SPure (Cons 110) -Store -SPure (Cons 2) -SPure (Cons 116) -Store -SPure (Cons 3) -SPure (Cons 101) -Store -SPure (Cons 4) -SPure (Cons 114) -Store -SPure (Cons 5) -SPure (Cons 32) -Store -SPure (Cons 6) -SPure (Cons 97) -Store -SPure (Cons 7) -SPure (Cons 32) -Store -SPure (Cons 8) -SPure (Cons 110) -Store -SPure (Cons 9) -SPure (Cons 117) -Store -SPure (Cons 10) -SPure (Cons 109) -Store -SPure (Cons 11) -SPure (Cons 98) -Store -SPure (Cons 12) -SPure (Cons 101) -Store -SPure (Cons 13) -SPure (Cons 114) -Store -SPure (Cons 14) -SPure (Cons 58) -Store -SPure (Cons 15) -SPure (Cons 32) -Store -SPure (Cons 16) -SPure (Cons 0) -Store -SPure (Cons 20) -SPure (Cons 33) -Store -SPure (Cons 21) -SPure (Cons 32) -Store -SPure (Cons 22) -SPure (Cons 61) -Store -SPure (Cons 23) -SPure (Cons 32) -Store -SPure (Cons 24) -SPure (Cons 0) -Store -SPure (Cons 0) -Labeled (LArtificial "write") Call -SPure (Cons 100) -MIO InputDec -SPure (Cons 100) -Load -Labeled (LArtificial "fact") Call -SPure (Cons 100) -Load -SIO OutputDec -SPure (Cons 20) -Labeled (LArtificial "write") Call -SIO OutputDec -Labeled (LArtificial "newline") Call -End +cons 0 +cons 69 +store +cons 1 +cons 110 +store +cons 2 +cons 116 +store +cons 3 +cons 101 +store +cons 4 +cons 114 +store +cons 5 +cons 32 +store +cons 6 +cons 97 +store +cons 7 +cons 32 +store +cons 8 +cons 110 +store +cons 9 +cons 117 +store +cons 10 +cons 109 +store +cons 11 +cons 98 +store +cons 12 +cons 101 +store +cons 13 +cons 114 +store +cons 14 +cons 58 +store +cons 15 +cons 32 +store +cons 16 +cons 0 +store +cons 20 +cons 33 +store +cons 21 +cons 32 +store +cons 22 +cons 61 +store +cons 23 +cons 32 +store +cons 24 +cons 0 +store +cons 0 +callA "write" +cons 100 +mio inputdec +cons 100 +load +callA "fact" +cons 100 +load +outputDS +cons 20 +callA "write" +outputDS +callA "newline" +end -Mark (MArtificial "fact") -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 1) -SPure (Binary Sub) -Labeled (LArtificial "factbase") (Branch EZ) -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 1) -SPure (Binary Sub) -Labeled (LArtificial "fact") Call -SPure (Binary Mul) -Return +markA "fact" +copyI 0 +cons 1 +sub +bEZA "factbase" +copyI 0 +cons 1 +sub +callA "fact" +mul +return -Mark (MArtificial "factbase") -SPure (Cons 1) -SPure Discard -Return +markA "factbase" +cons 1 +discard +return -Mark (MArtificial "add") -SPure (Binary Add) -Return +markA "add" +add +return -Mark (MArtificial "write") -SPure (Indexed (IImmediate 0) Copy) -Load -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "write_end") (Branch EZ) -SIO OutputChar -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "write") Jump +markA "write" +copyI 0 +load +copyI 0 +bEZA "write_end" +outputCS +cons 1 +add +jumpA "write" -Mark (MArtificial "write_end") -SPure Discard -SPure Discard -Return +markA "write_end" +discard +discard +return -Mark (MArtificial "read") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 0) Copy) -MIO InputChar -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 10) -SPure (Binary Sub) -Labeled (LArtificial "read_end") (Branch EZ) -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "read") Jump +markA "read" +copyI 0 +copyI 0 +mio inputchar +load +copyI 0 +cons 10 +sub +bEZA "read_end" +discard +cons 1 +add +jumpA "read" -Mark (MArtificial "read_end") -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -SPure (Cons 0) -Store -Return +markA "read_end" +discard +cons 1 +add +cons 0 +store +return -Mark (MArtificial "newline") -SPure (Cons 10) -SPure (Cons 13) -SIO OutputChar -SIO OutputChar -Return +markA "newline" +cons 10 +cons 13 +outputCS +outputCS +return diff --git a/.output/golden/ws/il/parsed/original/hWorld.il b/.output/golden/ws/il/parsed/original/hWorld.il index 39380554a..c5dca3f9a 100644 --- a/.output/golden/ws/il/parsed/original/hWorld.il +++ b/.output/golden/ws/il/parsed/original/hWorld.il @@ -1,124 +1,124 @@ -SPure (Cons 0) -SPure (Cons 72) -Store -SPure (Cons 1) -SPure (Cons 101) -Store -SPure (Cons 2) -SPure (Cons 108) -Store -SPure (Cons 3) -SPure (Cons 108) -Store -SPure (Cons 4) -SPure (Cons 111) -Store -SPure (Cons 5) -SPure (Cons 44) -Store -SPure (Cons 6) -SPure (Cons 32) -Store -SPure (Cons 7) -SPure (Cons 119) -Store -SPure (Cons 8) -SPure (Cons 111) -Store -SPure (Cons 9) -SPure (Cons 114) -Store -SPure (Cons 10) -SPure (Cons 108) -Store -SPure (Cons 11) -SPure (Cons 100) -Store -SPure (Cons 12) -SPure (Cons 32) -Store -SPure (Cons 13) -SPure (Cons 111) -Store -SPure (Cons 14) -SPure (Cons 102) -Store -SPure (Cons 15) -SPure (Cons 32) -Store -SPure (Cons 16) -SPure (Cons 115) -Store -SPure (Cons 17) -SPure (Cons 112) -Store -SPure (Cons 18) -SPure (Cons 97) -Store -SPure (Cons 19) -SPure (Cons 99) -Store -SPure (Cons 20) -SPure (Cons 101) -Store -SPure (Cons 21) -SPure (Cons 115) -Store -SPure (Cons 22) -SPure (Cons 33) -Store -SPure (Cons 23) -SPure (Cons 0) -Store -SPure (Cons 0) -Labeled (LArtificial "write") Call -Labeled (LArtificial "newline") Call -End +cons 0 +cons 72 +store +cons 1 +cons 101 +store +cons 2 +cons 108 +store +cons 3 +cons 108 +store +cons 4 +cons 111 +store +cons 5 +cons 44 +store +cons 6 +cons 32 +store +cons 7 +cons 119 +store +cons 8 +cons 111 +store +cons 9 +cons 114 +store +cons 10 +cons 108 +store +cons 11 +cons 100 +store +cons 12 +cons 32 +store +cons 13 +cons 111 +store +cons 14 +cons 102 +store +cons 15 +cons 32 +store +cons 16 +cons 115 +store +cons 17 +cons 112 +store +cons 18 +cons 97 +store +cons 19 +cons 99 +store +cons 20 +cons 101 +store +cons 21 +cons 115 +store +cons 22 +cons 33 +store +cons 23 +cons 0 +store +cons 0 +callA "write" +callA "newline" +end -Mark (MArtificial "add") -SPure (Binary Add) -Return +markA "add" +add +return -Mark (MArtificial "write") -SPure (Indexed (IImmediate 0) Copy) -Load -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "write_end") (Branch EZ) -SIO OutputChar -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "write") Jump +markA "write" +copyI 0 +load +copyI 0 +bEZA "write_end" +outputCS +cons 1 +add +jumpA "write" -Mark (MArtificial "write_end") -SPure Discard -SPure Discard -Return +markA "write_end" +discard +discard +return -Mark (MArtificial "read") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 0) Copy) -MIO InputChar -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 10) -SPure (Binary Sub) -Labeled (LArtificial "read_end") (Branch EZ) -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "read") Jump +markA "read" +copyI 0 +copyI 0 +mio inputchar +load +copyI 0 +cons 10 +sub +bEZA "read_end" +discard +cons 1 +add +jumpA "read" -Mark (MArtificial "read_end") -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -SPure (Cons 0) -Store -Return +markA "read_end" +discard +cons 1 +add +cons 0 +store +return -Mark (MArtificial "newline") -SPure (Cons 10) -SPure (Cons 13) -SIO OutputChar -SIO OutputChar -Return +markA "newline" +cons 10 +cons 13 +outputCS +outputCS +return diff --git a/.output/golden/ws/il/parsed/original/hanoi.il b/.output/golden/ws/il/parsed/original/hanoi.il index 0042b9aa4..9c0fd0dac 100644 --- a/.output/golden/ws/il/parsed/original/hanoi.il +++ b/.output/golden/ws/il/parsed/original/hanoi.il @@ -1,216 +1,216 @@ -SPure (Cons 0) -SPure (Cons 69) -Store -SPure (Cons 1) -SPure (Cons 110) -Store -SPure (Cons 2) -SPure (Cons 116) -Store -SPure (Cons 3) -SPure (Cons 101) -Store -SPure (Cons 4) -SPure (Cons 114) -Store -SPure (Cons 5) -SPure (Cons 32) -Store -SPure (Cons 6) -SPure (Cons 97) -Store -SPure (Cons 7) -SPure (Cons 32) -Store -SPure (Cons 8) -SPure (Cons 110) -Store -SPure (Cons 9) -SPure (Cons 117) -Store -SPure (Cons 10) -SPure (Cons 109) -Store -SPure (Cons 11) -SPure (Cons 98) -Store -SPure (Cons 12) -SPure (Cons 101) -Store -SPure (Cons 13) -SPure (Cons 114) -Store -SPure (Cons 14) -SPure (Cons 58) -Store -SPure (Cons 15) -SPure (Cons 32) -Store -SPure (Cons 16) -SPure (Cons 0) -Store -SPure (Cons 20) -SPure (Cons 32) -Store -SPure (Cons 21) -SPure (Cons 45) -Store -SPure (Cons 22) -SPure (Cons 62) -Store -SPure (Cons 23) -SPure (Cons 32) -Store -SPure (Cons 24) -SPure (Cons 0) -Store -SPure (Cons 0) -Labeled (LArtificial "write") Call -SPure (Cons 100) -MIO InputDec -SPure (Cons 100) -Load -SPure (Cons 1) -SPure (Cons 3) -SPure (Cons 2) -Labeled (LArtificial "hanoi") Call -End +cons 0 +cons 69 +store +cons 1 +cons 110 +store +cons 2 +cons 116 +store +cons 3 +cons 101 +store +cons 4 +cons 114 +store +cons 5 +cons 32 +store +cons 6 +cons 97 +store +cons 7 +cons 32 +store +cons 8 +cons 110 +store +cons 9 +cons 117 +store +cons 10 +cons 109 +store +cons 11 +cons 98 +store +cons 12 +cons 101 +store +cons 13 +cons 114 +store +cons 14 +cons 58 +store +cons 15 +cons 32 +store +cons 16 +cons 0 +store +cons 20 +cons 32 +store +cons 21 +cons 45 +store +cons 22 +cons 62 +store +cons 23 +cons 32 +store +cons 24 +cons 0 +store +cons 0 +callA "write" +cons 100 +mio inputdec +cons 100 +load +cons 1 +cons 3 +cons 2 +callA "hanoi" +end -Mark (MArtificial "hanoi") -SPure (Cons 103) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 102) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 101) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 100) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 100) -Load -Labeled (LArtificial "endhanoi") (Branch EZ) -SPure (Cons 100) -Load -SPure (Cons 101) -Load -SPure (Cons 102) -Load -SPure (Cons 103) -Load -SPure (Cons 100) -Load -SPure (Cons 1) -SPure (Binary Sub) -SPure (Cons 101) -Load -SPure (Cons 103) -Load -SPure (Cons 102) -Load -Labeled (LArtificial "hanoi") Call -SPure (Cons 103) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 102) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 101) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 100) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 101) -Load -SIO OutputDec -SPure (Cons 20) -Labeled (LArtificial "write") Call -SPure (Cons 102) -Load -SIO OutputDec -Labeled (LArtificial "newline") Call -SPure (Cons 100) -Load -SPure (Cons 101) -Load -SPure (Cons 102) -Load -SPure (Cons 103) -Load -SPure (Cons 100) -Load -SPure (Cons 1) -SPure (Binary Sub) -SPure (Cons 103) -Load -SPure (Cons 102) -Load -SPure (Cons 101) -Load -Labeled (LArtificial "hanoi") Call -SPure (Cons 103) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 102) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 101) -SPure (Indexed (IImmediate 1) Move) -Store -SPure (Cons 100) -SPure (Indexed (IImmediate 1) Move) -Store +markA "hanoi" +cons 103 +moveI 1 +store +cons 102 +moveI 1 +store +cons 101 +moveI 1 +store +cons 100 +moveI 1 +store +cons 100 +load +bEZA "endhanoi" +cons 100 +load +cons 101 +load +cons 102 +load +cons 103 +load +cons 100 +load +cons 1 +sub +cons 101 +load +cons 103 +load +cons 102 +load +callA "hanoi" +cons 103 +moveI 1 +store +cons 102 +moveI 1 +store +cons 101 +moveI 1 +store +cons 100 +moveI 1 +store +cons 101 +load +outputDS +cons 20 +callA "write" +cons 102 +load +outputDS +callA "newline" +cons 100 +load +cons 101 +load +cons 102 +load +cons 103 +load +cons 100 +load +cons 1 +sub +cons 103 +load +cons 102 +load +cons 101 +load +callA "hanoi" +cons 103 +moveI 1 +store +cons 102 +moveI 1 +store +cons 101 +moveI 1 +store +cons 100 +moveI 1 +store -Mark (MArtificial "endhanoi") -Return +markA "endhanoi" +return -Mark (MArtificial "add") -SPure (Binary Add) -Return +markA "add" +add +return -Mark (MArtificial "write") -SPure (Indexed (IImmediate 0) Copy) -Load -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "write_end") (Branch EZ) -SIO OutputChar -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "write") Jump +markA "write" +copyI 0 +load +copyI 0 +bEZA "write_end" +outputCS +cons 1 +add +jumpA "write" -Mark (MArtificial "write_end") -SPure Discard -SPure Discard -Return +markA "write_end" +discard +discard +return -Mark (MArtificial "read") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 0) Copy) -MIO InputChar -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 10) -SPure (Binary Sub) -Labeled (LArtificial "read_end") (Branch EZ) -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "read") Jump +markA "read" +copyI 0 +copyI 0 +mio inputchar +load +copyI 0 +cons 10 +sub +bEZA "read_end" +discard +cons 1 +add +jumpA "read" -Mark (MArtificial "read_end") -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -SPure (Cons 0) -Store -Return +markA "read_end" +discard +cons 1 +add +cons 0 +store +return -Mark (MArtificial "newline") -SPure (Cons 10) -SPure (Cons 13) -SIO OutputChar -SIO OutputChar -Return +markA "newline" +cons 10 +cons 13 +outputCS +outputCS +return diff --git a/.output/golden/ws/il/parsed/original/helloWorld.il b/.output/golden/ws/il/parsed/original/helloWorld.il index ecdd99958..bffe7c401 100644 --- a/.output/golden/ws/il/parsed/original/helloWorld.il +++ b/.output/golden/ws/il/parsed/original/helloWorld.il @@ -1,25 +1,25 @@ -SPure (Cons 72) -SIO OutputChar -SPure (Cons 101) -SIO OutputChar -SPure (Cons 108) -SIO OutputChar -SPure (Cons 108) -SIO OutputChar -SPure (Cons 111) -SIO OutputChar -SPure (Cons 44) -SIO OutputChar -SPure (Cons 32) -SIO OutputChar -SPure (Cons 119) -SIO OutputChar -SPure (Cons 111) -SIO OutputChar -SPure (Cons 114) -SIO OutputChar -SPure (Cons 108) -SIO OutputChar -SPure (Cons 100) -SIO OutputChar -End +cons 72 +outputCS +cons 101 +outputCS +cons 108 +outputCS +cons 108 +outputCS +cons 111 +outputCS +cons 44 +outputCS +cons 32 +outputCS +cons 119 +outputCS +cons 111 +outputCS +cons 114 +outputCS +cons 108 +outputCS +cons 100 +outputCS +end diff --git a/.output/golden/ws/il/parsed/original/locTest.il b/.output/golden/ws/il/parsed/original/locTest.il index 470861ea4..2e6dace7b 100644 --- a/.output/golden/ws/il/parsed/original/locTest.il +++ b/.output/golden/ws/il/parsed/original/locTest.il @@ -1,121 +1,121 @@ -SPure (Cons 0) -SPure (Cons 69) -Store -SPure (Cons 1) -SPure (Cons 110) -Store -SPure (Cons 2) -SPure (Cons 116) -Store -SPure (Cons 3) -SPure (Cons 101) -Store -SPure (Cons 4) -SPure (Cons 114) -Store -SPure (Cons 5) -SPure (Cons 32) -Store -SPure (Cons 6) -SPure (Cons 97) -Store -SPure (Cons 7) -SPure (Cons 32) -Store -SPure (Cons 8) -SPure (Cons 110) -Store -SPure (Cons 9) -SPure (Cons 117) -Store -SPure (Cons 10) -SPure (Cons 109) -Store -SPure (Cons 11) -SPure (Cons 98) -Store -SPure (Cons 12) -SPure (Cons 101) -Store -SPure (Cons 13) -SPure (Cons 114) -Store -SPure (Cons 14) -SPure (Cons 58) -Store -SPure (Cons 15) -SPure (Cons 32) -Store -SPure (Cons 16) -SPure (Cons 0) -Store -SPure (Cons 0) -Labeled (LArtificial "write") Call -SPure (Cons 100) -MIO InputDec -SPure (Cons 0) -Labeled (LArtificial "write") Call -SPure (Cons 101) -MIO InputDec -SPure (Cons 100) -Load -SPure (Cons 101) -Load -Labeled (LArtificial "loctest") Call -SIO OutputDec -End +cons 0 +cons 69 +store +cons 1 +cons 110 +store +cons 2 +cons 116 +store +cons 3 +cons 101 +store +cons 4 +cons 114 +store +cons 5 +cons 32 +store +cons 6 +cons 97 +store +cons 7 +cons 32 +store +cons 8 +cons 110 +store +cons 9 +cons 117 +store +cons 10 +cons 109 +store +cons 11 +cons 98 +store +cons 12 +cons 101 +store +cons 13 +cons 114 +store +cons 14 +cons 58 +store +cons 15 +cons 32 +store +cons 16 +cons 0 +store +cons 0 +callA "write" +cons 100 +mio inputdec +cons 0 +callA "write" +cons 101 +mio inputdec +cons 100 +load +cons 101 +load +callA "loctest" +outputDS +end -Mark (MArtificial "loctest") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 2) Copy) -SPure (Binary Add) -SPure (Indexed (IImmediate 2) Slide) -Return +markA "loctest" +copyI 0 +copyI 2 +add +slideI 2 +return -Mark (MArtificial "add") -SPure (Binary Add) -Return +markA "add" +add +return -Mark (MArtificial "write") -SPure (Indexed (IImmediate 0) Copy) -Load -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "write_end") (Branch EZ) -SIO OutputChar -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "write") Jump +markA "write" +copyI 0 +load +copyI 0 +bEZA "write_end" +outputCS +cons 1 +add +jumpA "write" -Mark (MArtificial "write_end") -SPure Discard -SPure Discard -Return +markA "write_end" +discard +discard +return -Mark (MArtificial "read") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 0) Copy) -MIO InputChar -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 10) -SPure (Binary Sub) -Labeled (LArtificial "read_end") (Branch EZ) -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "read") Jump +markA "read" +copyI 0 +copyI 0 +mio inputchar +load +copyI 0 +cons 10 +sub +bEZA "read_end" +discard +cons 1 +add +jumpA "read" -Mark (MArtificial "read_end") -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -SPure (Cons 0) -Store -Return +markA "read_end" +discard +cons 1 +add +cons 0 +store +return -Mark (MArtificial "newline") -SPure (Cons 10) -SPure (Cons 13) -SIO OutputChar -SIO OutputChar -Return +markA "newline" +cons 10 +cons 13 +outputCS +outputCS +return diff --git a/.output/golden/ws/il/parsed/original/name.il b/.output/golden/ws/il/parsed/original/name.il index ec1c152fe..ba122db55 100644 --- a/.output/golden/ws/il/parsed/original/name.il +++ b/.output/golden/ws/il/parsed/original/name.il @@ -1,154 +1,154 @@ -SPure (Cons 0) -SPure (Cons 80) -Store -SPure (Cons 1) -SPure (Cons 108) -Store -SPure (Cons 2) -SPure (Cons 101) -Store -SPure (Cons 3) -SPure (Cons 97) -Store -SPure (Cons 4) -SPure (Cons 115) -Store -SPure (Cons 5) -SPure (Cons 101) -Store -SPure (Cons 6) -SPure (Cons 32) -Store -SPure (Cons 7) -SPure (Cons 101) -Store -SPure (Cons 8) -SPure (Cons 110) -Store -SPure (Cons 9) -SPure (Cons 116) -Store -SPure (Cons 10) -SPure (Cons 101) -Store -SPure (Cons 11) -SPure (Cons 114) -Store -SPure (Cons 12) -SPure (Cons 32) -Store -SPure (Cons 13) -SPure (Cons 121) -Store -SPure (Cons 14) -SPure (Cons 111) -Store -SPure (Cons 15) -SPure (Cons 117) -Store -SPure (Cons 16) -SPure (Cons 114) -Store -SPure (Cons 17) -SPure (Cons 32) -Store -SPure (Cons 18) -SPure (Cons 110) -Store -SPure (Cons 19) -SPure (Cons 97) -Store -SPure (Cons 20) -SPure (Cons 109) -Store -SPure (Cons 21) -SPure (Cons 101) -Store -SPure (Cons 22) -SPure (Cons 58) -Store -SPure (Cons 23) -SPure (Cons 32) -Store -SPure (Cons 24) -SPure (Cons 0) -Store -SPure (Cons 30) -SPure (Cons 72) -Store -SPure (Cons 31) -SPure (Cons 101) -Store -SPure (Cons 32) -SPure (Cons 108) -Store -SPure (Cons 33) -SPure (Cons 108) -Store -SPure (Cons 34) -SPure (Cons 111) -Store -SPure (Cons 35) -SPure (Cons 32) -Store -SPure (Cons 36) -SPure (Cons 0) -Store -SPure (Cons 0) -Labeled (LArtificial "write") Call -SPure (Cons 100) -Labeled (LArtificial "read") Call -SPure (Cons 30) -Labeled (LArtificial "write") Call -SPure (Cons 100) -Labeled (LArtificial "write") Call -Labeled (LArtificial "newline") Call -End +cons 0 +cons 80 +store +cons 1 +cons 108 +store +cons 2 +cons 101 +store +cons 3 +cons 97 +store +cons 4 +cons 115 +store +cons 5 +cons 101 +store +cons 6 +cons 32 +store +cons 7 +cons 101 +store +cons 8 +cons 110 +store +cons 9 +cons 116 +store +cons 10 +cons 101 +store +cons 11 +cons 114 +store +cons 12 +cons 32 +store +cons 13 +cons 121 +store +cons 14 +cons 111 +store +cons 15 +cons 117 +store +cons 16 +cons 114 +store +cons 17 +cons 32 +store +cons 18 +cons 110 +store +cons 19 +cons 97 +store +cons 20 +cons 109 +store +cons 21 +cons 101 +store +cons 22 +cons 58 +store +cons 23 +cons 32 +store +cons 24 +cons 0 +store +cons 30 +cons 72 +store +cons 31 +cons 101 +store +cons 32 +cons 108 +store +cons 33 +cons 108 +store +cons 34 +cons 111 +store +cons 35 +cons 32 +store +cons 36 +cons 0 +store +cons 0 +callA "write" +cons 100 +callA "read" +cons 30 +callA "write" +cons 100 +callA "write" +callA "newline" +end -Mark (MArtificial "add") -SPure (Binary Add) -Return +markA "add" +add +return -Mark (MArtificial "write") -SPure (Indexed (IImmediate 0) Copy) -Load -SPure (Indexed (IImmediate 0) Copy) -Labeled (LArtificial "write_end") (Branch EZ) -SIO OutputChar -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "write") Jump +markA "write" +copyI 0 +load +copyI 0 +bEZA "write_end" +outputCS +cons 1 +add +jumpA "write" -Mark (MArtificial "write_end") -SPure Discard -SPure Discard -Return +markA "write_end" +discard +discard +return -Mark (MArtificial "read") -SPure (Indexed (IImmediate 0) Copy) -SPure (Indexed (IImmediate 0) Copy) -MIO InputChar -Load -SPure (Indexed (IImmediate 0) Copy) -SPure (Cons 10) -SPure (Binary Sub) -Labeled (LArtificial "read_end") (Branch EZ) -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -Labeled (LArtificial "read") Jump +markA "read" +copyI 0 +copyI 0 +mio inputchar +load +copyI 0 +cons 10 +sub +bEZA "read_end" +discard +cons 1 +add +jumpA "read" -Mark (MArtificial "read_end") -SPure Discard -SPure (Cons 1) -SPure (Binary Add) -SPure (Cons 0) -Store -Return +markA "read_end" +discard +cons 1 +add +cons 0 +store +return -Mark (MArtificial "newline") -SPure (Cons 10) -SPure (Cons 13) -SIO OutputChar -SIO OutputChar -Return +markA "newline" +cons 10 +cons 13 +outputCS +outputCS +return diff --git a/.output/golden/ws/il/parsed/original/truthMachine.il b/.output/golden/ws/il/parsed/original/truthMachine.il index 2f79514c2..b8d66f29a 100644 --- a/.output/golden/ws/il/parsed/original/truthMachine.il +++ b/.output/golden/ws/il/parsed/original/truthMachine.il @@ -1,15 +1,15 @@ -SPure (Cons 0) -SPure (Indexed (IImmediate 0) Copy) -MIO InputDec -Load -Labeled (LArtificial "\NUL") (Branch EZ) +cons 0 +copyI 0 +mio inputdec +load +bEZA "\NUL" -Mark (MArtificial "\SOH") -SPure (Cons 1) -SIO OutputDec -Labeled (LArtificial "\SOH") Jump +markA "\SOH" +cons 1 +outputDS +jumpA "\SOH" -Mark (MArtificial "\NUL") -SPure (Cons 0) -SIO OutputDec -End +markA "\NUL" +cons 0 +outputDS +end diff --git a/docs/developers/CHANGELOG.md b/docs/developers/CHANGELOG.md index ec9ec3d9e..3ff0cae60 100644 --- a/docs/developers/CHANGELOG.md +++ b/docs/developers/CHANGELOG.md @@ -1,5 +1,11 @@ # 📅 Revision history for HelMA +## 0.8.4.7 -- 2023-04-16 + +* Add optimize +* Add pattern synonyms +* Add pretty printer to ASM + ## 0.8.4.6 -- 2023-04-10 * Add optimize diff --git a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automaton.Combiner.CPU.hs.html b/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automaton.Combiner.CPU.hs.html deleted file mode 100644 index 215e32697..000000000 --- a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automaton.Combiner.CPU.hs.html +++ /dev/null @@ -1,138 +0,0 @@ - -
- - - - -
-never executed always true always false
-
-- 1 module HelVM.HelMA.Automaton.Combiner.CPU where - 2 - 3 import HelVM.HelMA.Automaton.Instruction - 4 import HelVM.HelMA.Automaton.Instruction.CFInstruction - 5 - 6 import HelVM.HelMA.Automaton.Combiner.ALU - 7 - 8 import HelVM.HelIO.Containers.LLIndexSafe - 9 import HelVM.HelIO.Control.Safe - 10 - 11 import Control.Type.Operator - 12 - 13 import Data.ListLike hiding (show) - 14 import qualified Data.Vector as Vector - 15 - 16 runCFI :: (ALU m ll element , Show element) => CFInstruction -> CentralProcessingStep ll m - 17 runCFI (Mark _ ) = pure - 18 runCFI (Labeled LTop i) = topInstruction i - 19 runCFI (Labeled (LImmediate l) i) = immediateInstruction i l - 20 runCFI (Labeled (LArtificial l) i) = artificialInstruction i l - 21 runCFI Return = popAddress - 22 - 23 popAddress :: ALU m ll element => CentralProcessingMemory ll -> m $ CentralProcessingMemory ll - 24 popAddress (CPM (CM il _ (IS (a : is))) s) = pure $ CPM (CM il a $ IS is) s - 25 popAddress (CPM (CM il _ (IS [] )) _) = liftErrorWithTupleList "Empty Return Stack" [("il" , show il)] - 26 - 27 -- - 28 - 29 topInstruction :: (ALU m ll element , Show element) => LabeledOperation -> CentralProcessingStep ll m - 30 topInstruction i cpm = appendError "CPM.topInstruction" $ uncurry (immediateInstruction i) =<< cpmPop1 cpm - 31 - 32 immediateInstruction :: (ALU m ll element, DynamicLabel l) => LabeledOperation -> l -> CentralProcessingStep ll m - 33 immediateInstruction i l cpm = appendError "CPM.immediateInstruction" $ flip (labeled i) cpm =<< findAddressForNaturalLabel l (cpmProgram cpm) - 34 - 35 artificialInstruction :: ALU m ll element => LabeledOperation -> Label -> CentralProcessingStep ll m - 36 artificialInstruction i l cpm = appendError "CPM.artificialInstruction" $ flip (labeled i) cpm =<< findAddressForArtificialLabel l (cpmProgram cpm) - 37 - 38 -- - 39 - 40 findAddressForNaturalLabel :: (MonadSafe m , DynamicLabel n) => n -> InstructionVector -> m InstructionAddress --FIXME - 41 findAddressForNaturalLabel n il - 42 | n < 0 = liftError $ show n - 43 | otherwise = liftMaybeOrErrorTuple ("Undefined label", show n) $ findIndex (checkNaturalMark $ fromIntegral n) il - 44 - 45 findAddressForArtificialLabel :: MonadSafe m => Label -> InstructionVector -> m InstructionAddress - 46 findAddressForArtificialLabel l = liftMaybeOrErrorTuple ("Undefined label", show l) . findIndex (checkArtificialMark l) - 47 - 48 -- - 49 - 50 labeled :: ALU m ll element => LabeledOperation -> InstructionCounter -> CentralProcessingStep ll m - 51 labeled (Branch t) = branch t - 52 labeled Jump = jump - 53 labeled Call = call - 54 - 55 branch :: ALU m ll element => BranchTest -> InstructionCounter -> CentralProcessingStep ll m - 56 branch t ic cpm = build <$> cpmPop1 cpm where - 57 build (e , cpm') - 58 | isNotJump t e = cpm' - 59 | otherwise = doJump ic cpm' - 60 - 61 doJump :: InstructionCounter -> CentralProcessingMemory ll -> CentralProcessingMemory ll - 62 doJump ic (CPM (CM il _ is) s) = CPM (CM il ic is) s - 63 - 64 jump :: (Applicative m) => InstructionCounter -> CentralProcessingStep ll m - 65 jump a (CPM (CM il _ is) s) = pure $ CPM (CM il a is) s - 66 - 67 call :: (Applicative m) => InstructionCounter -> CentralProcessingStep ll m - 68 call a (CPM (CM il ic (IS is)) s) = pure $ CPM (CM il a (IS (ic : is))) s - 69 - 70 -- | ControlMemory methods - 71 - 72 newCM :: InstructionList -> ControlMemory - 73 newCM il = CM (Vector.fromList il) 0 (IS []) - 74 - 75 currentInstruction :: MonadSafe m => ControlMemory -> m Instruction - 76 currentInstruction (CM il ic _) = indexSafe il ic - 77 - 78 incrementPC :: ControlMemory -> ControlMemory - 79 incrementPC cu = cu { programCounter = 1 + programCounter cu } - 80 - 81 cpmProgram :: CentralProcessingMemory al -> InstructionVector - 82 cpmProgram = program . controlMemory - 83 - 84 cpmPop1 :: ALU m ll element => CentralProcessingMemory ll -> m (element , CentralProcessingMemory ll) - 85 cpmPop1 (CPM cm s) = build <$> pop1 s where - 86 build (l , s') = (l , CPM cm s') - 87 - 88 cpmPop2 :: ALU m ll element => CentralProcessingMemory ll -> m (element , element , CentralProcessingMemory ll) - 89 cpmPop2 (CPM cm s) = build <$> pop2 s where - 90 build (l1 , l2 , s') = (l1 , l2 , CPM cm s') - 91 - 92 -- | Types - 93 type DynamicLabel l = (Integral l , Show l) - 94 - 95 type CentralProcessingStep ll m = CentralProcessingMemory ll -> m $ CentralProcessingMemory ll - 96 - 97 data CentralProcessingMemory ll = CPM - 98 { controlMemory :: ControlMemory - 99 , alm :: ll - 100 } - 101 deriving stock (Show) - 102 - 103 data ControlMemory = CM - 104 { program :: InstructionVector - 105 , programCounter :: InstructionCounter - 106 , returnStack :: InstructionStack - 107 } - 108 deriving stock (Show) - 109 - 110 newtype InstructionStack = IS [InstructionAddress] - 111 deriving stock (Show) - 112 - 113 type InstructionCounter = InstructionAddress - 114 - 115 type InstructionAddress = Int - -- - diff --git a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automaton.Instruction.hs.html b/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automaton.Instruction.hs.html deleted file mode 100644 index b04f08fbe..000000000 --- a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automaton.Instruction.hs.html +++ /dev/null @@ -1,165 +0,0 @@ - - - - - - -
-never executed always true always false
-
-- 1 module HelVM.HelMA.Automaton.Instruction where - 2 - 3 import HelVM.HelMA.Automaton.Instruction.CFInstruction - 4 import HelVM.HelMA.Automaton.Instruction.IOInstruction - 5 import HelVM.HelMA.Automaton.Instruction.LSInstruction - 6 import HelVM.HelMA.Automaton.Instruction.SInstruction - 7 - 8 import Data.Vector as Vector - 9 - 10 -- | Constructors - 11 - 12 immediateBinaryI :: Integer -> BinaryOperation -> Instruction - 13 immediateBinaryI i = IAL . SPure . Unary . UImmediate i - 14 - 15 consI :: Integer -> Instruction - 16 consI = sal . Cons - 17 - 18 addI , subI , mulI , divI , modI :: Instruction - 19 addI = binary Add - 20 subI = binary Sub - 21 mulI = binary Mul - 22 divI = binary Div - 23 modI = binary Mod - 24 - 25 divModI , negI , halibutI :: Instruction - 26 divModI = binaries [Mod, Div] - 27 negI = unary Neg - 28 halibutI = sal Halibut - 29 - 30 dupI , swapI , rotI , copyTI , discardI :: Instruction - 31 dupI = copyII 0 - 32 swapI = moveII 1 - 33 rotI = moveII 2 - 34 copyTI = sal $ Indexed ITop Copy - 35 discardI = sal Discard - 36 - 37 copyII :: Index -> Instruction - 38 copyII = manipulationII Copy - 39 - 40 moveII :: Index -> Instruction - 41 moveII = manipulationII Move - 42 - 43 slideII :: Index -> Instruction - 44 slideII = manipulationII Slide - 45 - 46 manipulationII :: IndexedOperation -> Index -> Instruction - 47 manipulationII op i = sal $ Indexed (IImmediate i) op - 48 - 49 sInputI , sOutputI , sOutputDecI :: Instruction - 50 sInputI = sio InputChar - 51 sOutputI = sio OutputChar - 52 sOutputDecI = sio OutputDec - 53 - 54 binaries :: [BinaryOperation] -> Instruction - 55 binaries = sal . Binaries - 56 - 57 binary :: BinaryOperation -> Instruction - 58 binary = sal . Binary - 59 - 60 unary :: UnaryOperation -> Instruction - 61 unary = sal . Unary - 62 - 63 sal :: SPureInstruction -> Instruction - 64 sal = IAL . SPure - 65 - 66 sio :: IOInstruction -> Instruction - 67 sio = IAL . SIO - 68 - 69 markNI :: Natural -> Instruction - 70 markNI = ICF . Mark . MNatural - 71 - 72 markSI :: Label -> Instruction - 73 markSI = ICF . Mark . MArtificial - 74 - 75 jumpTI :: Instruction - 76 jumpTI = cft Jump - 77 - 78 jumpII :: Natural -> Instruction - 79 jumpII = cfi Jump - 80 - 81 callSI , jumpSI :: Label -> Instruction - 82 callSI = cfs Call - 83 jumpSI = cfs Jump - 84 - 85 bNeTI :: Instruction - 86 bNeTI = cft (Branch NE) - 87 - 88 bNeII :: Natural -> Instruction - 89 bNeII = bII NE - 90 - 91 bII :: BranchTest -> Natural -> Instruction - 92 bII t = cfi (Branch t) - 93 - 94 bEzSI , bLtzSI :: Label -> Instruction - 95 bEzSI = cfs (Branch EZ ) - 96 bLtzSI = cfs (Branch LTZ) - 97 - 98 cft :: LabeledOperation -> Instruction - 99 cft = ICF . Labeled LTop - 100 - 101 cfi :: LabeledOperation -> Natural -> Instruction - 102 cfi op n = ICF $ Labeled (LImmediate n) op - 103 - 104 cfs :: LabeledOperation -> Label -> Instruction - 105 cfs op l = ICF $ Labeled (LArtificial l) op - 106 - 107 returnI :: Instruction - 108 returnI = ICF Return - 109 - 110 storeI , loadI :: Instruction - 111 storeI = ILS Store - 112 loadI = ILS Load - 113 - 114 mInputI , mInputDecI :: Instruction - 115 mInputI = ILS (MIO InputChar) - 116 mInputDecI = ILS (MIO InputDec ) - 117 - 118 -- | Others - 119 - 120 isICF :: Instruction -> Bool - 121 isICF (ICF _) = True - 122 isICF _ = False - 123 - 124 checkNaturalMark :: Natural -> Instruction -> Bool - 125 checkNaturalMark n (ICF (Mark (MNatural n'))) = n == n' - 126 checkNaturalMark _ _ = False - 127 - 128 checkArtificialMark :: Label -> Instruction -> Bool - 129 checkArtificialMark l (ICF (Mark (MArtificial l'))) = l == l' - 130 checkArtificialMark _ _ = False - 131 - 132 -- | Types - 133 - 134 data Instruction = - 135 IAL !SInstruction - 136 | ILS !LSInstruction - 137 | ICF !CFInstruction - 138 | End - 139 deriving stock (Eq , Read , Show) - 140 - 141 type InstructionList = [Instruction] - 142 type InstructionVector = Vector Instruction - -- - diff --git a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automaton.Optimizer.PeepholeOptimizer.hs.html b/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automaton.Optimizer.PeepholeOptimizer.hs.html deleted file mode 100644 index b8423603b..000000000 --- a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automaton.Optimizer.PeepholeOptimizer.hs.html +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - -
-never executed always true always false
-
-- 1 module HelVM.HelMA.Automaton.Optimizer.PeepholeOptimizer ( - 2 peepholeOptimize1, - 3 peepholeOptimize2, - 4 peepholeOptimize3, - 5 ) where - 6 - 7 import HelVM.HelMA.Automaton.Instruction - 8 import HelVM.HelMA.Automaton.Instruction.CFInstruction - 9 import HelVM.HelMA.Automaton.Instruction.SInstruction - 10 - 11 peepholeOptimize1 :: InstructionList -> InstructionList - 12 peepholeOptimize1 (IAL (SPure (Cons i)) : IAL (SPure (Binary op)) : il) = immediateBinaryI i op : peepholeOptimize1 il - 13 peepholeOptimize1 (IAL (SPure (Cons i)) : IAL (SPure Halibut) : il) = optimizeHalibut i : peepholeOptimize1 il - 14 peepholeOptimize1 (IAL (SPure (Cons i)) : IAL (SPure Pick) : il) = optimizePick i : peepholeOptimize1 il - 15 peepholeOptimize1 (IAL (SPure (Cons c)) : IAL (SPure (Cons a)) : ICF (Labeled LTop (Branch t)) : il) = optimizeBranch t c a <> peepholeOptimize1 il - 16 peepholeOptimize1 (IAL (SPure (Cons a)) : ICF (Labeled LTop (Branch t)) : il) = optimizeBranchLabel t a <> peepholeOptimize1 il - 17 peepholeOptimize1 (i : il) = i : peepholeOptimize1 il - 18 peepholeOptimize1 [] = [] - 19 - 20 peepholeOptimize2 :: InstructionList -> InstructionList - 21 peepholeOptimize2 (IAL (SPure (Cons c)) : IAL (SPure (Indexed (IImmediate i) Move)) : ICF (Labeled LTop (Branch t)) : il) = optimizeBranchCondition i t c <> peepholeOptimize2 il - 22 peepholeOptimize2 (i : il) = i : peepholeOptimize2 il - 23 peepholeOptimize2 [] = [] - 24 - 25 peepholeOptimize3 :: InstructionList -> InstructionList - 26 peepholeOptimize3 (j@(ICF (Labeled _ Jump)) : il) = optimizeDeadCode j il - 27 peepholeOptimize3 (i : il) = i : peepholeOptimize3 il - 28 peepholeOptimize3 [] = [] - 29 - 30 optimizeDeadCode :: Instruction -> InstructionList -> InstructionList - 31 optimizeDeadCode j (i@(ICF (Mark _)) : il) = j : i : peepholeOptimize3 il - 32 optimizeDeadCode j ( _ : il) = peepholeOptimize3 (j : il) - 33 optimizeDeadCode j [] = [j] - 34 - 35 optimizeHalibut :: Integer -> Instruction - 36 optimizeHalibut i - 37 | 0 < i = moveII $ fromIntegral i - 38 | otherwise = copyII $ fromIntegral $ negate i - 39 - 40 optimizePick :: Integer -> Instruction - 41 optimizePick i - 42 | 0 <= i = copyII $ fromIntegral i - 43 | otherwise = moveII $ fromIntegral $ negate i - 44 - 45 optimizeBranch :: BranchTest -> Integer -> Integer -> InstructionList - 46 optimizeBranch t c a = check $ isJump t c where - 47 check True = [jumpII $ fromIntegral a] - 48 check _ = [] - 49 - 50 optimizeBranchLabel :: BranchTest -> Integer -> InstructionList - 51 optimizeBranchLabel t a = [bII t $ fromIntegral a] - 52 - 53 optimizeBranchCondition :: Index -> BranchTest -> Integer -> InstructionList - 54 optimizeBranchCondition 1 t c = optimizeBranchCondition1 t c - 55 optimizeBranchCondition i t c = check $ isJump t c where - 56 check True = [moveII1 , jumpTI] - 57 check _ = [moveII1 , discardI] - 58 moveII1 = moveII (i - 1) - 59 - 60 optimizeBranchCondition1 :: BranchTest -> Integer -> InstructionList - 61 optimizeBranchCondition1 t c = check $ isJump t c where - 62 check True = [jumpTI] - 63 check _ = [discardI] - -- - diff --git a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automaton.PrettyPrinter.hs.html b/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automaton.PrettyPrinter.hs.html deleted file mode 100644 index d44dcbd8a..000000000 --- a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automaton.PrettyPrinter.hs.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - -
-never executed always true always false
-
-- 1 module HelVM.HelMA.Automaton.PrettyPrinter where - 2 - 3 import HelVM.HelMA.Automaton.Instruction - 4 - 5 import HelVM.HelMA.Automaton.Instruction.CFInstruction - 6 - 7 printIL :: InstructionList -> Text - 8 printIL il = unlines $ printI <$> il - 9 - 10 printI :: Instruction -> Text - 11 printI (IAL i) = show i - 12 printI (ILS i) = show i - 13 printI (ICF i) = printCF i - 14 printI End = show End - 15 - 16 printCF :: CFInstruction -> Text - 17 printCF i@(Mark _) = "\n" <> show i - 18 printCF i = show i - -- - diff --git a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.API.BFType.hs.html b/docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.API.BFType.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.API.BFType.hs.html rename to docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.API.BFType.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction.hs.html b/docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction.hs.html rename to docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Common.Symbol.hs.html b/docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Common.Symbol.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Common.Symbol.hs.html rename to docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Common.Symbol.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols.hs.html b/docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols.hs.html rename to docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Evaluator.hs.html b/docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Evaluator.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Evaluator.hs.html rename to docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Evaluator.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Evaluator.hs.html b/docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Evaluator.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Evaluator.hs.html rename to docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Evaluator.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction.hs.html b/docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction.hs.html rename to docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Optimizer.hs.html b/docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Optimizer.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Optimizer.hs.html rename to docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Optimizer.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser.hs.html b/docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser.hs.html rename to docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Evaluator.hs.html b/docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Evaluator.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Evaluator.hs.html rename to docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Evaluator.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction.hs.html b/docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction.hs.html rename to docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser.hs.html b/docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser.hs.html rename to docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions.hs.html b/docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions.hs.html rename to docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Evaluator.hs.html b/docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Evaluator.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Evaluator.hs.html rename to docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Evaluator.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction.hs.html b/docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction.hs.html rename to docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser.hs.html b/docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser.hs.html rename to docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.Cat.Evaluator.hs.html b/docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.Cat.Evaluator.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.Cat.Evaluator.hs.html rename to docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.Cat.Evaluator.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.ETA.API.ETAImplType.hs.html b/docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.ETA.API.ETAImplType.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.ETA.API.ETAImplType.hs.html rename to docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.ETA.API.ETAImplType.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.ETA.Addressing.hs.html b/docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.ETA.Addressing.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.ETA.Addressing.hs.html rename to docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.ETA.Addressing.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.ETA.Automaton.hs.html b/docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.ETA.Automaton.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.ETA.Automaton.hs.html rename to docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.ETA.Automaton.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.ETA.Evaluator.hs.html b/docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.ETA.Evaluator.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.ETA.Evaluator.hs.html rename to docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.ETA.Evaluator.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.ETA.Lexer.hs.html b/docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.ETA.Lexer.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.ETA.Lexer.hs.html rename to docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.ETA.Lexer.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.ETA.OperandParsers.hs.html b/docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.ETA.OperandParsers.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.ETA.OperandParsers.hs.html rename to docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.ETA.OperandParsers.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.ETA.Optimizer.hs.html b/docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.ETA.Optimizer.hs.html similarity index 63% rename from docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.ETA.Optimizer.hs.html rename to docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.ETA.Optimizer.hs.html index 31725a767..598931dcb 100644 --- a/docs/reports/helma-test/helma-0.8.4.6-inplace/HelVM.HelMA.Automata.ETA.Optimizer.hs.html +++ b/docs/reports/helma-test/helma-0.8.4.7-inplace/HelVM.HelMA.Automata.ETA.Optimizer.hs.html @@ -26,109 +26,110 @@ 7 import HelVM.HelMA.Automata.ETA.Token 8 9 import HelVM.HelMA.Automaton.Instruction - 10 - 11 import HelVM.HelIO.Control.Safe - 12 - 13 import Control.Applicative.Tools - 14 - 15 import Data.List.Extra - 16 import qualified Data.List.Index as List - 17 - 18 import qualified Data.ListLike as LL - 19 - 20 optimize :: MonadSafe m => TokenList -> m InstructionList - 21 optimize = appendEnd <.> join <.> optimizeLines - 22 - 23 appendEnd :: InstructionList -> InstructionList - 24 appendEnd l = l <> [markNI 0 , End] - 25 - 26 optimizeLines :: MonadSafe m => TokenList -> m [InstructionList] - 27 optimizeLines = sequence . optimizeLineInit <.> lineFromTuple2 <.> splitOnRAndIndex2 - 28 - 29 splitOnRAndIndex2 :: TokenList -> [(Natural, [TokenList])] - 30 splitOnRAndIndex2 = indexedByNaturalWithOffset 1 <.> List.indexed . filterNull . tails . splitOn [R] - 31 - 32 indexedByNaturalWithOffset :: Int -> (Int , a) -> (Natural , a) - 33 indexedByNaturalWithOffset offset (i , a) = (fromIntegral (i + offset) , a) - 34 - 35 optimizeLineInit :: MonadSafe m => Line -> m InstructionList - 36 optimizeLineInit line = (markNI (currentAddress line) : ) <$> optimizeLineTail line - 37 - 38 optimizeLineTail:: MonadSafe m => Line -> m InstructionList - 39 optimizeLineTail line = check (currentTL line) where - 40 check (t : tl) = optimizeLineForToken t $ line { currentTL = tl } - 41 check [] = pure [] - 42 - 43 optimizeLineForToken :: MonadSafe m => Token -> Line -> m InstructionList - 44 optimizeLineForToken O = (sOutputI : ) <.> optimizeLineTail - 45 optimizeLineForToken I = (sInputI : ) <.> optimizeLineTail - 46 - 47 optimizeLineForToken S = (subI : ) <.> optimizeLineTail - 48 optimizeLineForToken E = prependDivMod - 49 - 50 optimizeLineForToken H = (halibutI : ) <.> optimizeLineTail - 51 optimizeLineForToken T = (bNeTI : ) <.> optimizeLineTail - 52 - 53 optimizeLineForToken A = prependAddress - 54 optimizeLineForToken N = prependNumber - 55 - 56 optimizeLineForToken R = optimizeLineTail - 57 - 58 prependDivMod :: MonadSafe m => Line -> m InstructionList - 59 prependDivMod line = check $ numberFlag line where - 60 check False = prependDivModSimple line - 61 check True = prependStaticMakr line <.> optimizeLineTail $ line {numberFlag = False} - 62 - 63 prependStaticMakr :: Line -> InstructionList -> InstructionList - 64 prependStaticMakr line il = divModI : markSI (show $ currentAddress line) : il - 65 - 66 prependDivModSimple :: MonadSafe m => Line -> m InstructionList - 67 prependDivModSimple = (divModI : ) <.> optimizeLineTail - 68 - 69 prependAddress :: MonadSafe m => Line -> m InstructionList - 70 prependAddress line = ((consI $ fromIntegral $ nextAddress line) : ) <$> optimizeLineTail line - 71 - 72 prependNumber :: MonadSafe m => Line -> m InstructionList - 73 prependNumber line = flip buildNumber line =<< parseNumberFromTLL (currentTL line , nextTLL line) - 74 - 75 buildNumber :: MonadSafe m => (Integer , (TokenList , [TokenList])) -> Line -> m InstructionList - 76 buildNumber (n , (tl , ttl) ) line = build (LL.length (nextTLL line) - LL.length ttl) where - 77 build 0 = (consI n :) <$> optimizeLineTail (line {currentTL = tl}) - 78 build offset = pure [consI n , jumpSI $ show $ currentAddress line + fromIntegral offset] - 79 - 80 -- | Accessors - 81 - 82 nextAddress :: Line -> Natural - 83 nextAddress line = currentAddress line + 1 - 84 - 85 -- | Constructors - 86 - 87 lineFromTuple2 :: (Natural, [TokenList]) -> Line - 88 lineFromTuple2 (a, []) = Line - 89 { currentAddress = a - 90 , currentTL = [] - 91 , nextTLL = [] - 92 , numberFlag = True - 93 } - 94 lineFromTuple2 (a, l : ls) = Line - 95 { currentAddress = a - 96 , currentTL = l - 97 , nextTLL = ls - 98 , numberFlag = True - 99 } - 100 - 101 data Line = Line - 102 { currentTL :: TokenList - 103 , currentAddress :: Natural - 104 , numberFlag :: Bool - 105 , nextTLL :: [TokenList] - 106 } - 107 - 108 --consM :: Functor f => a -> f [a] -> f [a] - 109 --consM a l = (a : ) <$> l - 110 - 111 filterNull :: [[a]] -> [[a]] - 112 filterNull = filter notNull + 10 import HelVM.HelMA.Automaton.Instruction.Extras.Constructors + 11 + 12 import HelVM.HelIO.Control.Safe + 13 + 14 import Control.Applicative.Tools + 15 + 16 import Data.List.Extra + 17 import qualified Data.List.Index as List + 18 + 19 import qualified Data.ListLike as LL + 20 + 21 optimize :: MonadSafe m => TokenList -> m InstructionList + 22 optimize = appendEnd <.> join <.> optimizeLines + 23 + 24 appendEnd :: InstructionList -> InstructionList + 25 appendEnd l = l <> [markNI 0 , End] + 26 + 27 optimizeLines :: MonadSafe m => TokenList -> m [InstructionList] + 28 optimizeLines = sequence . optimizeLineInit <.> lineFromTuple2 <.> splitOnRAndIndex2 + 29 + 30 splitOnRAndIndex2 :: TokenList -> [(Natural, [TokenList])] + 31 splitOnRAndIndex2 = indexedByNaturalWithOffset 1 <.> List.indexed . filterNull . tails . splitOn [R] + 32 + 33 indexedByNaturalWithOffset :: Int -> (Int , a) -> (Natural , a) + 34 indexedByNaturalWithOffset offset (i , a) = (fromIntegral (i + offset) , a) + 35 + 36 optimizeLineInit :: MonadSafe m => Line -> m InstructionList + 37 optimizeLineInit line = (markNI (currentAddress line) : ) <$> optimizeLineTail line + 38 + 39 optimizeLineTail:: MonadSafe m => Line -> m InstructionList + 40 optimizeLineTail line = check (currentTL line) where + 41 check (t : tl) = optimizeLineForToken t $ line { currentTL = tl } + 42 check [] = pure [] + 43 + 44 optimizeLineForToken :: MonadSafe m => Token -> Line -> m InstructionList + 45 optimizeLineForToken O = (sOutputI : ) <.> optimizeLineTail + 46 optimizeLineForToken I = (sInputI : ) <.> optimizeLineTail + 47 + 48 optimizeLineForToken S = (subI : ) <.> optimizeLineTail + 49 optimizeLineForToken E = prependDivMod + 50 + 51 optimizeLineForToken H = (halibutI : ) <.> optimizeLineTail + 52 optimizeLineForToken T = (bNeTI : ) <.> optimizeLineTail + 53 + 54 optimizeLineForToken A = prependAddress + 55 optimizeLineForToken N = prependNumber + 56 + 57 optimizeLineForToken R = optimizeLineTail + 58 + 59 prependDivMod :: MonadSafe m => Line -> m InstructionList + 60 prependDivMod line = check $ numberFlag line where + 61 check False = prependDivModSimple line + 62 check True = prependStaticMakr line <.> optimizeLineTail $ line {numberFlag = False} + 63 + 64 prependStaticMakr :: Line -> InstructionList -> InstructionList + 65 prependStaticMakr line il = divModI : markSI (show $ currentAddress line) : il + 66 + 67 prependDivModSimple :: MonadSafe m => Line -> m InstructionList + 68 prependDivModSimple = (divModI : ) <.> optimizeLineTail + 69 + 70 prependAddress :: MonadSafe m => Line -> m InstructionList + 71 prependAddress line = ((consI $ fromIntegral $ nextAddress line) : ) <$> optimizeLineTail line + 72 + 73 prependNumber :: MonadSafe m => Line -> m InstructionList + 74 prependNumber line = flip buildNumber line =<< parseNumberFromTLL (currentTL line , nextTLL line) + 75 + 76 buildNumber :: MonadSafe m => (Integer , (TokenList , [TokenList])) -> Line -> m InstructionList + 77 buildNumber (n , (tl , ttl) ) line = build (LL.length (nextTLL line) - LL.length ttl) where + 78 build 0 = (consI n :) <$> optimizeLineTail (line {currentTL = tl}) + 79 build offset = pure [consI n , jumpSI $ show $ currentAddress line + fromIntegral offset] + 80 + 81 -- | Accessors + 82 + 83 nextAddress :: Line -> Natural + 84 nextAddress line = currentAddress line + 1 + 85 + 86 -- | Constructors + 87 + 88 lineFromTuple2 :: (Natural, [TokenList]) -> Line + 89 lineFromTuple2 (a, []) = Line + 90 { currentAddress = a + 91 , currentTL = [] + 92 , nextTLL = [] + 93 , numberFlag = True + 94 } + 95 lineFromTuple2 (a, l : ls) = Line + 96 { currentAddress = a + 97 , currentTL = l + 98 , nextTLL = ls + 99 , numberFlag = True + 100 } + 101 + 102 data Line = Line + 103 { currentTL :: TokenList + 104 , currentAddress :: Natural + 105 , numberFlag :: Bool + 106 , nextTLL :: [TokenList] + 107 } + 108 + 109 --consM :: Functor f => a -> f [a] -> f [a] + 110 --consM a l = (a : ) <$> l + 111 + 112 filterNull :: [[a]] -> [[a]] + 113 filterNull = filter notNull