From ae79855834d88dde7bf397fcb03850bb1d0a03ab Mon Sep 17 00:00:00 2001 From: Kamil Adam Date: Mon, 13 Feb 2023 19:05:26 +0100 Subject: [PATCH] Add optimizer for Stack Automaton --- .../logged/FastType/Int16Type/99botles.logged | 6 +- .../Int16Type/fascistHelloWorld.logged | 6 +- .../FastType/Int16Type/helloWorld.logged | 6 +- .../logged/FastType/Int16Type/triangle.logged | 6 +- .../logged/FastType/Int8Type/99botles.logged | 6 +- .../Int8Type/fascistHelloWorld.logged | 6 +- .../logged/FastType/Int8Type/fibonacci.logged | 6 +- .../FastType/Int8Type/helloWorld.logged | 6 +- .../FastType/Int8Type/padHelloWorld.logged | 6 +- .../Int8Type/theShortestHelloWorld.logged | 6 +- .../logged/FastType/Int8Type/triangle.logged | 6 +- .../logged/FastType/Int8Type/value256.logged | 6 +- .../FastType/Word16Type/99botles.logged | 6 +- .../Word16Type/fascistHelloWorld.logged | 6 +- .../FastType/Word16Type/helloWorld.logged | 6 +- .../FastType/Word16Type/triangle.logged | 6 +- .../logged/FastType/Word8Type/99botles.logged | 6 +- .../Word8Type/fascistHelloWorld.logged | 6 +- .../FastType/Word8Type/fibonacci.logged | 6 +- .../FastType/Word8Type/helloWorld.logged | 6 +- .../FastType/Word8Type/padHelloWorld.logged | 6 +- .../Word8Type/theShortestHelloWorld.logged | 6 +- .../logged/FastType/Word8Type/triangle.logged | 6 +- .../logged/FastType/Word8Type/value256.logged | 6 +- .../logged/Fast/False/from-eas/bottles.logged | 623 +++++++---- .../logged/Fast/False/from-eas/divmod.logged | 22 +- .../Fast/False/from-eas/fact0\n.logged" | 612 +++++++---- .../Fast/False/from-eas/fact1\n.logged" | 612 +++++++---- .../Fast/False/from-eas/fact2\n.logged" | 612 +++++++---- .../Fast/False/from-eas/fact3\n.logged" | 612 +++++++---- .../Fast/False/from-eas/fact4\n.logged" | 612 +++++++---- .../Fast/False/from-eas/fact5\n.logged" | 612 +++++++---- .../Fast/False/from-eas/fact6\n.logged" | 612 +++++++---- .../Fast/False/from-eas/fact7\n.logged" | 612 +++++++---- .../Fast/False/from-eas/fact8\n.logged" | 612 +++++++---- .../Fast/False/from-eas/fact9\n.logged" | 612 +++++++---- .../logged/Fast/False/from-eas/hello.logged | 64 +- .../logged/Fast/False/from-eas/hello2.logged | 131 ++- .../logged/Fast/False/from-eas/hello3.logged | 131 ++- .../logged/Fast/False/from-eas/hello4.logged | 131 ++- .../Fast/False/from-eas/readcharA.logged | 8 +- .../Fast/False/from-eas/readnum0\n.logged" | 312 ++++-- .../Fast/False/from-eas/readnum1\n.logged" | 312 ++++-- .../logged/Fast/False/from-eas/true.logged | 8 +- .../logged/Fast/False/original/bottles.logged | 876 +++++++++++----- .../logged/Fast/False/original/crlf.logged | 92 +- .../Fast/False/original/fact1\n.logged" | 619 +++++++---- .../Fast/False/original/fact2\n.logged" | 619 +++++++---- .../Fast/False/original/fact3\n.logged" | 619 +++++++---- .../Fast/False/original/fact4\n.logged" | 619 +++++++---- .../Fast/False/original/fact5\n.logged" | 619 +++++++---- .../Fast/False/original/fact6\n.logged" | 619 +++++++---- .../Fast/False/original/fact7\n.logged" | 619 +++++++---- .../Fast/False/original/fact8\n.logged" | 619 +++++++---- .../logged/Fast/False/original/hello.logged | 136 ++- .../logged/Fast/False/original/hello2.logged | 177 +++- .../logged/Fast/True/original/bottles.logged | 876 +++++++++++----- .../logged/Fast/True/original/fact1\n.logged" | 619 +++++++---- .../logged/Fast/True/original/fact2\n.logged" | 619 +++++++---- .../logged/Fast/True/original/fact3\n.logged" | 619 +++++++---- .../logged/Fast/True/original/fact4\n.logged" | 619 +++++++---- .../logged/Fast/True/original/fact5\n.logged" | 619 +++++++---- .../logged/Fast/True/original/fact6\n.logged" | 619 +++++++---- .../logged/Fast/True/original/fact7\n.logged" | 619 +++++++---- .../logged/Fast/True/original/fact8\n.logged" | 619 +++++++---- .../eval/logged/Fast/from-eas/bottles.logged | 446 -------- .../eval/logged/Fast/from-eas/divmod.logged | 30 - .../eval/logged/Fast/from-eas/fact0\n.logged" | 508 --------- .../eval/logged/Fast/from-eas/fact1\n.logged" | 508 --------- .../eval/logged/Fast/from-eas/fact2\n.logged" | 508 --------- .../eval/logged/Fast/from-eas/fact3\n.logged" | 508 --------- .../eval/logged/Fast/from-eas/fact4\n.logged" | 508 --------- .../eval/logged/Fast/from-eas/fact5\n.logged" | 508 --------- .../eval/logged/Fast/from-eas/fact6\n.logged" | 508 --------- .../eval/logged/Fast/from-eas/fact7\n.logged" | 508 --------- .../eval/logged/Fast/from-eas/fact8\n.logged" | 508 --------- .../eval/logged/Fast/from-eas/fact9\n.logged" | 508 --------- .../eval/logged/Fast/from-eas/hello.logged | 67 -- .../eval/logged/Fast/from-eas/hello2.logged | 101 -- .../eval/logged/Fast/from-eas/hello3.logged | 101 -- .../eval/logged/Fast/from-eas/hello4.logged | 101 -- .../logged/Fast/from-eas/readcharA.logged | 16 - .../logged/Fast/from-eas/readnum0\n.logged" | 255 ----- .../logged/Fast/from-eas/readnum1\n.logged" | 255 ----- .../eta/eval/logged/Fast/from-eas/true.logged | 13 - .../eval/logged/Fast/original/bottles.logged | 640 ------------ .../eta/eval/logged/Fast/original/crlf.logged | 80 -- .../eval/logged/Fast/original/fact1\n.logged" | 505 --------- .../eval/logged/Fast/original/fact2\n.logged" | 505 --------- .../eval/logged/Fast/original/fact3\n.logged" | 505 --------- .../eval/logged/Fast/original/fact4\n.logged" | 505 --------- .../eval/logged/Fast/original/fact5\n.logged" | 505 --------- .../eval/logged/Fast/original/fact6\n.logged" | 505 --------- .../eval/logged/Fast/original/fact7\n.logged" | 505 --------- .../eval/logged/Fast/original/fact8\n.logged" | 505 --------- .../eval/logged/Fast/original/hello.logged | 133 --- .../eval/logged/Fast/original/hello2.logged | 129 --- .../Original/False/from-eas/bottles.logged | 6 +- .../Original/False/from-eas/divmod.logged | 6 +- .../Original/False/from-eas/fact0\n.logged" | 6 +- .../Original/False/from-eas/fact1\n.logged" | 6 +- .../Original/False/from-eas/fact2\n.logged" | 6 +- .../Original/False/from-eas/fact3\n.logged" | 6 +- .../Original/False/from-eas/fact4\n.logged" | 6 +- .../Original/False/from-eas/fact5\n.logged" | 6 +- .../Original/False/from-eas/fact6\n.logged" | 6 +- .../Original/False/from-eas/fact7\n.logged" | 6 +- .../Original/False/from-eas/fact8\n.logged" | 6 +- .../Original/False/from-eas/fact9\n.logged" | 6 +- .../Original/False/from-eas/hello.logged | 6 +- .../Original/False/from-eas/hello2.logged | 6 +- .../Original/False/from-eas/hello3.logged | 6 +- .../Original/False/from-eas/hello4.logged | 6 +- .../Original/False/from-eas/readcharA.logged | 6 +- .../False/from-eas/readnum0\n.logged" | 6 +- .../False/from-eas/readnum1\n.logged" | 6 +- .../Original/False/from-eas/true.logged | 6 +- .../Original/False/original/crlf.logged | 6 +- .../Original/False/original/hello.logged | 6 +- .../Original/False/original/hello2.logged | 6 +- .../logged/Original/from-eas/bottles.logged | 613 ----------- .../logged/Original/from-eas/divmod.logged | 19 - .../logged/Original/from-eas/fact0\n.logged" | 533 ---------- .../logged/Original/from-eas/fact1\n.logged" | 533 ---------- .../logged/Original/from-eas/fact2\n.logged" | 533 ---------- .../logged/Original/from-eas/fact3\n.logged" | 533 ---------- .../logged/Original/from-eas/fact4\n.logged" | 533 ---------- .../logged/Original/from-eas/fact5\n.logged" | 533 ---------- .../logged/Original/from-eas/fact6\n.logged" | 533 ---------- .../logged/Original/from-eas/fact7\n.logged" | 533 ---------- .../logged/Original/from-eas/fact8\n.logged" | 533 ---------- .../logged/Original/from-eas/fact9\n.logged" | 533 ---------- .../logged/Original/from-eas/hello.logged | 94 -- .../logged/Original/from-eas/hello2.logged | 132 --- .../logged/Original/from-eas/hello3.logged | 132 --- .../logged/Original/from-eas/hello4.logged | 132 --- .../logged/Original/from-eas/readcharA.logged | 10 - .../Original/from-eas/readnum0\n.logged" | 268 ----- .../Original/from-eas/readnum1\n.logged" | 268 ----- .../eval/logged/Original/from-eas/true.logged | 7 - .../eval/logged/Original/original/crlf.logged | 112 -- .../logged/Original/original/hello.logged | 125 --- .../logged/Original/original/hello2.logged | 157 --- .../eval/output/Fast/from-eas/bottles.output | 12 - .../eval/output/Fast/from-eas/divmod.output | 0 .../eval/output/Fast/from-eas/fact0\n.output" | 0 .../eval/output/Fast/from-eas/fact1\n.output" | 0 .../eval/output/Fast/from-eas/fact2\n.output" | 0 .../eval/output/Fast/from-eas/fact3\n.output" | 0 .../eval/output/Fast/from-eas/fact4\n.output" | 0 .../eval/output/Fast/from-eas/fact5\n.output" | 0 .../eval/output/Fast/from-eas/fact6\n.output" | 0 .../eval/output/Fast/from-eas/fact7\n.output" | 0 .../eval/output/Fast/from-eas/fact8\n.output" | 0 .../eval/output/Fast/from-eas/fact9\n.output" | 0 .../eval/output/Fast/from-eas/hello.output | 1 - .../eval/output/Fast/from-eas/hello2.output | 1 - .../eval/output/Fast/from-eas/hello3.output | 1 - .../eval/output/Fast/from-eas/hello4.output | 1 - .../output/Fast/from-eas/readcharA.output | 0 .../output/Fast/from-eas/readnum0\n.output" | 0 .../output/Fast/from-eas/readnum1\n.output" | 0 .../eta/eval/output/Fast/from-eas/true.output | 0 .../eval/output/Fast/original/bottles.output | 396 ------- .../eta/eval/output/Fast/original/crlf.output | 1 - .../eval/output/Fast/original/fact1\n.output" | 1 - .../eval/output/Fast/original/fact2\n.output" | 1 - .../eval/output/Fast/original/fact3\n.output" | 1 - .../eval/output/Fast/original/fact4\n.output" | 1 - .../eval/output/Fast/original/fact5\n.output" | 1 - .../eval/output/Fast/original/fact6\n.output" | 1 - .../eval/output/Fast/original/fact7\n.output" | 1 - .../eval/output/Fast/original/fact8\n.output" | 1 - .../eval/output/Fast/original/hello.output | 1 - .../eval/output/Fast/original/hello2.output | 1 - .../output/Original/from-eas/bottles.output | 12 - .../output/Original/from-eas/divmod.output | 0 .../output/Original/from-eas/fact0\n.output" | 0 .../output/Original/from-eas/fact1\n.output" | 0 .../output/Original/from-eas/fact2\n.output" | 0 .../output/Original/from-eas/fact3\n.output" | 0 .../output/Original/from-eas/fact4\n.output" | 0 .../output/Original/from-eas/fact5\n.output" | 0 .../output/Original/from-eas/fact6\n.output" | 0 .../output/Original/from-eas/fact7\n.output" | 0 .../output/Original/from-eas/fact8\n.output" | 0 .../output/Original/from-eas/fact9\n.output" | 0 .../output/Original/from-eas/hello.output | 1 - .../output/Original/from-eas/hello2.output | 1 - .../output/Original/from-eas/hello3.output | 1 - .../output/Original/from-eas/hello4.output | 1 - .../output/Original/from-eas/readcharA.output | 0 .../Original/from-eas/readnum0\n.output" | 0 .../Original/from-eas/readnum1\n.output" | 0 .../eval/output/Original/from-eas/true.output | 0 .../eval/output/Original/original/crlf.output | 1 - .../output/Original/original/hello.output | 1 - .../output/Original/original/hello2.output | 1 - .../eta/il/optimized/from-eas/bottles.il | 692 +++++++++++++ .../eta/il/optimized/from-eas/euclid.il | 113 ++ .../actual/eta/il/optimized/from-eas/fact.il | 688 +++++++++++++ .../eta/il/optimized/from-eas/function.il | 55 + .../actual/eta/il/optimized/from-eas/hello.il | 86 ++ .../eta/il/optimized/from-eas/hello2.il | 141 +++ .../eta/il/optimized/from-eas/hello3.il | 141 +++ .../eta/il/optimized/from-eas/hello4.il | 141 +++ .../eta/il/optimized/from-eas/multiply.il | 140 +++ .../actual/eta/il/optimized/from-eas/pip.il | 68 ++ .../actual/eta/il/optimized/from-eas/pip2.il | 56 + .../eta/il/optimized/from-eas/readnum.il | 344 +++++++ .../eta/il/optimized/from-eas/reverse.il | 100 ++ .../actual/eta/il/optimized/from-eas/true.il | 4 + .../eta/il/optimized/from-eas/writenum.il | 192 ++++ .../eta/il/optimized/from-eas/writestr.il | 53 + .../eta/il/optimized/original/bottles.il | 971 ++++++++++++++++++ .../actual/eta/il/optimized/original/crlf.il | 113 ++ .../actual/eta/il/optimized/original/fact.il | 697 +++++++++++++ .../actual/eta/il/optimized/original/hello.il | 168 +++ .../eta/il/optimized/original/hello2.il | 187 ++++ .../actual/eta/il/optimized/original/pip.il | 68 ++ .../actual/eta/il/optimized/original/pip2.il | 56 + .../actual/eta/il/parsed/from-eas/bottles.il | 641 ++++++++---- .../actual/eta/il/parsed/from-eas/euclid.il | 105 +- .output/actual/eta/il/parsed/from-eas/fact.il | 666 ++++++++---- .../actual/eta/il/parsed/from-eas/function.il | 38 +- .../actual/eta/il/parsed/from-eas/hello.il | 56 +- .../actual/eta/il/parsed/from-eas/hello2.il | 131 ++- .../actual/eta/il/parsed/from-eas/hello3.il | 131 ++- .../actual/eta/il/parsed/from-eas/hello4.il | 131 ++- .../actual/eta/il/parsed/from-eas/multiply.il | 132 ++- .output/actual/eta/il/parsed/from-eas/pip.il | 50 +- .output/actual/eta/il/parsed/from-eas/pip2.il | 50 +- .../actual/eta/il/parsed/from-eas/readnum.il | 328 ++++-- .../actual/eta/il/parsed/from-eas/reverse.il | 109 +- .../actual/eta/il/parsed/from-eas/writenum.il | 198 ++-- .../actual/eta/il/parsed/from-eas/writestr.il | 51 +- .../actual/eta/il/parsed/original/bottles.il | 901 +++++++++++----- .output/actual/eta/il/parsed/original/crlf.il | 84 +- .output/actual/eta/il/parsed/original/fact.il | 663 ++++++++---- .../actual/eta/il/parsed/original/hello.il | 130 ++- .../actual/eta/il/parsed/original/hello2.il | 177 +++- .output/actual/eta/il/parsed/original/pip.il | 50 +- .output/actual/eta/il/parsed/original/pip2.il | 50 +- .output/actual/f/il/helma/add.il | 24 +- .output/actual/f/il/helma/copy.il | 20 +- .output/actual/f/il/helma/factorial.il | 52 +- .output/actual/f/il/helma/primeNumber.il | 111 +- .output/actual/f/il/other/benHoyt/bin2f.il | 15 +- .output/actual/f/il/other/benHoyt/fac.il | 71 +- .output/actual/f/il/other/iliiliiliili/sum.il | 4 +- .../actual/f/il/other/morphett/factorial.il | 55 +- .../actual/f/il/other/morphett/factorial2.il | 60 +- .output/actual/f/il/other/morphett/reverse.il | 23 +- .../actual/f/il/other/thunderseethe/prog.il | 61 +- .../il/strlen/contrib/Ben_Schaeffer/detab.il | 39 +- .../contrib/Ben_Schaeffer/postfix_while.il | 88 +- .../strlen/contrib/Eelko_de_Vos/chkbrack.il | 212 +++- .../il/strlen/contrib/Eelko_de_Vos/countwl.il | 148 ++- .../il/strlen/contrib/Eelko_de_Vos/crunch.il | 36 +- .../strlen/contrib/Eelko_de_Vos/decrunch.il | 68 +- .../il/strlen/contrib/Eelko_de_Vos/depack.il | 24 +- .../strlen/contrib/Eelko_de_Vos/readable.il | 8 +- .../il/strlen/contrib/Eelko_de_Vos/remcom.il | 56 +- .../f/il/strlen/contrib/Eelko_de_Vos/split.il | 44 +- .../strlen/contrib/Herb_Wollman/Fibonacci.il | 12 +- .../contrib/Marcel_van_Kervinck/queens.il | 267 +++-- .../strlen/contrib/Marcel_van_Kervinck/tic.il | 211 +++- .../strlen/contrib/Peter_Bengtsson/DoASC.il | 171 ++- .../strlen/contrib/Steinar_Knutsen/htmlcol.il | 115 ++- .../strlen/contrib/Steinar_Knutsen/passwdc.il | 20 +- .../strlen/contrib/Thomas_Fischbacher/life.il | 109 +- .output/actual/f/il/strlen/contrib/self.il | 20 +- .output/actual/f/il/strlen/examples/addcr.il | 40 +- .output/actual/f/il/strlen/examples/arg.il | 44 +- .../actual/f/il/strlen/examples/argtest.il | 24 +- .output/actual/f/il/strlen/examples/lambda.il | 67 +- .output/actual/f/il/strlen/examples/prime.il | 135 ++- .output/actual/f/il/strlen/examples/strip.il | 43 +- .output/actual/f/il/strlen/inline/copy.il | 20 +- .../actual/f/il/strlen/inline/factorial.il | 52 +- .../actual/f/il/strlen/inline/primeNumber.il | 111 +- .../sq/eval/logged/esolangs/helloWorld.logged | 4 +- .output/actual/sq/eval/logged/hello.logged | 4 +- .../actual/sq/eval/logged/longHello.logged | 4 +- .../sq/eval/logged/mazonka/factorial.logged | 4 +- .../sq/eval/logged/mazonka/helloWorld.logged | 4 +- .../actual/sq/eval/logged/mazonka/hi.logged | 4 +- .../stn/asciiOff/from-wsa/bottles.logged | 477 ++++++--- .../logged/stn/asciiOff/from-wsa/hello.logged | 64 +- .../stn/asciiOff/from-wsa/hello2.logged | 78 +- .../stn/asciiOff/from-wsa/hello4.logged | 74 +- .../logged/stn/asciiOff/from-wsa/prim.logged | 294 ++++-- .../logged/stn/asciiOff/from-wsa/true.logged | 8 +- .../stn/asciiOff/original/calc-1\n.logged" | 589 ++++++++--- .../logged/stn/asciiOff/original/count.logged | 111 +- .../stn/asciiOff/original/fact10\n.logged" | 303 ++++-- .../stn/asciiOff/original/hWorld.logged | 275 +++-- .../stn/asciiOff/original/hanoi1\n.logged" | 469 ++++++--- .../stn/asciiOff/original/helloWorld.logged | 56 +- .../asciiOff/original/locTest1\n2\n.logged" | 254 +++-- .../asciiOff/original/nameWriteOnly\n.logged" | 351 +++++-- .../asciiOff/original/truthMachine0\n.logged" | 24 +- .../stn/asciiOn/from-wsa/bottles.logged | 477 ++++++--- .../logged/stn/asciiOn/from-wsa/hello.logged | 64 +- .../logged/stn/asciiOn/from-wsa/hello2.logged | 78 +- .../logged/stn/asciiOn/from-wsa/hello4.logged | 74 +- .../logged/stn/asciiOn/from-wsa/prim.logged | 294 ++++-- .../logged/stn/asciiOn/from-wsa/true.logged | 8 +- .../stn/asciiOn/original/calc-1\n.logged" | 589 ++++++++--- .../logged/stn/asciiOn/original/count.logged | 111 +- .../stn/asciiOn/original/fact10\n.logged" | 303 ++++-- .../logged/stn/asciiOn/original/hWorld.logged | 275 +++-- .../stn/asciiOn/original/hanoi1\n.logged" | 469 ++++++--- .../stn/asciiOn/original/helloWorld.logged | 56 +- .../asciiOn/original/locTest1\n2\n.logged" | 254 +++-- .../asciiOn/original/nameWriteOnly\n.logged" | 351 +++++-- .../asciiOn/original/truthMachine0\n.logged" | 24 +- .../ws/asciiOff/original/calc-1\n.logged" | 589 ++++++++--- .../logged/ws/asciiOff/original/count.logged | 111 +- .../ws/asciiOff/original/fact10\n.logged" | 303 ++++-- .../ws/asciiOff/original/hanoi1\n.logged" | 469 ++++++--- .../logged/ws/asciiOff/original/hworld.logged | 275 +++-- .../asciiOff/original/loctest1\n2\n.logged" | 254 +++-- .../asciiOff/original/nameWriteOnly\n.logged" | 351 +++++-- .../ws/asciiOn/original/calc-1\n.logged" | 589 ++++++++--- .../logged/ws/asciiOn/original/count.logged | 111 +- .../ws/asciiOn/original/fact10\n.logged" | 303 ++++-- .../ws/asciiOn/original/hanoi1\n.logged" | 469 ++++++--- .../logged/ws/asciiOn/original/hworld.logged | 275 +++-- .../ws/asciiOn/original/loctest1\n2\n.logged" | 254 +++-- .../asciiOn/original/nameWriteOnly\n.logged" | 351 +++++-- .output/actual/ws/il/from-wsa/bottles.il | 273 ----- .output/actual/ws/il/from-wsa/hello.il | 44 - .output/actual/ws/il/from-wsa/hello2.il | 55 - .output/actual/ws/il/from-wsa/hello4.il | 53 - .output/actual/ws/il/from-wsa/prim.il | 207 ---- .../ws/il/optimized/from-wsa/bottles.il | 506 +++++++++ .../actual/ws/il/optimized/from-wsa/hello.il | 72 ++ .../actual/ws/il/optimized/from-wsa/hello2.il | 89 ++ .../actual/ws/il/optimized/from-wsa/hello4.il | 85 ++ .../actual/ws/il/optimized/from-wsa/prim.il | 339 ++++++ .../ws/il/{ => optimized}/from-wsa/true.il | 0 .../actual/ws/il/optimized/original/calc.il | 683 ++++++++++++ .../actual/ws/il/optimized/original/count.il | 134 +++ .../actual/ws/il/optimized/original/fact.il | 358 +++++++ .../actual/ws/il/optimized/original/hWorld.il | 319 ++++++ .../actual/ws/il/optimized/original/hanoi.il | 559 ++++++++++ .../ws/il/optimized/original/helloWorld.il | 62 ++ .../ws/il/optimized/original/locTest.il | 300 ++++++ .../actual/ws/il/optimized/original/name.il | 409 ++++++++ .../{ => optimized}/original/truthMachine.il | 16 +- .output/actual/ws/il/original/calc.il | 402 -------- .output/actual/ws/il/original/count.il | 91 -- .output/actual/ws/il/original/fact.il | 223 ---- .output/actual/ws/il/original/hWorld.il | 192 ---- .output/actual/ws/il/original/hanoi.il | 336 ------ .output/actual/ws/il/original/helloWorld.il | 38 - .output/actual/ws/il/original/locTest.il | 184 ---- .output/actual/ws/il/original/name.il | 244 ----- .../actual/ws/il/parsed/from-wsa/bottles.il | 506 +++++++++ .output/actual/ws/il/parsed/from-wsa/hello.il | 72 ++ .../actual/ws/il/parsed/from-wsa/hello2.il | 89 ++ .../actual/ws/il/parsed/from-wsa/hello4.il | 85 ++ .output/actual/ws/il/parsed/from-wsa/prim.il | 339 ++++++ .../ws/il/parsed}/from-wsa/true.il | 0 .output/actual/ws/il/parsed/original/calc.il | 683 ++++++++++++ .output/actual/ws/il/parsed/original/count.il | 134 +++ .output/actual/ws/il/parsed/original/fact.il | 363 +++++++ .../actual/ws/il/parsed/original/hWorld.il | 319 ++++++ .output/actual/ws/il/parsed/original/hanoi.il | 559 ++++++++++ .../ws/il/parsed/original/helloWorld.il | 62 ++ .../actual/ws/il/parsed/original/locTest.il | 300 ++++++ .output/actual/ws/il/parsed/original/name.il | 409 ++++++++ .../ws/il/parsed/original/truthMachine.il | 30 + .../logged/FastType/Int16Type/99botles.logged | 6 +- .../Int16Type/fascistHelloWorld.logged | 6 +- .../FastType/Int16Type/helloWorld.logged | 6 +- .../logged/FastType/Int16Type/triangle.logged | 6 +- .../logged/FastType/Int8Type/99botles.logged | 6 +- .../Int8Type/fascistHelloWorld.logged | 6 +- .../logged/FastType/Int8Type/fibonacci.logged | 6 +- .../FastType/Int8Type/helloWorld.logged | 6 +- .../FastType/Int8Type/padHelloWorld.logged | 6 +- .../Int8Type/theShortestHelloWorld.logged | 6 +- .../logged/FastType/Int8Type/triangle.logged | 6 +- .../logged/FastType/Int8Type/value256.logged | 6 +- .../FastType/Word16Type/99botles.logged | 6 +- .../Word16Type/fascistHelloWorld.logged | 6 +- .../FastType/Word16Type/helloWorld.logged | 6 +- .../FastType/Word16Type/triangle.logged | 6 +- .../logged/FastType/Word8Type/99botles.logged | 6 +- .../Word8Type/fascistHelloWorld.logged | 6 +- .../FastType/Word8Type/fibonacci.logged | 6 +- .../FastType/Word8Type/helloWorld.logged | 6 +- .../FastType/Word8Type/padHelloWorld.logged | 6 +- .../Word8Type/theShortestHelloWorld.logged | 6 +- .../logged/FastType/Word8Type/triangle.logged | 6 +- .../logged/FastType/Word8Type/value256.logged | 6 +- .../logged/Fast/False/from-eas/bottles.logged | 623 +++++++---- .../logged/Fast/False/from-eas/divmod.logged | 22 +- .../Fast/False/from-eas/fact0\n.logged" | 612 +++++++---- .../Fast/False/from-eas/fact1\n.logged" | 612 +++++++---- .../Fast/False/from-eas/fact2\n.logged" | 612 +++++++---- .../Fast/False/from-eas/fact3\n.logged" | 612 +++++++---- .../Fast/False/from-eas/fact4\n.logged" | 612 +++++++---- .../Fast/False/from-eas/fact5\n.logged" | 612 +++++++---- .../Fast/False/from-eas/fact6\n.logged" | 612 +++++++---- .../Fast/False/from-eas/fact7\n.logged" | 612 +++++++---- .../Fast/False/from-eas/fact8\n.logged" | 612 +++++++---- .../Fast/False/from-eas/fact9\n.logged" | 612 +++++++---- .../logged/Fast/False/from-eas/hello.logged | 64 +- .../logged/Fast/False/from-eas/hello2.logged | 131 ++- .../logged/Fast/False/from-eas/hello3.logged | 131 ++- .../logged/Fast/False/from-eas/hello4.logged | 131 ++- .../Fast/False/from-eas/readcharA.logged | 8 +- .../Fast/False/from-eas/readnum0\n.logged" | 312 ++++-- .../Fast/False/from-eas/readnum1\n.logged" | 312 ++++-- .../logged/Fast/False/from-eas/true.logged | 8 +- .../logged/Fast/False/original/bottles.logged | 876 +++++++++++----- .../logged/Fast/False/original/crlf.logged | 92 +- .../Fast/False/original/fact1\n.logged" | 619 +++++++---- .../Fast/False/original/fact2\n.logged" | 619 +++++++---- .../Fast/False/original/fact3\n.logged" | 619 +++++++---- .../Fast/False/original/fact4\n.logged" | 619 +++++++---- .../Fast/False/original/fact5\n.logged" | 619 +++++++---- .../Fast/False/original/fact6\n.logged" | 619 +++++++---- .../Fast/False/original/fact7\n.logged" | 619 +++++++---- .../Fast/False/original/fact8\n.logged" | 619 +++++++---- .../logged/Fast/False/original/hello.logged | 136 ++- .../logged/Fast/False/original/hello2.logged | 177 +++- .../logged/Fast/True/original/bottles.logged | 876 +++++++++++----- .../logged/Fast/True/original/fact1\n.logged" | 619 +++++++---- .../logged/Fast/True/original/fact2\n.logged" | 619 +++++++---- .../logged/Fast/True/original/fact3\n.logged" | 619 +++++++---- .../logged/Fast/True/original/fact4\n.logged" | 619 +++++++---- .../logged/Fast/True/original/fact5\n.logged" | 619 +++++++---- .../logged/Fast/True/original/fact6\n.logged" | 619 +++++++---- .../logged/Fast/True/original/fact7\n.logged" | 619 +++++++---- .../logged/Fast/True/original/fact8\n.logged" | 619 +++++++---- .../eval/logged/Fast/from-eas/bottles.logged | 446 -------- .../eval/logged/Fast/from-eas/divmod.logged | 30 - .../eval/logged/Fast/from-eas/fact0\n.logged" | 508 --------- .../eval/logged/Fast/from-eas/fact1\n.logged" | 508 --------- .../eval/logged/Fast/from-eas/fact2\n.logged" | 508 --------- .../eval/logged/Fast/from-eas/fact3\n.logged" | 508 --------- .../eval/logged/Fast/from-eas/fact4\n.logged" | 508 --------- .../eval/logged/Fast/from-eas/fact5\n.logged" | 508 --------- .../eval/logged/Fast/from-eas/fact6\n.logged" | 508 --------- .../eval/logged/Fast/from-eas/fact7\n.logged" | 508 --------- .../eval/logged/Fast/from-eas/fact8\n.logged" | 508 --------- .../eval/logged/Fast/from-eas/fact9\n.logged" | 508 --------- .../eval/logged/Fast/from-eas/hello.logged | 67 -- .../eval/logged/Fast/from-eas/hello2.logged | 101 -- .../eval/logged/Fast/from-eas/hello3.logged | 101 -- .../eval/logged/Fast/from-eas/hello4.logged | 101 -- .../logged/Fast/from-eas/readcharA.logged | 16 - .../logged/Fast/from-eas/readnum0\n.logged" | 255 ----- .../logged/Fast/from-eas/readnum1\n.logged" | 255 ----- .../eta/eval/logged/Fast/from-eas/true.logged | 13 - .../eval/logged/Fast/original/bottles.logged | 640 ------------ .../eta/eval/logged/Fast/original/crlf.logged | 80 -- .../eval/logged/Fast/original/fact1\n.logged" | 505 --------- .../eval/logged/Fast/original/fact2\n.logged" | 505 --------- .../eval/logged/Fast/original/fact3\n.logged" | 505 --------- .../eval/logged/Fast/original/fact4\n.logged" | 505 --------- .../eval/logged/Fast/original/fact5\n.logged" | 505 --------- .../eval/logged/Fast/original/fact6\n.logged" | 505 --------- .../eval/logged/Fast/original/fact7\n.logged" | 505 --------- .../eval/logged/Fast/original/fact8\n.logged" | 505 --------- .../eval/logged/Fast/original/hello.logged | 133 --- .../eval/logged/Fast/original/hello2.logged | 129 --- .../Original/False/from-eas/bottles.logged | 6 +- .../Original/False/from-eas/divmod.logged | 6 +- .../Original/False/from-eas/fact0\n.logged" | 6 +- .../Original/False/from-eas/fact1\n.logged" | 6 +- .../Original/False/from-eas/fact2\n.logged" | 6 +- .../Original/False/from-eas/fact3\n.logged" | 6 +- .../Original/False/from-eas/fact4\n.logged" | 6 +- .../Original/False/from-eas/fact5\n.logged" | 6 +- .../Original/False/from-eas/fact6\n.logged" | 6 +- .../Original/False/from-eas/fact7\n.logged" | 6 +- .../Original/False/from-eas/fact8\n.logged" | 6 +- .../Original/False/from-eas/fact9\n.logged" | 6 +- .../Original/False/from-eas/hello.logged | 6 +- .../Original/False/from-eas/hello2.logged | 6 +- .../Original/False/from-eas/hello3.logged | 6 +- .../Original/False/from-eas/hello4.logged | 6 +- .../Original/False/from-eas/readcharA.logged | 6 +- .../False/from-eas/readnum0\n.logged" | 6 +- .../False/from-eas/readnum1\n.logged" | 6 +- .../Original/False/from-eas/true.logged | 6 +- .../Original/False/original/crlf.logged | 6 +- .../Original/False/original/hello.logged | 6 +- .../Original/False/original/hello2.logged | 6 +- .../logged/Original/from-eas/bottles.logged | 613 ----------- .../logged/Original/from-eas/divmod.logged | 19 - .../logged/Original/from-eas/fact0\n.logged" | 533 ---------- .../logged/Original/from-eas/fact1\n.logged" | 533 ---------- .../logged/Original/from-eas/fact2\n.logged" | 533 ---------- .../logged/Original/from-eas/fact3\n.logged" | 533 ---------- .../logged/Original/from-eas/fact4\n.logged" | 533 ---------- .../logged/Original/from-eas/fact5\n.logged" | 533 ---------- .../logged/Original/from-eas/fact6\n.logged" | 533 ---------- .../logged/Original/from-eas/fact7\n.logged" | 533 ---------- .../logged/Original/from-eas/fact8\n.logged" | 533 ---------- .../logged/Original/from-eas/fact9\n.logged" | 533 ---------- .../logged/Original/from-eas/hello.logged | 94 -- .../logged/Original/from-eas/hello2.logged | 132 --- .../logged/Original/from-eas/hello3.logged | 132 --- .../logged/Original/from-eas/hello4.logged | 132 --- .../logged/Original/from-eas/readcharA.logged | 10 - .../Original/from-eas/readnum0\n.logged" | 268 ----- .../Original/from-eas/readnum1\n.logged" | 268 ----- .../eval/logged/Original/from-eas/true.logged | 7 - .../eval/logged/Original/original/crlf.logged | 112 -- .../logged/Original/original/hello.logged | 125 --- .../logged/Original/original/hello2.logged | 157 --- .../eval/output/Fast/from-eas/bottles.output | 12 - .../eval/output/Fast/from-eas/divmod.output | 0 .../eval/output/Fast/from-eas/fact0\n.output" | 0 .../eval/output/Fast/from-eas/fact1\n.output" | 0 .../eval/output/Fast/from-eas/fact2\n.output" | 0 .../eval/output/Fast/from-eas/fact3\n.output" | 0 .../eval/output/Fast/from-eas/fact4\n.output" | 0 .../eval/output/Fast/from-eas/fact5\n.output" | 0 .../eval/output/Fast/from-eas/fact6\n.output" | 0 .../eval/output/Fast/from-eas/fact7\n.output" | 0 .../eval/output/Fast/from-eas/fact8\n.output" | 0 .../eval/output/Fast/from-eas/fact9\n.output" | 0 .../eval/output/Fast/from-eas/hello.output | 1 - .../eval/output/Fast/from-eas/hello2.output | 1 - .../eval/output/Fast/from-eas/hello3.output | 1 - .../eval/output/Fast/from-eas/hello4.output | 1 - .../output/Fast/from-eas/readcharA.output | 0 .../output/Fast/from-eas/readnum0\n.output" | 0 .../output/Fast/from-eas/readnum1\n.output" | 0 .../eta/eval/output/Fast/from-eas/true.output | 0 .../eval/output/Fast/original/bottles.output | 396 ------- .../eta/eval/output/Fast/original/crlf.output | 1 - .../eval/output/Fast/original/fact1\n.output" | 1 - .../eval/output/Fast/original/fact2\n.output" | 1 - .../eval/output/Fast/original/fact3\n.output" | 1 - .../eval/output/Fast/original/fact4\n.output" | 1 - .../eval/output/Fast/original/fact5\n.output" | 1 - .../eval/output/Fast/original/fact6\n.output" | 1 - .../eval/output/Fast/original/fact7\n.output" | 1 - .../eval/output/Fast/original/fact8\n.output" | 1 - .../eval/output/Fast/original/hello.output | 1 - .../eval/output/Fast/original/hello2.output | 1 - .../output/Original/from-eas/bottles.output | 12 - .../output/Original/from-eas/divmod.output | 0 .../output/Original/from-eas/fact0\n.output" | 0 .../output/Original/from-eas/fact1\n.output" | 0 .../output/Original/from-eas/fact2\n.output" | 0 .../output/Original/from-eas/fact3\n.output" | 0 .../output/Original/from-eas/fact4\n.output" | 0 .../output/Original/from-eas/fact5\n.output" | 0 .../output/Original/from-eas/fact6\n.output" | 0 .../output/Original/from-eas/fact7\n.output" | 0 .../output/Original/from-eas/fact8\n.output" | 0 .../output/Original/from-eas/fact9\n.output" | 0 .../output/Original/from-eas/hello.output | 1 - .../output/Original/from-eas/hello2.output | 1 - .../output/Original/from-eas/hello3.output | 1 - .../output/Original/from-eas/hello4.output | 1 - .../output/Original/from-eas/readcharA.output | 0 .../Original/from-eas/readnum0\n.output" | 0 .../Original/from-eas/readnum1\n.output" | 0 .../eval/output/Original/from-eas/true.output | 0 .../eval/output/Original/original/crlf.output | 1 - .../output/Original/original/hello.output | 1 - .../output/Original/original/hello2.output | 1 - .../eta/il/optimized/from-eas/bottles.il | 692 +++++++++++++ .../eta/il/optimized/from-eas/euclid.il | 113 ++ .../golden/eta/il/optimized/from-eas/fact.il | 688 +++++++++++++ .../eta/il/optimized/from-eas/function.il | 55 + .../golden/eta/il/optimized/from-eas/hello.il | 86 ++ .../eta/il/optimized/from-eas/hello2.il | 141 +++ .../eta/il/optimized/from-eas/hello3.il | 141 +++ .../eta/il/optimized/from-eas/hello4.il | 141 +++ .../eta/il/optimized/from-eas/multiply.il | 140 +++ .../golden/eta/il/optimized/from-eas/pip.il | 68 ++ .../golden/eta/il/optimized/from-eas/pip2.il | 56 + .../eta/il/optimized/from-eas/readnum.il | 344 +++++++ .../eta/il/optimized/from-eas/reverse.il | 100 ++ .../golden/eta/il/optimized/from-eas/true.il | 4 + .../eta/il/optimized/from-eas/writenum.il | 192 ++++ .../eta/il/optimized/from-eas/writestr.il | 53 + .../eta/il/optimized/original/bottles.il | 971 ++++++++++++++++++ .../golden/eta/il/optimized/original/crlf.il | 113 ++ .../golden/eta/il/optimized/original/fact.il | 697 +++++++++++++ .../golden/eta/il/optimized/original/hello.il | 168 +++ .../eta/il/optimized/original/hello2.il | 187 ++++ .../golden/eta/il/optimized/original/pip.il | 68 ++ .../golden/eta/il/optimized/original/pip2.il | 56 + .../golden/eta/il/parsed/from-eas/bottles.il | 641 ++++++++---- .../golden/eta/il/parsed/from-eas/euclid.il | 105 +- .output/golden/eta/il/parsed/from-eas/fact.il | 666 ++++++++---- .../golden/eta/il/parsed/from-eas/function.il | 38 +- .../golden/eta/il/parsed/from-eas/hello.il | 56 +- .../golden/eta/il/parsed/from-eas/hello2.il | 131 ++- .../golden/eta/il/parsed/from-eas/hello3.il | 131 ++- .../golden/eta/il/parsed/from-eas/hello4.il | 131 ++- .../golden/eta/il/parsed/from-eas/multiply.il | 132 ++- .output/golden/eta/il/parsed/from-eas/pip.il | 50 +- .output/golden/eta/il/parsed/from-eas/pip2.il | 50 +- .../golden/eta/il/parsed/from-eas/readnum.il | 328 ++++-- .../golden/eta/il/parsed/from-eas/reverse.il | 109 +- .../golden/eta/il/parsed/from-eas/writenum.il | 198 ++-- .../golden/eta/il/parsed/from-eas/writestr.il | 51 +- .../golden/eta/il/parsed/original/bottles.il | 901 +++++++++++----- .output/golden/eta/il/parsed/original/crlf.il | 84 +- .output/golden/eta/il/parsed/original/fact.il | 663 ++++++++---- .../golden/eta/il/parsed/original/hello.il | 130 ++- .../golden/eta/il/parsed/original/hello2.il | 177 +++- .output/golden/eta/il/parsed/original/pip.il | 50 +- .output/golden/eta/il/parsed/original/pip2.il | 50 +- .output/golden/f/il/helma/add.il | 24 +- .output/golden/f/il/helma/copy.il | 20 +- .output/golden/f/il/helma/factorial.il | 52 +- .output/golden/f/il/helma/primeNumber.il | 111 +- .output/golden/f/il/other/benHoyt/bin2f.il | 15 +- .output/golden/f/il/other/benHoyt/fac.il | 71 +- .output/golden/f/il/other/iliiliiliili/sum.il | 4 +- .../golden/f/il/other/morphett/factorial.il | 55 +- .../golden/f/il/other/morphett/factorial2.il | 60 +- .output/golden/f/il/other/morphett/reverse.il | 23 +- .../golden/f/il/other/thunderseethe/prog.il | 61 +- .../il/strlen/contrib/Ben_Schaeffer/detab.il | 39 +- .../contrib/Ben_Schaeffer/postfix_while.il | 88 +- .../strlen/contrib/Eelko_de_Vos/chkbrack.il | 212 +++- .../il/strlen/contrib/Eelko_de_Vos/countwl.il | 148 ++- .../il/strlen/contrib/Eelko_de_Vos/crunch.il | 36 +- .../strlen/contrib/Eelko_de_Vos/decrunch.il | 68 +- .../il/strlen/contrib/Eelko_de_Vos/depack.il | 24 +- .../strlen/contrib/Eelko_de_Vos/readable.il | 8 +- .../il/strlen/contrib/Eelko_de_Vos/remcom.il | 56 +- .../f/il/strlen/contrib/Eelko_de_Vos/split.il | 44 +- .../strlen/contrib/Herb_Wollman/Fibonacci.il | 12 +- .../contrib/Marcel_van_Kervinck/queens.il | 267 +++-- .../strlen/contrib/Marcel_van_Kervinck/tic.il | 211 +++- .../strlen/contrib/Peter_Bengtsson/DoASC.il | 171 ++- .../strlen/contrib/Steinar_Knutsen/htmlcol.il | 115 ++- .../strlen/contrib/Steinar_Knutsen/passwdc.il | 20 +- .../strlen/contrib/Thomas_Fischbacher/life.il | 109 +- .output/golden/f/il/strlen/contrib/self.il | 20 +- .output/golden/f/il/strlen/examples/addcr.il | 40 +- .output/golden/f/il/strlen/examples/arg.il | 44 +- .../golden/f/il/strlen/examples/argtest.il | 24 +- .output/golden/f/il/strlen/examples/lambda.il | 67 +- .output/golden/f/il/strlen/examples/prime.il | 135 ++- .output/golden/f/il/strlen/examples/strip.il | 43 +- .output/golden/f/il/strlen/inline/copy.il | 20 +- .../golden/f/il/strlen/inline/factorial.il | 52 +- .../golden/f/il/strlen/inline/primeNumber.il | 111 +- .../sq/eval/logged/esolangs/helloWorld.logged | 4 +- .output/golden/sq/eval/logged/hello.logged | 4 +- .../golden/sq/eval/logged/longHello.logged | 4 +- .../sq/eval/logged/mazonka/factorial.logged | 4 +- .../sq/eval/logged/mazonka/helloWorld.logged | 4 +- .../golden/sq/eval/logged/mazonka/hi.logged | 4 +- .../stn/asciiOff/from-wsa/bottles.logged | 477 ++++++--- .../logged/stn/asciiOff/from-wsa/hello.logged | 64 +- .../stn/asciiOff/from-wsa/hello2.logged | 78 +- .../stn/asciiOff/from-wsa/hello4.logged | 74 +- .../logged/stn/asciiOff/from-wsa/prim.logged | 294 ++++-- .../logged/stn/asciiOff/from-wsa/true.logged | 8 +- .../stn/asciiOff/original/calc-1\n.logged" | 589 ++++++++--- .../logged/stn/asciiOff/original/count.logged | 111 +- .../stn/asciiOff/original/fact10\n.logged" | 303 ++++-- .../stn/asciiOff/original/hWorld.logged | 275 +++-- .../stn/asciiOff/original/hanoi1\n.logged" | 469 ++++++--- .../stn/asciiOff/original/helloWorld.logged | 56 +- .../asciiOff/original/locTest1\n2\n.logged" | 254 +++-- .../asciiOff/original/nameWriteOnly\n.logged" | 351 +++++-- .../asciiOff/original/truthMachine0\n.logged" | 24 +- .../stn/asciiOn/from-wsa/bottles.logged | 477 ++++++--- .../logged/stn/asciiOn/from-wsa/hello.logged | 64 +- .../logged/stn/asciiOn/from-wsa/hello2.logged | 78 +- .../logged/stn/asciiOn/from-wsa/hello4.logged | 74 +- .../logged/stn/asciiOn/from-wsa/prim.logged | 294 ++++-- .../logged/stn/asciiOn/from-wsa/true.logged | 8 +- .../stn/asciiOn/original/calc-1\n.logged" | 589 ++++++++--- .../logged/stn/asciiOn/original/count.logged | 111 +- .../stn/asciiOn/original/fact10\n.logged" | 303 ++++-- .../logged/stn/asciiOn/original/hWorld.logged | 275 +++-- .../stn/asciiOn/original/hanoi1\n.logged" | 469 ++++++--- .../stn/asciiOn/original/helloWorld.logged | 56 +- .../asciiOn/original/locTest1\n2\n.logged" | 254 +++-- .../asciiOn/original/nameWriteOnly\n.logged" | 351 +++++-- .../asciiOn/original/truthMachine0\n.logged" | 24 +- .../ws/asciiOff/original/calc-1\n.logged" | 589 ++++++++--- .../logged/ws/asciiOff/original/count.logged | 111 +- .../ws/asciiOff/original/fact10\n.logged" | 303 ++++-- .../ws/asciiOff/original/hanoi1\n.logged" | 469 ++++++--- .../logged/ws/asciiOff/original/hworld.logged | 275 +++-- .../asciiOff/original/loctest1\n2\n.logged" | 254 +++-- .../asciiOff/original/nameWriteOnly\n.logged" | 351 +++++-- .../ws/asciiOn/original/calc-1\n.logged" | 589 ++++++++--- .../logged/ws/asciiOn/original/count.logged | 111 +- .../ws/asciiOn/original/fact10\n.logged" | 303 ++++-- .../ws/asciiOn/original/hanoi1\n.logged" | 469 ++++++--- .../logged/ws/asciiOn/original/hworld.logged | 275 +++-- .../ws/asciiOn/original/loctest1\n2\n.logged" | 254 +++-- .../asciiOn/original/nameWriteOnly\n.logged" | 351 +++++-- .output/golden/ws/il/from-wsa/bottles.il | 273 ----- .output/golden/ws/il/from-wsa/hello.il | 44 - .output/golden/ws/il/from-wsa/hello2.il | 55 - .output/golden/ws/il/from-wsa/hello4.il | 53 - .output/golden/ws/il/from-wsa/prim.il | 207 ---- .../ws/il/optimized/from-wsa/bottles.il | 506 +++++++++ .../golden/ws/il/optimized/from-wsa/hello.il | 72 ++ .../golden/ws/il/optimized/from-wsa/hello2.il | 89 ++ .../golden/ws/il/optimized/from-wsa/hello4.il | 85 ++ .../golden/ws/il/optimized/from-wsa/prim.il | 339 ++++++ .../golden/ws/il/optimized/from-wsa/true.il | 1 + .../golden/ws/il/optimized/original/calc.il | 683 ++++++++++++ .../golden/ws/il/optimized/original/count.il | 134 +++ .../golden/ws/il/optimized/original/fact.il | 358 +++++++ .../golden/ws/il/optimized/original/hWorld.il | 319 ++++++ .../golden/ws/il/optimized/original/hanoi.il | 559 ++++++++++ .../ws/il/optimized/original/helloWorld.il | 62 ++ .../ws/il/optimized/original/locTest.il | 300 ++++++ .../golden/ws/il/optimized/original/name.il | 409 ++++++++ .../{ => optimized}/original/truthMachine.il | 16 +- .output/golden/ws/il/original/calc.il | 402 -------- .output/golden/ws/il/original/count.il | 91 -- .output/golden/ws/il/original/fact.il | 223 ---- .output/golden/ws/il/original/hWorld.il | 192 ---- .output/golden/ws/il/original/hanoi.il | 336 ------ .output/golden/ws/il/original/helloWorld.il | 38 - .output/golden/ws/il/original/locTest.il | 184 ---- .output/golden/ws/il/original/name.il | 244 ----- .../golden/ws/il/parsed/from-wsa/bottles.il | 506 +++++++++ .output/golden/ws/il/parsed/from-wsa/hello.il | 72 ++ .../golden/ws/il/parsed/from-wsa/hello2.il | 89 ++ .../golden/ws/il/parsed/from-wsa/hello4.il | 85 ++ .output/golden/ws/il/parsed/from-wsa/prim.il | 339 ++++++ .output/golden/ws/il/parsed/from-wsa/true.il | 1 + .output/golden/ws/il/parsed/original/calc.il | 683 ++++++++++++ .output/golden/ws/il/parsed/original/count.il | 134 +++ .output/golden/ws/il/parsed/original/fact.il | 363 +++++++ .../golden/ws/il/parsed/original/hWorld.il | 319 ++++++ .output/golden/ws/il/parsed/original/hanoi.il | 559 ++++++++++ .../ws/il/parsed/original/helloWorld.il | 62 ++ .../golden/ws/il/parsed/original/locTest.il | 300 ++++++ .output/golden/ws/il/parsed/original/name.il | 409 ++++++++ .../ws/il/parsed/original/truthMachine.il | 30 + docs/developers/CHANGELOG.md | 4 + ...elMA.Automata.WhiteSpace.Evaluator.hs.html | 89 -- ...lVM.HelMA.Automaton.API.EvalParams.hs.html | 59 -- .../HelVM.HelMA.Automaton.Automaton.hs.html | 162 --- .../HelVM.HelMA.Automaton.Instruction.hs.html | 80 -- ...elMA.Automata.BrainFuck.API.BFType.hs.html | 0 ...BrainFuck.Common.SimpleInstruction.hs.html | 0 ...A.Automata.BrainFuck.Common.Symbol.hs.html | 0 ...ata.BrainFuck.Common.TapeOfSymbols.hs.html | 0 ...HelMA.Automata.BrainFuck.Evaluator.hs.html | 0 ...mata.BrainFuck.Impl.Fast.Evaluator.hs.html | 32 +- ...ta.BrainFuck.Impl.Fast.Instruction.hs.html | 0 ...mata.BrainFuck.Impl.Fast.Optimizer.hs.html | 0 ...utomata.BrainFuck.Impl.Fast.Parser.hs.html | 0 ...mata.BrainFuck.Impl.Flat.Evaluator.hs.html | 20 +- ...ta.BrainFuck.Impl.Flat.Instruction.hs.html | 0 ...utomata.BrainFuck.Impl.Flat.Parser.hs.html | 0 ...Fuck.Impl.Flat.TableOfInstructions.hs.html | 0 ...mata.BrainFuck.Impl.Tree.Evaluator.hs.html | 32 +- ...ta.BrainFuck.Impl.Tree.Instruction.hs.html | 0 ...utomata.BrainFuck.Impl.Tree.Parser.hs.html | 0 ...HelVM.HelMA.Automata.Cat.Evaluator.hs.html | 0 ...HelMA.Automata.ETA.API.ETAImplType.hs.html | 0 ...elVM.HelMA.Automata.ETA.Addressing.hs.html | 0 ...HelVM.HelMA.Automata.ETA.Automaton.hs.html | 68 +- ...HelVM.HelMA.Automata.ETA.Evaluator.hs.html | 72 +- .../HelVM.HelMA.Automata.ETA.Lexer.hs.html | 0 ....HelMA.Automata.ETA.OperandParsers.hs.html | 69 +- ...HelVM.HelMA.Automata.ETA.Optimizer.hs.html | 4 +- .../HelVM.HelMA.Automata.ETA.Parser.hs.html | 0 ...VM.HelMA.Automata.ETA.SimpleParams.hs.html | 14 +- .../HelVM.HelMA.Automata.ETA.Token.hs.html | 0 ...VM.HelMA.Automata.FALSE.Expression.hs.html | 0 .../HelVM.HelMA.Automata.FALSE.Parser.hs.html | 87 +- ...lVM.HelMA.Automata.LazyK.Automaton.hs.html | 0 ...lVM.HelMA.Automata.LazyK.Constants.hs.html | 0 ...lVM.HelMA.Automata.LazyK.Evaluator.hs.html | 0 ....HelMA.Automata.LazyK.InputEncoder.hs.html | 0 .../HelVM.HelMA.Automata.LazyK.Lambda.hs.html | 0 .../HelVM.HelMA.Automata.LazyK.Lexer.hs.html | 0 .../HelVM.HelMA.Automata.LazyK.Parser.hs.html | 0 ...HelVM.HelMA.Automata.LazyK.Reducer.hs.html | 0 ...HelVM.HelMA.Automata.Rev.Evaluator.hs.html | 0 ...VM.HelMA.Automata.SubLeq.Automaton.hs.html | 12 +- ...VM.HelMA.Automata.SubLeq.Evaluator.hs.html | 2 +- .../HelVM.HelMA.Automata.SubLeq.Lexer.hs.html | 0 ...elMA.Automata.WhiteSpace.Evaluator.hs.html | 62 ++ ...VM.HelMA.Automata.WhiteSpace.Lexer.hs.html | 0 ...Automata.WhiteSpace.OperandParsers.hs.html | 0 ...M.HelMA.Automata.WhiteSpace.Parser.hs.html | 156 ++- ...A.Automata.WhiteSpace.SimpleParams.hs.html | 59 +- ...VM.HelMA.Automata.WhiteSpace.Token.hs.html | 0 ...HelVM.HelMA.Automata.Zot.Automaton.hs.html | 0 ...HelVM.HelMA.Automata.Zot.Evaluator.hs.html | 0 ...elVM.HelMA.Automata.Zot.Expression.hs.html | 0 .../HelVM.HelMA.Automata.Zot.Parser.hs.html | 0 ...VM.HelMA.Automaton.API.AutoOptions.hs.html | 46 + ...lVM.HelMA.Automaton.API.AutoParams.hs.html | 30 +- ...lMA.Automaton.API.AutomatonOptions.hs.html | 45 + ...lVM.HelMA.Automaton.API.EvalParams.hs.html | 63 ++ ...HelMA.Automaton.API.MemoryOptions.hs.html} | 4 +- ...MA.Automaton.API.OptimizationLevel.hs.html | 54 + .../HelVM.HelMA.Automaton.Automaton.hs.html | 104 ++ ...HelVM.HelMA.Automaton.Combiner.ALU.hs.html | 209 ++++ ...HelVM.HelMA.Automaton.Combiner.CPU.hs.html | 126 +++ ...HelVM.HelMA.Automaton.Combiner.LSU.hs.html | 76 ++ ...HelVM.HelMA.Automaton.Combiner.RAM.hs.html | 64 ++ .../HelVM.HelMA.Automaton.Combiner.hs.html | 121 +++ ...elVM.HelMA.Automaton.IO.BusinessIO.hs.html | 0 .../HelVM.HelMA.Automaton.IO.FreeIO.hs.html | 0 .../HelVM.HelMA.Automaton.IO.MockIO.hs.html | 0 ...utomaton.Instruction.ALInstruction.hs.html | 132 ++- ...utomaton.Instruction.CFInstruction.hs.html | 0 ...utomaton.Instruction.IOInstruction.hs.html | 0 ...utomaton.Instruction.LSInstruction.hs.html | 0 ...Automaton.Instruction.SInstruction.hs.html | 98 ++ .../HelVM.HelMA.Automaton.Instruction.hs.html | 162 +++ .../HelVM.HelMA.Automaton.Loop.hs.html | 0 .../HelVM.HelMA.Automaton.Optimizer.hs.html | 64 ++ .../HelVM.HelMA.Automaton.ReadPExtra.hs.html | 0 ...lVM.HelMA.Automaton.Types.CellType.hs.html | 0 ...lVM.HelMA.Automaton.Types.DumpType.hs.html | 0 ...M.HelMA.Automaton.Types.FormatType.hs.html | 0 ....HelMA.Automaton.Types.IntCellType.hs.html | 0 ...elVM.HelMA.Automaton.Types.RAMType.hs.html | 0 ...VM.HelMA.Automaton.Types.StackType.hs.html | 0 ...VM.HelMA.Automaton.Types.TokenType.hs.html | 0 .../HelVM.HelMA.Automaton.Unit.hs.html | 121 +++ .../HelVM.HelMA.Automaton.Units.ALU.hs.html | 2 +- .../HelVM.HelMA.Automaton.Units.CPU.hs.html | 197 ++-- .../HelVM.HelMA.Automaton.Units.LSU.hs.html | 6 +- .../HelVM.HelMA.Automaton.Units.RAM.hs.html | 2 +- ...elVM.HelMA.Automaton.WrapTokenList.hs.html | 0 docs/reports/helma-test/hpc_index.html | 206 ++-- docs/reports/helma-test/hpc_index_alt.html | 192 ++-- docs/reports/helma-test/hpc_index_exp.html | 204 ++-- docs/reports/helma-test/hpc_index_fun.html | 196 ++-- ...M-HelMA-Automata-BrainFuck-API-BFType.html | 2 +- ...ta-BrainFuck-Common-SimpleInstruction.html | 2 +- ...elMA-Automata-BrainFuck-Common-Symbol.html | 2 +- ...tomata-BrainFuck-Common-TapeOfSymbols.html | 2 +- ...VM-HelMA-Automata-BrainFuck-Evaluator.html | 2 +- ...utomata-BrainFuck-Impl-Fast-Evaluator.html | 2 +- ...omata-BrainFuck-Impl-Fast-Instruction.html | 2 +- ...utomata-BrainFuck-Impl-Fast-Optimizer.html | 2 +- ...A-Automata-BrainFuck-Impl-Fast-Parser.html | 2 +- ...utomata-BrainFuck-Impl-Flat-Evaluator.html | 2 +- ...omata-BrainFuck-Impl-Flat-Instruction.html | 2 +- ...A-Automata-BrainFuck-Impl-Flat-Parser.html | 2 +- ...ainFuck-Impl-Flat-TableOfInstructions.html | 2 +- ...utomata-BrainFuck-Impl-Tree-Evaluator.html | 2 +- ...omata-BrainFuck-Impl-Tree-Instruction.html | 2 +- ...BrainFuck-Impl-Tree-InstructionMemory.html | 1 + ...a-BrainFuck-Impl-Tree-InstructionUnit.html | 2 +- ...A-Automata-BrainFuck-Impl-Tree-Parser.html | 2 +- .../HelVM-HelMA-Automata-Cat-Evaluator.html | 2 +- ...VM-HelMA-Automata-ETA-API-ETAImplType.html | 2 +- .../HelVM-HelMA-Automata-ETA-Addressing.html | 2 +- .../HelVM-HelMA-Automata-ETA-Automaton.html | 2 +- .../HelVM-HelMA-Automata-ETA-Evaluator.html | 2 +- .../helma/HelVM-HelMA-Automata-ETA-Lexer.html | 2 +- ...lVM-HelMA-Automata-ETA-OperandParsers.html | 2 +- .../HelVM-HelMA-Automata-ETA-Optimizer.html | 2 +- .../HelVM-HelMA-Automata-ETA-Parser.html | 2 +- ...HelVM-HelMA-Automata-ETA-SimpleParams.html | 2 +- .../HelVM-HelMA-Automata-ETA-Symbol.html | 2 +- .../helma/HelVM-HelMA-Automata-ETA-Token.html | 2 +- ...HelVM-HelMA-Automata-FALSE-Expression.html | 2 +- .../HelVM-HelMA-Automata-FALSE-Parser.html | 2 +- .../HelVM-HelMA-Automata-LazyK-Automaton.html | 2 +- .../HelVM-HelMA-Automata-LazyK-Constants.html | 2 +- .../HelVM-HelMA-Automata-LazyK-Evaluator.html | 2 +- ...lVM-HelMA-Automata-LazyK-InputEncoder.html | 2 +- .../HelVM-HelMA-Automata-LazyK-Lambda.html | 2 +- .../HelVM-HelMA-Automata-LazyK-Lexer.html | 2 +- .../HelVM-HelMA-Automata-LazyK-Parser.html | 2 +- .../HelVM-HelMA-Automata-LazyK-Reducer.html | 2 +- .../HelVM-HelMA-Automata-Rev-Evaluator.html | 2 +- ...HelVM-HelMA-Automata-SubLeq-Automaton.html | 2 +- ...HelVM-HelMA-Automata-SubLeq-Evaluator.html | 2 +- .../HelVM-HelMA-Automata-SubLeq-Lexer.html | 2 +- .../HelVM-HelMA-Automata-SubLeq-Symbol.html | 2 +- ...M-HelMA-Automata-WhiteSpace-Evaluator.html | 2 +- ...HelVM-HelMA-Automata-WhiteSpace-Lexer.html | 2 +- ...MA-Automata-WhiteSpace-OperandParsers.html | 2 +- ...elVM-HelMA-Automata-WhiteSpace-Parser.html | 2 +- ...elMA-Automata-WhiteSpace-SimpleParams.html | 2 +- ...HelVM-HelMA-Automata-WhiteSpace-Token.html | 2 +- .../HelVM-HelMA-Automata-Zot-Automaton.html | 2 +- .../HelVM-HelMA-Automata-Zot-Evaluator.html | 2 +- .../HelVM-HelMA-Automata-Zot-Expression.html | 2 +- .../HelVM-HelMA-Automata-Zot-Parser.html | 2 +- .../helma/HelVM-HelMA-Automaton-AOT.html | 2 +- ...HelVM-HelMA-Automaton-API-AutoOptions.html | 2 +- .../HelVM-HelMA-Automaton-API-AutoParams.html | 2 +- ...-HelMA-Automaton-API-AutomatonOptions.html | 1 + .../HelVM-HelMA-Automaton-API-EvalParams.html | 2 +- .../HelVM-HelMA-Automaton-API-IOTypes.html | 2 +- ...lVM-HelMA-Automaton-API-MemoryOptions.html | 1 + ...HelMA-Automaton-API-OptimizationLevel.html | 1 + .../HelVM-HelMA-Automaton-API-RunParams.html | 2 +- ...HelVM-HelMA-Automaton-API-TypeOptions.html | 2 +- .../HelVM-HelMA-Automaton-Automaton.html | 2 +- .../HelVM-HelMA-Automaton-Combiner-ALU.html | 1 + .../HelVM-HelMA-Automaton-Combiner-CPU.html | 1 + .../HelVM-HelMA-Automaton-Combiner-LSU.html | 1 + .../HelVM-HelMA-Automaton-Combiner-RAM.html | 2 + .../helma/HelVM-HelMA-Automaton-Combiner.html | 1 + .../HelVM-HelMA-Automaton-IO-AutomatonIO.html | 2 +- .../HelVM-HelMA-Automaton-IO-BusinessIO.html | 2 +- .../HelVM-HelMA-Automaton-IO-EvaluatorIO.html | 2 +- .../HelVM-HelMA-Automaton-IO-FreeIO.html | 2 +- .../HelVM-HelMA-Automaton-IO-MockIO.html | 2 +- ...A-Automaton-Instruction-ALInstruction.html | 2 +- ...A-Automaton-Instruction-CFInstruction.html | 2 +- ...A-Automaton-Instruction-IOInstruction.html | 2 +- ...A-Automaton-Instruction-LSInstruction.html | 2 +- ...MA-Automaton-Instruction-SInstruction.html | 1 + .../HelVM-HelMA-Automaton-Instruction.html | 2 +- .../helma/HelVM-HelMA-Automaton-Loop.html | 2 +- .../HelVM-HelMA-Automaton-Optimizer.html | 1 + .../HelVM-HelMA-Automaton-ReadPExtra.html | 2 +- .../helma/HelVM-HelMA-Automaton-Symbol.html | 2 +- .../HelVM-HelMA-Automaton-Types-CellType.html | 2 +- .../HelVM-HelMA-Automaton-Types-DumpType.html | 2 +- ...elVM-HelMA-Automaton-Types-FormatType.html | 2 +- ...lVM-HelMA-Automaton-Types-IntCellType.html | 2 +- .../HelVM-HelMA-Automaton-Types-RAMType.html | 2 +- ...HelVM-HelMA-Automaton-Types-StackType.html | 2 +- ...HelVM-HelMA-Automaton-Types-TokenType.html | 2 +- .../helma/HelVM-HelMA-Automaton-Unit.html | 1 + .../HelVM-HelMA-Automaton-Units-ALU.html | 2 +- .../HelVM-HelMA-Automaton-Units-CPU.html | 2 +- .../HelVM-HelMA-Automaton-Units-LSU.html | 2 +- .../HelVM-HelMA-Automaton-Units-RAM.html | 2 +- .../HelVM-HelMA-Automaton-Units-Unit.html | 2 +- .../HelVM-HelMA-Automaton-WrapTokenList.html | 2 +- docs/reports/helma/doc-index-A.html | 2 +- docs/reports/helma/doc-index-All.html | 2 +- docs/reports/helma/doc-index-B.html | 2 +- docs/reports/helma/doc-index-C.html | 2 +- docs/reports/helma/doc-index-D.html | 2 +- docs/reports/helma/doc-index-E.html | 2 +- docs/reports/helma/doc-index-F.html | 2 +- docs/reports/helma/doc-index-G.html | 2 +- docs/reports/helma/doc-index-H.html | 2 +- docs/reports/helma/doc-index-I.html | 2 +- docs/reports/helma/doc-index-J.html | 2 +- docs/reports/helma/doc-index-K.html | 2 +- docs/reports/helma/doc-index-L.html | 2 +- docs/reports/helma/doc-index-M.html | 2 +- docs/reports/helma/doc-index-N.html | 2 +- docs/reports/helma/doc-index-O.html | 2 +- docs/reports/helma/doc-index-P.html | 2 +- docs/reports/helma/doc-index-R.html | 2 +- docs/reports/helma/doc-index-S.html | 2 +- docs/reports/helma/doc-index-T.html | 2 +- docs/reports/helma/doc-index-U.html | 2 +- docs/reports/helma/doc-index-V.html | 2 +- docs/reports/helma/doc-index-W.html | 2 +- docs/reports/helma/doc-index-Z.html | 2 +- docs/reports/helma/doc-index.html | 2 +- docs/reports/helma/helma.haddock | Bin 30644 -> 33321 bytes docs/reports/helma/index.html | 2 +- docs/reports/stan.html | 2 +- helma.cabal | 22 +- hs/app/AppOptions.hs | 66 +- hs/app/BoolTypes.hs | 1 + hs/app/Main.hs | 12 +- .../Automata/BrainFuck/Impl/Fast/Evaluator.hs | 32 +- .../Automata/BrainFuck/Impl/Flat/Evaluator.hs | 20 +- .../Automata/BrainFuck/Impl/Tree/Evaluator.hs | 32 +- .../BrainFuck/Impl/Tree/InstructionUnit.hs | 10 +- hs/src/HelVM/HelMA/Automata/ETA/Automaton.hs | 68 +- hs/src/HelVM/HelMA/Automata/ETA/Evaluator.hs | 44 +- .../HelMA/Automata/ETA/OperandParsers.hs | 21 +- hs/src/HelVM/HelMA/Automata/ETA/Optimizer.hs | 4 +- .../HelVM/HelMA/Automata/ETA/SimpleParams.hs | 12 +- hs/src/HelVM/HelMA/Automata/FALSE/Parser.hs | 53 +- .../HelVM/HelMA/Automata/SubLeq/Automaton.hs | 12 +- .../HelVM/HelMA/Automata/SubLeq/Evaluator.hs | 2 +- .../HelMA/Automata/WhiteSpace/Evaluator.hs | 41 +- .../HelVM/HelMA/Automata/WhiteSpace/Parser.hs | 52 +- .../HelMA/Automata/WhiteSpace/SimpleParams.hs | 23 +- hs/src/HelVM/HelMA/Automaton/AOT.hs | 53 - .../HelVM/HelMA/Automaton/API/AutoOptions.hs | 27 +- .../HelVM/HelMA/Automaton/API/AutoParams.hs | 20 - .../HelMA/Automaton/API/AutomatonOptions.hs | 22 + .../HelVM/HelMA/Automaton/API/EvalParams.hs | 24 +- .../HelMA/Automaton/API/MemoryOptions.hs | 14 + .../HelMA/Automaton/API/OptimizationLevel.hs | 31 + hs/src/HelVM/HelMA/Automaton/Automaton.hs | 140 +-- hs/src/HelVM/HelMA/Automaton/Combiner.hs | 98 ++ .../Automaton/{Units => Combiner}/ALU.hs | 96 +- .../Automaton/{Units => Combiner}/CPU.hs | 87 +- hs/src/HelVM/HelMA/Automaton/Combiner/LSU.hs | 53 + .../Automaton/{Units => Combiner}/RAM.hs | 2 +- .../HelVM/HelMA/Automaton/IO/AutomatonIO.hs | 4 +- hs/src/HelVM/HelMA/Automaton/Instruction.hs | 108 +- .../{ALInstruction.hs => SInstruction.hs} | 14 +- hs/src/HelVM/HelMA/Automaton/Optimizer.hs | 41 + hs/src/HelVM/HelMA/Automaton/Units/LSU.hs | 53 - hs/test/HelVM/HelMA/Automata/ETA/LexerSpec.hs | 20 +- .../HelMA/Automata/ETA/OperandParsersSpec.hs | 23 +- .../HelMA/Automata/WhiteSpace/ParserSpec.hs | 14 +- .../HelMA/Automaton/API/AutoOptionsExtra.hs | 6 +- .../HelVM/HelMA/Automaton/OptimizerSpec.hs | 20 + 1015 files changed, 84314 insertions(+), 69363 deletions(-) delete mode 100644 .output/actual/eta/eval/logged/Fast/from-eas/bottles.logged delete mode 100644 .output/actual/eta/eval/logged/Fast/from-eas/divmod.logged delete mode 100644 ".output/actual/eta/eval/logged/Fast/from-eas/fact0\n.logged" delete mode 100644 ".output/actual/eta/eval/logged/Fast/from-eas/fact1\n.logged" delete mode 100644 ".output/actual/eta/eval/logged/Fast/from-eas/fact2\n.logged" delete mode 100644 ".output/actual/eta/eval/logged/Fast/from-eas/fact3\n.logged" delete mode 100644 ".output/actual/eta/eval/logged/Fast/from-eas/fact4\n.logged" delete mode 100644 ".output/actual/eta/eval/logged/Fast/from-eas/fact5\n.logged" delete mode 100644 ".output/actual/eta/eval/logged/Fast/from-eas/fact6\n.logged" delete mode 100644 ".output/actual/eta/eval/logged/Fast/from-eas/fact7\n.logged" delete mode 100644 ".output/actual/eta/eval/logged/Fast/from-eas/fact8\n.logged" delete mode 100644 ".output/actual/eta/eval/logged/Fast/from-eas/fact9\n.logged" delete mode 100644 .output/actual/eta/eval/logged/Fast/from-eas/hello.logged delete mode 100644 .output/actual/eta/eval/logged/Fast/from-eas/hello2.logged delete mode 100644 .output/actual/eta/eval/logged/Fast/from-eas/hello3.logged delete mode 100644 .output/actual/eta/eval/logged/Fast/from-eas/hello4.logged delete mode 100644 .output/actual/eta/eval/logged/Fast/from-eas/readcharA.logged delete mode 100644 ".output/actual/eta/eval/logged/Fast/from-eas/readnum0\n.logged" delete mode 100644 ".output/actual/eta/eval/logged/Fast/from-eas/readnum1\n.logged" delete mode 100644 .output/actual/eta/eval/logged/Fast/from-eas/true.logged delete mode 100644 .output/actual/eta/eval/logged/Fast/original/bottles.logged delete mode 100644 .output/actual/eta/eval/logged/Fast/original/crlf.logged delete mode 100644 ".output/actual/eta/eval/logged/Fast/original/fact1\n.logged" delete mode 100644 ".output/actual/eta/eval/logged/Fast/original/fact2\n.logged" delete mode 100644 ".output/actual/eta/eval/logged/Fast/original/fact3\n.logged" delete mode 100644 ".output/actual/eta/eval/logged/Fast/original/fact4\n.logged" delete mode 100644 ".output/actual/eta/eval/logged/Fast/original/fact5\n.logged" delete mode 100644 ".output/actual/eta/eval/logged/Fast/original/fact6\n.logged" delete mode 100644 ".output/actual/eta/eval/logged/Fast/original/fact7\n.logged" delete mode 100644 ".output/actual/eta/eval/logged/Fast/original/fact8\n.logged" delete mode 100644 .output/actual/eta/eval/logged/Fast/original/hello.logged delete mode 100644 .output/actual/eta/eval/logged/Fast/original/hello2.logged delete mode 100644 .output/actual/eta/eval/logged/Original/from-eas/bottles.logged delete mode 100644 .output/actual/eta/eval/logged/Original/from-eas/divmod.logged delete mode 100644 ".output/actual/eta/eval/logged/Original/from-eas/fact0\n.logged" delete mode 100644 ".output/actual/eta/eval/logged/Original/from-eas/fact1\n.logged" delete mode 100644 ".output/actual/eta/eval/logged/Original/from-eas/fact2\n.logged" delete mode 100644 ".output/actual/eta/eval/logged/Original/from-eas/fact3\n.logged" delete mode 100644 ".output/actual/eta/eval/logged/Original/from-eas/fact4\n.logged" delete mode 100644 ".output/actual/eta/eval/logged/Original/from-eas/fact5\n.logged" delete mode 100644 ".output/actual/eta/eval/logged/Original/from-eas/fact6\n.logged" delete mode 100644 ".output/actual/eta/eval/logged/Original/from-eas/fact7\n.logged" delete mode 100644 ".output/actual/eta/eval/logged/Original/from-eas/fact8\n.logged" delete mode 100644 ".output/actual/eta/eval/logged/Original/from-eas/fact9\n.logged" delete mode 100644 .output/actual/eta/eval/logged/Original/from-eas/hello.logged delete mode 100644 .output/actual/eta/eval/logged/Original/from-eas/hello2.logged delete mode 100644 .output/actual/eta/eval/logged/Original/from-eas/hello3.logged delete mode 100644 .output/actual/eta/eval/logged/Original/from-eas/hello4.logged delete mode 100644 .output/actual/eta/eval/logged/Original/from-eas/readcharA.logged delete mode 100644 ".output/actual/eta/eval/logged/Original/from-eas/readnum0\n.logged" delete mode 100644 ".output/actual/eta/eval/logged/Original/from-eas/readnum1\n.logged" delete mode 100644 .output/actual/eta/eval/logged/Original/from-eas/true.logged delete mode 100644 .output/actual/eta/eval/logged/Original/original/crlf.logged delete mode 100644 .output/actual/eta/eval/logged/Original/original/hello.logged delete mode 100644 .output/actual/eta/eval/logged/Original/original/hello2.logged delete mode 100644 .output/actual/eta/eval/output/Fast/from-eas/bottles.output delete mode 100644 .output/actual/eta/eval/output/Fast/from-eas/divmod.output delete mode 100644 ".output/actual/eta/eval/output/Fast/from-eas/fact0\n.output" delete mode 100644 ".output/actual/eta/eval/output/Fast/from-eas/fact1\n.output" delete mode 100644 ".output/actual/eta/eval/output/Fast/from-eas/fact2\n.output" delete mode 100644 ".output/actual/eta/eval/output/Fast/from-eas/fact3\n.output" delete mode 100644 ".output/actual/eta/eval/output/Fast/from-eas/fact4\n.output" delete mode 100644 ".output/actual/eta/eval/output/Fast/from-eas/fact5\n.output" delete mode 100644 ".output/actual/eta/eval/output/Fast/from-eas/fact6\n.output" delete mode 100644 ".output/actual/eta/eval/output/Fast/from-eas/fact7\n.output" delete mode 100644 ".output/actual/eta/eval/output/Fast/from-eas/fact8\n.output" delete mode 100644 ".output/actual/eta/eval/output/Fast/from-eas/fact9\n.output" delete mode 100644 .output/actual/eta/eval/output/Fast/from-eas/hello.output delete mode 100644 .output/actual/eta/eval/output/Fast/from-eas/hello2.output delete mode 100644 .output/actual/eta/eval/output/Fast/from-eas/hello3.output delete mode 100644 .output/actual/eta/eval/output/Fast/from-eas/hello4.output delete mode 100644 .output/actual/eta/eval/output/Fast/from-eas/readcharA.output delete mode 100644 ".output/actual/eta/eval/output/Fast/from-eas/readnum0\n.output" delete mode 100644 ".output/actual/eta/eval/output/Fast/from-eas/readnum1\n.output" delete mode 100644 .output/actual/eta/eval/output/Fast/from-eas/true.output delete mode 100644 .output/actual/eta/eval/output/Fast/original/bottles.output delete mode 100644 .output/actual/eta/eval/output/Fast/original/crlf.output delete mode 100644 ".output/actual/eta/eval/output/Fast/original/fact1\n.output" delete mode 100644 ".output/actual/eta/eval/output/Fast/original/fact2\n.output" delete mode 100644 ".output/actual/eta/eval/output/Fast/original/fact3\n.output" delete mode 100644 ".output/actual/eta/eval/output/Fast/original/fact4\n.output" delete mode 100644 ".output/actual/eta/eval/output/Fast/original/fact5\n.output" delete mode 100644 ".output/actual/eta/eval/output/Fast/original/fact6\n.output" delete mode 100644 ".output/actual/eta/eval/output/Fast/original/fact7\n.output" delete mode 100644 ".output/actual/eta/eval/output/Fast/original/fact8\n.output" delete mode 100644 .output/actual/eta/eval/output/Fast/original/hello.output delete mode 100644 .output/actual/eta/eval/output/Fast/original/hello2.output delete mode 100644 .output/actual/eta/eval/output/Original/from-eas/bottles.output delete mode 100644 .output/actual/eta/eval/output/Original/from-eas/divmod.output delete mode 100644 ".output/actual/eta/eval/output/Original/from-eas/fact0\n.output" delete mode 100644 ".output/actual/eta/eval/output/Original/from-eas/fact1\n.output" delete mode 100644 ".output/actual/eta/eval/output/Original/from-eas/fact2\n.output" delete mode 100644 ".output/actual/eta/eval/output/Original/from-eas/fact3\n.output" delete mode 100644 ".output/actual/eta/eval/output/Original/from-eas/fact4\n.output" delete mode 100644 ".output/actual/eta/eval/output/Original/from-eas/fact5\n.output" delete mode 100644 ".output/actual/eta/eval/output/Original/from-eas/fact6\n.output" delete mode 100644 ".output/actual/eta/eval/output/Original/from-eas/fact7\n.output" delete mode 100644 ".output/actual/eta/eval/output/Original/from-eas/fact8\n.output" delete mode 100644 ".output/actual/eta/eval/output/Original/from-eas/fact9\n.output" delete mode 100644 .output/actual/eta/eval/output/Original/from-eas/hello.output delete mode 100644 .output/actual/eta/eval/output/Original/from-eas/hello2.output delete mode 100644 .output/actual/eta/eval/output/Original/from-eas/hello3.output delete mode 100644 .output/actual/eta/eval/output/Original/from-eas/hello4.output delete mode 100644 .output/actual/eta/eval/output/Original/from-eas/readcharA.output delete mode 100644 ".output/actual/eta/eval/output/Original/from-eas/readnum0\n.output" delete mode 100644 ".output/actual/eta/eval/output/Original/from-eas/readnum1\n.output" delete mode 100644 .output/actual/eta/eval/output/Original/from-eas/true.output delete mode 100644 .output/actual/eta/eval/output/Original/original/crlf.output delete mode 100644 .output/actual/eta/eval/output/Original/original/hello.output delete mode 100644 .output/actual/eta/eval/output/Original/original/hello2.output create mode 100644 .output/actual/eta/il/optimized/from-eas/bottles.il create mode 100644 .output/actual/eta/il/optimized/from-eas/euclid.il create mode 100644 .output/actual/eta/il/optimized/from-eas/fact.il create mode 100644 .output/actual/eta/il/optimized/from-eas/function.il create mode 100644 .output/actual/eta/il/optimized/from-eas/hello.il create mode 100644 .output/actual/eta/il/optimized/from-eas/hello2.il create mode 100644 .output/actual/eta/il/optimized/from-eas/hello3.il create mode 100644 .output/actual/eta/il/optimized/from-eas/hello4.il create mode 100644 .output/actual/eta/il/optimized/from-eas/multiply.il create mode 100644 .output/actual/eta/il/optimized/from-eas/pip.il create mode 100644 .output/actual/eta/il/optimized/from-eas/pip2.il create mode 100644 .output/actual/eta/il/optimized/from-eas/readnum.il create mode 100644 .output/actual/eta/il/optimized/from-eas/reverse.il create mode 100644 .output/actual/eta/il/optimized/from-eas/true.il create mode 100644 .output/actual/eta/il/optimized/from-eas/writenum.il create mode 100644 .output/actual/eta/il/optimized/from-eas/writestr.il create mode 100644 .output/actual/eta/il/optimized/original/bottles.il create mode 100644 .output/actual/eta/il/optimized/original/crlf.il create mode 100644 .output/actual/eta/il/optimized/original/fact.il create mode 100644 .output/actual/eta/il/optimized/original/hello.il create mode 100644 .output/actual/eta/il/optimized/original/hello2.il create mode 100644 .output/actual/eta/il/optimized/original/pip.il create mode 100644 .output/actual/eta/il/optimized/original/pip2.il delete mode 100644 .output/actual/ws/il/from-wsa/bottles.il delete mode 100644 .output/actual/ws/il/from-wsa/hello.il delete mode 100644 .output/actual/ws/il/from-wsa/hello2.il delete mode 100644 .output/actual/ws/il/from-wsa/hello4.il delete mode 100644 .output/actual/ws/il/from-wsa/prim.il create mode 100644 .output/actual/ws/il/optimized/from-wsa/bottles.il create mode 100644 .output/actual/ws/il/optimized/from-wsa/hello.il create mode 100644 .output/actual/ws/il/optimized/from-wsa/hello2.il create mode 100644 .output/actual/ws/il/optimized/from-wsa/hello4.il create mode 100644 .output/actual/ws/il/optimized/from-wsa/prim.il rename .output/actual/ws/il/{ => optimized}/from-wsa/true.il (100%) create mode 100644 .output/actual/ws/il/optimized/original/calc.il create mode 100644 .output/actual/ws/il/optimized/original/count.il create mode 100644 .output/actual/ws/il/optimized/original/fact.il create mode 100644 .output/actual/ws/il/optimized/original/hWorld.il create mode 100644 .output/actual/ws/il/optimized/original/hanoi.il create mode 100644 .output/actual/ws/il/optimized/original/helloWorld.il create mode 100644 .output/actual/ws/il/optimized/original/locTest.il create mode 100644 .output/actual/ws/il/optimized/original/name.il rename .output/actual/ws/il/{ => optimized}/original/truthMachine.il (63%) delete mode 100644 .output/actual/ws/il/original/calc.il delete mode 100644 .output/actual/ws/il/original/count.il delete mode 100644 .output/actual/ws/il/original/fact.il delete mode 100644 .output/actual/ws/il/original/hWorld.il delete mode 100644 .output/actual/ws/il/original/hanoi.il delete mode 100644 .output/actual/ws/il/original/helloWorld.il delete mode 100644 .output/actual/ws/il/original/locTest.il delete mode 100644 .output/actual/ws/il/original/name.il create mode 100644 .output/actual/ws/il/parsed/from-wsa/bottles.il create mode 100644 .output/actual/ws/il/parsed/from-wsa/hello.il create mode 100644 .output/actual/ws/il/parsed/from-wsa/hello2.il create mode 100644 .output/actual/ws/il/parsed/from-wsa/hello4.il create mode 100644 .output/actual/ws/il/parsed/from-wsa/prim.il rename .output/{golden/ws/il => actual/ws/il/parsed}/from-wsa/true.il (100%) create mode 100644 .output/actual/ws/il/parsed/original/calc.il create mode 100644 .output/actual/ws/il/parsed/original/count.il create mode 100644 .output/actual/ws/il/parsed/original/fact.il create mode 100644 .output/actual/ws/il/parsed/original/hWorld.il create mode 100644 .output/actual/ws/il/parsed/original/hanoi.il create mode 100644 .output/actual/ws/il/parsed/original/helloWorld.il create mode 100644 .output/actual/ws/il/parsed/original/locTest.il create mode 100644 .output/actual/ws/il/parsed/original/name.il create mode 100644 .output/actual/ws/il/parsed/original/truthMachine.il delete mode 100644 .output/golden/eta/eval/logged/Fast/from-eas/bottles.logged delete mode 100644 .output/golden/eta/eval/logged/Fast/from-eas/divmod.logged delete mode 100644 ".output/golden/eta/eval/logged/Fast/from-eas/fact0\n.logged" delete mode 100644 ".output/golden/eta/eval/logged/Fast/from-eas/fact1\n.logged" delete mode 100644 ".output/golden/eta/eval/logged/Fast/from-eas/fact2\n.logged" delete mode 100644 ".output/golden/eta/eval/logged/Fast/from-eas/fact3\n.logged" delete mode 100644 ".output/golden/eta/eval/logged/Fast/from-eas/fact4\n.logged" delete mode 100644 ".output/golden/eta/eval/logged/Fast/from-eas/fact5\n.logged" delete mode 100644 ".output/golden/eta/eval/logged/Fast/from-eas/fact6\n.logged" delete mode 100644 ".output/golden/eta/eval/logged/Fast/from-eas/fact7\n.logged" delete mode 100644 ".output/golden/eta/eval/logged/Fast/from-eas/fact8\n.logged" delete mode 100644 ".output/golden/eta/eval/logged/Fast/from-eas/fact9\n.logged" delete mode 100644 .output/golden/eta/eval/logged/Fast/from-eas/hello.logged delete mode 100644 .output/golden/eta/eval/logged/Fast/from-eas/hello2.logged delete mode 100644 .output/golden/eta/eval/logged/Fast/from-eas/hello3.logged delete mode 100644 .output/golden/eta/eval/logged/Fast/from-eas/hello4.logged delete mode 100644 .output/golden/eta/eval/logged/Fast/from-eas/readcharA.logged delete mode 100644 ".output/golden/eta/eval/logged/Fast/from-eas/readnum0\n.logged" delete mode 100644 ".output/golden/eta/eval/logged/Fast/from-eas/readnum1\n.logged" delete mode 100644 .output/golden/eta/eval/logged/Fast/from-eas/true.logged delete mode 100644 .output/golden/eta/eval/logged/Fast/original/bottles.logged delete mode 100644 .output/golden/eta/eval/logged/Fast/original/crlf.logged delete mode 100644 ".output/golden/eta/eval/logged/Fast/original/fact1\n.logged" delete mode 100644 ".output/golden/eta/eval/logged/Fast/original/fact2\n.logged" delete mode 100644 ".output/golden/eta/eval/logged/Fast/original/fact3\n.logged" delete mode 100644 ".output/golden/eta/eval/logged/Fast/original/fact4\n.logged" delete mode 100644 ".output/golden/eta/eval/logged/Fast/original/fact5\n.logged" delete mode 100644 ".output/golden/eta/eval/logged/Fast/original/fact6\n.logged" delete mode 100644 ".output/golden/eta/eval/logged/Fast/original/fact7\n.logged" delete mode 100644 ".output/golden/eta/eval/logged/Fast/original/fact8\n.logged" delete mode 100644 .output/golden/eta/eval/logged/Fast/original/hello.logged delete mode 100644 .output/golden/eta/eval/logged/Fast/original/hello2.logged delete mode 100644 .output/golden/eta/eval/logged/Original/from-eas/bottles.logged delete mode 100644 .output/golden/eta/eval/logged/Original/from-eas/divmod.logged delete mode 100644 ".output/golden/eta/eval/logged/Original/from-eas/fact0\n.logged" delete mode 100644 ".output/golden/eta/eval/logged/Original/from-eas/fact1\n.logged" delete mode 100644 ".output/golden/eta/eval/logged/Original/from-eas/fact2\n.logged" delete mode 100644 ".output/golden/eta/eval/logged/Original/from-eas/fact3\n.logged" delete mode 100644 ".output/golden/eta/eval/logged/Original/from-eas/fact4\n.logged" delete mode 100644 ".output/golden/eta/eval/logged/Original/from-eas/fact5\n.logged" delete mode 100644 ".output/golden/eta/eval/logged/Original/from-eas/fact6\n.logged" delete mode 100644 ".output/golden/eta/eval/logged/Original/from-eas/fact7\n.logged" delete mode 100644 ".output/golden/eta/eval/logged/Original/from-eas/fact8\n.logged" delete mode 100644 ".output/golden/eta/eval/logged/Original/from-eas/fact9\n.logged" delete mode 100644 .output/golden/eta/eval/logged/Original/from-eas/hello.logged delete mode 100644 .output/golden/eta/eval/logged/Original/from-eas/hello2.logged delete mode 100644 .output/golden/eta/eval/logged/Original/from-eas/hello3.logged delete mode 100644 .output/golden/eta/eval/logged/Original/from-eas/hello4.logged delete mode 100644 .output/golden/eta/eval/logged/Original/from-eas/readcharA.logged delete mode 100644 ".output/golden/eta/eval/logged/Original/from-eas/readnum0\n.logged" delete mode 100644 ".output/golden/eta/eval/logged/Original/from-eas/readnum1\n.logged" delete mode 100644 .output/golden/eta/eval/logged/Original/from-eas/true.logged delete mode 100644 .output/golden/eta/eval/logged/Original/original/crlf.logged delete mode 100644 .output/golden/eta/eval/logged/Original/original/hello.logged delete mode 100644 .output/golden/eta/eval/logged/Original/original/hello2.logged delete mode 100644 .output/golden/eta/eval/output/Fast/from-eas/bottles.output delete mode 100644 .output/golden/eta/eval/output/Fast/from-eas/divmod.output delete mode 100644 ".output/golden/eta/eval/output/Fast/from-eas/fact0\n.output" delete mode 100644 ".output/golden/eta/eval/output/Fast/from-eas/fact1\n.output" delete mode 100644 ".output/golden/eta/eval/output/Fast/from-eas/fact2\n.output" delete mode 100644 ".output/golden/eta/eval/output/Fast/from-eas/fact3\n.output" delete mode 100644 ".output/golden/eta/eval/output/Fast/from-eas/fact4\n.output" delete mode 100644 ".output/golden/eta/eval/output/Fast/from-eas/fact5\n.output" delete mode 100644 ".output/golden/eta/eval/output/Fast/from-eas/fact6\n.output" delete mode 100644 ".output/golden/eta/eval/output/Fast/from-eas/fact7\n.output" delete mode 100644 ".output/golden/eta/eval/output/Fast/from-eas/fact8\n.output" delete mode 100644 ".output/golden/eta/eval/output/Fast/from-eas/fact9\n.output" delete mode 100644 .output/golden/eta/eval/output/Fast/from-eas/hello.output delete mode 100644 .output/golden/eta/eval/output/Fast/from-eas/hello2.output delete mode 100644 .output/golden/eta/eval/output/Fast/from-eas/hello3.output delete mode 100644 .output/golden/eta/eval/output/Fast/from-eas/hello4.output delete mode 100644 .output/golden/eta/eval/output/Fast/from-eas/readcharA.output delete mode 100644 ".output/golden/eta/eval/output/Fast/from-eas/readnum0\n.output" delete mode 100644 ".output/golden/eta/eval/output/Fast/from-eas/readnum1\n.output" delete mode 100644 .output/golden/eta/eval/output/Fast/from-eas/true.output delete mode 100644 .output/golden/eta/eval/output/Fast/original/bottles.output delete mode 100644 .output/golden/eta/eval/output/Fast/original/crlf.output delete mode 100644 ".output/golden/eta/eval/output/Fast/original/fact1\n.output" delete mode 100644 ".output/golden/eta/eval/output/Fast/original/fact2\n.output" delete mode 100644 ".output/golden/eta/eval/output/Fast/original/fact3\n.output" delete mode 100644 ".output/golden/eta/eval/output/Fast/original/fact4\n.output" delete mode 100644 ".output/golden/eta/eval/output/Fast/original/fact5\n.output" delete mode 100644 ".output/golden/eta/eval/output/Fast/original/fact6\n.output" delete mode 100644 ".output/golden/eta/eval/output/Fast/original/fact7\n.output" delete mode 100644 ".output/golden/eta/eval/output/Fast/original/fact8\n.output" delete mode 100644 .output/golden/eta/eval/output/Fast/original/hello.output delete mode 100644 .output/golden/eta/eval/output/Fast/original/hello2.output delete mode 100644 .output/golden/eta/eval/output/Original/from-eas/bottles.output delete mode 100644 .output/golden/eta/eval/output/Original/from-eas/divmod.output delete mode 100644 ".output/golden/eta/eval/output/Original/from-eas/fact0\n.output" delete mode 100644 ".output/golden/eta/eval/output/Original/from-eas/fact1\n.output" delete mode 100644 ".output/golden/eta/eval/output/Original/from-eas/fact2\n.output" delete mode 100644 ".output/golden/eta/eval/output/Original/from-eas/fact3\n.output" delete mode 100644 ".output/golden/eta/eval/output/Original/from-eas/fact4\n.output" delete mode 100644 ".output/golden/eta/eval/output/Original/from-eas/fact5\n.output" delete mode 100644 ".output/golden/eta/eval/output/Original/from-eas/fact6\n.output" delete mode 100644 ".output/golden/eta/eval/output/Original/from-eas/fact7\n.output" delete mode 100644 ".output/golden/eta/eval/output/Original/from-eas/fact8\n.output" delete mode 100644 ".output/golden/eta/eval/output/Original/from-eas/fact9\n.output" delete mode 100644 .output/golden/eta/eval/output/Original/from-eas/hello.output delete mode 100644 .output/golden/eta/eval/output/Original/from-eas/hello2.output delete mode 100644 .output/golden/eta/eval/output/Original/from-eas/hello3.output delete mode 100644 .output/golden/eta/eval/output/Original/from-eas/hello4.output delete mode 100644 .output/golden/eta/eval/output/Original/from-eas/readcharA.output delete mode 100644 ".output/golden/eta/eval/output/Original/from-eas/readnum0\n.output" delete mode 100644 ".output/golden/eta/eval/output/Original/from-eas/readnum1\n.output" delete mode 100644 .output/golden/eta/eval/output/Original/from-eas/true.output delete mode 100644 .output/golden/eta/eval/output/Original/original/crlf.output delete mode 100644 .output/golden/eta/eval/output/Original/original/hello.output delete mode 100644 .output/golden/eta/eval/output/Original/original/hello2.output create mode 100644 .output/golden/eta/il/optimized/from-eas/bottles.il create mode 100644 .output/golden/eta/il/optimized/from-eas/euclid.il create mode 100644 .output/golden/eta/il/optimized/from-eas/fact.il create mode 100644 .output/golden/eta/il/optimized/from-eas/function.il create mode 100644 .output/golden/eta/il/optimized/from-eas/hello.il create mode 100644 .output/golden/eta/il/optimized/from-eas/hello2.il create mode 100644 .output/golden/eta/il/optimized/from-eas/hello3.il create mode 100644 .output/golden/eta/il/optimized/from-eas/hello4.il create mode 100644 .output/golden/eta/il/optimized/from-eas/multiply.il create mode 100644 .output/golden/eta/il/optimized/from-eas/pip.il create mode 100644 .output/golden/eta/il/optimized/from-eas/pip2.il create mode 100644 .output/golden/eta/il/optimized/from-eas/readnum.il create mode 100644 .output/golden/eta/il/optimized/from-eas/reverse.il create mode 100644 .output/golden/eta/il/optimized/from-eas/true.il create mode 100644 .output/golden/eta/il/optimized/from-eas/writenum.il create mode 100644 .output/golden/eta/il/optimized/from-eas/writestr.il create mode 100644 .output/golden/eta/il/optimized/original/bottles.il create mode 100644 .output/golden/eta/il/optimized/original/crlf.il create mode 100644 .output/golden/eta/il/optimized/original/fact.il create mode 100644 .output/golden/eta/il/optimized/original/hello.il create mode 100644 .output/golden/eta/il/optimized/original/hello2.il create mode 100644 .output/golden/eta/il/optimized/original/pip.il create mode 100644 .output/golden/eta/il/optimized/original/pip2.il delete mode 100644 .output/golden/ws/il/from-wsa/bottles.il delete mode 100644 .output/golden/ws/il/from-wsa/hello.il delete mode 100644 .output/golden/ws/il/from-wsa/hello2.il delete mode 100644 .output/golden/ws/il/from-wsa/hello4.il delete mode 100644 .output/golden/ws/il/from-wsa/prim.il create mode 100644 .output/golden/ws/il/optimized/from-wsa/bottles.il create mode 100644 .output/golden/ws/il/optimized/from-wsa/hello.il create mode 100644 .output/golden/ws/il/optimized/from-wsa/hello2.il create mode 100644 .output/golden/ws/il/optimized/from-wsa/hello4.il create mode 100644 .output/golden/ws/il/optimized/from-wsa/prim.il create mode 100644 .output/golden/ws/il/optimized/from-wsa/true.il create mode 100644 .output/golden/ws/il/optimized/original/calc.il create mode 100644 .output/golden/ws/il/optimized/original/count.il create mode 100644 .output/golden/ws/il/optimized/original/fact.il create mode 100644 .output/golden/ws/il/optimized/original/hWorld.il create mode 100644 .output/golden/ws/il/optimized/original/hanoi.il create mode 100644 .output/golden/ws/il/optimized/original/helloWorld.il create mode 100644 .output/golden/ws/il/optimized/original/locTest.il create mode 100644 .output/golden/ws/il/optimized/original/name.il rename .output/golden/ws/il/{ => optimized}/original/truthMachine.il (63%) delete mode 100644 .output/golden/ws/il/original/calc.il delete mode 100644 .output/golden/ws/il/original/count.il delete mode 100644 .output/golden/ws/il/original/fact.il delete mode 100644 .output/golden/ws/il/original/hWorld.il delete mode 100644 .output/golden/ws/il/original/hanoi.il delete mode 100644 .output/golden/ws/il/original/helloWorld.il delete mode 100644 .output/golden/ws/il/original/locTest.il delete mode 100644 .output/golden/ws/il/original/name.il create mode 100644 .output/golden/ws/il/parsed/from-wsa/bottles.il create mode 100644 .output/golden/ws/il/parsed/from-wsa/hello.il create mode 100644 .output/golden/ws/il/parsed/from-wsa/hello2.il create mode 100644 .output/golden/ws/il/parsed/from-wsa/hello4.il create mode 100644 .output/golden/ws/il/parsed/from-wsa/prim.il create mode 100644 .output/golden/ws/il/parsed/from-wsa/true.il create mode 100644 .output/golden/ws/il/parsed/original/calc.il create mode 100644 .output/golden/ws/il/parsed/original/count.il create mode 100644 .output/golden/ws/il/parsed/original/fact.il create mode 100644 .output/golden/ws/il/parsed/original/hWorld.il create mode 100644 .output/golden/ws/il/parsed/original/hanoi.il create mode 100644 .output/golden/ws/il/parsed/original/helloWorld.il create mode 100644 .output/golden/ws/il/parsed/original/locTest.il create mode 100644 .output/golden/ws/il/parsed/original/name.il create mode 100644 .output/golden/ws/il/parsed/original/truthMachine.il delete mode 100644 docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.Evaluator.hs.html delete mode 100644 docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.API.EvalParams.hs.html delete mode 100644 docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Automaton.hs.html delete mode 100644 docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.hs.html rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.BrainFuck.API.BFType.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.BrainFuck.Common.Symbol.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.BrainFuck.Evaluator.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Evaluator.hs.html (87%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Optimizer.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Evaluator.hs.html (91%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Evaluator.hs.html (85%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.Cat.Evaluator.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.ETA.API.ETAImplType.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.ETA.Addressing.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.ETA.Automaton.hs.html (72%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.ETA.Evaluator.hs.html (53%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.ETA.Lexer.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.ETA.OperandParsers.hs.html (71%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.ETA.Optimizer.hs.html (98%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.ETA.Parser.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.ETA.SimpleParams.hs.html (89%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.ETA.Token.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.FALSE.Expression.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.FALSE.Parser.hs.html (76%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.LazyK.Automaton.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.LazyK.Constants.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.LazyK.Evaluator.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.LazyK.InputEncoder.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.LazyK.Lambda.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.LazyK.Lexer.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.LazyK.Parser.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.LazyK.Reducer.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.Rev.Evaluator.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.SubLeq.Automaton.hs.html (94%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.SubLeq.Evaluator.hs.html (99%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.SubLeq.Lexer.hs.html (100%) create mode 100644 docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.Evaluator.hs.html rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.WhiteSpace.Lexer.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.WhiteSpace.OperandParsers.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.WhiteSpace.Parser.hs.html (58%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.WhiteSpace.SimpleParams.hs.html (73%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.WhiteSpace.Token.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.Zot.Automaton.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.Zot.Evaluator.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.Zot.Expression.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automata.Zot.Parser.hs.html (100%) create mode 100644 docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.AutoOptions.hs.html rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automaton.API.AutoParams.hs.html (69%) create mode 100644 docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.AutomatonOptions.hs.html create mode 100644 docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.EvalParams.hs.html rename docs/reports/helma-test/{helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.API.AutoOptions.hs.html => helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.MemoryOptions.hs.html} (95%) create mode 100644 docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.OptimizationLevel.hs.html create mode 100644 docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Automaton.hs.html create mode 100644 docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.ALU.hs.html create mode 100644 docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.CPU.hs.html create mode 100644 docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.LSU.hs.html create mode 100644 docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.RAM.hs.html create mode 100644 docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.hs.html rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automaton.IO.BusinessIO.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automaton.IO.FreeIO.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automaton.IO.MockIO.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automaton.Instruction.ALInstruction.hs.html (51%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automaton.Instruction.CFInstruction.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automaton.Instruction.IOInstruction.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automaton.Instruction.LSInstruction.hs.html (100%) create mode 100644 docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.SInstruction.hs.html create mode 100644 docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.hs.html rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automaton.Loop.hs.html (100%) create mode 100644 docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Optimizer.hs.html rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automaton.ReadPExtra.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automaton.Types.CellType.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automaton.Types.DumpType.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automaton.Types.FormatType.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automaton.Types.IntCellType.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automaton.Types.RAMType.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automaton.Types.StackType.hs.html (100%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automaton.Types.TokenType.hs.html (100%) create mode 100644 docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Unit.hs.html rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automaton.Units.ALU.hs.html (99%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automaton.Units.CPU.hs.html (55%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automaton.Units.LSU.hs.html (97%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automaton.Units.RAM.hs.html (98%) rename docs/reports/helma-test/{helma-0.8.4.3-inplace => helma-0.8.4.4-inplace}/HelVM.HelMA.Automaton.WrapTokenList.hs.html (100%) create mode 100644 docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Tree-InstructionMemory.html create mode 100644 docs/reports/helma/HelVM-HelMA-Automaton-API-AutomatonOptions.html create mode 100644 docs/reports/helma/HelVM-HelMA-Automaton-API-MemoryOptions.html create mode 100644 docs/reports/helma/HelVM-HelMA-Automaton-API-OptimizationLevel.html create mode 100644 docs/reports/helma/HelVM-HelMA-Automaton-Combiner-ALU.html create mode 100644 docs/reports/helma/HelVM-HelMA-Automaton-Combiner-CPU.html create mode 100644 docs/reports/helma/HelVM-HelMA-Automaton-Combiner-LSU.html create mode 100644 docs/reports/helma/HelVM-HelMA-Automaton-Combiner-RAM.html create mode 100644 docs/reports/helma/HelVM-HelMA-Automaton-Combiner.html create mode 100644 docs/reports/helma/HelVM-HelMA-Automaton-Instruction-SInstruction.html create mode 100644 docs/reports/helma/HelVM-HelMA-Automaton-Optimizer.html create mode 100644 docs/reports/helma/HelVM-HelMA-Automaton-Unit.html delete mode 100644 hs/src/HelVM/HelMA/Automaton/AOT.hs delete mode 100644 hs/src/HelVM/HelMA/Automaton/API/AutoParams.hs create mode 100644 hs/src/HelVM/HelMA/Automaton/API/AutomatonOptions.hs create mode 100644 hs/src/HelVM/HelMA/Automaton/API/MemoryOptions.hs create mode 100644 hs/src/HelVM/HelMA/Automaton/API/OptimizationLevel.hs create mode 100644 hs/src/HelVM/HelMA/Automaton/Combiner.hs rename hs/src/HelVM/HelMA/Automaton/{Units => Combiner}/ALU.hs (58%) rename hs/src/HelVM/HelMA/Automaton/{Units => Combiner}/CPU.hs (52%) create mode 100644 hs/src/HelVM/HelMA/Automaton/Combiner/LSU.hs rename hs/src/HelVM/HelMA/Automaton/{Units => Combiner}/RAM.hs (96%) rename hs/src/HelVM/HelMA/Automaton/Instruction/{ALInstruction.hs => SInstruction.hs} (89%) create mode 100644 hs/src/HelVM/HelMA/Automaton/Optimizer.hs delete mode 100644 hs/src/HelVM/HelMA/Automaton/Units/LSU.hs create mode 100644 hs/test/HelVM/HelMA/Automaton/OptimizerSpec.hs diff --git a/.output/actual/bf/eval/logged/FastType/Int16Type/99botles.logged b/.output/actual/bf/eval/logged/FastType/Int16Type/99botles.logged index b44f4515b..f4079ee7d 100644 --- a/.output/actual/bf/eval/logged/FastType/Int16Type/99botles.logged +++ b/.output/actual/bf/eval/logged/FastType/Int16Type/99botles.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Move 1 , Inc 9 , MulAddClr 11 @@ -942,7 +942,7 @@ dump: Automaton ( -3 ) ] ] 6 - , unitTape = + , memoryTape = ( [ 48 , 48 diff --git a/.output/actual/bf/eval/logged/FastType/Int16Type/fascistHelloWorld.logged b/.output/actual/bf/eval/logged/FastType/Int16Type/fascistHelloWorld.logged index 654e6a1ab..f50e9283f 100644 --- a/.output/actual/bf/eval/logged/FastType/Int16Type/fascistHelloWorld.logged +++ b/.output/actual/bf/eval/logged/FastType/Int16Type/fascistHelloWorld.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Move 1 , Inc 8 , MulAddClr 9 @@ -75,7 +75,7 @@ dump: Automaton , Inc 1 , Output ] 50 - , unitTape = + , memoryTape = ( [ 0 , 0 diff --git a/.output/actual/bf/eval/logged/FastType/Int16Type/helloWorld.logged b/.output/actual/bf/eval/logged/FastType/Int16Type/helloWorld.logged index 9f3c89023..18a4c08c4 100644 --- a/.output/actual/bf/eval/logged/FastType/Int16Type/helloWorld.logged +++ b/.output/actual/bf/eval/logged/FastType/Int16Type/helloWorld.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Inc 8 , While [ Move 1 @@ -72,7 +72,7 @@ dump: Automaton , Inc 2 , Output ] 32 - , unitTape = + , memoryTape = ( [ 0 ] , [ 10 diff --git a/.output/actual/bf/eval/logged/FastType/Int16Type/triangle.logged b/.output/actual/bf/eval/logged/FastType/Int16Type/triangle.logged index 21d5a4237..a73ff944a 100644 --- a/.output/actual/bf/eval/logged/FastType/Int16Type/triangle.logged +++ b/.output/actual/bf/eval/logged/FastType/Int16Type/triangle.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ While [ Inc ( -1 ) @@ -98,7 +98,7 @@ dump: Automaton ] , Inc 5 ] 17 - , unitTape = + , memoryTape = ( [ 0 , 0 diff --git a/.output/actual/bf/eval/logged/FastType/Int8Type/99botles.logged b/.output/actual/bf/eval/logged/FastType/Int8Type/99botles.logged index b44f4515b..f4079ee7d 100644 --- a/.output/actual/bf/eval/logged/FastType/Int8Type/99botles.logged +++ b/.output/actual/bf/eval/logged/FastType/Int8Type/99botles.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Move 1 , Inc 9 , MulAddClr 11 @@ -942,7 +942,7 @@ dump: Automaton ( -3 ) ] ] 6 - , unitTape = + , memoryTape = ( [ 48 , 48 diff --git a/.output/actual/bf/eval/logged/FastType/Int8Type/fascistHelloWorld.logged b/.output/actual/bf/eval/logged/FastType/Int8Type/fascistHelloWorld.logged index 654e6a1ab..f50e9283f 100644 --- a/.output/actual/bf/eval/logged/FastType/Int8Type/fascistHelloWorld.logged +++ b/.output/actual/bf/eval/logged/FastType/Int8Type/fascistHelloWorld.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Move 1 , Inc 8 , MulAddClr 9 @@ -75,7 +75,7 @@ dump: Automaton , Inc 1 , Output ] 50 - , unitTape = + , memoryTape = ( [ 0 , 0 diff --git a/.output/actual/bf/eval/logged/FastType/Int8Type/fibonacci.logged b/.output/actual/bf/eval/logged/FastType/Int8Type/fibonacci.logged index d378bc724..0a4dc5501 100644 --- a/.output/actual/bf/eval/logged/FastType/Int8Type/fibonacci.logged +++ b/.output/actual/bf/eval/logged/FastType/Int8Type/fibonacci.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Input , Output , Input @@ -265,7 +265,7 @@ dump: Automaton ( -1 ) ] ] 25 - , unitTape = + , memoryTape = ( [ 114 , 94 diff --git a/.output/actual/bf/eval/logged/FastType/Int8Type/helloWorld.logged b/.output/actual/bf/eval/logged/FastType/Int8Type/helloWorld.logged index 9f3c89023..18a4c08c4 100644 --- a/.output/actual/bf/eval/logged/FastType/Int8Type/helloWorld.logged +++ b/.output/actual/bf/eval/logged/FastType/Int8Type/helloWorld.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Inc 8 , While [ Move 1 @@ -72,7 +72,7 @@ dump: Automaton , Inc 2 , Output ] 32 - , unitTape = + , memoryTape = ( [ 0 ] , [ 10 diff --git a/.output/actual/bf/eval/logged/FastType/Int8Type/padHelloWorld.logged b/.output/actual/bf/eval/logged/FastType/Int8Type/padHelloWorld.logged index 8c787557a..60192ca56 100644 --- a/.output/actual/bf/eval/logged/FastType/Int8Type/padHelloWorld.logged +++ b/.output/actual/bf/eval/logged/FastType/Int8Type/padHelloWorld.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Inc ( -2 ) , Move @@ -74,7 +74,7 @@ dump: Automaton , Inc 1 , Output ] 38 - , unitTape = + , memoryTape = ( [ 108 , 87 diff --git a/.output/actual/bf/eval/logged/FastType/Int8Type/theShortestHelloWorld.logged b/.output/actual/bf/eval/logged/FastType/Int8Type/theShortestHelloWorld.logged index d1716706f..816bbea9e 100644 --- a/.output/actual/bf/eval/logged/FastType/Int8Type/theShortestHelloWorld.logged +++ b/.output/actual/bf/eval/logged/FastType/Int8Type/theShortestHelloWorld.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Inc 1 , While [ Inc @@ -57,7 +57,7 @@ dump: Automaton , Inc 1 , Output ] 26 - , unitTape = + , memoryTape = ( [ 87 , 0 diff --git a/.output/actual/bf/eval/logged/FastType/Int8Type/triangle.logged b/.output/actual/bf/eval/logged/FastType/Int8Type/triangle.logged index 21d5a4237..a73ff944a 100644 --- a/.output/actual/bf/eval/logged/FastType/Int8Type/triangle.logged +++ b/.output/actual/bf/eval/logged/FastType/Int8Type/triangle.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ While [ Inc ( -1 ) @@ -98,7 +98,7 @@ dump: Automaton ] , Inc 5 ] 17 - , unitTape = + , memoryTape = ( [ 0 , 0 diff --git a/.output/actual/bf/eval/logged/FastType/Int8Type/value256.logged b/.output/actual/bf/eval/logged/FastType/Int8Type/value256.logged index 91f192ef7..f6aa354b0 100644 --- a/.output/actual/bf/eval/logged/FastType/Int8Type/value256.logged +++ b/.output/actual/bf/eval/logged/FastType/Int8Type/value256.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Inc 8 , MulAddClr 8 1 , Move 1 @@ -127,7 +127,7 @@ dump: Automaton ( -1 ) ] ] 39 - , unitTape = + , memoryTape = ( [ 0 , 0 diff --git a/.output/actual/bf/eval/logged/FastType/Word16Type/99botles.logged b/.output/actual/bf/eval/logged/FastType/Word16Type/99botles.logged index b44f4515b..f4079ee7d 100644 --- a/.output/actual/bf/eval/logged/FastType/Word16Type/99botles.logged +++ b/.output/actual/bf/eval/logged/FastType/Word16Type/99botles.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Move 1 , Inc 9 , MulAddClr 11 @@ -942,7 +942,7 @@ dump: Automaton ( -3 ) ] ] 6 - , unitTape = + , memoryTape = ( [ 48 , 48 diff --git a/.output/actual/bf/eval/logged/FastType/Word16Type/fascistHelloWorld.logged b/.output/actual/bf/eval/logged/FastType/Word16Type/fascistHelloWorld.logged index 654e6a1ab..f50e9283f 100644 --- a/.output/actual/bf/eval/logged/FastType/Word16Type/fascistHelloWorld.logged +++ b/.output/actual/bf/eval/logged/FastType/Word16Type/fascistHelloWorld.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Move 1 , Inc 8 , MulAddClr 9 @@ -75,7 +75,7 @@ dump: Automaton , Inc 1 , Output ] 50 - , unitTape = + , memoryTape = ( [ 0 , 0 diff --git a/.output/actual/bf/eval/logged/FastType/Word16Type/helloWorld.logged b/.output/actual/bf/eval/logged/FastType/Word16Type/helloWorld.logged index 9f3c89023..18a4c08c4 100644 --- a/.output/actual/bf/eval/logged/FastType/Word16Type/helloWorld.logged +++ b/.output/actual/bf/eval/logged/FastType/Word16Type/helloWorld.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Inc 8 , While [ Move 1 @@ -72,7 +72,7 @@ dump: Automaton , Inc 2 , Output ] 32 - , unitTape = + , memoryTape = ( [ 0 ] , [ 10 diff --git a/.output/actual/bf/eval/logged/FastType/Word16Type/triangle.logged b/.output/actual/bf/eval/logged/FastType/Word16Type/triangle.logged index 21d5a4237..a73ff944a 100644 --- a/.output/actual/bf/eval/logged/FastType/Word16Type/triangle.logged +++ b/.output/actual/bf/eval/logged/FastType/Word16Type/triangle.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ While [ Inc ( -1 ) @@ -98,7 +98,7 @@ dump: Automaton ] , Inc 5 ] 17 - , unitTape = + , memoryTape = ( [ 0 , 0 diff --git a/.output/actual/bf/eval/logged/FastType/Word8Type/99botles.logged b/.output/actual/bf/eval/logged/FastType/Word8Type/99botles.logged index b44f4515b..f4079ee7d 100644 --- a/.output/actual/bf/eval/logged/FastType/Word8Type/99botles.logged +++ b/.output/actual/bf/eval/logged/FastType/Word8Type/99botles.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Move 1 , Inc 9 , MulAddClr 11 @@ -942,7 +942,7 @@ dump: Automaton ( -3 ) ] ] 6 - , unitTape = + , memoryTape = ( [ 48 , 48 diff --git a/.output/actual/bf/eval/logged/FastType/Word8Type/fascistHelloWorld.logged b/.output/actual/bf/eval/logged/FastType/Word8Type/fascistHelloWorld.logged index 654e6a1ab..f50e9283f 100644 --- a/.output/actual/bf/eval/logged/FastType/Word8Type/fascistHelloWorld.logged +++ b/.output/actual/bf/eval/logged/FastType/Word8Type/fascistHelloWorld.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Move 1 , Inc 8 , MulAddClr 9 @@ -75,7 +75,7 @@ dump: Automaton , Inc 1 , Output ] 50 - , unitTape = + , memoryTape = ( [ 0 , 0 diff --git a/.output/actual/bf/eval/logged/FastType/Word8Type/fibonacci.logged b/.output/actual/bf/eval/logged/FastType/Word8Type/fibonacci.logged index d378bc724..0a4dc5501 100644 --- a/.output/actual/bf/eval/logged/FastType/Word8Type/fibonacci.logged +++ b/.output/actual/bf/eval/logged/FastType/Word8Type/fibonacci.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Input , Output , Input @@ -265,7 +265,7 @@ dump: Automaton ( -1 ) ] ] 25 - , unitTape = + , memoryTape = ( [ 114 , 94 diff --git a/.output/actual/bf/eval/logged/FastType/Word8Type/helloWorld.logged b/.output/actual/bf/eval/logged/FastType/Word8Type/helloWorld.logged index 9f3c89023..18a4c08c4 100644 --- a/.output/actual/bf/eval/logged/FastType/Word8Type/helloWorld.logged +++ b/.output/actual/bf/eval/logged/FastType/Word8Type/helloWorld.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Inc 8 , While [ Move 1 @@ -72,7 +72,7 @@ dump: Automaton , Inc 2 , Output ] 32 - , unitTape = + , memoryTape = ( [ 0 ] , [ 10 diff --git a/.output/actual/bf/eval/logged/FastType/Word8Type/padHelloWorld.logged b/.output/actual/bf/eval/logged/FastType/Word8Type/padHelloWorld.logged index ed9ab3cdb..c4958f6cf 100644 --- a/.output/actual/bf/eval/logged/FastType/Word8Type/padHelloWorld.logged +++ b/.output/actual/bf/eval/logged/FastType/Word8Type/padHelloWorld.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Inc ( -2 ) , Move @@ -74,7 +74,7 @@ dump: Automaton , Inc 1 , Output ] 38 - , unitTape = + , memoryTape = ( [ 108 , 87 diff --git a/.output/actual/bf/eval/logged/FastType/Word8Type/theShortestHelloWorld.logged b/.output/actual/bf/eval/logged/FastType/Word8Type/theShortestHelloWorld.logged index 6e3b8412c..f3f9087f6 100644 --- a/.output/actual/bf/eval/logged/FastType/Word8Type/theShortestHelloWorld.logged +++ b/.output/actual/bf/eval/logged/FastType/Word8Type/theShortestHelloWorld.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Inc 1 , While [ Inc @@ -57,7 +57,7 @@ dump: Automaton , Inc 1 , Output ] 26 - , unitTape = + , memoryTape = ( [ 87 , 0 diff --git a/.output/actual/bf/eval/logged/FastType/Word8Type/triangle.logged b/.output/actual/bf/eval/logged/FastType/Word8Type/triangle.logged index 21d5a4237..a73ff944a 100644 --- a/.output/actual/bf/eval/logged/FastType/Word8Type/triangle.logged +++ b/.output/actual/bf/eval/logged/FastType/Word8Type/triangle.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ While [ Inc ( -1 ) @@ -98,7 +98,7 @@ dump: Automaton ] , Inc 5 ] 17 - , unitTape = + , memoryTape = ( [ 0 , 0 diff --git a/.output/actual/bf/eval/logged/FastType/Word8Type/value256.logged b/.output/actual/bf/eval/logged/FastType/Word8Type/value256.logged index 91f192ef7..f6aa354b0 100644 --- a/.output/actual/bf/eval/logged/FastType/Word8Type/value256.logged +++ b/.output/actual/bf/eval/logged/FastType/Word8Type/value256.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Inc 8 , MulAddClr 8 1 , Move 1 @@ -127,7 +127,7 @@ dump: Automaton ( -1 ) ] ] 39 - , unitTape = + , memoryTape = ( [ 0 , 0 diff --git a/.output/actual/eta/eval/logged/Fast/False/from-eas/bottles.logged b/.output/actual/eta/eval/logged/Fast/False/from-eas/bottles.logged index fa4388e06..a40bb326a 100644 --- a/.output/actual/eta/eval/logged/Fast/False/from-eas/bottles.logged +++ b/.output/actual/eta/eval/logged/Fast/False/from-eas/bottles.logged @@ -1,42 +1,51 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 31 ) + ( SAL + ( Cons 31 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 3 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 4 ) , IAL - ( Cons 5 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 6 ) + ) , Transfer , ICF ( DMark 5 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 6 ) @@ -44,403 +53,649 @@ dump: Automaton , ICF ( DMark 7 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 11 ) + ) , Transfer , ICF ( DMark 10 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 11 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 12 ) , IAL - ( Cons 13 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 13 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 14 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "14" ) , ICF ( DMark 15 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 17 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 19 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 20 ) , ICF ( DMark 21 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 22 ) , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , Transfer , ICF ( DMark 23 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( DMark 24 ) , IAL - ( Cons 25 ) + ( SAL + ( Cons 25 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 25 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 27 ) , IAL - ( Cons 28 ) + ( SAL + ( Cons 28 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( DMark 29 ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , ICF ( DMark 32 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) , Transfer , ICF ( DMark 33 ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 34 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , Transfer , ICF ( DMark 35 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 36 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 112 ) + ( SAL + ( Cons 112 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 107 ) + ( SAL + ( Cons 107 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 84 ) + ( SAL + ( Cons 84 ) + ) , ICF ( DMark 37 ) , IAL - ( Cons 38 ) + ( SAL + ( Cons 38 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 39 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF ( DMark 41 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 43 ) , End ] - , programCounter = 246 + , programCounter = 232 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git a/.output/actual/eta/eval/logged/Fast/False/from-eas/divmod.logged b/.output/actual/eta/eval/logged/Fast/False/from-eas/divmod.logged index 0cd9d37fb..08d7bd5b8 100644 --- a/.output/actual/eta/eval/logged/Fast/False/from-eas/divmod.logged +++ b/.output/actual/eta/eval/logged/Fast/False/from-eas/divmod.logged @@ -1,17 +1,15 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Cons 0 ) ) , ICF ( SMark "1" ) @@ -19,12 +17,12 @@ dump: Automaton ( DMark 2 ) , End ] - , programCounter = 7 + , programCounter = 6 , returnStack = IS [] } - , unitStack = fromList + , memoryStack = fromList [ 0 , 2 ] - , unitRAM = [] + , memoryRAM = [] } diff --git "a/.output/actual/eta/eval/logged/Fast/False/from-eas/fact0\n.logged" "b/.output/actual/eta/eval/logged/Fast/False/from-eas/fact0\n.logged" index 21731cdee..bdfe9a478 100644 --- "a/.output/actual/eta/eval/logged/Fast/False/from-eas/fact0\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/False/from-eas/fact0\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,513 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 16 ) + ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 35 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 36 ) , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 38 ) + ) , Transfer , ICF ( DMark 37 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 38 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "38" ) , ICF ( DMark 39 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 40 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 43 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 46 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 48 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 49 ) , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 51 ) + ) , Transfer , ICF ( DMark 50 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 51 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 52 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 53 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 55 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 56 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 59 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 60 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 61 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 62 ) , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 64 ) + ) , Transfer , ICF ( DMark 63 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 64 ) @@ -489,20 +677,24 @@ dump: Automaton , ICF ( DMark 65 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 66 ) , End ] - , programCounter = 148 + , programCounter = 136 , returnStack = IS [] } - , unitStack = fromList + , memoryStack = fromList [ 496 , 2 ] - , unitRAM = [] + , memoryRAM = [] } diff --git "a/.output/actual/eta/eval/logged/Fast/False/from-eas/fact1\n.logged" "b/.output/actual/eta/eval/logged/Fast/False/from-eas/fact1\n.logged" index d0524355a..9d2a670b8 100644 --- "a/.output/actual/eta/eval/logged/Fast/False/from-eas/fact1\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/False/from-eas/fact1\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,513 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 16 ) + ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 35 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 36 ) , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 38 ) + ) , Transfer , ICF ( DMark 37 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 38 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "38" ) , ICF ( DMark 39 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 40 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 43 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 46 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 48 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 49 ) , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 51 ) + ) , Transfer , ICF ( DMark 50 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 51 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 52 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 53 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 55 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 56 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 59 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 60 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 61 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 62 ) , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 64 ) + ) , Transfer , ICF ( DMark 63 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 64 ) @@ -489,20 +677,24 @@ dump: Automaton , ICF ( DMark 65 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 66 ) , End ] - , programCounter = 148 + , programCounter = 136 , returnStack = IS [] } - , unitStack = fromList + , memoryStack = fromList [ 506 , 2 ] - , unitRAM = [] + , memoryRAM = [] } diff --git "a/.output/actual/eta/eval/logged/Fast/False/from-eas/fact2\n.logged" "b/.output/actual/eta/eval/logged/Fast/False/from-eas/fact2\n.logged" index 9056ebf56..06019efb2 100644 --- "a/.output/actual/eta/eval/logged/Fast/False/from-eas/fact2\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/False/from-eas/fact2\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,513 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 16 ) + ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 35 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 36 ) , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 38 ) + ) , Transfer , ICF ( DMark 37 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 38 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "38" ) , ICF ( DMark 39 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 40 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 43 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 46 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 48 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 49 ) , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 51 ) + ) , Transfer , ICF ( DMark 50 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 51 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 52 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 53 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 55 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 56 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 59 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 60 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 61 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 62 ) , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 64 ) + ) , Transfer , ICF ( DMark 63 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 64 ) @@ -489,20 +677,24 @@ dump: Automaton , ICF ( DMark 65 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 66 ) , End ] - , programCounter = 148 + , programCounter = 136 , returnStack = IS [] } - , unitStack = fromList + , memoryStack = fromList [ 516 , 2 ] - , unitRAM = [] + , memoryRAM = [] } diff --git "a/.output/actual/eta/eval/logged/Fast/False/from-eas/fact3\n.logged" "b/.output/actual/eta/eval/logged/Fast/False/from-eas/fact3\n.logged" index 01ff51bef..b2995434d 100644 --- "a/.output/actual/eta/eval/logged/Fast/False/from-eas/fact3\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/False/from-eas/fact3\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,513 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 16 ) + ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 35 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 36 ) , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 38 ) + ) , Transfer , ICF ( DMark 37 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 38 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "38" ) , ICF ( DMark 39 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 40 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 43 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 46 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 48 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 49 ) , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 51 ) + ) , Transfer , ICF ( DMark 50 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 51 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 52 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 53 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 55 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 56 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 59 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 60 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 61 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 62 ) , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 64 ) + ) , Transfer , ICF ( DMark 63 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 64 ) @@ -489,20 +677,24 @@ dump: Automaton , ICF ( DMark 65 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 66 ) , End ] - , programCounter = 148 + , programCounter = 136 , returnStack = IS [] } - , unitStack = fromList + , memoryStack = fromList [ 526 , 2 ] - , unitRAM = [] + , memoryRAM = [] } diff --git "a/.output/actual/eta/eval/logged/Fast/False/from-eas/fact4\n.logged" "b/.output/actual/eta/eval/logged/Fast/False/from-eas/fact4\n.logged" index 79a61894b..9cc70c121 100644 --- "a/.output/actual/eta/eval/logged/Fast/False/from-eas/fact4\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/False/from-eas/fact4\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,513 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 16 ) + ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 35 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 36 ) , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 38 ) + ) , Transfer , ICF ( DMark 37 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 38 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "38" ) , ICF ( DMark 39 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 40 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 43 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 46 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 48 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 49 ) , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 51 ) + ) , Transfer , ICF ( DMark 50 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 51 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 52 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 53 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 55 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 56 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 59 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 60 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 61 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 62 ) , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 64 ) + ) , Transfer , ICF ( DMark 63 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 64 ) @@ -489,20 +677,24 @@ dump: Automaton , ICF ( DMark 65 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 66 ) , End ] - , programCounter = 148 + , programCounter = 136 , returnStack = IS [] } - , unitStack = fromList + , memoryStack = fromList [ 536 , 2 ] - , unitRAM = [] + , memoryRAM = [] } diff --git "a/.output/actual/eta/eval/logged/Fast/False/from-eas/fact5\n.logged" "b/.output/actual/eta/eval/logged/Fast/False/from-eas/fact5\n.logged" index 51b356411..3773a24e0 100644 --- "a/.output/actual/eta/eval/logged/Fast/False/from-eas/fact5\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/False/from-eas/fact5\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,513 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 16 ) + ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 35 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 36 ) , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 38 ) + ) , Transfer , ICF ( DMark 37 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 38 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "38" ) , ICF ( DMark 39 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 40 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 43 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 46 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 48 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 49 ) , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 51 ) + ) , Transfer , ICF ( DMark 50 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 51 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 52 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 53 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 55 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 56 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 59 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 60 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 61 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 62 ) , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 64 ) + ) , Transfer , ICF ( DMark 63 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 64 ) @@ -489,20 +677,24 @@ dump: Automaton , ICF ( DMark 65 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 66 ) , End ] - , programCounter = 148 + , programCounter = 136 , returnStack = IS [] } - , unitStack = fromList + , memoryStack = fromList [ 546 , 2 ] - , unitRAM = [] + , memoryRAM = [] } diff --git "a/.output/actual/eta/eval/logged/Fast/False/from-eas/fact6\n.logged" "b/.output/actual/eta/eval/logged/Fast/False/from-eas/fact6\n.logged" index b4839c7e2..d24dd431f 100644 --- "a/.output/actual/eta/eval/logged/Fast/False/from-eas/fact6\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/False/from-eas/fact6\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,513 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 16 ) + ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 35 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 36 ) , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 38 ) + ) , Transfer , ICF ( DMark 37 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 38 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "38" ) , ICF ( DMark 39 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 40 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 43 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 46 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 48 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 49 ) , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 51 ) + ) , Transfer , ICF ( DMark 50 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 51 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 52 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 53 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 55 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 56 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 59 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 60 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 61 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 62 ) , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 64 ) + ) , Transfer , ICF ( DMark 63 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 64 ) @@ -489,20 +677,24 @@ dump: Automaton , ICF ( DMark 65 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 66 ) , End ] - , programCounter = 148 + , programCounter = 136 , returnStack = IS [] } - , unitStack = fromList + , memoryStack = fromList [ 556 , 2 ] - , unitRAM = [] + , memoryRAM = [] } diff --git "a/.output/actual/eta/eval/logged/Fast/False/from-eas/fact7\n.logged" "b/.output/actual/eta/eval/logged/Fast/False/from-eas/fact7\n.logged" index b7c5d5ea2..1cfa310f9 100644 --- "a/.output/actual/eta/eval/logged/Fast/False/from-eas/fact7\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/False/from-eas/fact7\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,513 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 16 ) + ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 35 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 36 ) , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 38 ) + ) , Transfer , ICF ( DMark 37 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 38 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "38" ) , ICF ( DMark 39 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 40 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 43 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 46 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 48 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 49 ) , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 51 ) + ) , Transfer , ICF ( DMark 50 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 51 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 52 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 53 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 55 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 56 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 59 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 60 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 61 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 62 ) , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 64 ) + ) , Transfer , ICF ( DMark 63 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 64 ) @@ -489,20 +677,24 @@ dump: Automaton , ICF ( DMark 65 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 66 ) , End ] - , programCounter = 148 + , programCounter = 136 , returnStack = IS [] } - , unitStack = fromList + , memoryStack = fromList [ 566 , 2 ] - , unitRAM = [] + , memoryRAM = [] } diff --git "a/.output/actual/eta/eval/logged/Fast/False/from-eas/fact8\n.logged" "b/.output/actual/eta/eval/logged/Fast/False/from-eas/fact8\n.logged" index 75f191133..d18a648c0 100644 --- "a/.output/actual/eta/eval/logged/Fast/False/from-eas/fact8\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/False/from-eas/fact8\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,513 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 16 ) + ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 35 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 36 ) , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 38 ) + ) , Transfer , ICF ( DMark 37 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 38 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "38" ) , ICF ( DMark 39 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 40 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 43 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 46 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 48 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 49 ) , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 51 ) + ) , Transfer , ICF ( DMark 50 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 51 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 52 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 53 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 55 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 56 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 59 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 60 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 61 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 62 ) , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 64 ) + ) , Transfer , ICF ( DMark 63 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 64 ) @@ -489,20 +677,24 @@ dump: Automaton , ICF ( DMark 65 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 66 ) , End ] - , programCounter = 148 + , programCounter = 136 , returnStack = IS [] } - , unitStack = fromList + , memoryStack = fromList [ 576 , 2 ] - , unitRAM = [] + , memoryRAM = [] } diff --git "a/.output/actual/eta/eval/logged/Fast/False/from-eas/fact9\n.logged" "b/.output/actual/eta/eval/logged/Fast/False/from-eas/fact9\n.logged" index a0a495d10..e835f10f2 100644 --- "a/.output/actual/eta/eval/logged/Fast/False/from-eas/fact9\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/False/from-eas/fact9\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,513 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 16 ) + ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 35 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 36 ) , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 38 ) + ) , Transfer , ICF ( DMark 37 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 38 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "38" ) , ICF ( DMark 39 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 40 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 43 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 46 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 48 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 49 ) , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 51 ) + ) , Transfer , ICF ( DMark 50 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 51 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 52 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 53 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 55 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 56 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 59 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 60 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 61 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 62 ) , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 64 ) + ) , Transfer , ICF ( DMark 63 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 64 ) @@ -489,20 +677,24 @@ dump: Automaton , ICF ( DMark 65 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 66 ) , End ] - , programCounter = 148 + , programCounter = 136 , returnStack = IS [] } - , unitStack = fromList + , memoryStack = fromList [ 586 , 2 ] - , unitRAM = [] + , memoryRAM = [] } diff --git a/.output/actual/eta/eval/logged/Fast/False/from-eas/hello.logged b/.output/actual/eta/eval/logged/Fast/False/from-eas/hello.logged index 677f9216f..d174229ba 100644 --- a/.output/actual/eta/eval/logged/Fast/False/from-eas/hello.logged +++ b/.output/actual/eta/eval/logged/Fast/False/from-eas/hello.logged @@ -1,24 +1,38 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( DMark 2 ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ICF ( DMark 3 ) , IAL ( SIO OutputChar ) @@ -31,21 +45,35 @@ dump: Automaton , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , ICF ( DMark 5 ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , ICF ( DMark 6 ) , IAL ( SIO OutputChar ) @@ -62,6 +90,6 @@ dump: Automaton , programCounter = 36 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git a/.output/actual/eta/eval/logged/Fast/False/from-eas/hello2.logged b/.output/actual/eta/eval/logged/Fast/False/from-eas/hello2.logged index bbe7e76a8..bd0d5cdb1 100644 --- a/.output/actual/eta/eval/logged/Fast/False/from-eas/hello2.logged +++ b/.output/actual/eta/eval/logged/Fast/False/from-eas/hello2.logged @@ -1,83 +1,128 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 5 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 7 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 8 ) + ) , Transfer , ICF ( DMark 7 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 8 ) @@ -85,9 +130,13 @@ dump: Automaton , ICF ( DMark 9 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 10 ) @@ -96,6 +145,6 @@ dump: Automaton , programCounter = 25 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git a/.output/actual/eta/eval/logged/Fast/False/from-eas/hello3.logged b/.output/actual/eta/eval/logged/Fast/False/from-eas/hello3.logged index bbe7e76a8..bd0d5cdb1 100644 --- a/.output/actual/eta/eval/logged/Fast/False/from-eas/hello3.logged +++ b/.output/actual/eta/eval/logged/Fast/False/from-eas/hello3.logged @@ -1,83 +1,128 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 5 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 7 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 8 ) + ) , Transfer , ICF ( DMark 7 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 8 ) @@ -85,9 +130,13 @@ dump: Automaton , ICF ( DMark 9 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 10 ) @@ -96,6 +145,6 @@ dump: Automaton , programCounter = 25 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git a/.output/actual/eta/eval/logged/Fast/False/from-eas/hello4.logged b/.output/actual/eta/eval/logged/Fast/False/from-eas/hello4.logged index bbe7e76a8..bd0d5cdb1 100644 --- a/.output/actual/eta/eval/logged/Fast/False/from-eas/hello4.logged +++ b/.output/actual/eta/eval/logged/Fast/False/from-eas/hello4.logged @@ -1,83 +1,128 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 5 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 7 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 8 ) + ) , Transfer , ICF ( DMark 7 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 8 ) @@ -85,9 +130,13 @@ dump: Automaton , ICF ( DMark 9 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 10 ) @@ -96,6 +145,6 @@ dump: Automaton , programCounter = 25 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git a/.output/actual/eta/eval/logged/Fast/False/from-eas/readcharA.logged b/.output/actual/eta/eval/logged/Fast/False/from-eas/readcharA.logged index 0f849610d..00863b7dd 100644 --- a/.output/actual/eta/eval/logged/Fast/False/from-eas/readcharA.logged +++ b/.output/actual/eta/eval/logged/Fast/False/from-eas/readcharA.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) @@ -11,6 +11,6 @@ dump: Automaton , programCounter = 4 , returnStack = IS [] } - , unitStack = fromList [ 65 ] - , unitRAM = [] + , memoryStack = fromList [ 65 ] + , memoryRAM = [] } diff --git "a/.output/actual/eta/eval/logged/Fast/False/from-eas/readnum0\n.logged" "b/.output/actual/eta/eval/logged/Fast/False/from-eas/readnum0\n.logged" index 82fd01c75..6a2e0c9d9 100644 --- "a/.output/actual/eta/eval/logged/Fast/False/from-eas/readnum0\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/False/from-eas/readnum0\n.logged" @@ -1,5 +1,5 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) @@ -7,249 +7,347 @@ dump: Automaton , ICF ( DMark 2 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 32 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 3 ) , IAL - ( Cons 4 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 16 ) + ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 8 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL ( SIO InputChar ) , ICF ( DMark 12 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , Transfer , ICF ( DMark 14 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 16 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 16 ) + ) , Transfer , ICF ( DMark 15 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , Transfer , ICF ( DMark 16 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 19 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 20 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 21 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 22 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 24 ) , IAL - ( Cons 25 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 26 ) + ) , Transfer , ICF ( DMark 25 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 27 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 28 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 29 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 30 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 31 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 32 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , Transfer , ICF ( DMark 33 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 35 ) , End ] - , programCounter = 87 + , programCounter = 79 , returnStack = IS [] } - , unitStack = fromList [ 496 ] - , unitRAM = [] + , memoryStack = fromList [ 496 ] + , memoryRAM = [] } diff --git "a/.output/actual/eta/eval/logged/Fast/False/from-eas/readnum1\n.logged" "b/.output/actual/eta/eval/logged/Fast/False/from-eas/readnum1\n.logged" index ed8b5d90b..b1e21e3d2 100644 --- "a/.output/actual/eta/eval/logged/Fast/False/from-eas/readnum1\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/False/from-eas/readnum1\n.logged" @@ -1,5 +1,5 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) @@ -7,249 +7,347 @@ dump: Automaton , ICF ( DMark 2 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 32 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 3 ) , IAL - ( Cons 4 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 16 ) + ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 8 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL ( SIO InputChar ) , ICF ( DMark 12 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , Transfer , ICF ( DMark 14 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 16 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 16 ) + ) , Transfer , ICF ( DMark 15 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , Transfer , ICF ( DMark 16 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 19 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 20 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 21 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 22 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 24 ) , IAL - ( Cons 25 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 26 ) + ) , Transfer , ICF ( DMark 25 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 27 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 28 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 29 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 30 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 31 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 32 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , Transfer , ICF ( DMark 33 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 35 ) , End ] - , programCounter = 87 + , programCounter = 79 , returnStack = IS [] } - , unitStack = fromList [ 506 ] - , unitRAM = [] + , memoryStack = fromList [ 506 ] + , memoryRAM = [] } diff --git a/.output/actual/eta/eval/logged/Fast/False/from-eas/true.logged b/.output/actual/eta/eval/logged/Fast/False/from-eas/true.logged index 8a8f91324..d3f18cf2d 100644 --- a/.output/actual/eta/eval/logged/Fast/False/from-eas/true.logged +++ b/.output/actual/eta/eval/logged/Fast/False/from-eas/true.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) @@ -8,6 +8,6 @@ dump: Automaton , programCounter = 2 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git a/.output/actual/eta/eval/logged/Fast/False/original/bottles.logged b/.output/actual/eta/eval/logged/Fast/False/original/bottles.logged index b3271b4de..7b78e5e28 100644 --- a/.output/actual/eta/eval/logged/Fast/False/original/bottles.logged +++ b/.output/actual/eta/eval/logged/Fast/False/original/bottles.logged @@ -1,89 +1,127 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 141 ) + ( SAL + ( Cons 141 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , IAL ( SIO OutputChar ) , IAL - ( Cons 155 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 155 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "1" ) , Transfer , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL ( SIO InputChar ) , Transfer , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 2 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , Transfer - , IAL ( Binary Sub ) , IAL - ( Cons 3 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 3 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "2" ) , IAL ( SIO InputChar ) , IAL ( SIO OutputChar ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL ( SIO InputChar ) , Transfer - , IAL ( Binary Sub ) - , IAL Halibut , IAL - ( Cons 3 ) + ( SAL ( Binary Sub ) ) + , IAL ( SAL Halibut ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) + , IAL + ( SAL + ( Cons 3 ) + ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL ( SIO InputChar ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer , IAL ( SIO InputChar ) , IAL ( SIO OutputChar ) @@ -91,51 +129,68 @@ dump: Automaton , ICF ( DMark 3 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer - , IAL ( Binary Sub ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "3" ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , IAL ( SIO InputChar ) , Transfer - , IAL ( Binary Sub ) , IAL - ( Cons 18828800 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 18828800 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , ICF ( DMark 4 ) , IAL - ( Cons 5 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 6 ) + ) , Transfer , ICF ( DMark 5 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 6 ) @@ -143,498 +198,783 @@ dump: Automaton , ICF ( DMark 7 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 11 ) + ) , Transfer , ICF ( DMark 10 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 11 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 12 ) , IAL - ( Cons 13 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 13 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 18 ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 14 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "14" ) , ICF ( DMark 15 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 17 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , Transfer , IAL - ( Cons 18 ) - , IAL - ( Cons 11 ) - , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 13128773 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut - , IAL ( Binary Sub ) + ( SAL + ( Cons 13128755 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 19 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , Transfer , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , Transfer , IAL - ( Cons 2348471754576 ) + ( SAL + ( Cons 2348471754576 ) + ) , ICF ( CStatic "23" Jump ) , ICF ( DMark 23 ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , Transfer , IAL - ( Cons 335495964812 ) + ( SAL + ( Cons 335495964812 ) + ) , ICF ( CStatic "24" Jump ) , ICF ( DMark 24 ) , IAL - ( Cons 25 ) + ( SAL + ( Cons 25 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 25 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 27 ) , IAL - ( Cons 28 ) + ( SAL + ( Cons 28 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , IAL - ( Cons 2348471754565 ) + ( SAL + ( Cons 2348471754565 ) + ) , ICF ( CStatic "29" Jump ) , ICF ( DMark 29 ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , IAL - ( Cons 335495964812 ) + ( SAL + ( Cons 335495964812 ) + ) , ICF ( CStatic "30" Jump ) , ICF ( DMark 30 ) , IAL - ( Cons 31 ) + ( SAL + ( Cons 31 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "31" ) - , IAL ( Binary Sub ) , IAL - ( Cons 32 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 32 ) + ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL ( SIO InputChar ) , IAL - ( Cons 402523 ) + ( SAL + ( Cons 402523 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL ( SIO InputChar ) , IAL - ( Cons 1814 ) + ( SAL + ( Cons 1814 ) + ) , ICF ( CStatic "32" Jump ) , ICF ( DMark 32 ) , IAL - ( Cons 99 ) + ( SAL + ( Cons 99 ) + ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 34 ) + ( SAL + ( Cons 34 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 35 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 36 ) + ( SAL + ( Cons 36 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ICF ( DMark 38 ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( DMark 39 ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 112 ) + ( SAL + ( Cons 112 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , ICF ( DMark 40 ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ICF ( DMark 41 ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 107 ) + ( SAL + ( Cons 107 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 84 ) + ( SAL + ( Cons 84 ) + ) , ICF ( DMark 42 ) , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 43 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 44 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) , Transfer , ICF ( DMark 45 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 47 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 48 ) , End ] - , programCounter = 347 + , programCounter = 329 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git a/.output/actual/eta/eval/logged/Fast/False/original/crlf.logged b/.output/actual/eta/eval/logged/Fast/False/original/crlf.logged index 8e603fad1..27112c718 100644 --- a/.output/actual/eta/eval/logged/Fast/False/original/crlf.logged +++ b/.output/actual/eta/eval/logged/Fast/False/original/crlf.logged @@ -1,72 +1,114 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 49 ) + ( SAL + ( Cons 49 ) + ) , IAL - ( Cons 68 ) + ( SAL + ( Cons 68 ) + ) , IAL - ( Cons 65 ) + ( SAL + ( Cons 65 ) + ) , IAL - ( Cons 66 ) + ( SAL + ( Cons 66 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 75 ) + ( SAL + ( Cons 75 ) + ) , IAL - ( Cons 79 ) + ( SAL + ( Cons 79 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 50 ) + ( SAL + ( Cons 50 ) + ) , IAL - ( Cons 68 ) + ( SAL + ( Cons 68 ) + ) , IAL - ( Cons 65 ) + ( SAL + ( Cons 65 ) + ) , IAL - ( Cons 66 ) + ( SAL + ( Cons 66 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) @@ -75,6 +117,6 @@ dump: Automaton , programCounter = 28 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/actual/eta/eval/logged/Fast/False/original/fact1\n.logged" "b/.output/actual/eta/eval/logged/Fast/False/original/fact1\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/actual/eta/eval/logged/Fast/False/original/fact1\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/False/original/fact1\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/actual/eta/eval/logged/Fast/False/original/fact2\n.logged" "b/.output/actual/eta/eval/logged/Fast/False/original/fact2\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/actual/eta/eval/logged/Fast/False/original/fact2\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/False/original/fact2\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/actual/eta/eval/logged/Fast/False/original/fact3\n.logged" "b/.output/actual/eta/eval/logged/Fast/False/original/fact3\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/actual/eta/eval/logged/Fast/False/original/fact3\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/False/original/fact3\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/actual/eta/eval/logged/Fast/False/original/fact4\n.logged" "b/.output/actual/eta/eval/logged/Fast/False/original/fact4\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/actual/eta/eval/logged/Fast/False/original/fact4\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/False/original/fact4\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/actual/eta/eval/logged/Fast/False/original/fact5\n.logged" "b/.output/actual/eta/eval/logged/Fast/False/original/fact5\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/actual/eta/eval/logged/Fast/False/original/fact5\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/False/original/fact5\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/actual/eta/eval/logged/Fast/False/original/fact6\n.logged" "b/.output/actual/eta/eval/logged/Fast/False/original/fact6\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/actual/eta/eval/logged/Fast/False/original/fact6\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/False/original/fact6\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/actual/eta/eval/logged/Fast/False/original/fact7\n.logged" "b/.output/actual/eta/eval/logged/Fast/False/original/fact7\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/actual/eta/eval/logged/Fast/False/original/fact7\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/False/original/fact7\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/actual/eta/eval/logged/Fast/False/original/fact8\n.logged" "b/.output/actual/eta/eval/logged/Fast/False/original/fact8\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/actual/eta/eval/logged/Fast/False/original/fact8\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/False/original/fact8\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git a/.output/actual/eta/eval/logged/Fast/False/original/hello.logged b/.output/actual/eta/eval/logged/Fast/False/original/hello.logged index f3c59ec13..3d6152bb8 100644 --- a/.output/actual/eta/eval/logged/Fast/False/original/hello.logged +++ b/.output/actual/eta/eval/logged/Fast/False/original/hello.logged @@ -1,88 +1,118 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer - , IAL Halibut - , IAL - ( Binaries - [ Mod - , Div - ] + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "1" ) , IAL ( SIO OutputChar ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL ( SIO InputChar ) , Transfer , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 2 ) , ICF ( DMark 3 ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( DMark 4 ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ICF ( CStatic "5" Jump ) , ICF ( DMark 5 ) , Transfer - , IAL ( Binary Sub ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "5" ) , ICF ( DMark 6 ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ICF ( DMark 7 ) , IAL - ( Cons 72 ) - , IAL - ( Cons 0 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 72 ) + ) , ICF ( DMark 8 ) , IAL ( SIO OutputChar ) @@ -95,23 +125,37 @@ dump: Automaton , ICF ( DMark 9 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , ICF ( DMark 10 ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ICF ( DMark 11 ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , ICF ( DMark 12 ) , IAL ( SIO OutputChar ) @@ -125,9 +169,9 @@ dump: Automaton ( DMark 13 ) , End ] - , programCounter = 67 + , programCounter = 65 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git a/.output/actual/eta/eval/logged/Fast/False/original/hello2.logged b/.output/actual/eta/eval/logged/Fast/False/original/hello2.logged index 2e4fd5847..fe6f3f9de 100644 --- a/.output/actual/eta/eval/logged/Fast/False/original/hello2.logged +++ b/.output/actual/eta/eval/logged/Fast/False/original/hello2.logged @@ -1,120 +1,187 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( DMark 2 ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , Transfer , IAL ( SIO InputChar ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "3" ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , IAL ( SIO InputChar ) , IAL - ( Cons 337 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 337 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 4 ) , IAL - ( Cons 1 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 5 ) + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 6 ) + ) , Transfer , ICF ( DMark 5 ) - , IAL ( Binary Sub ) , IAL - ( Cons 11 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 6 ) , IAL ( SIO OutputChar ) , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , IAL ( SIO InputChar ) , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "7" Jump ) , ICF @@ -124,6 +191,6 @@ dump: Automaton , programCounter = 25 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git a/.output/actual/eta/eval/logged/Fast/True/original/bottles.logged b/.output/actual/eta/eval/logged/Fast/True/original/bottles.logged index b3271b4de..7b78e5e28 100644 --- a/.output/actual/eta/eval/logged/Fast/True/original/bottles.logged +++ b/.output/actual/eta/eval/logged/Fast/True/original/bottles.logged @@ -1,89 +1,127 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 141 ) + ( SAL + ( Cons 141 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , IAL ( SIO OutputChar ) , IAL - ( Cons 155 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 155 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "1" ) , Transfer , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL ( SIO InputChar ) , Transfer , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 2 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , Transfer - , IAL ( Binary Sub ) , IAL - ( Cons 3 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 3 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "2" ) , IAL ( SIO InputChar ) , IAL ( SIO OutputChar ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL ( SIO InputChar ) , Transfer - , IAL ( Binary Sub ) - , IAL Halibut , IAL - ( Cons 3 ) + ( SAL ( Binary Sub ) ) + , IAL ( SAL Halibut ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) + , IAL + ( SAL + ( Cons 3 ) + ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL ( SIO InputChar ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer , IAL ( SIO InputChar ) , IAL ( SIO OutputChar ) @@ -91,51 +129,68 @@ dump: Automaton , ICF ( DMark 3 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer - , IAL ( Binary Sub ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "3" ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , IAL ( SIO InputChar ) , Transfer - , IAL ( Binary Sub ) , IAL - ( Cons 18828800 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 18828800 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , ICF ( DMark 4 ) , IAL - ( Cons 5 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 6 ) + ) , Transfer , ICF ( DMark 5 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 6 ) @@ -143,498 +198,783 @@ dump: Automaton , ICF ( DMark 7 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 11 ) + ) , Transfer , ICF ( DMark 10 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 11 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 12 ) , IAL - ( Cons 13 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 13 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 18 ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 14 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "14" ) , ICF ( DMark 15 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 17 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , Transfer , IAL - ( Cons 18 ) - , IAL - ( Cons 11 ) - , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 13128773 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut - , IAL ( Binary Sub ) + ( SAL + ( Cons 13128755 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 19 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , Transfer , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , Transfer , IAL - ( Cons 2348471754576 ) + ( SAL + ( Cons 2348471754576 ) + ) , ICF ( CStatic "23" Jump ) , ICF ( DMark 23 ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , Transfer , IAL - ( Cons 335495964812 ) + ( SAL + ( Cons 335495964812 ) + ) , ICF ( CStatic "24" Jump ) , ICF ( DMark 24 ) , IAL - ( Cons 25 ) + ( SAL + ( Cons 25 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 25 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 27 ) , IAL - ( Cons 28 ) + ( SAL + ( Cons 28 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , IAL - ( Cons 2348471754565 ) + ( SAL + ( Cons 2348471754565 ) + ) , ICF ( CStatic "29" Jump ) , ICF ( DMark 29 ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , IAL - ( Cons 335495964812 ) + ( SAL + ( Cons 335495964812 ) + ) , ICF ( CStatic "30" Jump ) , ICF ( DMark 30 ) , IAL - ( Cons 31 ) + ( SAL + ( Cons 31 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "31" ) - , IAL ( Binary Sub ) , IAL - ( Cons 32 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 32 ) + ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL ( SIO InputChar ) , IAL - ( Cons 402523 ) + ( SAL + ( Cons 402523 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL ( SIO InputChar ) , IAL - ( Cons 1814 ) + ( SAL + ( Cons 1814 ) + ) , ICF ( CStatic "32" Jump ) , ICF ( DMark 32 ) , IAL - ( Cons 99 ) + ( SAL + ( Cons 99 ) + ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 34 ) + ( SAL + ( Cons 34 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 35 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 36 ) + ( SAL + ( Cons 36 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ICF ( DMark 38 ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( DMark 39 ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 112 ) + ( SAL + ( Cons 112 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , ICF ( DMark 40 ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ICF ( DMark 41 ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 107 ) + ( SAL + ( Cons 107 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 84 ) + ( SAL + ( Cons 84 ) + ) , ICF ( DMark 42 ) , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 43 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 44 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) , Transfer , ICF ( DMark 45 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 47 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 48 ) , End ] - , programCounter = 347 + , programCounter = 329 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/actual/eta/eval/logged/Fast/True/original/fact1\n.logged" "b/.output/actual/eta/eval/logged/Fast/True/original/fact1\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/actual/eta/eval/logged/Fast/True/original/fact1\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/True/original/fact1\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/actual/eta/eval/logged/Fast/True/original/fact2\n.logged" "b/.output/actual/eta/eval/logged/Fast/True/original/fact2\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/actual/eta/eval/logged/Fast/True/original/fact2\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/True/original/fact2\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/actual/eta/eval/logged/Fast/True/original/fact3\n.logged" "b/.output/actual/eta/eval/logged/Fast/True/original/fact3\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/actual/eta/eval/logged/Fast/True/original/fact3\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/True/original/fact3\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/actual/eta/eval/logged/Fast/True/original/fact4\n.logged" "b/.output/actual/eta/eval/logged/Fast/True/original/fact4\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/actual/eta/eval/logged/Fast/True/original/fact4\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/True/original/fact4\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/actual/eta/eval/logged/Fast/True/original/fact5\n.logged" "b/.output/actual/eta/eval/logged/Fast/True/original/fact5\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/actual/eta/eval/logged/Fast/True/original/fact5\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/True/original/fact5\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/actual/eta/eval/logged/Fast/True/original/fact6\n.logged" "b/.output/actual/eta/eval/logged/Fast/True/original/fact6\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/actual/eta/eval/logged/Fast/True/original/fact6\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/True/original/fact6\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/actual/eta/eval/logged/Fast/True/original/fact7\n.logged" "b/.output/actual/eta/eval/logged/Fast/True/original/fact7\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/actual/eta/eval/logged/Fast/True/original/fact7\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/True/original/fact7\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/actual/eta/eval/logged/Fast/True/original/fact8\n.logged" "b/.output/actual/eta/eval/logged/Fast/True/original/fact8\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/actual/eta/eval/logged/Fast/True/original/fact8\n.logged" +++ "b/.output/actual/eta/eval/logged/Fast/True/original/fact8\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git a/.output/actual/eta/eval/logged/Fast/from-eas/bottles.logged b/.output/actual/eta/eval/logged/Fast/from-eas/bottles.logged deleted file mode 100644 index fa4388e06..000000000 --- a/.output/actual/eta/eval/logged/Fast/from-eas/bottles.logged +++ /dev/null @@ -1,446 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 31 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 3 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 4 ) - , IAL - ( Cons 5 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 5 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 6 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 10 ) - , IAL - ( Cons 48 ) - , IAL ( SIO OutputChar ) - , Transfer - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 11 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 13 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 18 ) - , Transfer - , ICF - ( DMark 14 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "14" ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 17 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 11 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 19 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , Transfer - , ICF - ( DMark 19 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 20 ) - , ICF - ( DMark 21 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 22 ) - , IAL - ( Cons 23 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 8 ) - , Transfer - , ICF - ( DMark 23 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 114 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 98 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 102 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 115 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 116 ) - , IAL - ( Cons 116 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 98 ) - , IAL - ( Cons 32 ) - , ICF - ( DMark 24 ) - , IAL - ( Cons 25 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , Transfer - , ICF - ( DMark 25 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 27 ) - , IAL - ( Cons 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 21 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 97 ) - , IAL - ( Cons 119 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 104 ) - , IAL - ( Cons 116 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 110 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 32 ) - , ICF - ( DMark 29 ) - , IAL - ( Cons 30 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 3 ) - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 33 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 26 ) - , Transfer - , ICF - ( DMark 33 ) - , IAL - ( Cons 44 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 32 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 34 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 35 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 21 ) - , Transfer - , ICF - ( DMark 35 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 36 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 100 ) - , IAL - ( Cons 110 ) - , IAL - ( Cons 117 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 114 ) - , IAL - ( Cons 97 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 116 ) - , IAL - ( Cons 105 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 115 ) - , IAL - ( Cons 115 ) - , IAL - ( Cons 97 ) - , IAL - ( Cons 112 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 44 ) - , IAL - ( Cons 110 ) - , IAL - ( Cons 119 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 100 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 110 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 107 ) - , IAL - ( Cons 97 ) - , IAL - ( Cons 84 ) - , ICF - ( DMark 37 ) - , IAL - ( Cons 38 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , Transfer - , ICF - ( DMark 38 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 39 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 40 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 26 ) - , Transfer - , ICF - ( DMark 40 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 41 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 43 ) - , End - ] - , programCounter = 246 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git a/.output/actual/eta/eval/logged/Fast/from-eas/divmod.logged b/.output/actual/eta/eval/logged/Fast/from-eas/divmod.logged deleted file mode 100644 index 0cd9d37fb..000000000 --- a/.output/actual/eta/eval/logged/Fast/from-eas/divmod.logged +++ /dev/null @@ -1,30 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "1" ) - , ICF - ( DMark 2 ) - , End - ] - , programCounter = 7 - , returnStack = IS [] - } - , unitStack = fromList - [ 0 - , 2 - ] - , unitRAM = [] - } 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" deleted file mode 100644 index 21731cdee..000000000 --- "a/.output/actual/eta/eval/logged/Fast/from-eas/fact0\n.logged" +++ /dev/null @@ -1,508 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 34 ) - , IAL - ( Cons 48 ) - , IAL ( SIO OutputChar ) - , Transfer - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 35 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 36 ) - , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 37 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 38 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "38" ) - , ICF - ( DMark 39 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 40 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 35 ) - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 46 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 48 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 49 ) - , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 50 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 51 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 52 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 53 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 55 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 56 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 48 ) - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 59 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 60 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 61 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 62 ) - , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 63 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 64 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 65 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 66 ) - , End - ] - , programCounter = 148 - , returnStack = IS [] - } - , unitStack = fromList - [ 496 - , 2 - ] - , unitRAM = [] - } 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" deleted file mode 100644 index d0524355a..000000000 --- "a/.output/actual/eta/eval/logged/Fast/from-eas/fact1\n.logged" +++ /dev/null @@ -1,508 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 34 ) - , IAL - ( Cons 48 ) - , IAL ( SIO OutputChar ) - , Transfer - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 35 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 36 ) - , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 37 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 38 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "38" ) - , ICF - ( DMark 39 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 40 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 35 ) - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 46 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 48 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 49 ) - , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 50 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 51 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 52 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 53 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 55 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 56 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 48 ) - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 59 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 60 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 61 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 62 ) - , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 63 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 64 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 65 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 66 ) - , End - ] - , programCounter = 148 - , returnStack = IS [] - } - , unitStack = fromList - [ 506 - , 2 - ] - , unitRAM = [] - } diff --git "a/.output/actual/eta/eval/logged/Fast/from-eas/fact2\n.logged" "b/.output/actual/eta/eval/logged/Fast/from-eas/fact2\n.logged" deleted file mode 100644 index 9056ebf56..000000000 --- "a/.output/actual/eta/eval/logged/Fast/from-eas/fact2\n.logged" +++ /dev/null @@ -1,508 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 34 ) - , IAL - ( Cons 48 ) - , IAL ( SIO OutputChar ) - , Transfer - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 35 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 36 ) - , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 37 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 38 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "38" ) - , ICF - ( DMark 39 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 40 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 35 ) - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 46 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 48 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 49 ) - , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 50 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 51 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 52 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 53 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 55 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 56 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 48 ) - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 59 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 60 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 61 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 62 ) - , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 63 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 64 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 65 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 66 ) - , End - ] - , programCounter = 148 - , returnStack = IS [] - } - , unitStack = fromList - [ 516 - , 2 - ] - , unitRAM = [] - } diff --git "a/.output/actual/eta/eval/logged/Fast/from-eas/fact3\n.logged" "b/.output/actual/eta/eval/logged/Fast/from-eas/fact3\n.logged" deleted file mode 100644 index 01ff51bef..000000000 --- "a/.output/actual/eta/eval/logged/Fast/from-eas/fact3\n.logged" +++ /dev/null @@ -1,508 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 34 ) - , IAL - ( Cons 48 ) - , IAL ( SIO OutputChar ) - , Transfer - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 35 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 36 ) - , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 37 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 38 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "38" ) - , ICF - ( DMark 39 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 40 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 35 ) - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 46 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 48 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 49 ) - , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 50 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 51 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 52 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 53 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 55 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 56 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 48 ) - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 59 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 60 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 61 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 62 ) - , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 63 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 64 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 65 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 66 ) - , End - ] - , programCounter = 148 - , returnStack = IS [] - } - , unitStack = fromList - [ 526 - , 2 - ] - , unitRAM = [] - } diff --git "a/.output/actual/eta/eval/logged/Fast/from-eas/fact4\n.logged" "b/.output/actual/eta/eval/logged/Fast/from-eas/fact4\n.logged" deleted file mode 100644 index 79a61894b..000000000 --- "a/.output/actual/eta/eval/logged/Fast/from-eas/fact4\n.logged" +++ /dev/null @@ -1,508 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 34 ) - , IAL - ( Cons 48 ) - , IAL ( SIO OutputChar ) - , Transfer - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 35 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 36 ) - , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 37 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 38 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "38" ) - , ICF - ( DMark 39 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 40 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 35 ) - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 46 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 48 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 49 ) - , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 50 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 51 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 52 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 53 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 55 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 56 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 48 ) - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 59 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 60 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 61 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 62 ) - , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 63 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 64 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 65 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 66 ) - , End - ] - , programCounter = 148 - , returnStack = IS [] - } - , unitStack = fromList - [ 536 - , 2 - ] - , unitRAM = [] - } diff --git "a/.output/actual/eta/eval/logged/Fast/from-eas/fact5\n.logged" "b/.output/actual/eta/eval/logged/Fast/from-eas/fact5\n.logged" deleted file mode 100644 index 51b356411..000000000 --- "a/.output/actual/eta/eval/logged/Fast/from-eas/fact5\n.logged" +++ /dev/null @@ -1,508 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 34 ) - , IAL - ( Cons 48 ) - , IAL ( SIO OutputChar ) - , Transfer - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 35 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 36 ) - , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 37 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 38 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "38" ) - , ICF - ( DMark 39 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 40 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 35 ) - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 46 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 48 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 49 ) - , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 50 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 51 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 52 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 53 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 55 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 56 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 48 ) - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 59 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 60 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 61 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 62 ) - , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 63 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 64 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 65 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 66 ) - , End - ] - , programCounter = 148 - , returnStack = IS [] - } - , unitStack = fromList - [ 546 - , 2 - ] - , unitRAM = [] - } diff --git "a/.output/actual/eta/eval/logged/Fast/from-eas/fact6\n.logged" "b/.output/actual/eta/eval/logged/Fast/from-eas/fact6\n.logged" deleted file mode 100644 index b4839c7e2..000000000 --- "a/.output/actual/eta/eval/logged/Fast/from-eas/fact6\n.logged" +++ /dev/null @@ -1,508 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 34 ) - , IAL - ( Cons 48 ) - , IAL ( SIO OutputChar ) - , Transfer - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 35 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 36 ) - , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 37 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 38 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "38" ) - , ICF - ( DMark 39 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 40 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 35 ) - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 46 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 48 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 49 ) - , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 50 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 51 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 52 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 53 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 55 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 56 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 48 ) - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 59 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 60 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 61 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 62 ) - , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 63 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 64 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 65 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 66 ) - , End - ] - , programCounter = 148 - , returnStack = IS [] - } - , unitStack = fromList - [ 556 - , 2 - ] - , unitRAM = [] - } diff --git "a/.output/actual/eta/eval/logged/Fast/from-eas/fact7\n.logged" "b/.output/actual/eta/eval/logged/Fast/from-eas/fact7\n.logged" deleted file mode 100644 index b7c5d5ea2..000000000 --- "a/.output/actual/eta/eval/logged/Fast/from-eas/fact7\n.logged" +++ /dev/null @@ -1,508 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 34 ) - , IAL - ( Cons 48 ) - , IAL ( SIO OutputChar ) - , Transfer - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 35 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 36 ) - , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 37 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 38 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "38" ) - , ICF - ( DMark 39 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 40 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 35 ) - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 46 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 48 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 49 ) - , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 50 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 51 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 52 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 53 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 55 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 56 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 48 ) - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 59 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 60 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 61 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 62 ) - , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 63 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 64 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 65 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 66 ) - , End - ] - , programCounter = 148 - , returnStack = IS [] - } - , unitStack = fromList - [ 566 - , 2 - ] - , unitRAM = [] - } diff --git "a/.output/actual/eta/eval/logged/Fast/from-eas/fact8\n.logged" "b/.output/actual/eta/eval/logged/Fast/from-eas/fact8\n.logged" deleted file mode 100644 index 75f191133..000000000 --- "a/.output/actual/eta/eval/logged/Fast/from-eas/fact8\n.logged" +++ /dev/null @@ -1,508 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 34 ) - , IAL - ( Cons 48 ) - , IAL ( SIO OutputChar ) - , Transfer - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 35 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 36 ) - , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 37 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 38 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "38" ) - , ICF - ( DMark 39 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 40 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 35 ) - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 46 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 48 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 49 ) - , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 50 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 51 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 52 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 53 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 55 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 56 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 48 ) - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 59 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 60 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 61 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 62 ) - , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 63 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 64 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 65 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 66 ) - , End - ] - , programCounter = 148 - , returnStack = IS [] - } - , unitStack = fromList - [ 576 - , 2 - ] - , unitRAM = [] - } 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" deleted file mode 100644 index a0a495d10..000000000 --- "a/.output/actual/eta/eval/logged/Fast/from-eas/fact9\n.logged" +++ /dev/null @@ -1,508 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 34 ) - , IAL - ( Cons 48 ) - , IAL ( SIO OutputChar ) - , Transfer - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 35 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 36 ) - , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 37 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 38 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "38" ) - , ICF - ( DMark 39 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 40 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 35 ) - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 46 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 48 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 49 ) - , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 50 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 51 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 52 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 53 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 55 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 56 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 48 ) - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 59 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 60 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 61 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 62 ) - , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 63 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 64 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 65 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 66 ) - , End - ] - , programCounter = 148 - , returnStack = IS [] - } - , unitStack = fromList - [ 586 - , 2 - ] - , unitRAM = [] - } diff --git a/.output/actual/eta/eval/logged/Fast/from-eas/hello.logged b/.output/actual/eta/eval/logged/Fast/from-eas/hello.logged deleted file mode 100644 index 677f9216f..000000000 --- a/.output/actual/eta/eval/logged/Fast/from-eas/hello.logged +++ /dev/null @@ -1,67 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 32 ) - , ICF - ( DMark 2 ) - , IAL - ( Cons 44 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 72 ) - , ICF - ( DMark 3 ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , ICF - ( DMark 5 ) - , IAL - ( Cons 33 ) - , IAL - ( Cons 100 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 114 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 119 ) - , ICF - ( DMark 6 ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 7 ) - , End - ] - , programCounter = 36 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git a/.output/actual/eta/eval/logged/Fast/from-eas/hello2.logged b/.output/actual/eta/eval/logged/Fast/from-eas/hello2.logged deleted file mode 100644 index bbe7e76a8..000000000 --- a/.output/actual/eta/eval/logged/Fast/from-eas/hello2.logged +++ /dev/null @@ -1,101 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 33 ) - , IAL - ( Cons 100 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 114 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 119 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 44 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 72 ) - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 4 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 5 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 7 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 7 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 8 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 9 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 4 ) - , Transfer - , ICF - ( DMark 10 ) - , End - ] - , programCounter = 25 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git a/.output/actual/eta/eval/logged/Fast/from-eas/hello3.logged b/.output/actual/eta/eval/logged/Fast/from-eas/hello3.logged deleted file mode 100644 index bbe7e76a8..000000000 --- a/.output/actual/eta/eval/logged/Fast/from-eas/hello3.logged +++ /dev/null @@ -1,101 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 33 ) - , IAL - ( Cons 100 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 114 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 119 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 44 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 72 ) - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 4 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 5 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 7 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 7 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 8 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 9 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 4 ) - , Transfer - , ICF - ( DMark 10 ) - , End - ] - , programCounter = 25 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git a/.output/actual/eta/eval/logged/Fast/from-eas/hello4.logged b/.output/actual/eta/eval/logged/Fast/from-eas/hello4.logged deleted file mode 100644 index bbe7e76a8..000000000 --- a/.output/actual/eta/eval/logged/Fast/from-eas/hello4.logged +++ /dev/null @@ -1,101 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 33 ) - , IAL - ( Cons 100 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 114 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 119 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 44 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 72 ) - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 4 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 5 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 7 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 7 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 8 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 9 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 4 ) - , Transfer - , ICF - ( DMark 10 ) - , End - ] - , programCounter = 25 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git a/.output/actual/eta/eval/logged/Fast/from-eas/readcharA.logged b/.output/actual/eta/eval/logged/Fast/from-eas/readcharA.logged deleted file mode 100644 index 0f849610d..000000000 --- a/.output/actual/eta/eval/logged/Fast/from-eas/readcharA.logged +++ /dev/null @@ -1,16 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 2 ) - , End - ] - , programCounter = 4 - , returnStack = IS [] - } - , unitStack = fromList [ 65 ] - , unitRAM = [] - } 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" deleted file mode 100644 index 82fd01c75..000000000 --- "a/.output/actual/eta/eval/logged/Fast/from-eas/readnum0\n.logged" +++ /dev/null @@ -1,255 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 2 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 1 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 8 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 9 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 12 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 17 ) - , Transfer - , ICF - ( DMark 14 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 16 ) - , Transfer - , ICF - ( DMark 15 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 17 ) - , Transfer - , ICF - ( DMark 16 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 6 ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 19 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 20 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 21 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 22 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 24 ) - , IAL - ( Cons 25 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 25 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 33 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 27 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 28 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 29 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 30 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 31 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 32 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 23 ) - , Transfer - , ICF - ( DMark 33 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 34 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 35 ) - , End - ] - , programCounter = 87 - , returnStack = IS [] - } - , unitStack = fromList [ 496 ] - , unitRAM = [] - } 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" deleted file mode 100644 index ed8b5d90b..000000000 --- "a/.output/actual/eta/eval/logged/Fast/from-eas/readnum1\n.logged" +++ /dev/null @@ -1,255 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 2 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 1 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 8 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 9 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 12 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 17 ) - , Transfer - , ICF - ( DMark 14 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 16 ) - , Transfer - , ICF - ( DMark 15 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 17 ) - , Transfer - , ICF - ( DMark 16 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 6 ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 19 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 20 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 21 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 22 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 24 ) - , IAL - ( Cons 25 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 25 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 33 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 27 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 28 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 29 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 30 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 31 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 32 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 23 ) - , Transfer - , ICF - ( DMark 33 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 34 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 35 ) - , End - ] - , programCounter = 87 - , returnStack = IS [] - } - , unitStack = fromList [ 506 ] - , unitRAM = [] - } diff --git a/.output/actual/eta/eval/logged/Fast/from-eas/true.logged b/.output/actual/eta/eval/logged/Fast/from-eas/true.logged deleted file mode 100644 index 8a8f91324..000000000 --- a/.output/actual/eta/eval/logged/Fast/from-eas/true.logged +++ /dev/null @@ -1,13 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , End - ] - , programCounter = 2 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git a/.output/actual/eta/eval/logged/Fast/original/bottles.logged b/.output/actual/eta/eval/logged/Fast/original/bottles.logged deleted file mode 100644 index b3271b4de..000000000 --- a/.output/actual/eta/eval/logged/Fast/original/bottles.logged +++ /dev/null @@ -1,640 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 141 ) - , IAL - ( Cons 32 ) - , Transfer - , IAL ( SIO OutputChar ) - , IAL - ( Cons 155 ) - , IAL ( Binary Sub ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "1" ) - , Transfer - , IAL - ( Cons 2 ) - , IAL ( SIO InputChar ) - , Transfer - , Transfer - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , IAL - ( Cons 4 ) - , Transfer - , IAL - ( Cons 2 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 2 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , IAL - ( Cons 1 ) - , IAL - ( Cons 3 ) - , Transfer - , IAL ( Binary Sub ) - , IAL - ( Cons 3 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "2" ) - , IAL ( SIO InputChar ) - , IAL ( SIO OutputChar ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , IAL ( SIO InputChar ) - , Transfer - , IAL ( Binary Sub ) - , IAL Halibut - , IAL - ( Cons 3 ) - , IAL - ( Cons 3 ) - , Transfer - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , IAL ( SIO InputChar ) - , IAL ( Binary Sub ) - , Transfer - , IAL ( SIO InputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 3 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 1 ) - , IAL - ( Cons 4 ) - , Transfer - , IAL ( Binary Sub ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "3" ) - , IAL ( Binary Sub ) - , Transfer - , IAL ( Binary Sub ) - , IAL ( SIO InputChar ) - , Transfer - , IAL ( Binary Sub ) - , IAL - ( Cons 18828800 ) - , IAL - ( Cons 4 ) - , ICF - ( DMark 4 ) - , IAL - ( Cons 5 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 5 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 6 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 10 ) - , IAL - ( Cons 48 ) - , IAL ( SIO OutputChar ) - , Transfer - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 11 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 13 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 18 ) - , Transfer - , ICF - ( DMark 14 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "14" ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 17 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 11 ) - , Transfer - , IAL - ( Cons 18 ) - , IAL - ( Cons 11 ) - , IAL - ( Cons 18 ) - , IAL - ( Cons 13128773 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 19 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , Transfer - , ICF - ( DMark 19 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 8 ) - , Transfer - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 114 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 98 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 102 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 23 ) - , Transfer - , IAL - ( Cons 2348471754576 ) - , ICF - ( CStatic "23" Jump ) - , ICF - ( DMark 23 ) - , IAL - ( Cons 115 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 116 ) - , IAL - ( Cons 116 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 98 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 24 ) - , Transfer - , IAL - ( Cons 335495964812 ) - , ICF - ( CStatic "24" Jump ) - , ICF - ( DMark 24 ) - , IAL - ( Cons 25 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , Transfer - , ICF - ( DMark 25 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 27 ) - , IAL - ( Cons 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 20 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 97 ) - , IAL - ( Cons 119 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 29 ) - , Transfer - , IAL - ( Cons 2348471754565 ) - , ICF - ( CStatic "29" Jump ) - , ICF - ( DMark 29 ) - , IAL - ( Cons 104 ) - , IAL - ( Cons 116 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 110 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , IAL - ( Cons 335495964812 ) - , ICF - ( CStatic "30" Jump ) - , ICF - ( DMark 30 ) - , IAL - ( Cons 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , IAL ( SIO InputChar ) - , Transfer - , IAL - ( Cons 0 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "31" ) - , IAL ( Binary Sub ) - , IAL - ( Cons 32 ) - , Transfer - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , IAL ( SIO InputChar ) - , IAL - ( Cons 402523 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , IAL ( SIO InputChar ) - , IAL - ( Cons 1814 ) - , ICF - ( CStatic "32" Jump ) - , ICF - ( DMark 32 ) - , IAL - ( Cons 99 ) - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 26 ) - , Transfer - , ICF - ( DMark 34 ) - , IAL - ( Cons 44 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 32 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 35 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 36 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 20 ) - , Transfer - , ICF - ( DMark 36 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 100 ) - , IAL - ( Cons 110 ) - , IAL - ( Cons 117 ) - , IAL - ( Cons 111 ) - , ICF - ( DMark 38 ) - , IAL - ( Cons 114 ) - , IAL - ( Cons 97 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 116 ) - , IAL - ( Cons 105 ) - , IAL - ( Cons 32 ) - , ICF - ( DMark 39 ) - , IAL - ( Cons 115 ) - , IAL - ( Cons 115 ) - , IAL - ( Cons 97 ) - , IAL - ( Cons 112 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 44 ) - , ICF - ( DMark 40 ) - , IAL - ( Cons 110 ) - , IAL - ( Cons 119 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 100 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 101 ) - , ICF - ( DMark 41 ) - , IAL - ( Cons 110 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 107 ) - , IAL - ( Cons 97 ) - , IAL - ( Cons 84 ) - , ICF - ( DMark 42 ) - , IAL - ( Cons 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , Transfer - , ICF - ( DMark 43 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 44 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 45 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 26 ) - , Transfer - , ICF - ( DMark 45 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 46 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 33 ) - , Transfer - , ICF - ( DMark 47 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 48 ) - , End - ] - , programCounter = 347 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git a/.output/actual/eta/eval/logged/Fast/original/crlf.logged b/.output/actual/eta/eval/logged/Fast/original/crlf.logged deleted file mode 100644 index 8e603fad1..000000000 --- a/.output/actual/eta/eval/logged/Fast/original/crlf.logged +++ /dev/null @@ -1,80 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 3 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 49 ) - , IAL - ( Cons 68 ) - , IAL - ( Cons 65 ) - , IAL - ( Cons 66 ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 75 ) - , IAL - ( Cons 79 ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 50 ) - , IAL - ( Cons 68 ) - , IAL - ( Cons 65 ) - , IAL - ( Cons 66 ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , End - ] - , programCounter = 28 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git "a/.output/actual/eta/eval/logged/Fast/original/fact1\n.logged" "b/.output/actual/eta/eval/logged/Fast/original/fact1\n.logged" deleted file mode 100644 index 73b5e0edd..000000000 --- "a/.output/actual/eta/eval/logged/Fast/original/fact1\n.logged" +++ /dev/null @@ -1,505 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , IAL ( Binary Sub ) - , Transfer - , IAL Halibut - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "21" ) - , IAL - ( Cons 22 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , Transfer - , IAL ( SIO InputChar ) - , Transfer - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 34 ) - , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 35 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 40 ) - , Transfer - , ICF - ( DMark 36 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "36" ) - , ICF - ( DMark 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 38 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 39 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 33 ) - , Transfer - , ICF - ( DMark 40 ) - , IAL - ( Cons 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 43 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 46 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 48 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 56 ) - , Transfer - , ICF - ( DMark 49 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 50 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 51 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 53 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 55 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 46 ) - , Transfer - , ICF - ( DMark 56 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 59 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 60 ) - , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 61 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 62 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 63 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 64 ) - , End - ] - , programCounter = 21 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git "a/.output/actual/eta/eval/logged/Fast/original/fact2\n.logged" "b/.output/actual/eta/eval/logged/Fast/original/fact2\n.logged" deleted file mode 100644 index 73b5e0edd..000000000 --- "a/.output/actual/eta/eval/logged/Fast/original/fact2\n.logged" +++ /dev/null @@ -1,505 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , IAL ( Binary Sub ) - , Transfer - , IAL Halibut - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "21" ) - , IAL - ( Cons 22 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , Transfer - , IAL ( SIO InputChar ) - , Transfer - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 34 ) - , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 35 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 40 ) - , Transfer - , ICF - ( DMark 36 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "36" ) - , ICF - ( DMark 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 38 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 39 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 33 ) - , Transfer - , ICF - ( DMark 40 ) - , IAL - ( Cons 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 43 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 46 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 48 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 56 ) - , Transfer - , ICF - ( DMark 49 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 50 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 51 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 53 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 55 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 46 ) - , Transfer - , ICF - ( DMark 56 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 59 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 60 ) - , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 61 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 62 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 63 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 64 ) - , End - ] - , programCounter = 21 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git "a/.output/actual/eta/eval/logged/Fast/original/fact3\n.logged" "b/.output/actual/eta/eval/logged/Fast/original/fact3\n.logged" deleted file mode 100644 index 73b5e0edd..000000000 --- "a/.output/actual/eta/eval/logged/Fast/original/fact3\n.logged" +++ /dev/null @@ -1,505 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , IAL ( Binary Sub ) - , Transfer - , IAL Halibut - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "21" ) - , IAL - ( Cons 22 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , Transfer - , IAL ( SIO InputChar ) - , Transfer - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 34 ) - , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 35 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 40 ) - , Transfer - , ICF - ( DMark 36 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "36" ) - , ICF - ( DMark 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 38 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 39 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 33 ) - , Transfer - , ICF - ( DMark 40 ) - , IAL - ( Cons 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 43 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 46 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 48 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 56 ) - , Transfer - , ICF - ( DMark 49 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 50 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 51 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 53 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 55 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 46 ) - , Transfer - , ICF - ( DMark 56 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 59 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 60 ) - , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 61 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 62 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 63 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 64 ) - , End - ] - , programCounter = 21 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git "a/.output/actual/eta/eval/logged/Fast/original/fact4\n.logged" "b/.output/actual/eta/eval/logged/Fast/original/fact4\n.logged" deleted file mode 100644 index 73b5e0edd..000000000 --- "a/.output/actual/eta/eval/logged/Fast/original/fact4\n.logged" +++ /dev/null @@ -1,505 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , IAL ( Binary Sub ) - , Transfer - , IAL Halibut - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "21" ) - , IAL - ( Cons 22 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , Transfer - , IAL ( SIO InputChar ) - , Transfer - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 34 ) - , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 35 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 40 ) - , Transfer - , ICF - ( DMark 36 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "36" ) - , ICF - ( DMark 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 38 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 39 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 33 ) - , Transfer - , ICF - ( DMark 40 ) - , IAL - ( Cons 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 43 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 46 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 48 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 56 ) - , Transfer - , ICF - ( DMark 49 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 50 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 51 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 53 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 55 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 46 ) - , Transfer - , ICF - ( DMark 56 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 59 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 60 ) - , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 61 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 62 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 63 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 64 ) - , End - ] - , programCounter = 21 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git "a/.output/actual/eta/eval/logged/Fast/original/fact5\n.logged" "b/.output/actual/eta/eval/logged/Fast/original/fact5\n.logged" deleted file mode 100644 index 73b5e0edd..000000000 --- "a/.output/actual/eta/eval/logged/Fast/original/fact5\n.logged" +++ /dev/null @@ -1,505 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , IAL ( Binary Sub ) - , Transfer - , IAL Halibut - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "21" ) - , IAL - ( Cons 22 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , Transfer - , IAL ( SIO InputChar ) - , Transfer - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 34 ) - , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 35 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 40 ) - , Transfer - , ICF - ( DMark 36 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "36" ) - , ICF - ( DMark 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 38 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 39 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 33 ) - , Transfer - , ICF - ( DMark 40 ) - , IAL - ( Cons 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 43 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 46 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 48 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 56 ) - , Transfer - , ICF - ( DMark 49 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 50 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 51 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 53 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 55 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 46 ) - , Transfer - , ICF - ( DMark 56 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 59 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 60 ) - , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 61 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 62 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 63 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 64 ) - , End - ] - , programCounter = 21 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git "a/.output/actual/eta/eval/logged/Fast/original/fact6\n.logged" "b/.output/actual/eta/eval/logged/Fast/original/fact6\n.logged" deleted file mode 100644 index 73b5e0edd..000000000 --- "a/.output/actual/eta/eval/logged/Fast/original/fact6\n.logged" +++ /dev/null @@ -1,505 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , IAL ( Binary Sub ) - , Transfer - , IAL Halibut - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "21" ) - , IAL - ( Cons 22 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , Transfer - , IAL ( SIO InputChar ) - , Transfer - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 34 ) - , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 35 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 40 ) - , Transfer - , ICF - ( DMark 36 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "36" ) - , ICF - ( DMark 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 38 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 39 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 33 ) - , Transfer - , ICF - ( DMark 40 ) - , IAL - ( Cons 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 43 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 46 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 48 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 56 ) - , Transfer - , ICF - ( DMark 49 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 50 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 51 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 53 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 55 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 46 ) - , Transfer - , ICF - ( DMark 56 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 59 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 60 ) - , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 61 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 62 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 63 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 64 ) - , End - ] - , programCounter = 21 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git "a/.output/actual/eta/eval/logged/Fast/original/fact7\n.logged" "b/.output/actual/eta/eval/logged/Fast/original/fact7\n.logged" deleted file mode 100644 index 73b5e0edd..000000000 --- "a/.output/actual/eta/eval/logged/Fast/original/fact7\n.logged" +++ /dev/null @@ -1,505 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , IAL ( Binary Sub ) - , Transfer - , IAL Halibut - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "21" ) - , IAL - ( Cons 22 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , Transfer - , IAL ( SIO InputChar ) - , Transfer - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 34 ) - , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 35 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 40 ) - , Transfer - , ICF - ( DMark 36 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "36" ) - , ICF - ( DMark 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 38 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 39 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 33 ) - , Transfer - , ICF - ( DMark 40 ) - , IAL - ( Cons 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 43 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 46 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 48 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 56 ) - , Transfer - , ICF - ( DMark 49 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 50 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 51 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 53 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 55 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 46 ) - , Transfer - , ICF - ( DMark 56 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 59 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 60 ) - , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 61 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 62 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 63 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 64 ) - , End - ] - , programCounter = 21 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git "a/.output/actual/eta/eval/logged/Fast/original/fact8\n.logged" "b/.output/actual/eta/eval/logged/Fast/original/fact8\n.logged" deleted file mode 100644 index 73b5e0edd..000000000 --- "a/.output/actual/eta/eval/logged/Fast/original/fact8\n.logged" +++ /dev/null @@ -1,505 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , IAL ( Binary Sub ) - , Transfer - , IAL Halibut - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "21" ) - , IAL - ( Cons 22 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , Transfer - , IAL ( SIO InputChar ) - , Transfer - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 34 ) - , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 35 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 40 ) - , Transfer - , ICF - ( DMark 36 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "36" ) - , ICF - ( DMark 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 38 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 39 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 33 ) - , Transfer - , ICF - ( DMark 40 ) - , IAL - ( Cons 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 43 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 46 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 48 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 56 ) - , Transfer - , ICF - ( DMark 49 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 50 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 51 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 53 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 55 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 46 ) - , Transfer - , ICF - ( DMark 56 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 59 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 60 ) - , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 61 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 62 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 63 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 64 ) - , End - ] - , programCounter = 21 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git a/.output/actual/eta/eval/logged/Fast/original/hello.logged b/.output/actual/eta/eval/logged/Fast/original/hello.logged deleted file mode 100644 index f3c59ec13..000000000 --- a/.output/actual/eta/eval/logged/Fast/original/hello.logged +++ /dev/null @@ -1,133 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 21 ) - , IAL - ( Cons 2 ) - , Transfer - , IAL Halibut - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "1" ) - , IAL ( SIO OutputChar ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , Transfer - , IAL - ( Cons 2 ) - , IAL ( SIO InputChar ) - , Transfer - , Transfer - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , IAL - ( Cons 4 ) - , Transfer - , IAL - ( Cons 2 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 2 ) - , ICF - ( DMark 3 ) - , IAL - ( Cons 32 ) - , ICF - ( DMark 4 ) - , IAL - ( Cons 44 ) - , IAL - ( Cons 111 ) - , ICF - ( CStatic "5" Jump ) - , ICF - ( DMark 5 ) - , Transfer - , IAL ( Binary Sub ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "5" ) - , ICF - ( DMark 6 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 101 ) - , ICF - ( DMark 7 ) - , IAL - ( Cons 72 ) - , IAL - ( Cons 0 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 8 ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 9 ) - , IAL - ( Cons 10 ) - , ICF - ( DMark 10 ) - , IAL - ( Cons 33 ) - , IAL - ( Cons 100 ) - , IAL - ( Cons 108 ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 114 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 119 ) - , ICF - ( DMark 12 ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 13 ) - , End - ] - , programCounter = 67 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git a/.output/actual/eta/eval/logged/Fast/original/hello2.logged b/.output/actual/eta/eval/logged/Fast/original/hello2.logged deleted file mode 100644 index 2e4fd5847..000000000 --- a/.output/actual/eta/eval/logged/Fast/original/hello2.logged +++ /dev/null @@ -1,129 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 33 ) - , IAL - ( Cons 100 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 114 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 119 ) - , IAL - ( Cons 32 ) - , ICF - ( DMark 2 ) - , IAL - ( Cons 44 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 72 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 4 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , IAL - ( Cons 4 ) - , IAL - ( Cons 22 ) - , Transfer - , IAL ( SIO InputChar ) - , IAL ( Binary Sub ) - , Transfer - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "3" ) - , IAL - ( Cons 4 ) - , Transfer - , IAL ( SIO InputChar ) - , IAL - ( Cons 337 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 4 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 5 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 5 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 11 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 6 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 7 ) - , IAL - ( Cons 4 ) - , Transfer - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL ( SIO InputChar ) - , IAL - ( Cons 7 ) - , IAL - ( Cons 0 ) - , ICF - ( CStatic "7" Jump ) - , ICF - ( DMark 7 ) - , End - ] - , programCounter = 25 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git a/.output/actual/eta/eval/logged/Original/False/from-eas/bottles.logged b/.output/actual/eta/eval/logged/Original/False/from-eas/bottles.logged index 733cb9597..da0f86435 100644 --- a/.output/actual/eta/eval/logged/Original/False/from-eas/bottles.logged +++ b/.output/actual/eta/eval/logged/Original/False/from-eas/bottles.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ N , T @@ -609,5 +609,5 @@ dump: Automaton ] , programCounter = 605 } - , unitStack = fromList [] + , memoryStack = fromList [] } diff --git a/.output/actual/eta/eval/logged/Original/False/from-eas/divmod.logged b/.output/actual/eta/eval/logged/Original/False/from-eas/divmod.logged index 176d0da2c..92245a505 100644 --- a/.output/actual/eta/eval/logged/Original/False/from-eas/divmod.logged +++ b/.output/actual/eta/eval/logged/Original/False/from-eas/divmod.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ N , A @@ -12,7 +12,7 @@ dump: Automaton ] , programCounter = 8 } - , unitStack = fromList + , memoryStack = fromList [ 0 , 2 ] diff --git "a/.output/actual/eta/eval/logged/Original/False/from-eas/fact0\n.logged" "b/.output/actual/eta/eval/logged/Original/False/from-eas/fact0\n.logged" index 4430eba59..7395d6bd1 100644 --- "a/.output/actual/eta/eval/logged/Original/False/from-eas/fact0\n.logged" +++ "b/.output/actual/eta/eval/logged/Original/False/from-eas/fact0\n.logged" @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ A , N @@ -526,7 +526,7 @@ dump: Automaton ] , programCounter = 269 } - , unitStack = fromList + , memoryStack = fromList [ 496 , 2 ] diff --git "a/.output/actual/eta/eval/logged/Original/False/from-eas/fact1\n.logged" "b/.output/actual/eta/eval/logged/Original/False/from-eas/fact1\n.logged" index bbeec4304..b6805b878 100644 --- "a/.output/actual/eta/eval/logged/Original/False/from-eas/fact1\n.logged" +++ "b/.output/actual/eta/eval/logged/Original/False/from-eas/fact1\n.logged" @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ A , N @@ -526,7 +526,7 @@ dump: Automaton ] , programCounter = 269 } - , unitStack = fromList + , memoryStack = fromList [ 506 , 2 ] diff --git "a/.output/actual/eta/eval/logged/Original/False/from-eas/fact2\n.logged" "b/.output/actual/eta/eval/logged/Original/False/from-eas/fact2\n.logged" index d66b3dbe0..136455bf3 100644 --- "a/.output/actual/eta/eval/logged/Original/False/from-eas/fact2\n.logged" +++ "b/.output/actual/eta/eval/logged/Original/False/from-eas/fact2\n.logged" @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ A , N @@ -526,7 +526,7 @@ dump: Automaton ] , programCounter = 269 } - , unitStack = fromList + , memoryStack = fromList [ 516 , 2 ] diff --git "a/.output/actual/eta/eval/logged/Original/False/from-eas/fact3\n.logged" "b/.output/actual/eta/eval/logged/Original/False/from-eas/fact3\n.logged" index 8ed3e05b5..405114a84 100644 --- "a/.output/actual/eta/eval/logged/Original/False/from-eas/fact3\n.logged" +++ "b/.output/actual/eta/eval/logged/Original/False/from-eas/fact3\n.logged" @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ A , N @@ -526,7 +526,7 @@ dump: Automaton ] , programCounter = 269 } - , unitStack = fromList + , memoryStack = fromList [ 526 , 2 ] diff --git "a/.output/actual/eta/eval/logged/Original/False/from-eas/fact4\n.logged" "b/.output/actual/eta/eval/logged/Original/False/from-eas/fact4\n.logged" index 12e7b80ec..43f73ed08 100644 --- "a/.output/actual/eta/eval/logged/Original/False/from-eas/fact4\n.logged" +++ "b/.output/actual/eta/eval/logged/Original/False/from-eas/fact4\n.logged" @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ A , N @@ -526,7 +526,7 @@ dump: Automaton ] , programCounter = 269 } - , unitStack = fromList + , memoryStack = fromList [ 536 , 2 ] diff --git "a/.output/actual/eta/eval/logged/Original/False/from-eas/fact5\n.logged" "b/.output/actual/eta/eval/logged/Original/False/from-eas/fact5\n.logged" index 8fb99a0d6..e448ca0b3 100644 --- "a/.output/actual/eta/eval/logged/Original/False/from-eas/fact5\n.logged" +++ "b/.output/actual/eta/eval/logged/Original/False/from-eas/fact5\n.logged" @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ A , N @@ -526,7 +526,7 @@ dump: Automaton ] , programCounter = 269 } - , unitStack = fromList + , memoryStack = fromList [ 546 , 2 ] diff --git "a/.output/actual/eta/eval/logged/Original/False/from-eas/fact6\n.logged" "b/.output/actual/eta/eval/logged/Original/False/from-eas/fact6\n.logged" index 0b95ebf86..f50a339f9 100644 --- "a/.output/actual/eta/eval/logged/Original/False/from-eas/fact6\n.logged" +++ "b/.output/actual/eta/eval/logged/Original/False/from-eas/fact6\n.logged" @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ A , N @@ -526,7 +526,7 @@ dump: Automaton ] , programCounter = 269 } - , unitStack = fromList + , memoryStack = fromList [ 556 , 2 ] diff --git "a/.output/actual/eta/eval/logged/Original/False/from-eas/fact7\n.logged" "b/.output/actual/eta/eval/logged/Original/False/from-eas/fact7\n.logged" index 31709b52e..8575dbb00 100644 --- "a/.output/actual/eta/eval/logged/Original/False/from-eas/fact7\n.logged" +++ "b/.output/actual/eta/eval/logged/Original/False/from-eas/fact7\n.logged" @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ A , N @@ -526,7 +526,7 @@ dump: Automaton ] , programCounter = 269 } - , unitStack = fromList + , memoryStack = fromList [ 566 , 2 ] diff --git "a/.output/actual/eta/eval/logged/Original/False/from-eas/fact8\n.logged" "b/.output/actual/eta/eval/logged/Original/False/from-eas/fact8\n.logged" index 934ca5b73..0d753cd45 100644 --- "a/.output/actual/eta/eval/logged/Original/False/from-eas/fact8\n.logged" +++ "b/.output/actual/eta/eval/logged/Original/False/from-eas/fact8\n.logged" @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ A , N @@ -526,7 +526,7 @@ dump: Automaton ] , programCounter = 269 } - , unitStack = fromList + , memoryStack = fromList [ 576 , 2 ] diff --git "a/.output/actual/eta/eval/logged/Original/False/from-eas/fact9\n.logged" "b/.output/actual/eta/eval/logged/Original/False/from-eas/fact9\n.logged" index 5a095dd36..485fc474a 100644 --- "a/.output/actual/eta/eval/logged/Original/False/from-eas/fact9\n.logged" +++ "b/.output/actual/eta/eval/logged/Original/False/from-eas/fact9\n.logged" @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ A , N @@ -526,7 +526,7 @@ dump: Automaton ] , programCounter = 269 } - , unitStack = fromList + , memoryStack = fromList [ 586 , 2 ] diff --git a/.output/actual/eta/eval/logged/Original/False/from-eas/hello.logged b/.output/actual/eta/eval/logged/Original/False/from-eas/hello.logged index af7e38085..090d6eb28 100644 --- a/.output/actual/eta/eval/logged/Original/False/from-eas/hello.logged +++ b/.output/actual/eta/eval/logged/Original/False/from-eas/hello.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ N , I @@ -90,5 +90,5 @@ dump: Automaton ] , programCounter = 86 } - , unitStack = fromList [] + , memoryStack = fromList [] } diff --git a/.output/actual/eta/eval/logged/Original/False/from-eas/hello2.logged b/.output/actual/eta/eval/logged/Original/False/from-eas/hello2.logged index 239f71d0f..0e9847351 100644 --- a/.output/actual/eta/eval/logged/Original/False/from-eas/hello2.logged +++ b/.output/actual/eta/eval/logged/Original/False/from-eas/hello2.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ N , E @@ -128,5 +128,5 @@ dump: Automaton ] , programCounter = 84 } - , unitStack = fromList [] + , memoryStack = fromList [] } diff --git a/.output/actual/eta/eval/logged/Original/False/from-eas/hello3.logged b/.output/actual/eta/eval/logged/Original/False/from-eas/hello3.logged index 239f71d0f..0e9847351 100644 --- a/.output/actual/eta/eval/logged/Original/False/from-eas/hello3.logged +++ b/.output/actual/eta/eval/logged/Original/False/from-eas/hello3.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ N , E @@ -128,5 +128,5 @@ dump: Automaton ] , programCounter = 84 } - , unitStack = fromList [] + , memoryStack = fromList [] } diff --git a/.output/actual/eta/eval/logged/Original/False/from-eas/hello4.logged b/.output/actual/eta/eval/logged/Original/False/from-eas/hello4.logged index 239f71d0f..0e9847351 100644 --- a/.output/actual/eta/eval/logged/Original/False/from-eas/hello4.logged +++ b/.output/actual/eta/eval/logged/Original/False/from-eas/hello4.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ N , E @@ -128,5 +128,5 @@ dump: Automaton ] , programCounter = 84 } - , unitStack = fromList [] + , memoryStack = fromList [] } diff --git a/.output/actual/eta/eval/logged/Original/False/from-eas/readcharA.logged b/.output/actual/eta/eval/logged/Original/False/from-eas/readcharA.logged index a57087fca..ebc722be7 100644 --- a/.output/actual/eta/eval/logged/Original/False/from-eas/readcharA.logged +++ b/.output/actual/eta/eval/logged/Original/False/from-eas/readcharA.logged @@ -1,10 +1,10 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ I , R ] , programCounter = 2 } - , unitStack = fromList [ 65 ] + , memoryStack = fromList [ 65 ] } diff --git "a/.output/actual/eta/eval/logged/Original/False/from-eas/readnum0\n.logged" "b/.output/actual/eta/eval/logged/Original/False/from-eas/readnum0\n.logged" index c9b0028aa..b0248cef7 100644 --- "a/.output/actual/eta/eval/logged/Original/False/from-eas/readnum0\n.logged" +++ "b/.output/actual/eta/eval/logged/Original/False/from-eas/readnum0\n.logged" @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ I , R @@ -264,5 +264,5 @@ dump: Automaton ] , programCounter = 157 } - , unitStack = fromList [ 496 ] + , memoryStack = fromList [ 496 ] } diff --git "a/.output/actual/eta/eval/logged/Original/False/from-eas/readnum1\n.logged" "b/.output/actual/eta/eval/logged/Original/False/from-eas/readnum1\n.logged" index 30bc74edc..c7a26d08a 100644 --- "a/.output/actual/eta/eval/logged/Original/False/from-eas/readnum1\n.logged" +++ "b/.output/actual/eta/eval/logged/Original/False/from-eas/readnum1\n.logged" @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ I , R @@ -264,5 +264,5 @@ dump: Automaton ] , programCounter = 157 } - , unitStack = fromList [ 506 ] + , memoryStack = fromList [ 506 ] } diff --git a/.output/actual/eta/eval/logged/Original/False/from-eas/true.logged b/.output/actual/eta/eval/logged/Original/False/from-eas/true.logged index 0ddd7fa1f..b025006e9 100644 --- a/.output/actual/eta/eval/logged/Original/False/from-eas/true.logged +++ b/.output/actual/eta/eval/logged/Original/False/from-eas/true.logged @@ -1,7 +1,7 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [] , programCounter = 0 } - , unitStack = fromList [] + , memoryStack = fromList [] } diff --git a/.output/actual/eta/eval/logged/Original/False/original/crlf.logged b/.output/actual/eta/eval/logged/Original/False/original/crlf.logged index f410aa572..271b56d70 100644 --- a/.output/actual/eta/eval/logged/Original/False/original/crlf.logged +++ b/.output/actual/eta/eval/logged/Original/False/original/crlf.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ N , T @@ -108,5 +108,5 @@ dump: Automaton ] , programCounter = 67 } - , unitStack = fromList [] + , memoryStack = fromList [] } diff --git a/.output/actual/eta/eval/logged/Original/False/original/hello.logged b/.output/actual/eta/eval/logged/Original/False/original/hello.logged index 0e102d806..39a10ea8d 100644 --- a/.output/actual/eta/eval/logged/Original/False/original/hello.logged +++ b/.output/actual/eta/eval/logged/Original/False/original/hello.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ N , O @@ -121,5 +121,5 @@ dump: Automaton ] , programCounter = 117 } - , unitStack = fromList [] + , memoryStack = fromList [] } diff --git a/.output/actual/eta/eval/logged/Original/False/original/hello2.logged b/.output/actual/eta/eval/logged/Original/False/original/hello2.logged index e944a35c4..389a7edbf 100644 --- a/.output/actual/eta/eval/logged/Original/False/original/hello2.logged +++ b/.output/actual/eta/eval/logged/Original/False/original/hello2.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ N , E @@ -153,5 +153,5 @@ dump: Automaton ] , programCounter = 84 } - , unitStack = fromList [] + , memoryStack = fromList [] } diff --git a/.output/actual/eta/eval/logged/Original/from-eas/bottles.logged b/.output/actual/eta/eval/logged/Original/from-eas/bottles.logged deleted file mode 100644 index 733cb9597..000000000 --- a/.output/actual/eta/eval/logged/Original/from-eas/bottles.logged +++ /dev/null @@ -1,613 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ N - , T - , E - , N - , I - , O - , E - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , T - , E - , H - , T - , R - , O - , R - , N - , T - , E - , N - , A - , E - , T - , R - , N - , E - , N - , A - , E - , H - , R - , N - , E - , H - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , S - , S - , E - , O - , T - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , A - , I - , E - , T - , R - , N - , T - , O - , E - , E - , R - , N - , E - , N - , S - , S - , E - , S - , S - , R - , N - , T - , E - , H - , R - , N - , T - , E - , N - , T - , I - , E - , T - , R - , A - , N - , T - , E - , N - , A - , E - , T - , R - , N - , T - , E - , N - , T - , E - , H - , T - , R - , R - , N - , T - , E - , H - , R - , A - , N - , T - , E - , N - , T - , T - , E - , T - , R - , N - , E - , N - , A - , A - , A - , E - , N - , A - , H - , O - , E - , N - , A - , H - , O - , E - , N - , A - , H - , H - , E - , N - , I - , I - , E - , N - , A - , H - , I - , E - , N - , A - , T - , S - , E - , N - , I - , I - , E - , N - , A - , A - , O - , E - , N - , A - , H - , O - , E - , N - , A - , T - , O - , E - , N - , A - , A - , I - , E - , N - , A - , A - , I - , E - , N - , A - , T - , S - , E - , N - , A - , H - , H - , E - , N - , I - , I - , E - , R - , A - , N - , T - , E - , N - , A - , E - , T - , R - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , T - , E - , H - , R - , A - , N - , T - , E - , N - , O - , H - , E - , T - , R - , N - , E - , N - , A - , T - , O - , E - , N - , A - , T - , O - , E - , N - , T - , S - , S - , E - , N - , A - , O - , H - , E - , N - , I - , I - , E - , N - , A - , H - , O - , E - , N - , A - , H - , S - , E - , N - , A - , A - , I - , E - , N - , I - , I - , E - , N - , A - , T - , N - , E - , N - , A - , T - , S - , E - , N - , I - , I - , E - , R - , A - , N - , T - , E - , N - , A - , E - , T - , R - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , O - , E - , R - , N - , E - , H - , A - , N - , T - , E - , N - , O - , N - , E - , T - , R - , N - , S - , A - , E - , O - , N - , I - , I - , E - , O - , R - , N - , E - , H - , A - , N - , T - , E - , N - , O - , H - , E - , T - , R - , N - , T - , O - , E - , O - , R - , N - , E - , N - , T - , O - , E - , N - , A - , H - , A - , E - , N - , A - , T - , N - , E - , N - , A - , A - , N - , E - , N - , A - , T - , S - , E - , N - , A - , A - , A - , E - , N - , T - , S - , S - , E - , N - , I - , I - , E - , N - , A - , A - , I - , E - , N - , A - , T - , H - , E - , N - , I - , I - , E - , N - , A - , A - , O - , E - , N - , A - , A - , O - , E - , N - , T - , S - , S - , E - , N - , A - , A - , H - , E - , N - , I - , I - , E - , N - , S - , A - , E - , N - , A - , T - , N - , E - , N - , A - , O - , H - , E - , N - , A - , T - , S - , E - , N - , A - , H - , A - , E - , N - , I - , I - , E - , N - , A - , H - , O - , E - , N - , A - , T - , N - , E - , N - , A - , T - , S - , E - , N - , I - , I - , E - , N - , A - , H - , O - , E - , N - , A - , T - , A - , E - , N - , T - , S - , S - , E - , N - , T - , N - , H - , E - , R - , A - , N - , T - , E - , N - , A - , E - , T - , R - , N - , T - , E - , S - , R - , N - , E - , H - , A - , N - , T - , E - , N - , O - , N - , E - , T - , R - , N - , T - , O - , E - , N - , T - , O - , E - , O - , O - , R - , N - , E - , H - , N - , I - , I - , E - , T - , R - , N - , E - , T - , R - ] - , programCounter = 605 - } - , unitStack = fromList [] - } diff --git a/.output/actual/eta/eval/logged/Original/from-eas/divmod.logged b/.output/actual/eta/eval/logged/Original/from-eas/divmod.logged deleted file mode 100644 index 176d0da2c..000000000 --- a/.output/actual/eta/eval/logged/Original/from-eas/divmod.logged +++ /dev/null @@ -1,19 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ N - , A - , E - , N - , T - , E - , E - , R - ] - , programCounter = 8 - } - , unitStack = fromList - [ 0 - , 2 - ] - } diff --git "a/.output/actual/eta/eval/logged/Original/from-eas/fact0\n.logged" "b/.output/actual/eta/eval/logged/Original/from-eas/fact0\n.logged" deleted file mode 100644 index 4430eba59..000000000 --- "a/.output/actual/eta/eval/logged/Original/from-eas/fact0\n.logged" +++ /dev/null @@ -1,533 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ A - , N - , T - , E - , N - , A - , H - , E - , T - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , I - , I - , E - , T - , R - , N - , T - , O - , E - , O - , N - , T - , E - , N - , E - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , N - , T - , E - , S - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , S - , E - , T - , R - , N - , E - , H - , R - , N - , T - , E - , S - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , E - , N - , T - , E - , T - , N - , A - , H - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , N - , S - , S - , E - , N - , I - , I - , E - , S - , R - , N - , T - , E - , H - , R - , N - , T - , O - , E - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , S - , S - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , N - , O - , S - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , T - , O - , E - , S - , N - , I - , T - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , E - , N - , T - , E - , S - , S - , N - , A - , N - , E - , T - , R - , N - , E - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , E - , N - , A - , E - , H - , R - , N - , E - , H - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , S - , S - , E - , O - , T - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , S - , H - , E - , T - , R - , N - , T - , O - , E - , E - , R - , N - , E - , N - , S - , S - , E - , S - , S - , R - , N - , T - , E - , H - , R - , N - , T - , E - , N - , N - , H - , E - , T - , R - , A - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , A - , E - , H - , N - , A - , E - , H - , R - , N - , E - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , T - , A - , E - , T - , R - , N - , T - , E - , S - , R - , N - , A - , E - , H - , R - , N - , E - , N - , E - , N - , O - , E - , S - , H - , R - , S - , S - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , T - , E - , N - , S - , S - , E - , T - , R - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , T - , E - , H - , T - , R - , O - , R - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - ] - , programCounter = 269 - } - , unitStack = fromList - [ 496 - , 2 - ] - } diff --git "a/.output/actual/eta/eval/logged/Original/from-eas/fact1\n.logged" "b/.output/actual/eta/eval/logged/Original/from-eas/fact1\n.logged" deleted file mode 100644 index bbeec4304..000000000 --- "a/.output/actual/eta/eval/logged/Original/from-eas/fact1\n.logged" +++ /dev/null @@ -1,533 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ A - , N - , T - , E - , N - , A - , H - , E - , T - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , I - , I - , E - , T - , R - , N - , T - , O - , E - , O - , N - , T - , E - , N - , E - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , N - , T - , E - , S - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , S - , E - , T - , R - , N - , E - , H - , R - , N - , T - , E - , S - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , E - , N - , T - , E - , T - , N - , A - , H - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , N - , S - , S - , E - , N - , I - , I - , E - , S - , R - , N - , T - , E - , H - , R - , N - , T - , O - , E - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , S - , S - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , N - , O - , S - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , T - , O - , E - , S - , N - , I - , T - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , E - , N - , T - , E - , S - , S - , N - , A - , N - , E - , T - , R - , N - , E - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , E - , N - , A - , E - , H - , R - , N - , E - , H - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , S - , S - , E - , O - , T - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , S - , H - , E - , T - , R - , N - , T - , O - , E - , E - , R - , N - , E - , N - , S - , S - , E - , S - , S - , R - , N - , T - , E - , H - , R - , N - , T - , E - , N - , N - , H - , E - , T - , R - , A - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , A - , E - , H - , N - , A - , E - , H - , R - , N - , E - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , T - , A - , E - , T - , R - , N - , T - , E - , S - , R - , N - , A - , E - , H - , R - , N - , E - , N - , E - , N - , O - , E - , S - , H - , R - , S - , S - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , T - , E - , N - , S - , S - , E - , T - , R - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , T - , E - , H - , T - , R - , O - , R - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - ] - , programCounter = 269 - } - , unitStack = fromList - [ 506 - , 2 - ] - } diff --git "a/.output/actual/eta/eval/logged/Original/from-eas/fact2\n.logged" "b/.output/actual/eta/eval/logged/Original/from-eas/fact2\n.logged" deleted file mode 100644 index d66b3dbe0..000000000 --- "a/.output/actual/eta/eval/logged/Original/from-eas/fact2\n.logged" +++ /dev/null @@ -1,533 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ A - , N - , T - , E - , N - , A - , H - , E - , T - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , I - , I - , E - , T - , R - , N - , T - , O - , E - , O - , N - , T - , E - , N - , E - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , N - , T - , E - , S - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , S - , E - , T - , R - , N - , E - , H - , R - , N - , T - , E - , S - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , E - , N - , T - , E - , T - , N - , A - , H - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , N - , S - , S - , E - , N - , I - , I - , E - , S - , R - , N - , T - , E - , H - , R - , N - , T - , O - , E - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , S - , S - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , N - , O - , S - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , T - , O - , E - , S - , N - , I - , T - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , E - , N - , T - , E - , S - , S - , N - , A - , N - , E - , T - , R - , N - , E - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , E - , N - , A - , E - , H - , R - , N - , E - , H - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , S - , S - , E - , O - , T - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , S - , H - , E - , T - , R - , N - , T - , O - , E - , E - , R - , N - , E - , N - , S - , S - , E - , S - , S - , R - , N - , T - , E - , H - , R - , N - , T - , E - , N - , N - , H - , E - , T - , R - , A - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , A - , E - , H - , N - , A - , E - , H - , R - , N - , E - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , T - , A - , E - , T - , R - , N - , T - , E - , S - , R - , N - , A - , E - , H - , R - , N - , E - , N - , E - , N - , O - , E - , S - , H - , R - , S - , S - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , T - , E - , N - , S - , S - , E - , T - , R - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , T - , E - , H - , T - , R - , O - , R - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - ] - , programCounter = 269 - } - , unitStack = fromList - [ 516 - , 2 - ] - } diff --git "a/.output/actual/eta/eval/logged/Original/from-eas/fact3\n.logged" "b/.output/actual/eta/eval/logged/Original/from-eas/fact3\n.logged" deleted file mode 100644 index 8ed3e05b5..000000000 --- "a/.output/actual/eta/eval/logged/Original/from-eas/fact3\n.logged" +++ /dev/null @@ -1,533 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ A - , N - , T - , E - , N - , A - , H - , E - , T - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , I - , I - , E - , T - , R - , N - , T - , O - , E - , O - , N - , T - , E - , N - , E - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , N - , T - , E - , S - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , S - , E - , T - , R - , N - , E - , H - , R - , N - , T - , E - , S - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , E - , N - , T - , E - , T - , N - , A - , H - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , N - , S - , S - , E - , N - , I - , I - , E - , S - , R - , N - , T - , E - , H - , R - , N - , T - , O - , E - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , S - , S - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , N - , O - , S - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , T - , O - , E - , S - , N - , I - , T - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , E - , N - , T - , E - , S - , S - , N - , A - , N - , E - , T - , R - , N - , E - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , E - , N - , A - , E - , H - , R - , N - , E - , H - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , S - , S - , E - , O - , T - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , S - , H - , E - , T - , R - , N - , T - , O - , E - , E - , R - , N - , E - , N - , S - , S - , E - , S - , S - , R - , N - , T - , E - , H - , R - , N - , T - , E - , N - , N - , H - , E - , T - , R - , A - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , A - , E - , H - , N - , A - , E - , H - , R - , N - , E - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , T - , A - , E - , T - , R - , N - , T - , E - , S - , R - , N - , A - , E - , H - , R - , N - , E - , N - , E - , N - , O - , E - , S - , H - , R - , S - , S - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , T - , E - , N - , S - , S - , E - , T - , R - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , T - , E - , H - , T - , R - , O - , R - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - ] - , programCounter = 269 - } - , unitStack = fromList - [ 526 - , 2 - ] - } diff --git "a/.output/actual/eta/eval/logged/Original/from-eas/fact4\n.logged" "b/.output/actual/eta/eval/logged/Original/from-eas/fact4\n.logged" deleted file mode 100644 index 12e7b80ec..000000000 --- "a/.output/actual/eta/eval/logged/Original/from-eas/fact4\n.logged" +++ /dev/null @@ -1,533 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ A - , N - , T - , E - , N - , A - , H - , E - , T - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , I - , I - , E - , T - , R - , N - , T - , O - , E - , O - , N - , T - , E - , N - , E - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , N - , T - , E - , S - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , S - , E - , T - , R - , N - , E - , H - , R - , N - , T - , E - , S - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , E - , N - , T - , E - , T - , N - , A - , H - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , N - , S - , S - , E - , N - , I - , I - , E - , S - , R - , N - , T - , E - , H - , R - , N - , T - , O - , E - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , S - , S - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , N - , O - , S - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , T - , O - , E - , S - , N - , I - , T - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , E - , N - , T - , E - , S - , S - , N - , A - , N - , E - , T - , R - , N - , E - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , E - , N - , A - , E - , H - , R - , N - , E - , H - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , S - , S - , E - , O - , T - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , S - , H - , E - , T - , R - , N - , T - , O - , E - , E - , R - , N - , E - , N - , S - , S - , E - , S - , S - , R - , N - , T - , E - , H - , R - , N - , T - , E - , N - , N - , H - , E - , T - , R - , A - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , A - , E - , H - , N - , A - , E - , H - , R - , N - , E - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , T - , A - , E - , T - , R - , N - , T - , E - , S - , R - , N - , A - , E - , H - , R - , N - , E - , N - , E - , N - , O - , E - , S - , H - , R - , S - , S - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , T - , E - , N - , S - , S - , E - , T - , R - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , T - , E - , H - , T - , R - , O - , R - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - ] - , programCounter = 269 - } - , unitStack = fromList - [ 536 - , 2 - ] - } diff --git "a/.output/actual/eta/eval/logged/Original/from-eas/fact5\n.logged" "b/.output/actual/eta/eval/logged/Original/from-eas/fact5\n.logged" deleted file mode 100644 index 8fb99a0d6..000000000 --- "a/.output/actual/eta/eval/logged/Original/from-eas/fact5\n.logged" +++ /dev/null @@ -1,533 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ A - , N - , T - , E - , N - , A - , H - , E - , T - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , I - , I - , E - , T - , R - , N - , T - , O - , E - , O - , N - , T - , E - , N - , E - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , N - , T - , E - , S - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , S - , E - , T - , R - , N - , E - , H - , R - , N - , T - , E - , S - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , E - , N - , T - , E - , T - , N - , A - , H - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , N - , S - , S - , E - , N - , I - , I - , E - , S - , R - , N - , T - , E - , H - , R - , N - , T - , O - , E - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , S - , S - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , N - , O - , S - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , T - , O - , E - , S - , N - , I - , T - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , E - , N - , T - , E - , S - , S - , N - , A - , N - , E - , T - , R - , N - , E - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , E - , N - , A - , E - , H - , R - , N - , E - , H - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , S - , S - , E - , O - , T - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , S - , H - , E - , T - , R - , N - , T - , O - , E - , E - , R - , N - , E - , N - , S - , S - , E - , S - , S - , R - , N - , T - , E - , H - , R - , N - , T - , E - , N - , N - , H - , E - , T - , R - , A - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , A - , E - , H - , N - , A - , E - , H - , R - , N - , E - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , T - , A - , E - , T - , R - , N - , T - , E - , S - , R - , N - , A - , E - , H - , R - , N - , E - , N - , E - , N - , O - , E - , S - , H - , R - , S - , S - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , T - , E - , N - , S - , S - , E - , T - , R - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , T - , E - , H - , T - , R - , O - , R - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - ] - , programCounter = 269 - } - , unitStack = fromList - [ 546 - , 2 - ] - } diff --git "a/.output/actual/eta/eval/logged/Original/from-eas/fact6\n.logged" "b/.output/actual/eta/eval/logged/Original/from-eas/fact6\n.logged" deleted file mode 100644 index 0b95ebf86..000000000 --- "a/.output/actual/eta/eval/logged/Original/from-eas/fact6\n.logged" +++ /dev/null @@ -1,533 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ A - , N - , T - , E - , N - , A - , H - , E - , T - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , I - , I - , E - , T - , R - , N - , T - , O - , E - , O - , N - , T - , E - , N - , E - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , N - , T - , E - , S - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , S - , E - , T - , R - , N - , E - , H - , R - , N - , T - , E - , S - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , E - , N - , T - , E - , T - , N - , A - , H - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , N - , S - , S - , E - , N - , I - , I - , E - , S - , R - , N - , T - , E - , H - , R - , N - , T - , O - , E - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , S - , S - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , N - , O - , S - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , T - , O - , E - , S - , N - , I - , T - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , E - , N - , T - , E - , S - , S - , N - , A - , N - , E - , T - , R - , N - , E - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , E - , N - , A - , E - , H - , R - , N - , E - , H - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , S - , S - , E - , O - , T - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , S - , H - , E - , T - , R - , N - , T - , O - , E - , E - , R - , N - , E - , N - , S - , S - , E - , S - , S - , R - , N - , T - , E - , H - , R - , N - , T - , E - , N - , N - , H - , E - , T - , R - , A - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , A - , E - , H - , N - , A - , E - , H - , R - , N - , E - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , T - , A - , E - , T - , R - , N - , T - , E - , S - , R - , N - , A - , E - , H - , R - , N - , E - , N - , E - , N - , O - , E - , S - , H - , R - , S - , S - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , T - , E - , N - , S - , S - , E - , T - , R - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , T - , E - , H - , T - , R - , O - , R - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - ] - , programCounter = 269 - } - , unitStack = fromList - [ 556 - , 2 - ] - } diff --git "a/.output/actual/eta/eval/logged/Original/from-eas/fact7\n.logged" "b/.output/actual/eta/eval/logged/Original/from-eas/fact7\n.logged" deleted file mode 100644 index 31709b52e..000000000 --- "a/.output/actual/eta/eval/logged/Original/from-eas/fact7\n.logged" +++ /dev/null @@ -1,533 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ A - , N - , T - , E - , N - , A - , H - , E - , T - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , I - , I - , E - , T - , R - , N - , T - , O - , E - , O - , N - , T - , E - , N - , E - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , N - , T - , E - , S - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , S - , E - , T - , R - , N - , E - , H - , R - , N - , T - , E - , S - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , E - , N - , T - , E - , T - , N - , A - , H - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , N - , S - , S - , E - , N - , I - , I - , E - , S - , R - , N - , T - , E - , H - , R - , N - , T - , O - , E - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , S - , S - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , N - , O - , S - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , T - , O - , E - , S - , N - , I - , T - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , E - , N - , T - , E - , S - , S - , N - , A - , N - , E - , T - , R - , N - , E - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , E - , N - , A - , E - , H - , R - , N - , E - , H - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , S - , S - , E - , O - , T - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , S - , H - , E - , T - , R - , N - , T - , O - , E - , E - , R - , N - , E - , N - , S - , S - , E - , S - , S - , R - , N - , T - , E - , H - , R - , N - , T - , E - , N - , N - , H - , E - , T - , R - , A - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , A - , E - , H - , N - , A - , E - , H - , R - , N - , E - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , T - , A - , E - , T - , R - , N - , T - , E - , S - , R - , N - , A - , E - , H - , R - , N - , E - , N - , E - , N - , O - , E - , S - , H - , R - , S - , S - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , T - , E - , N - , S - , S - , E - , T - , R - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , T - , E - , H - , T - , R - , O - , R - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - ] - , programCounter = 269 - } - , unitStack = fromList - [ 566 - , 2 - ] - } diff --git "a/.output/actual/eta/eval/logged/Original/from-eas/fact8\n.logged" "b/.output/actual/eta/eval/logged/Original/from-eas/fact8\n.logged" deleted file mode 100644 index 934ca5b73..000000000 --- "a/.output/actual/eta/eval/logged/Original/from-eas/fact8\n.logged" +++ /dev/null @@ -1,533 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ A - , N - , T - , E - , N - , A - , H - , E - , T - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , I - , I - , E - , T - , R - , N - , T - , O - , E - , O - , N - , T - , E - , N - , E - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , N - , T - , E - , S - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , S - , E - , T - , R - , N - , E - , H - , R - , N - , T - , E - , S - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , E - , N - , T - , E - , T - , N - , A - , H - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , N - , S - , S - , E - , N - , I - , I - , E - , S - , R - , N - , T - , E - , H - , R - , N - , T - , O - , E - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , S - , S - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , N - , O - , S - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , T - , O - , E - , S - , N - , I - , T - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , E - , N - , T - , E - , S - , S - , N - , A - , N - , E - , T - , R - , N - , E - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , E - , N - , A - , E - , H - , R - , N - , E - , H - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , S - , S - , E - , O - , T - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , S - , H - , E - , T - , R - , N - , T - , O - , E - , E - , R - , N - , E - , N - , S - , S - , E - , S - , S - , R - , N - , T - , E - , H - , R - , N - , T - , E - , N - , N - , H - , E - , T - , R - , A - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , A - , E - , H - , N - , A - , E - , H - , R - , N - , E - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , T - , A - , E - , T - , R - , N - , T - , E - , S - , R - , N - , A - , E - , H - , R - , N - , E - , N - , E - , N - , O - , E - , S - , H - , R - , S - , S - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , T - , E - , N - , S - , S - , E - , T - , R - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , T - , E - , H - , T - , R - , O - , R - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - ] - , programCounter = 269 - } - , unitStack = fromList - [ 576 - , 2 - ] - } diff --git "a/.output/actual/eta/eval/logged/Original/from-eas/fact9\n.logged" "b/.output/actual/eta/eval/logged/Original/from-eas/fact9\n.logged" deleted file mode 100644 index 5a095dd36..000000000 --- "a/.output/actual/eta/eval/logged/Original/from-eas/fact9\n.logged" +++ /dev/null @@ -1,533 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ A - , N - , T - , E - , N - , A - , H - , E - , T - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , I - , I - , E - , T - , R - , N - , T - , O - , E - , O - , N - , T - , E - , N - , E - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , N - , T - , E - , S - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , S - , E - , T - , R - , N - , E - , H - , R - , N - , T - , E - , S - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , E - , N - , T - , E - , T - , N - , A - , H - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , N - , S - , S - , E - , N - , I - , I - , E - , S - , R - , N - , T - , E - , H - , R - , N - , T - , O - , E - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , S - , S - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , N - , O - , S - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , T - , O - , E - , S - , N - , I - , T - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , E - , N - , T - , E - , S - , S - , N - , A - , N - , E - , T - , R - , N - , E - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , E - , N - , A - , E - , H - , R - , N - , E - , H - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , S - , S - , E - , O - , T - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , S - , H - , E - , T - , R - , N - , T - , O - , E - , E - , R - , N - , E - , N - , S - , S - , E - , S - , S - , R - , N - , T - , E - , H - , R - , N - , T - , E - , N - , N - , H - , E - , T - , R - , A - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , A - , E - , H - , N - , A - , E - , H - , R - , N - , E - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , T - , A - , E - , T - , R - , N - , T - , E - , S - , R - , N - , A - , E - , H - , R - , N - , E - , N - , E - , N - , O - , E - , S - , H - , R - , S - , S - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , T - , E - , N - , S - , S - , E - , T - , R - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , T - , E - , H - , T - , R - , O - , R - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - ] - , programCounter = 269 - } - , unitStack = fromList - [ 586 - , 2 - ] - } diff --git a/.output/actual/eta/eval/logged/Original/from-eas/hello.logged b/.output/actual/eta/eval/logged/Original/from-eas/hello.logged deleted file mode 100644 index af7e38085..000000000 --- a/.output/actual/eta/eval/logged/Original/from-eas/hello.logged +++ /dev/null @@ -1,94 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ N - , I - , I - , E - , R - , N - , S - , A - , E - , N - , A - , T - , S - , E - , N - , A - , T - , O - , E - , N - , A - , T - , O - , E - , N - , A - , H - , O - , E - , N - , T - , O - , A - , E - , R - , O - , O - , O - , O - , O - , O - , O - , R - , N - , T - , O - , E - , R - , N - , I - , N - , E - , N - , A - , H - , A - , E - , N - , A - , T - , O - , E - , N - , A - , A - , A - , E - , N - , A - , T - , S - , E - , N - , A - , O - , H - , E - , R - , O - , O - , O - , O - , O - , O - , O - , R - ] - , programCounter = 86 - } - , unitStack = fromList [] - } diff --git a/.output/actual/eta/eval/logged/Original/from-eas/hello2.logged b/.output/actual/eta/eval/logged/Original/from-eas/hello2.logged deleted file mode 100644 index 239f71d0f..000000000 --- a/.output/actual/eta/eval/logged/Original/from-eas/hello2.logged +++ /dev/null @@ -1,132 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ N - , E - , N - , T - , O - , E - , N - , I - , N - , E - , N - , A - , H - , A - , E - , N - , A - , T - , O - , E - , N - , A - , A - , A - , E - , N - , A - , T - , S - , E - , N - , A - , O - , H - , E - , N - , I - , I - , E - , N - , S - , A - , E - , N - , A - , T - , S - , E - , N - , A - , T - , O - , E - , N - , A - , T - , O - , E - , N - , A - , H - , O - , E - , N - , T - , O - , A - , E - , R - , A - , N - , T - , E - , N - , I - , E - , T - , R - , N - , T - , E - , N - , E - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , T - , E - , H - , T - , R - , O - , R - , N - , T - , E - , N - , I - , E - , T - , R - ] - , programCounter = 84 - } - , unitStack = fromList [] - } diff --git a/.output/actual/eta/eval/logged/Original/from-eas/hello3.logged b/.output/actual/eta/eval/logged/Original/from-eas/hello3.logged deleted file mode 100644 index 239f71d0f..000000000 --- a/.output/actual/eta/eval/logged/Original/from-eas/hello3.logged +++ /dev/null @@ -1,132 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ N - , E - , N - , T - , O - , E - , N - , I - , N - , E - , N - , A - , H - , A - , E - , N - , A - , T - , O - , E - , N - , A - , A - , A - , E - , N - , A - , T - , S - , E - , N - , A - , O - , H - , E - , N - , I - , I - , E - , N - , S - , A - , E - , N - , A - , T - , S - , E - , N - , A - , T - , O - , E - , N - , A - , T - , O - , E - , N - , A - , H - , O - , E - , N - , T - , O - , A - , E - , R - , A - , N - , T - , E - , N - , I - , E - , T - , R - , N - , T - , E - , N - , E - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , T - , E - , H - , T - , R - , O - , R - , N - , T - , E - , N - , I - , E - , T - , R - ] - , programCounter = 84 - } - , unitStack = fromList [] - } diff --git a/.output/actual/eta/eval/logged/Original/from-eas/hello4.logged b/.output/actual/eta/eval/logged/Original/from-eas/hello4.logged deleted file mode 100644 index 239f71d0f..000000000 --- a/.output/actual/eta/eval/logged/Original/from-eas/hello4.logged +++ /dev/null @@ -1,132 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ N - , E - , N - , T - , O - , E - , N - , I - , N - , E - , N - , A - , H - , A - , E - , N - , A - , T - , O - , E - , N - , A - , A - , A - , E - , N - , A - , T - , S - , E - , N - , A - , O - , H - , E - , N - , I - , I - , E - , N - , S - , A - , E - , N - , A - , T - , S - , E - , N - , A - , T - , O - , E - , N - , A - , T - , O - , E - , N - , A - , H - , O - , E - , N - , T - , O - , A - , E - , R - , A - , N - , T - , E - , N - , I - , E - , T - , R - , N - , T - , E - , N - , E - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , T - , E - , H - , T - , R - , O - , R - , N - , T - , E - , N - , I - , E - , T - , R - ] - , programCounter = 84 - } - , unitStack = fromList [] - } diff --git a/.output/actual/eta/eval/logged/Original/from-eas/readcharA.logged b/.output/actual/eta/eval/logged/Original/from-eas/readcharA.logged deleted file mode 100644 index a57087fca..000000000 --- a/.output/actual/eta/eval/logged/Original/from-eas/readcharA.logged +++ /dev/null @@ -1,10 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ I - , R - ] - , programCounter = 2 - } - , unitStack = fromList [ 65 ] - } diff --git "a/.output/actual/eta/eval/logged/Original/from-eas/readnum0\n.logged" "b/.output/actual/eta/eval/logged/Original/from-eas/readnum0\n.logged" deleted file mode 100644 index c9b0028aa..000000000 --- "a/.output/actual/eta/eval/logged/Original/from-eas/readnum0\n.logged" +++ /dev/null @@ -1,268 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , E - , N - , T - , E - , T - , N - , T - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , N - , S - , S - , E - , N - , I - , I - , E - , S - , R - , N - , T - , E - , H - , R - , N - , T - , O - , E - , A - , N - , T - , E - , N - , A - , N - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , S - , S - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , N - , A - , H - , E - , T - , R - , N - , T - , E - , N - , A - , O - , E - , T - , R - , N - , E - , H - , N - , T - , O - , E - , S - , N - , A - , A - , E - , T - , R - , N - , T - , E - , N - , A - , O - , E - , T - , R - , N - , E - , H - , N - , E - , N - , T - , E - , S - , S - , N - , S - , E - , T - , R - , N - , E - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , A - , E - , H - , N - , A - , E - , H - , R - , N - , E - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , I - , N - , E - , T - , R - , N - , T - , E - , S - , R - , N - , A - , E - , H - , R - , N - , E - , N - , E - , N - , O - , E - , S - , H - , R - , S - , S - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , T - , E - , N - , O - , A - , E - , T - , R - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - ] - , programCounter = 157 - } - , unitStack = fromList [ 496 ] - } diff --git "a/.output/actual/eta/eval/logged/Original/from-eas/readnum1\n.logged" "b/.output/actual/eta/eval/logged/Original/from-eas/readnum1\n.logged" deleted file mode 100644 index 30bc74edc..000000000 --- "a/.output/actual/eta/eval/logged/Original/from-eas/readnum1\n.logged" +++ /dev/null @@ -1,268 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , E - , N - , T - , E - , T - , N - , T - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , N - , S - , S - , E - , N - , I - , I - , E - , S - , R - , N - , T - , E - , H - , R - , N - , T - , O - , E - , A - , N - , T - , E - , N - , A - , N - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , S - , S - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , N - , A - , H - , E - , T - , R - , N - , T - , E - , N - , A - , O - , E - , T - , R - , N - , E - , H - , N - , T - , O - , E - , S - , N - , A - , A - , E - , T - , R - , N - , T - , E - , N - , A - , O - , E - , T - , R - , N - , E - , H - , N - , E - , N - , T - , E - , S - , S - , N - , S - , E - , T - , R - , N - , E - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , A - , E - , H - , N - , A - , E - , H - , R - , N - , E - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , I - , N - , E - , T - , R - , N - , T - , E - , S - , R - , N - , A - , E - , H - , R - , N - , E - , N - , E - , N - , O - , E - , S - , H - , R - , S - , S - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , T - , E - , N - , O - , A - , E - , T - , R - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - ] - , programCounter = 157 - } - , unitStack = fromList [ 506 ] - } diff --git a/.output/actual/eta/eval/logged/Original/from-eas/true.logged b/.output/actual/eta/eval/logged/Original/from-eas/true.logged deleted file mode 100644 index 0ddd7fa1f..000000000 --- a/.output/actual/eta/eval/logged/Original/from-eas/true.logged +++ /dev/null @@ -1,7 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = [] - , programCounter = 0 - } - , unitStack = fromList [] - } diff --git a/.output/actual/eta/eval/logged/Original/original/crlf.logged b/.output/actual/eta/eval/logged/Original/original/crlf.logged deleted file mode 100644 index f410aa572..000000000 --- a/.output/actual/eta/eval/logged/Original/original/crlf.logged +++ /dev/null @@ -1,112 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ N - , T - , E - , N - , O - , E - , T - , R - , N - , T - , O - , E - , N - , T - , H - , H - , E - , N - , T - , A - , N - , E - , N - , T - , A - , A - , E - , N - , T - , A - , O - , E - , O - , O - , O - , O - , O - , N - , T - , E - , N - , E - , T - , R - , N - , T - , O - , E - , N - , T - , O - , N - , E - , N - , T - , I - , A - , E - , O - , O - , O - , N - , T - , E - , N - , E - , T - , R - , N - , T - , O - , E - , N - , T - , H - , T - , E - , N - , T - , A - , N - , E - , N - , T - , A - , A - , E - , N - , T - , A - , O - , E - , O - , O - , O - , O - , O - , N - , T - , E - , N - , E - , T - , R - ] - , programCounter = 67 - } - , unitStack = fromList [] - } diff --git a/.output/actual/eta/eval/logged/Original/original/hello.logged b/.output/actual/eta/eval/logged/Original/original/hello.logged deleted file mode 100644 index 0e102d806..000000000 --- a/.output/actual/eta/eval/logged/Original/original/hello.logged +++ /dev/null @@ -1,125 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ N - , O - , H - , E - , A - , T - , H - , E - , O - , E - , T - , A - , I - , T - , T - , E - , N - , I - , E - , T - , A - , O - , R - , R - , N - , I - , I - , E - , R - , N - , S - , A - , E - , N - , A - , R - , T - , S - , E - , R - , N - , A - , T - , O - , E - , N - , A - , T - , O - , E - , N - , A - , H - , O - , E - , R - , N - , T - , O - , A - , E - , N - , E - , S - , R - , O - , O - , O - , O - , O - , O - , O - , R - , N - , T - , O - , E - , R - , N - , I - , N - , E - , N - , A - , H - , A - , E - , N - , A - , T - , O - , E - , R - , N - , A - , A - , A - , E - , N - , A - , T - , S - , E - , N - , A - , O - , H - , E - , R - , O - , O - , O - , O - , O - , O - , O - , R - ] - , programCounter = 117 - } - , unitStack = fromList [] - } diff --git a/.output/actual/eta/eval/logged/Original/original/hello2.logged b/.output/actual/eta/eval/logged/Original/original/hello2.logged deleted file mode 100644 index e944a35c4..000000000 --- a/.output/actual/eta/eval/logged/Original/original/hello2.logged +++ /dev/null @@ -1,157 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ N - , E - , N - , T - , O - , E - , N - , I - , N - , E - , N - , A - , H - , A - , E - , N - , A - , T - , O - , E - , N - , A - , A - , A - , E - , N - , A - , T - , S - , E - , N - , A - , O - , H - , E - , N - , I - , I - , E - , R - , N - , S - , A - , E - , N - , A - , T - , S - , E - , N - , A - , T - , O - , E - , N - , A - , T - , O - , E - , N - , A - , H - , O - , E - , N - , T - , O - , A - , E - , A - , N - , T - , E - , N - , I - , E - , T - , R - , N - , T - , E - , N - , E - , T - , A - , N - , O - , T - , E - , T - , I - , S - , T - , O - , O - , E - , A - , T - , I - , N - , S - , S - , T - , E - , S - , R - , N - , T - , E - , H - , N - , E - , H - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , I - , E - , N - , T - , E - , H - , T - , R - , O - , N - , T - , H - , E - , N - , I - , E - , T - , S - , S - , I - , A - , N - , R - ] - , programCounter = 84 - } - , unitStack = fromList [] - } diff --git a/.output/actual/eta/eval/output/Fast/from-eas/bottles.output b/.output/actual/eta/eval/output/Fast/from-eas/bottles.output deleted file mode 100644 index 6d9316acf..000000000 --- a/.output/actual/eta/eval/output/Fast/from-eas/bottles.output +++ /dev/null @@ -1,12 +0,0 @@ -3 bottles of beer on the wall, 3 bottles of beer -Take one down, pass it around -2 bottles of beer on the wall - -2 bottles of beer on the wall, 2 bottles of beer -Take one down, pass it around -1 bottles of beer on the wall - -1 bottles of beer on the wall, 1 bottles of beer -Take one down, pass it around -0 bottles of beer on the wall - diff --git a/.output/actual/eta/eval/output/Fast/from-eas/divmod.output b/.output/actual/eta/eval/output/Fast/from-eas/divmod.output deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/actual/eta/eval/output/Fast/from-eas/fact0\n.output" "b/.output/actual/eta/eval/output/Fast/from-eas/fact0\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/actual/eta/eval/output/Fast/from-eas/fact1\n.output" "b/.output/actual/eta/eval/output/Fast/from-eas/fact1\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/actual/eta/eval/output/Fast/from-eas/fact2\n.output" "b/.output/actual/eta/eval/output/Fast/from-eas/fact2\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/actual/eta/eval/output/Fast/from-eas/fact3\n.output" "b/.output/actual/eta/eval/output/Fast/from-eas/fact3\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/actual/eta/eval/output/Fast/from-eas/fact4\n.output" "b/.output/actual/eta/eval/output/Fast/from-eas/fact4\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/actual/eta/eval/output/Fast/from-eas/fact5\n.output" "b/.output/actual/eta/eval/output/Fast/from-eas/fact5\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/actual/eta/eval/output/Fast/from-eas/fact6\n.output" "b/.output/actual/eta/eval/output/Fast/from-eas/fact6\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/actual/eta/eval/output/Fast/from-eas/fact7\n.output" "b/.output/actual/eta/eval/output/Fast/from-eas/fact7\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/actual/eta/eval/output/Fast/from-eas/fact8\n.output" "b/.output/actual/eta/eval/output/Fast/from-eas/fact8\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/actual/eta/eval/output/Fast/from-eas/fact9\n.output" "b/.output/actual/eta/eval/output/Fast/from-eas/fact9\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git a/.output/actual/eta/eval/output/Fast/from-eas/hello.output b/.output/actual/eta/eval/output/Fast/from-eas/hello.output deleted file mode 100644 index af5626b4a..000000000 --- a/.output/actual/eta/eval/output/Fast/from-eas/hello.output +++ /dev/null @@ -1 +0,0 @@ -Hello, world! diff --git a/.output/actual/eta/eval/output/Fast/from-eas/hello2.output b/.output/actual/eta/eval/output/Fast/from-eas/hello2.output deleted file mode 100644 index af5626b4a..000000000 --- a/.output/actual/eta/eval/output/Fast/from-eas/hello2.output +++ /dev/null @@ -1 +0,0 @@ -Hello, world! diff --git a/.output/actual/eta/eval/output/Fast/from-eas/hello3.output b/.output/actual/eta/eval/output/Fast/from-eas/hello3.output deleted file mode 100644 index af5626b4a..000000000 --- a/.output/actual/eta/eval/output/Fast/from-eas/hello3.output +++ /dev/null @@ -1 +0,0 @@ -Hello, world! diff --git a/.output/actual/eta/eval/output/Fast/from-eas/hello4.output b/.output/actual/eta/eval/output/Fast/from-eas/hello4.output deleted file mode 100644 index af5626b4a..000000000 --- a/.output/actual/eta/eval/output/Fast/from-eas/hello4.output +++ /dev/null @@ -1 +0,0 @@ -Hello, world! diff --git a/.output/actual/eta/eval/output/Fast/from-eas/readcharA.output b/.output/actual/eta/eval/output/Fast/from-eas/readcharA.output deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/actual/eta/eval/output/Fast/from-eas/readnum0\n.output" "b/.output/actual/eta/eval/output/Fast/from-eas/readnum0\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/actual/eta/eval/output/Fast/from-eas/readnum1\n.output" "b/.output/actual/eta/eval/output/Fast/from-eas/readnum1\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git a/.output/actual/eta/eval/output/Fast/from-eas/true.output b/.output/actual/eta/eval/output/Fast/from-eas/true.output deleted file mode 100644 index e69de29bb..000000000 diff --git a/.output/actual/eta/eval/output/Fast/original/bottles.output b/.output/actual/eta/eval/output/Fast/original/bottles.output deleted file mode 100644 index 9fa0b1d3c..000000000 --- a/.output/actual/eta/eval/output/Fast/original/bottles.output +++ /dev/null @@ -1,396 +0,0 @@ -99 bottles of beer on the wall, 99 bottles of beer -Take one down, pass it around -98 bottles of beer on the wall - -98 bottles of beer on the wall, 98 bottles of beer -Take one down, pass it around -97 bottles of beer on the wall - -97 bottles of beer on the wall, 97 bottles of beer -Take one down, pass it around -96 bottles of beer on the wall - -96 bottles of beer on the wall, 96 bottles of beer -Take one down, pass it around -95 bottles of beer on the wall - -95 bottles of beer on the wall, 95 bottles of beer -Take one down, pass it around -94 bottles of beer on the wall - -94 bottles of beer on the wall, 94 bottles of beer -Take one down, pass it around -93 bottles of beer on the wall - -93 bottles of beer on the wall, 93 bottles of beer -Take one down, pass it around -92 bottles of beer on the wall - -92 bottles of beer on the wall, 92 bottles of beer -Take one down, pass it around -91 bottles of beer on the wall - -91 bottles of beer on the wall, 91 bottles of beer -Take one down, pass it around -90 bottles of beer on the wall - -90 bottles of beer on the wall, 90 bottles of beer -Take one down, pass it around -89 bottles of beer on the wall - -89 bottles of beer on the wall, 89 bottles of beer -Take one down, pass it around -88 bottles of beer on the wall - -88 bottles of beer on the wall, 88 bottles of beer -Take one down, pass it around -87 bottles of beer on the wall - -87 bottles of beer on the wall, 87 bottles of beer -Take one down, pass it around -86 bottles of beer on the wall - -86 bottles of beer on the wall, 86 bottles of beer -Take one down, pass it around -85 bottles of beer on the wall - -85 bottles of beer on the wall, 85 bottles of beer -Take one down, pass it around -84 bottles of beer on the wall - -84 bottles of beer on the wall, 84 bottles of beer -Take one down, pass it around -83 bottles of beer on the wall - -83 bottles of beer on the wall, 83 bottles of beer -Take one down, pass it around -82 bottles of beer on the wall - -82 bottles of beer on the wall, 82 bottles of beer -Take one down, pass it around -81 bottles of beer on the wall - -81 bottles of beer on the wall, 81 bottles of beer -Take one down, pass it around -80 bottles of beer on the wall - -80 bottles of beer on the wall, 80 bottles of beer -Take one down, pass it around -79 bottles of beer on the wall - -79 bottles of beer on the wall, 79 bottles of beer -Take one down, pass it around -78 bottles of beer on the wall - -78 bottles of beer on the wall, 78 bottles of beer -Take one down, pass it around -77 bottles of beer on the wall - -77 bottles of beer on the wall, 77 bottles of beer -Take one down, pass it around -76 bottles of beer on the wall - -76 bottles of beer on the wall, 76 bottles of beer -Take one down, pass it around -75 bottles of beer on the wall - -75 bottles of beer on the wall, 75 bottles of beer -Take one down, pass it around -74 bottles of beer on the wall - -74 bottles of beer on the wall, 74 bottles of beer -Take one down, pass it around -73 bottles of beer on the wall - -73 bottles of beer on the wall, 73 bottles of beer -Take one down, pass it around -72 bottles of beer on the wall - -72 bottles of beer on the wall, 72 bottles of beer -Take one down, pass it around -71 bottles of beer on the wall - -71 bottles of beer on the wall, 71 bottles of beer -Take one down, pass it around -70 bottles of beer on the wall - -70 bottles of beer on the wall, 70 bottles of beer -Take one down, pass it around -69 bottles of beer on the wall - -69 bottles of beer on the wall, 69 bottles of beer -Take one down, pass it around -68 bottles of beer on the wall - -68 bottles of beer on the wall, 68 bottles of beer -Take one down, pass it around -67 bottles of beer on the wall - -67 bottles of beer on the wall, 67 bottles of beer -Take one down, pass it around -66 bottles of beer on the wall - -66 bottles of beer on the wall, 66 bottles of beer -Take one down, pass it around -65 bottles of beer on the wall - -65 bottles of beer on the wall, 65 bottles of beer -Take one down, pass it around -64 bottles of beer on the wall - -64 bottles of beer on the wall, 64 bottles of beer -Take one down, pass it around -63 bottles of beer on the wall - -63 bottles of beer on the wall, 63 bottles of beer -Take one down, pass it around -62 bottles of beer on the wall - -62 bottles of beer on the wall, 62 bottles of beer -Take one down, pass it around -61 bottles of beer on the wall - -61 bottles of beer on the wall, 61 bottles of beer -Take one down, pass it around -60 bottles of beer on the wall - -60 bottles of beer on the wall, 60 bottles of beer -Take one down, pass it around -59 bottles of beer on the wall - -59 bottles of beer on the wall, 59 bottles of beer -Take one down, pass it around -58 bottles of beer on the wall - -58 bottles of beer on the wall, 58 bottles of beer -Take one down, pass it around -57 bottles of beer on the wall - -57 bottles of beer on the wall, 57 bottles of beer -Take one down, pass it around -56 bottles of beer on the wall - -56 bottles of beer on the wall, 56 bottles of beer -Take one down, pass it around -55 bottles of beer on the wall - -55 bottles of beer on the wall, 55 bottles of beer -Take one down, pass it around -54 bottles of beer on the wall - -54 bottles of beer on the wall, 54 bottles of beer -Take one down, pass it around -53 bottles of beer on the wall - -53 bottles of beer on the wall, 53 bottles of beer -Take one down, pass it around -52 bottles of beer on the wall - -52 bottles of beer on the wall, 52 bottles of beer -Take one down, pass it around -51 bottles of beer on the wall - -51 bottles of beer on the wall, 51 bottles of beer -Take one down, pass it around -50 bottles of beer on the wall - -50 bottles of beer on the wall, 50 bottles of beer -Take one down, pass it around -49 bottles of beer on the wall - -49 bottles of beer on the wall, 49 bottles of beer -Take one down, pass it around -48 bottles of beer on the wall - -48 bottles of beer on the wall, 48 bottles of beer -Take one down, pass it around -47 bottles of beer on the wall - -47 bottles of beer on the wall, 47 bottles of beer -Take one down, pass it around -46 bottles of beer on the wall - -46 bottles of beer on the wall, 46 bottles of beer -Take one down, pass it around -45 bottles of beer on the wall - -45 bottles of beer on the wall, 45 bottles of beer -Take one down, pass it around -44 bottles of beer on the wall - -44 bottles of beer on the wall, 44 bottles of beer -Take one down, pass it around -43 bottles of beer on the wall - -43 bottles of beer on the wall, 43 bottles of beer -Take one down, pass it around -42 bottles of beer on the wall - -42 bottles of beer on the wall, 42 bottles of beer -Take one down, pass it around -41 bottles of beer on the wall - -41 bottles of beer on the wall, 41 bottles of beer -Take one down, pass it around -40 bottles of beer on the wall - -40 bottles of beer on the wall, 40 bottles of beer -Take one down, pass it around -39 bottles of beer on the wall - -39 bottles of beer on the wall, 39 bottles of beer -Take one down, pass it around -38 bottles of beer on the wall - -38 bottles of beer on the wall, 38 bottles of beer -Take one down, pass it around -37 bottles of beer on the wall - -37 bottles of beer on the wall, 37 bottles of beer -Take one down, pass it around -36 bottles of beer on the wall - -36 bottles of beer on the wall, 36 bottles of beer -Take one down, pass it around -35 bottles of beer on the wall - -35 bottles of beer on the wall, 35 bottles of beer -Take one down, pass it around -34 bottles of beer on the wall - -34 bottles of beer on the wall, 34 bottles of beer -Take one down, pass it around -33 bottles of beer on the wall - -33 bottles of beer on the wall, 33 bottles of beer -Take one down, pass it around -32 bottles of beer on the wall - -32 bottles of beer on the wall, 32 bottles of beer -Take one down, pass it around -31 bottles of beer on the wall - -31 bottles of beer on the wall, 31 bottles of beer -Take one down, pass it around -30 bottles of beer on the wall - -30 bottles of beer on the wall, 30 bottles of beer -Take one down, pass it around -29 bottles of beer on the wall - -29 bottles of beer on the wall, 29 bottles of beer -Take one down, pass it around -28 bottles of beer on the wall - -28 bottles of beer on the wall, 28 bottles of beer -Take one down, pass it around -27 bottles of beer on the wall - -27 bottles of beer on the wall, 27 bottles of beer -Take one down, pass it around -26 bottles of beer on the wall - -26 bottles of beer on the wall, 26 bottles of beer -Take one down, pass it around -25 bottles of beer on the wall - -25 bottles of beer on the wall, 25 bottles of beer -Take one down, pass it around -24 bottles of beer on the wall - -24 bottles of beer on the wall, 24 bottles of beer -Take one down, pass it around -23 bottles of beer on the wall - -23 bottles of beer on the wall, 23 bottles of beer -Take one down, pass it around -22 bottles of beer on the wall - -22 bottles of beer on the wall, 22 bottles of beer -Take one down, pass it around -21 bottles of beer on the wall - -21 bottles of beer on the wall, 21 bottles of beer -Take one down, pass it around -20 bottles of beer on the wall - -20 bottles of beer on the wall, 20 bottles of beer -Take one down, pass it around -19 bottles of beer on the wall - -19 bottles of beer on the wall, 19 bottles of beer -Take one down, pass it around -18 bottles of beer on the wall - -18 bottles of beer on the wall, 18 bottles of beer -Take one down, pass it around -17 bottles of beer on the wall - -17 bottles of beer on the wall, 17 bottles of beer -Take one down, pass it around -16 bottles of beer on the wall - -16 bottles of beer on the wall, 16 bottles of beer -Take one down, pass it around -15 bottles of beer on the wall - -15 bottles of beer on the wall, 15 bottles of beer -Take one down, pass it around -14 bottles of beer on the wall - -14 bottles of beer on the wall, 14 bottles of beer -Take one down, pass it around -13 bottles of beer on the wall - -13 bottles of beer on the wall, 13 bottles of beer -Take one down, pass it around -12 bottles of beer on the wall - -12 bottles of beer on the wall, 12 bottles of beer -Take one down, pass it around -11 bottles of beer on the wall - -11 bottles of beer on the wall, 11 bottles of beer -Take one down, pass it around -10 bottles of beer on the wall - -10 bottles of beer on the wall, 10 bottles of beer -Take one down, pass it around -9 bottles of beer on the wall - -9 bottles of beer on the wall, 9 bottles of beer -Take one down, pass it around -8 bottles of beer on the wall - -8 bottles of beer on the wall, 8 bottles of beer -Take one down, pass it around -7 bottles of beer on the wall - -7 bottles of beer on the wall, 7 bottles of beer -Take one down, pass it around -6 bottles of beer on the wall - -6 bottles of beer on the wall, 6 bottles of beer -Take one down, pass it around -5 bottles of beer on the wall - -5 bottles of beer on the wall, 5 bottles of beer -Take one down, pass it around -4 bottles of beer on the wall - -4 bottles of beer on the wall, 4 bottles of beer -Take one down, pass it around -3 bottles of beer on the wall - -3 bottles of beer on the wall, 3 bottles of beer -Take one down, pass it around -2 bottles of beer on the wall - -2 bottles of beer on the wall, 2 bottles of beer -Take one down, pass it around -1 bottles of beer on the wall - -1 bottles of beer on the wall, 1 bottles of beer -Take one down, pass it around -0 bottles of beer on the wall - diff --git a/.output/actual/eta/eval/output/Fast/original/crlf.output b/.output/actual/eta/eval/output/Fast/original/crlf.output deleted file mode 100644 index d86bac9de..000000000 --- a/.output/actual/eta/eval/output/Fast/original/crlf.output +++ /dev/null @@ -1 +0,0 @@ -OK diff --git "a/.output/actual/eta/eval/output/Fast/original/fact1\n.output" "b/.output/actual/eta/eval/output/Fast/original/fact1\n.output" deleted file mode 100644 index d00491fd7..000000000 --- "a/.output/actual/eta/eval/output/Fast/original/fact1\n.output" +++ /dev/null @@ -1 +0,0 @@ -1 diff --git "a/.output/actual/eta/eval/output/Fast/original/fact2\n.output" "b/.output/actual/eta/eval/output/Fast/original/fact2\n.output" deleted file mode 100644 index 0cfbf0888..000000000 --- "a/.output/actual/eta/eval/output/Fast/original/fact2\n.output" +++ /dev/null @@ -1 +0,0 @@ -2 diff --git "a/.output/actual/eta/eval/output/Fast/original/fact3\n.output" "b/.output/actual/eta/eval/output/Fast/original/fact3\n.output" deleted file mode 100644 index 1e8b31496..000000000 --- "a/.output/actual/eta/eval/output/Fast/original/fact3\n.output" +++ /dev/null @@ -1 +0,0 @@ -6 diff --git "a/.output/actual/eta/eval/output/Fast/original/fact4\n.output" "b/.output/actual/eta/eval/output/Fast/original/fact4\n.output" deleted file mode 100644 index a45fd52cc..000000000 --- "a/.output/actual/eta/eval/output/Fast/original/fact4\n.output" +++ /dev/null @@ -1 +0,0 @@ -24 diff --git "a/.output/actual/eta/eval/output/Fast/original/fact5\n.output" "b/.output/actual/eta/eval/output/Fast/original/fact5\n.output" deleted file mode 100644 index 52bd8e43a..000000000 --- "a/.output/actual/eta/eval/output/Fast/original/fact5\n.output" +++ /dev/null @@ -1 +0,0 @@ -120 diff --git "a/.output/actual/eta/eval/output/Fast/original/fact6\n.output" "b/.output/actual/eta/eval/output/Fast/original/fact6\n.output" deleted file mode 100644 index a1708fb1c..000000000 --- "a/.output/actual/eta/eval/output/Fast/original/fact6\n.output" +++ /dev/null @@ -1 +0,0 @@ -720 diff --git "a/.output/actual/eta/eval/output/Fast/original/fact7\n.output" "b/.output/actual/eta/eval/output/Fast/original/fact7\n.output" deleted file mode 100644 index 89810b154..000000000 --- "a/.output/actual/eta/eval/output/Fast/original/fact7\n.output" +++ /dev/null @@ -1 +0,0 @@ -5040 diff --git "a/.output/actual/eta/eval/output/Fast/original/fact8\n.output" "b/.output/actual/eta/eval/output/Fast/original/fact8\n.output" deleted file mode 100644 index 47ae14062..000000000 --- "a/.output/actual/eta/eval/output/Fast/original/fact8\n.output" +++ /dev/null @@ -1 +0,0 @@ -40320 diff --git a/.output/actual/eta/eval/output/Fast/original/hello.output b/.output/actual/eta/eval/output/Fast/original/hello.output deleted file mode 100644 index af5626b4a..000000000 --- a/.output/actual/eta/eval/output/Fast/original/hello.output +++ /dev/null @@ -1 +0,0 @@ -Hello, world! diff --git a/.output/actual/eta/eval/output/Fast/original/hello2.output b/.output/actual/eta/eval/output/Fast/original/hello2.output deleted file mode 100644 index af5626b4a..000000000 --- a/.output/actual/eta/eval/output/Fast/original/hello2.output +++ /dev/null @@ -1 +0,0 @@ -Hello, world! diff --git a/.output/actual/eta/eval/output/Original/from-eas/bottles.output b/.output/actual/eta/eval/output/Original/from-eas/bottles.output deleted file mode 100644 index 6d9316acf..000000000 --- a/.output/actual/eta/eval/output/Original/from-eas/bottles.output +++ /dev/null @@ -1,12 +0,0 @@ -3 bottles of beer on the wall, 3 bottles of beer -Take one down, pass it around -2 bottles of beer on the wall - -2 bottles of beer on the wall, 2 bottles of beer -Take one down, pass it around -1 bottles of beer on the wall - -1 bottles of beer on the wall, 1 bottles of beer -Take one down, pass it around -0 bottles of beer on the wall - diff --git a/.output/actual/eta/eval/output/Original/from-eas/divmod.output b/.output/actual/eta/eval/output/Original/from-eas/divmod.output deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/actual/eta/eval/output/Original/from-eas/fact0\n.output" "b/.output/actual/eta/eval/output/Original/from-eas/fact0\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/actual/eta/eval/output/Original/from-eas/fact1\n.output" "b/.output/actual/eta/eval/output/Original/from-eas/fact1\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/actual/eta/eval/output/Original/from-eas/fact2\n.output" "b/.output/actual/eta/eval/output/Original/from-eas/fact2\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/actual/eta/eval/output/Original/from-eas/fact3\n.output" "b/.output/actual/eta/eval/output/Original/from-eas/fact3\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/actual/eta/eval/output/Original/from-eas/fact4\n.output" "b/.output/actual/eta/eval/output/Original/from-eas/fact4\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/actual/eta/eval/output/Original/from-eas/fact5\n.output" "b/.output/actual/eta/eval/output/Original/from-eas/fact5\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/actual/eta/eval/output/Original/from-eas/fact6\n.output" "b/.output/actual/eta/eval/output/Original/from-eas/fact6\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/actual/eta/eval/output/Original/from-eas/fact7\n.output" "b/.output/actual/eta/eval/output/Original/from-eas/fact7\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/actual/eta/eval/output/Original/from-eas/fact8\n.output" "b/.output/actual/eta/eval/output/Original/from-eas/fact8\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/actual/eta/eval/output/Original/from-eas/fact9\n.output" "b/.output/actual/eta/eval/output/Original/from-eas/fact9\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git a/.output/actual/eta/eval/output/Original/from-eas/hello.output b/.output/actual/eta/eval/output/Original/from-eas/hello.output deleted file mode 100644 index af5626b4a..000000000 --- a/.output/actual/eta/eval/output/Original/from-eas/hello.output +++ /dev/null @@ -1 +0,0 @@ -Hello, world! diff --git a/.output/actual/eta/eval/output/Original/from-eas/hello2.output b/.output/actual/eta/eval/output/Original/from-eas/hello2.output deleted file mode 100644 index af5626b4a..000000000 --- a/.output/actual/eta/eval/output/Original/from-eas/hello2.output +++ /dev/null @@ -1 +0,0 @@ -Hello, world! diff --git a/.output/actual/eta/eval/output/Original/from-eas/hello3.output b/.output/actual/eta/eval/output/Original/from-eas/hello3.output deleted file mode 100644 index af5626b4a..000000000 --- a/.output/actual/eta/eval/output/Original/from-eas/hello3.output +++ /dev/null @@ -1 +0,0 @@ -Hello, world! diff --git a/.output/actual/eta/eval/output/Original/from-eas/hello4.output b/.output/actual/eta/eval/output/Original/from-eas/hello4.output deleted file mode 100644 index af5626b4a..000000000 --- a/.output/actual/eta/eval/output/Original/from-eas/hello4.output +++ /dev/null @@ -1 +0,0 @@ -Hello, world! diff --git a/.output/actual/eta/eval/output/Original/from-eas/readcharA.output b/.output/actual/eta/eval/output/Original/from-eas/readcharA.output deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/actual/eta/eval/output/Original/from-eas/readnum0\n.output" "b/.output/actual/eta/eval/output/Original/from-eas/readnum0\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/actual/eta/eval/output/Original/from-eas/readnum1\n.output" "b/.output/actual/eta/eval/output/Original/from-eas/readnum1\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git a/.output/actual/eta/eval/output/Original/from-eas/true.output b/.output/actual/eta/eval/output/Original/from-eas/true.output deleted file mode 100644 index e69de29bb..000000000 diff --git a/.output/actual/eta/eval/output/Original/original/crlf.output b/.output/actual/eta/eval/output/Original/original/crlf.output deleted file mode 100644 index d86bac9de..000000000 --- a/.output/actual/eta/eval/output/Original/original/crlf.output +++ /dev/null @@ -1 +0,0 @@ -OK diff --git a/.output/actual/eta/eval/output/Original/original/hello.output b/.output/actual/eta/eval/output/Original/original/hello.output deleted file mode 100644 index af5626b4a..000000000 --- a/.output/actual/eta/eval/output/Original/original/hello.output +++ /dev/null @@ -1 +0,0 @@ -Hello, world! diff --git a/.output/actual/eta/eval/output/Original/original/hello2.output b/.output/actual/eta/eval/output/Original/original/hello2.output deleted file mode 100644 index af5626b4a..000000000 --- a/.output/actual/eta/eval/output/Original/original/hello2.output +++ /dev/null @@ -1 +0,0 @@ -Hello, world! diff --git a/.output/actual/eta/il/optimized/from-eas/bottles.il b/.output/actual/eta/il/optimized/from-eas/bottles.il new file mode 100644 index 000000000..dcb193fd0 --- /dev/null +++ b/.output/actual/eta/il/optimized/from-eas/bottles.il @@ -0,0 +1,692 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 31 ) + ) +, Transfer +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 6 ) + ) +, Transfer +, ICF + ( DMark 5 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 6 ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 7 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, ICF + ( DMark 8 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 9 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 11 ) + ) +, Transfer +, ICF + ( DMark 10 ) +, IAL + ( SAL + ( Cons 48 ) + ) +, IAL ( SIO OutputChar ) +, Transfer +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 11 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 12 ) +, IAL + ( SAL + ( Cons 14 ) + ) +, Transfer +, ICF + ( DMark 13 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 18 ) + ) +, Transfer +, ICF + ( DMark 14 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( SMark "14" ) +, ICF + ( DMark 15 ) +, IAL + ( SAL + ( Cons + ( -48 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 16 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 17 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 11 ) + ) +, Transfer +, ICF + ( DMark 18 ) +, IAL + ( SAL + ( Cons 19 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, ICF + ( DMark 19 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 20 ) +, ICF + ( DMark 21 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 22 ) +, IAL + ( SAL + ( Cons 23 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 8 ) + ) +, Transfer +, ICF + ( DMark 23 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 102 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ICF + ( DMark 24 ) +, IAL + ( SAL + ( Cons 25 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, ICF + ( DMark 25 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 26 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 27 ) +, IAL + ( SAL + ( Cons 28 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 21 ) + ) +, Transfer +, ICF + ( DMark 28 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 104 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ICF + ( DMark 29 ) +, IAL + ( SAL + ( Cons 30 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, ICF + ( DMark 30 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 31 ) +, IAL + ( SAL + ( Cons 3 ) + ) +, ICF + ( DMark 32 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 26 ) + ) +, Transfer +, ICF + ( DMark 33 ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 34 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 35 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 21 ) + ) +, Transfer +, ICF + ( DMark 35 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 36 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 105 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 112 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 107 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 84 ) + ) +, ICF + ( DMark 37 ) +, IAL + ( SAL + ( Cons 38 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, ICF + ( DMark 38 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 39 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 40 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 26 ) + ) +, Transfer +, ICF + ( DMark 40 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 41 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 32 ) + ) +, Transfer +, ICF + ( DMark 42 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 43 ) +, End +] \ No newline at end of file diff --git a/.output/actual/eta/il/optimized/from-eas/euclid.il b/.output/actual/eta/il/optimized/from-eas/euclid.il new file mode 100644 index 000000000..67cf4bfd2 --- /dev/null +++ b/.output/actual/eta/il/optimized/from-eas/euclid.il @@ -0,0 +1,113 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 5 ) + ) +, Transfer +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, Transfer +, ICF + ( DMark 5 ) +, IAL + ( SAL + ( Cons + ( -1 ) + ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 6 ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( SMark "6" ) +, ICF + ( DMark 7 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 8 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 9 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, ICF + ( DMark 10 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 11 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 12 ) +, Transfer +, ICF + ( DMark 13 ) +, End +] \ No newline at end of file diff --git a/.output/actual/eta/il/optimized/from-eas/fact.il b/.output/actual/eta/il/optimized/from-eas/fact.il new file mode 100644 index 000000000..7e5822f11 --- /dev/null +++ b/.output/actual/eta/il/optimized/from-eas/fact.il @@ -0,0 +1,688 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 14 ) + ) +, Transfer +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 5 ) + ) +, Transfer +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, Transfer +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 5 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 6 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 7 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 9 ) + ) +, Transfer +, ICF + ( DMark 8 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, Transfer +, ICF + ( DMark 9 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 10 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 11 ) +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 5 ) + ) +, Transfer +, ICF + ( DMark 12 ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, Transfer +, ICF + ( DMark 13 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 14 ) +, IAL ( SIO InputChar ) +, ICF + ( DMark 15 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 16 ) +, IAL + ( SAL + ( Cons 18 ) + ) +, Transfer +, ICF + ( DMark 17 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, Transfer +, IAL + ( SAL + ( Cons 14 ) + ) +, Transfer +, ICF + ( DMark 18 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 19 ) +, IAL + ( SAL + ( Cons 16 ) + ) +, ICF + ( DMark 20 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 21 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 22 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, Transfer +, ICF + ( DMark 22 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 23 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 24 ) +, IAL ( SIO InputChar ) +, ICF + ( DMark 25 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 27 ) + ) +, Transfer +, ICF + ( DMark 26 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 30 ) + ) +, Transfer +, ICF + ( DMark 27 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 29 ) + ) +, Transfer +, ICF + ( DMark 28 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 30 ) + ) +, Transfer +, ICF + ( DMark 29 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons + ( -1 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 19 ) + ) +, Transfer +, ICF + ( DMark 30 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 31 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 32 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 33 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 35 ) + ) +, Transfer +, ICF + ( DMark 34 ) +, IAL + ( SAL + ( Cons 48 ) + ) +, IAL ( SIO OutputChar ) +, Transfer +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 35 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 36 ) +, IAL + ( SAL + ( Cons 38 ) + ) +, Transfer +, ICF + ( DMark 37 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 42 ) + ) +, Transfer +, ICF + ( DMark 38 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( SMark "38" ) +, ICF + ( DMark 39 ) +, IAL + ( SAL + ( Cons + ( -48 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 40 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 41 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 35 ) + ) +, Transfer +, ICF + ( DMark 42 ) +, IAL + ( SAL + ( Cons 43 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 60 ) + ) +, Transfer +, ICF + ( DMark 43 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 44 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 45 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( DMark 46 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 47 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 48 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 49 ) +, IAL + ( SAL + ( Cons 51 ) + ) +, Transfer +, ICF + ( DMark 50 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 58 ) + ) +, Transfer +, ICF + ( DMark 51 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 52 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 53 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons + ( -3 ) + ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 54 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 55 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 56 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 57 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 48 ) + ) +, Transfer +, ICF + ( DMark 58 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 59 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 60 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 61 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 62 ) +, IAL + ( SAL + ( Cons 64 ) + ) +, Transfer +, ICF + ( DMark 63 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 64 ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 65 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 60 ) + ) +, Transfer +, ICF + ( DMark 66 ) +, End +] \ No newline at end of file diff --git a/.output/actual/eta/il/optimized/from-eas/function.il b/.output/actual/eta/il/optimized/from-eas/function.il new file mode 100644 index 000000000..a8e326dbe --- /dev/null +++ b/.output/actual/eta/il/optimized/from-eas/function.il @@ -0,0 +1,55 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 5 ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 6 ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 7 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, ICF + ( DMark 8 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 9 ) +, Transfer +, ICF + ( DMark 10 ) +, End +] \ No newline at end of file diff --git a/.output/actual/eta/il/optimized/from-eas/hello.il b/.output/actual/eta/il/optimized/from-eas/hello.il new file mode 100644 index 000000000..bb2fc89e7 --- /dev/null +++ b/.output/actual/eta/il/optimized/from-eas/hello.il @@ -0,0 +1,86 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, ICF + ( DMark 3 ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, ICF + ( DMark 5 ) +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, ICF + ( DMark 6 ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 7 ) +, End +] \ No newline at end of file diff --git a/.output/actual/eta/il/optimized/from-eas/hello2.il b/.output/actual/eta/il/optimized/from-eas/hello2.il new file mode 100644 index 000000000..527ee5bcd --- /dev/null +++ b/.output/actual/eta/il/optimized/from-eas/hello2.il @@ -0,0 +1,141 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 4 ) + ) +, Transfer +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 5 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 6 ) +, IAL + ( SAL + ( Cons 8 ) + ) +, Transfer +, ICF + ( DMark 7 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 8 ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 9 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 4 ) + ) +, Transfer +, ICF + ( DMark 10 ) +, End +] \ No newline at end of file diff --git a/.output/actual/eta/il/optimized/from-eas/hello3.il b/.output/actual/eta/il/optimized/from-eas/hello3.il new file mode 100644 index 000000000..527ee5bcd --- /dev/null +++ b/.output/actual/eta/il/optimized/from-eas/hello3.il @@ -0,0 +1,141 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 4 ) + ) +, Transfer +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 5 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 6 ) +, IAL + ( SAL + ( Cons 8 ) + ) +, Transfer +, ICF + ( DMark 7 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 8 ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 9 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 4 ) + ) +, Transfer +, ICF + ( DMark 10 ) +, End +] \ No newline at end of file diff --git a/.output/actual/eta/il/optimized/from-eas/hello4.il b/.output/actual/eta/il/optimized/from-eas/hello4.il new file mode 100644 index 000000000..527ee5bcd --- /dev/null +++ b/.output/actual/eta/il/optimized/from-eas/hello4.il @@ -0,0 +1,141 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 4 ) + ) +, Transfer +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 5 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 6 ) +, IAL + ( SAL + ( Cons 8 ) + ) +, Transfer +, ICF + ( DMark 7 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 8 ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 9 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 4 ) + ) +, Transfer +, ICF + ( DMark 10 ) +, End +] \ No newline at end of file diff --git a/.output/actual/eta/il/optimized/from-eas/multiply.il b/.output/actual/eta/il/optimized/from-eas/multiply.il new file mode 100644 index 000000000..084fb5643 --- /dev/null +++ b/.output/actual/eta/il/optimized/from-eas/multiply.il @@ -0,0 +1,140 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 5 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 6 ) +, IAL + ( SAL + ( Cons 8 ) + ) +, Transfer +, ICF + ( DMark 7 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 15 ) + ) +, Transfer +, ICF + ( DMark 8 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 9 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 10 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons + ( -3 ) + ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 11 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 12 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 13 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 14 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 5 ) + ) +, Transfer +, ICF + ( DMark 15 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 16 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 17 ) +, End +] \ No newline at end of file diff --git a/.output/actual/eta/il/optimized/from-eas/pip.il b/.output/actual/eta/il/optimized/from-eas/pip.il new file mode 100644 index 000000000..0c137c9fb --- /dev/null +++ b/.output/actual/eta/il/optimized/from-eas/pip.il @@ -0,0 +1,68 @@ +[ ICF + ( DMark 1 ) +, IAL ( SIO InputChar ) +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons + ( -1 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 7 ) + ) +, Transfer +, ICF + ( DMark 5 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 6 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 7 ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 8 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, Transfer +, ICF + ( DMark 9 ) +, End +] \ No newline at end of file diff --git a/.output/actual/eta/il/optimized/from-eas/pip2.il b/.output/actual/eta/il/optimized/from-eas/pip2.il new file mode 100644 index 000000000..ad7cdb019 --- /dev/null +++ b/.output/actual/eta/il/optimized/from-eas/pip2.il @@ -0,0 +1,56 @@ +[ ICF + ( DMark 1 ) +, IAL ( SIO InputChar ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons + ( -1 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 2 ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, Transfer +, ICF + ( DMark 3 ) +, End +] \ No newline at end of file diff --git a/.output/actual/eta/il/optimized/from-eas/readnum.il b/.output/actual/eta/il/optimized/from-eas/readnum.il new file mode 100644 index 000000000..233404150 --- /dev/null +++ b/.output/actual/eta/il/optimized/from-eas/readnum.il @@ -0,0 +1,344 @@ +[ ICF + ( DMark 1 ) +, IAL ( SIO InputChar ) +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 5 ) + ) +, Transfer +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, Transfer +, IAL + ( SAL + ( Cons 1 ) + ) +, Transfer +, ICF + ( DMark 5 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 6 ) +, IAL + ( SAL + ( Cons 16 ) + ) +, ICF + ( DMark 7 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 8 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 9 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 19 ) + ) +, Transfer +, ICF + ( DMark 9 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 10 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 11 ) +, IAL ( SIO InputChar ) +, ICF + ( DMark 12 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 14 ) + ) +, Transfer +, ICF + ( DMark 13 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 17 ) + ) +, Transfer +, ICF + ( DMark 14 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 16 ) + ) +, Transfer +, ICF + ( DMark 15 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 17 ) + ) +, Transfer +, ICF + ( DMark 16 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons + ( -1 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 6 ) + ) +, Transfer +, ICF + ( DMark 17 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 18 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 19 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 20 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( DMark 21 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 22 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 23 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 24 ) +, IAL + ( SAL + ( Cons 26 ) + ) +, Transfer +, ICF + ( DMark 25 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, Transfer +, ICF + ( DMark 26 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 27 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 28 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons + ( -3 ) + ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 29 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 30 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 31 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 32 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 23 ) + ) +, Transfer +, ICF + ( DMark 33 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 34 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 35 ) +, End +] \ No newline at end of file diff --git a/.output/actual/eta/il/optimized/from-eas/reverse.il b/.output/actual/eta/il/optimized/from-eas/reverse.il new file mode 100644 index 000000000..92103d1f3 --- /dev/null +++ b/.output/actual/eta/il/optimized/from-eas/reverse.il @@ -0,0 +1,100 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons + ( -1 ) + ) + ) +, ICF + ( DMark 2 ) +, IAL ( SIO InputChar ) +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons + ( -1 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 5 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons + ( -1 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 7 ) + ) +, Transfer +, ICF + ( DMark 6 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 7 ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 5 ) + ) +, Transfer +, ICF + ( DMark 8 ) +, End +] \ No newline at end of file diff --git a/.output/actual/eta/il/optimized/from-eas/true.il b/.output/actual/eta/il/optimized/from-eas/true.il new file mode 100644 index 000000000..2e0854629 --- /dev/null +++ b/.output/actual/eta/il/optimized/from-eas/true.il @@ -0,0 +1,4 @@ +[ ICF + ( DMark 1 ) +, End +] \ No newline at end of file diff --git a/.output/actual/eta/il/optimized/from-eas/writenum.il b/.output/actual/eta/il/optimized/from-eas/writenum.il new file mode 100644 index 000000000..64fa1dbdc --- /dev/null +++ b/.output/actual/eta/il/optimized/from-eas/writenum.il @@ -0,0 +1,192 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 4 ) + ) +, Transfer +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 48 ) + ) +, IAL ( SIO OutputChar ) +, Transfer +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 5 ) +, IAL + ( SAL + ( Cons 7 ) + ) +, Transfer +, ICF + ( DMark 6 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 11 ) + ) +, Transfer +, ICF + ( DMark 7 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( SMark "7" ) +, ICF + ( DMark 8 ) +, IAL + ( SAL + ( Cons + ( -48 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 9 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 10 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 4 ) + ) +, Transfer +, ICF + ( DMark 11 ) +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, Transfer +, ICF + ( DMark 12 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 13 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 14 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 15 ) +, IAL + ( SAL + ( Cons 17 ) + ) +, Transfer +, ICF + ( DMark 16 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 17 ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 18 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, Transfer +, ICF + ( DMark 19 ) +, End +] \ No newline at end of file diff --git a/.output/actual/eta/il/optimized/from-eas/writestr.il b/.output/actual/eta/il/optimized/from-eas/writestr.il new file mode 100644 index 000000000..f26924264 --- /dev/null +++ b/.output/actual/eta/il/optimized/from-eas/writestr.il @@ -0,0 +1,53 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 5 ) + ) +, Transfer +, ICF + ( DMark 4 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 5 ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 6 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, Transfer +, ICF + ( DMark 7 ) +, End +] \ No newline at end of file diff --git a/.output/actual/eta/il/optimized/original/bottles.il b/.output/actual/eta/il/optimized/original/bottles.il new file mode 100644 index 000000000..039dbd237 --- /dev/null +++ b/.output/actual/eta/il/optimized/original/bottles.il @@ -0,0 +1,971 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 141 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, Transfer +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 155 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( SMark "1" ) +, Transfer +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SIO InputChar ) +, Transfer +, Transfer +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, IAL + ( SAL + ( Cons 4 ) + ) +, Transfer +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 3 ) + ) +, Transfer +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( SMark "2" ) +, IAL ( SIO InputChar ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, IAL ( SIO InputChar ) +, Transfer +, IAL + ( SAL ( Binary Sub ) ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 3 ) + ) +, Transfer +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, IAL ( SIO InputChar ) +, IAL + ( SAL ( Binary Sub ) ) +, Transfer +, IAL ( SIO InputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 4 ) + ) +, Transfer +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( SMark "3" ) +, IAL + ( SAL ( Binary Sub ) ) +, Transfer +, IAL + ( SAL ( Binary Sub ) ) +, IAL ( SIO InputChar ) +, Transfer +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 18828800 ) + ) +, IAL + ( SAL + ( Cons 4 ) + ) +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 6 ) + ) +, Transfer +, ICF + ( DMark 5 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 6 ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 7 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, ICF + ( DMark 8 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 9 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 11 ) + ) +, Transfer +, ICF + ( DMark 10 ) +, IAL + ( SAL + ( Cons 48 ) + ) +, IAL ( SIO OutputChar ) +, Transfer +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 11 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 12 ) +, IAL + ( SAL + ( Cons 14 ) + ) +, Transfer +, ICF + ( DMark 13 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 18 ) + ) +, Transfer +, ICF + ( DMark 14 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( SMark "14" ) +, ICF + ( DMark 15 ) +, IAL + ( SAL + ( Cons + ( -48 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 16 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 17 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 11 ) + ) +, Transfer +, IAL + ( SAL + ( Cons 18 ) + ) +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL + ( Cons 13128755 ) + ) +, Transfer +, ICF + ( DMark 18 ) +, IAL + ( SAL + ( Cons 19 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, ICF + ( DMark 19 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 20 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 21 ) +, IAL + ( SAL + ( Cons 22 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 8 ) + ) +, Transfer +, ICF + ( DMark 22 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 102 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 23 ) + ) +, Transfer +, IAL + ( SAL + ( Cons 2348471754576 ) + ) +, ICF + ( CStatic "23" Jump ) +, ICF + ( DMark 23 ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 24 ) + ) +, Transfer +, IAL + ( SAL + ( Cons 335495964812 ) + ) +, ICF + ( CStatic "24" Jump ) +, ICF + ( DMark 24 ) +, IAL + ( SAL + ( Cons 25 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, ICF + ( DMark 25 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 26 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 27 ) +, IAL + ( SAL + ( Cons 28 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 20 ) + ) +, Transfer +, ICF + ( DMark 28 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 29 ) + ) +, Transfer +, IAL + ( SAL + ( Cons 2348471754565 ) + ) +, ICF + ( CStatic "29" Jump ) +, ICF + ( DMark 29 ) +, IAL + ( SAL + ( Cons 104 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 30 ) + ) +, Transfer +, IAL + ( SAL + ( Cons 335495964812 ) + ) +, ICF + ( CStatic "30" Jump ) +, ICF + ( DMark 30 ) +, IAL + ( SAL + ( Cons 31 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, ICF + ( DMark 31 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, IAL ( SIO InputChar ) +, Transfer +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( SMark "31" ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 32 ) + ) +, Transfer +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, IAL ( SIO InputChar ) +, IAL + ( SAL + ( Cons 402523 ) + ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, IAL ( SIO InputChar ) +, IAL + ( SAL + ( Cons 1814 ) + ) +, ICF + ( CStatic "32" Jump ) +, ICF + ( DMark 32 ) +, IAL + ( SAL + ( Cons 99 ) + ) +, ICF + ( DMark 33 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 34 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 26 ) + ) +, Transfer +, ICF + ( DMark 34 ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 35 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 36 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 20 ) + ) +, Transfer +, ICF + ( DMark 36 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 37 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ICF + ( DMark 38 ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 105 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ICF + ( DMark 39 ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 112 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, ICF + ( DMark 40 ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ICF + ( DMark 41 ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 107 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 84 ) + ) +, ICF + ( DMark 42 ) +, IAL + ( SAL + ( Cons 43 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, ICF + ( DMark 43 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 44 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 45 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 26 ) + ) +, Transfer +, ICF + ( DMark 45 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 46 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 33 ) + ) +, Transfer +, ICF + ( DMark 47 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 48 ) +, End +] \ No newline at end of file diff --git a/.output/actual/eta/il/optimized/original/crlf.il b/.output/actual/eta/il/optimized/original/crlf.il new file mode 100644 index 000000000..0007ac0e1 --- /dev/null +++ b/.output/actual/eta/il/optimized/original/crlf.il @@ -0,0 +1,113 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 3 ) + ) +, Transfer +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 49 ) + ) +, IAL + ( SAL + ( Cons 68 ) + ) +, IAL + ( SAL + ( Cons 65 ) + ) +, IAL + ( SAL + ( Cons 66 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 75 ) + ) +, IAL + ( SAL + ( Cons 79 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 50 ) + ) +, IAL + ( SAL + ( Cons 68 ) + ) +, IAL + ( SAL + ( Cons 65 ) + ) +, IAL + ( SAL + ( Cons 66 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 5 ) +, End +] \ No newline at end of file diff --git a/.output/actual/eta/il/optimized/original/fact.il b/.output/actual/eta/il/optimized/original/fact.il new file mode 100644 index 000000000..a3ba873c2 --- /dev/null +++ b/.output/actual/eta/il/optimized/original/fact.il @@ -0,0 +1,697 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 14 ) + ) +, Transfer +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 5 ) + ) +, Transfer +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, Transfer +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 5 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 6 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 7 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 9 ) + ) +, Transfer +, ICF + ( DMark 8 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, Transfer +, ICF + ( DMark 9 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 10 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 11 ) +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 5 ) + ) +, Transfer +, ICF + ( DMark 12 ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 42 ) + ) +, Transfer +, ICF + ( DMark 13 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 14 ) +, IAL ( SIO InputChar ) +, ICF + ( DMark 15 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 16 ) +, IAL + ( SAL + ( Cons 18 ) + ) +, Transfer +, ICF + ( DMark 17 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, Transfer +, IAL + ( SAL + ( Cons 14 ) + ) +, Transfer +, ICF + ( DMark 18 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 19 ) +, IAL + ( SAL + ( Cons 48 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 20 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 21 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 22 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 42 ) + ) +, Transfer +, IAL + ( SAL ( Binary Sub ) ) +, Transfer +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( SMark "21" ) +, IAL + ( SAL + ( Cons 22 ) + ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, Transfer +, IAL ( SIO InputChar ) +, Transfer +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( DMark 22 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 23 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 24 ) +, IAL ( SIO InputChar ) +, ICF + ( DMark 25 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 27 ) + ) +, Transfer +, ICF + ( DMark 26 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 30 ) + ) +, Transfer +, ICF + ( DMark 27 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 29 ) + ) +, Transfer +, ICF + ( DMark 28 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 30 ) + ) +, Transfer +, ICF + ( DMark 29 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons + ( -1 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 19 ) + ) +, Transfer +, ICF + ( DMark 30 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 31 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 32 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 33 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 34 ) +, IAL + ( SAL + ( Cons 36 ) + ) +, Transfer +, ICF + ( DMark 35 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 40 ) + ) +, Transfer +, ICF + ( DMark 36 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( SMark "36" ) +, ICF + ( DMark 37 ) +, IAL + ( SAL + ( Cons + ( -48 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 38 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 39 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, Transfer +, ICF + ( DMark 40 ) +, IAL + ( SAL + ( Cons 41 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 58 ) + ) +, Transfer +, ICF + ( DMark 41 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 42 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 43 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( DMark 44 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 45 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 46 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 47 ) +, IAL + ( SAL + ( Cons 49 ) + ) +, Transfer +, ICF + ( DMark 48 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 56 ) + ) +, Transfer +, ICF + ( DMark 49 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 50 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 51 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons + ( -3 ) + ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 52 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 53 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 54 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 55 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 46 ) + ) +, Transfer +, ICF + ( DMark 56 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 57 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 58 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 59 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 60 ) +, IAL + ( SAL + ( Cons 62 ) + ) +, Transfer +, ICF + ( DMark 61 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 62 ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 63 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 58 ) + ) +, Transfer +, ICF + ( DMark 64 ) +, End +] \ No newline at end of file diff --git a/.output/actual/eta/il/optimized/original/hello.il b/.output/actual/eta/il/optimized/original/hello.il new file mode 100644 index 000000000..b53b0e8ed --- /dev/null +++ b/.output/actual/eta/il/optimized/original/hello.il @@ -0,0 +1,168 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 21 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( SMark "1" ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, Transfer +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SIO InputChar ) +, Transfer +, Transfer +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, IAL + ( SAL + ( Cons 4 ) + ) +, Transfer +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 2 ) +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ICF + ( CStatic "5" Jump ) +, ICF + ( DMark 5 ) +, Transfer +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( SMark "5" ) +, ICF + ( DMark 6 ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ICF + ( DMark 7 ) +, IAL + ( SAL + ( Cons 72 ) + ) +, ICF + ( DMark 8 ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 9 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, ICF + ( DMark 10 ) +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ICF + ( DMark 11 ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, ICF + ( DMark 12 ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 13 ) +, End +] \ No newline at end of file diff --git a/.output/actual/eta/il/optimized/original/hello2.il b/.output/actual/eta/il/optimized/original/hello2.il new file mode 100644 index 000000000..2dd961ddf --- /dev/null +++ b/.output/actual/eta/il/optimized/original/hello2.il @@ -0,0 +1,187 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 4 ) + ) +, Transfer +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 22 ) + ) +, Transfer +, IAL ( SIO InputChar ) +, IAL + ( SAL ( Binary Sub ) ) +, Transfer +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( SMark "3" ) +, IAL + ( SAL + ( Cons 4 ) + ) +, Transfer +, IAL ( SIO InputChar ) +, IAL + ( SAL + ( Cons 337 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 6 ) + ) +, Transfer +, ICF + ( DMark 5 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 6 ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 7 ) + ) +, IAL + ( SAL + ( Cons 4 ) + ) +, Transfer +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL ( SIO InputChar ) +, IAL + ( SAL + ( Cons 7 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "7" Jump ) +, ICF + ( DMark 7 ) +, End +] \ No newline at end of file diff --git a/.output/actual/eta/il/optimized/original/pip.il b/.output/actual/eta/il/optimized/original/pip.il new file mode 100644 index 000000000..0c137c9fb --- /dev/null +++ b/.output/actual/eta/il/optimized/original/pip.il @@ -0,0 +1,68 @@ +[ ICF + ( DMark 1 ) +, IAL ( SIO InputChar ) +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons + ( -1 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 7 ) + ) +, Transfer +, ICF + ( DMark 5 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 6 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 7 ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 8 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, Transfer +, ICF + ( DMark 9 ) +, End +] \ No newline at end of file diff --git a/.output/actual/eta/il/optimized/original/pip2.il b/.output/actual/eta/il/optimized/original/pip2.il new file mode 100644 index 000000000..ad7cdb019 --- /dev/null +++ b/.output/actual/eta/il/optimized/original/pip2.il @@ -0,0 +1,56 @@ +[ ICF + ( DMark 1 ) +, IAL ( SIO InputChar ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons + ( -1 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 2 ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, Transfer +, ICF + ( DMark 3 ) +, End +] \ No newline at end of file diff --git a/.output/actual/eta/il/parsed/from-eas/bottles.il b/.output/actual/eta/il/parsed/from-eas/bottles.il index 630fe5e3f..f5e5f7b38 100644 --- a/.output/actual/eta/il/parsed/from-eas/bottles.il +++ b/.output/actual/eta/il/parsed/from-eas/bottles.il @@ -1,39 +1,60 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 31 ) + ( SAL + ( Cons 31 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 3 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 4 ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 5 ) -, IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 6 ) @@ -41,395 +62,669 @@ , ICF ( DMark 7 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 9 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 10 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 11 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 13 ) -, IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 18 ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 14 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "14" ) , ICF ( DMark 15 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 48 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , IAL - ( Cons 48 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 17 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 19 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 20 ) , ICF ( DMark 21 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 22 ) , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , Transfer , ICF ( DMark 23 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( DMark 24 ) , IAL - ( Cons 25 ) + ( SAL + ( Cons 25 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 25 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 27 ) , IAL - ( Cons 28 ) + ( SAL + ( Cons 28 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( DMark 29 ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , ICF ( DMark 32 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) , Transfer , ICF ( DMark 33 ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 34 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , Transfer , ICF ( DMark 35 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 36 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 112 ) + ( SAL + ( Cons 112 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 107 ) + ( SAL + ( Cons 107 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 84 ) + ( SAL + ( Cons 84 ) + ) , ICF ( DMark 37 ) , IAL - ( Cons 38 ) + ( SAL + ( Cons 38 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 38 ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 39 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF ( DMark 41 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 43 ) diff --git a/.output/actual/eta/il/parsed/from-eas/euclid.il b/.output/actual/eta/il/parsed/from-eas/euclid.il index 54e4bf524..8fcef7f35 100644 --- a/.output/actual/eta/il/parsed/from-eas/euclid.il +++ b/.output/actual/eta/il/parsed/from-eas/euclid.il @@ -1,84 +1,125 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 2 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "6" ) , ICF ( DMark 7 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 9 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 10 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 11 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 12 ) , Transfer diff --git a/.output/actual/eta/il/parsed/from-eas/fact.il b/.output/actual/eta/il/parsed/from-eas/fact.il index 58d703206..4b70ea6d8 100644 --- a/.output/actual/eta/il/parsed/from-eas/fact.il +++ b/.output/actual/eta/il/parsed/from-eas/fact.il @@ -1,106 +1,170 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -108,377 +172,591 @@ , ICF ( DMark 15 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 32 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 23 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 10 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 29 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 19 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 34 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 34 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 35 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 36 ) , IAL - ( Cons 37 ) + ( SAL + ( Cons 37 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 37 ) -, IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 38 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "38" ) , ICF ( DMark 39 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 48 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , IAL - ( Cons 48 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 40 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 43 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 44 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 46 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 48 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 49 ) , IAL - ( Cons 50 ) + ( SAL + ( Cons 50 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 50 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 51 ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 52 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 53 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) -, IAL ( Binary Sub ) -, IAL Halibut + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL ( SAL Halibut ) , ICF ( DMark 54 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 55 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 56 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 59 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 60 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 61 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 62 ) , IAL - ( Cons 63 ) + ( SAL + ( Cons 63 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 63 ) -, IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 64 ) @@ -486,9 +764,13 @@ , ICF ( DMark 65 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 66 ) diff --git a/.output/actual/eta/il/parsed/from-eas/function.il b/.output/actual/eta/il/parsed/from-eas/function.il index 0a37ef62f..a8e326dbe 100644 --- a/.output/actual/eta/il/parsed/from-eas/function.il +++ b/.output/actual/eta/il/parsed/from-eas/function.il @@ -1,37 +1,51 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 2 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 3 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 4 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 5 ) -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 6 ) -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , ICF ( DMark 8 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 9 ) , Transfer diff --git a/.output/actual/eta/il/parsed/from-eas/hello.il b/.output/actual/eta/il/parsed/from-eas/hello.il index 1364e48ac..bb2fc89e7 100644 --- a/.output/actual/eta/il/parsed/from-eas/hello.il +++ b/.output/actual/eta/il/parsed/from-eas/hello.il @@ -1,21 +1,35 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( DMark 2 ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ICF ( DMark 3 ) , IAL ( SIO OutputChar ) @@ -28,21 +42,35 @@ , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , ICF ( DMark 5 ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , ICF ( DMark 6 ) , IAL ( SIO OutputChar ) diff --git a/.output/actual/eta/il/parsed/from-eas/hello2.il b/.output/actual/eta/il/parsed/from-eas/hello2.il index a7fd322a4..65fac6667 100644 --- a/.output/actual/eta/il/parsed/from-eas/hello2.il +++ b/.output/actual/eta/il/parsed/from-eas/hello2.il @@ -1,80 +1,137 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 5 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 7 ) -, IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 8 ) @@ -82,9 +139,13 @@ , ICF ( DMark 9 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 10 ) diff --git a/.output/actual/eta/il/parsed/from-eas/hello3.il b/.output/actual/eta/il/parsed/from-eas/hello3.il index a7fd322a4..65fac6667 100644 --- a/.output/actual/eta/il/parsed/from-eas/hello3.il +++ b/.output/actual/eta/il/parsed/from-eas/hello3.il @@ -1,80 +1,137 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 5 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 7 ) -, IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 8 ) @@ -82,9 +139,13 @@ , ICF ( DMark 9 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 10 ) diff --git a/.output/actual/eta/il/parsed/from-eas/hello4.il b/.output/actual/eta/il/parsed/from-eas/hello4.il index a7fd322a4..65fac6667 100644 --- a/.output/actual/eta/il/parsed/from-eas/hello4.il +++ b/.output/actual/eta/il/parsed/from-eas/hello4.il @@ -1,80 +1,137 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 5 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 7 ) -, IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 8 ) @@ -82,9 +139,13 @@ , ICF ( DMark 9 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 10 ) diff --git a/.output/actual/eta/il/parsed/from-eas/multiply.il b/.output/actual/eta/il/parsed/from-eas/multiply.il index ca8952efb..75a8809d7 100644 --- a/.output/actual/eta/il/parsed/from-eas/multiply.il +++ b/.output/actual/eta/il/parsed/from-eas/multiply.il @@ -1,102 +1,154 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 2 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 3 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 4 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 5 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 7 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 9 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) -, IAL ( Binary Sub ) -, IAL Halibut + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL ( SAL Halibut ) , ICF ( DMark 11 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 12 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 13 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 14 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 15 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 16 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 17 ) diff --git a/.output/actual/eta/il/parsed/from-eas/pip.il b/.output/actual/eta/il/parsed/from-eas/pip.il index 726190775..76b5ebe2a 100644 --- a/.output/actual/eta/il/parsed/from-eas/pip.il +++ b/.output/actual/eta/il/parsed/from-eas/pip.il @@ -4,35 +4,53 @@ , ICF ( DMark 2 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 3 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 4 ) , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 6 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 7 ) @@ -40,9 +58,13 @@ , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , ICF ( DMark 9 ) diff --git a/.output/actual/eta/il/parsed/from-eas/pip2.il b/.output/actual/eta/il/parsed/from-eas/pip2.il index 834aa3cf9..b3af748cd 100644 --- a/.output/actual/eta/il/parsed/from-eas/pip2.il +++ b/.output/actual/eta/il/parsed/from-eas/pip2.il @@ -2,35 +2,57 @@ ( DMark 1 ) , IAL ( SIO InputChar ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 2 ) + ) , Transfer , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 2 ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , ICF ( DMark 3 ) diff --git a/.output/actual/eta/il/parsed/from-eas/readnum.il b/.output/actual/eta/il/parsed/from-eas/readnum.il index 6cfa6e03c..312b9c4e0 100644 --- a/.output/actual/eta/il/parsed/from-eas/readnum.il +++ b/.output/actual/eta/il/parsed/from-eas/readnum.il @@ -4,241 +4,377 @@ , ICF ( DMark 2 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 32 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 8 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 10 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL ( SIO InputChar ) , ICF ( DMark 12 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 32 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 14 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , Transfer , ICF ( DMark 14 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , Transfer , ICF ( DMark 15 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , Transfer , ICF ( DMark 16 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 6 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 6 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 19 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 20 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 21 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 22 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 23 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 24 ) , IAL - ( Cons 25 ) + ( SAL + ( Cons 25 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 25 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 27 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 28 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 3 ) -, IAL ( Binary Sub ) -, IAL Halibut + ( SAL ( Binary Sub ) ) +, IAL ( SAL Halibut ) , ICF ( DMark 29 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 30 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 31 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 32 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , Transfer , ICF ( DMark 33 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 35 ) diff --git a/.output/actual/eta/il/parsed/from-eas/reverse.il b/.output/actual/eta/il/parsed/from-eas/reverse.il index 471179445..021d0644c 100644 --- a/.output/actual/eta/il/parsed/from-eas/reverse.il +++ b/.output/actual/eta/il/parsed/from-eas/reverse.il @@ -1,75 +1,122 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 2 ) , IAL ( SIO InputChar ) , ICF ( DMark 3 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 2 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 6 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 6 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 7 ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 8 ) diff --git a/.output/actual/eta/il/parsed/from-eas/writenum.il b/.output/actual/eta/il/parsed/from-eas/writenum.il index a76166d49..f8e0ea829 100644 --- a/.output/actual/eta/il/parsed/from-eas/writenum.il +++ b/.output/actual/eta/il/parsed/from-eas/writenum.il @@ -1,138 +1,216 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 2 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 5 ) , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 6 ) -, IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 11 ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 11 ) + ) , Transfer , ICF ( DMark 7 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "7" ) , ICF ( DMark 8 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 48 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 9 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 14 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 15 ) , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 16 ) -, IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 17 ) @@ -140,9 +218,13 @@ , ICF ( DMark 18 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 19 ) diff --git a/.output/actual/eta/il/parsed/from-eas/writestr.il b/.output/actual/eta/il/parsed/from-eas/writestr.il index c590a3384..3b72641d2 100644 --- a/.output/actual/eta/il/parsed/from-eas/writestr.il +++ b/.output/actual/eta/il/parsed/from-eas/writestr.il @@ -1,32 +1,49 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 2 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 4 ) -, IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 5 ) @@ -34,9 +51,13 @@ , ICF ( DMark 6 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , ICF ( DMark 7 ) diff --git a/.output/actual/eta/il/parsed/original/bottles.il b/.output/actual/eta/il/parsed/original/bottles.il index f008ee77c..dfb3eba8c 100644 --- a/.output/actual/eta/il/parsed/original/bottles.il +++ b/.output/actual/eta/il/parsed/original/bottles.il @@ -1,86 +1,124 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 141 ) + ( SAL + ( Cons 141 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , IAL ( SIO OutputChar ) , IAL - ( Cons 155 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 155 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "1" ) , Transfer , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL ( SIO InputChar ) , Transfer , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 2 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , Transfer -, IAL ( Binary Sub ) , IAL - ( Cons 3 ) + ( SAL ( Binary Sub ) ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "2" ) , IAL ( SIO InputChar ) , IAL ( SIO OutputChar ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL ( SIO InputChar ) , Transfer -, IAL ( Binary Sub ) -, IAL Halibut , IAL - ( Cons 3 ) + ( SAL ( Binary Sub ) ) +, IAL ( SAL Halibut ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 3 ) + ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL ( SIO InputChar ) -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , IAL ( SIO InputChar ) , IAL ( SIO OutputChar ) @@ -88,51 +126,80 @@ , ICF ( DMark 3 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer -, IAL ( Binary Sub ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "3" ) -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) , IAL ( SIO InputChar ) , Transfer -, IAL ( Binary Sub ) , IAL - ( Cons 18828800 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 18828800 ) + ) +, IAL + ( SAL + ( Cons 4 ) + ) , ICF ( DMark 4 ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 5 ) -, IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 6 ) @@ -140,490 +207,814 @@ , ICF ( DMark 7 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 9 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 10 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 11 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 13 ) -, IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 18 ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 14 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "14" ) , ICF ( DMark 15 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 48 ) + ) , IAL - ( Cons 48 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 17 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , Transfer , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) +, IAL + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 11 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 18 ) + ( SAL + ( Cons 13128773 ) + ) , IAL - ( Cons 13128773 ) + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 1 ) -, IAL Halibut -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 19 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 20 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , Transfer , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , Transfer , IAL - ( Cons 2348471754576 ) + ( SAL + ( Cons 2348471754576 ) + ) , ICF ( CStatic "23" Jump ) , ICF ( DMark 23 ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , Transfer , IAL - ( Cons 335495964812 ) + ( SAL + ( Cons 335495964812 ) + ) , ICF ( CStatic "24" Jump ) , ICF ( DMark 24 ) , IAL - ( Cons 25 ) + ( SAL + ( Cons 25 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 25 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 27 ) , IAL - ( Cons 28 ) + ( SAL + ( Cons 28 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , IAL - ( Cons 2348471754565 ) + ( SAL + ( Cons 2348471754565 ) + ) , ICF ( CStatic "29" Jump ) , ICF ( DMark 29 ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , IAL - ( Cons 335495964812 ) + ( SAL + ( Cons 335495964812 ) + ) , ICF ( CStatic "30" Jump ) , ICF ( DMark 30 ) , IAL - ( Cons 31 ) + ( SAL + ( Cons 31 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "31" ) -, IAL ( Binary Sub ) , IAL - ( Cons 32 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 32 ) + ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL ( SIO InputChar ) , IAL - ( Cons 402523 ) + ( SAL + ( Cons 402523 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL ( SIO InputChar ) , IAL - ( Cons 1814 ) + ( SAL + ( Cons 1814 ) + ) , ICF ( CStatic "32" Jump ) , ICF ( DMark 32 ) , IAL - ( Cons 99 ) + ( SAL + ( Cons 99 ) + ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 34 ) + ( SAL + ( Cons 34 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 35 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 36 ) + ( SAL + ( Cons 36 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ICF ( DMark 38 ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( DMark 39 ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 112 ) + ( SAL + ( Cons 112 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , ICF ( DMark 40 ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ICF ( DMark 41 ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 107 ) + ( SAL + ( Cons 107 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 84 ) + ( SAL + ( Cons 84 ) + ) , ICF ( DMark 42 ) , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 43 ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 44 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) , Transfer , ICF ( DMark 45 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 47 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 48 ) diff --git a/.output/actual/eta/il/parsed/original/crlf.il b/.output/actual/eta/il/parsed/original/crlf.il index 51f78f188..0007ac0e1 100644 --- a/.output/actual/eta/il/parsed/original/crlf.il +++ b/.output/actual/eta/il/parsed/original/crlf.il @@ -1,69 +1,111 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 49 ) + ( SAL + ( Cons 49 ) + ) , IAL - ( Cons 68 ) + ( SAL + ( Cons 68 ) + ) , IAL - ( Cons 65 ) + ( SAL + ( Cons 65 ) + ) , IAL - ( Cons 66 ) + ( SAL + ( Cons 66 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 75 ) + ( SAL + ( Cons 75 ) + ) , IAL - ( Cons 79 ) + ( SAL + ( Cons 79 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 50 ) + ( SAL + ( Cons 50 ) + ) , IAL - ( Cons 68 ) + ( SAL + ( Cons 68 ) + ) , IAL - ( Cons 65 ) + ( SAL + ( Cons 65 ) + ) , IAL - ( Cons 66 ) + ( SAL + ( Cons 66 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) diff --git a/.output/actual/eta/il/parsed/original/fact.il b/.output/actual/eta/il/parsed/original/fact.il index a6ce40c1c..b60e59a42 100644 --- a/.output/actual/eta/il/parsed/original/fact.il +++ b/.output/actual/eta/il/parsed/original/fact.il @@ -1,106 +1,170 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 8 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 8 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -108,377 +172,582 @@ , ICF ( DMark 15 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer -, IAL Halibut +, IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 23 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 32 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 10 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 29 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 35 ) -, IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 48 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , IAL - ( Cons 48 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) -, IAL ( Binary Sub ) -, IAL Halibut + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL ( SAL Halibut ) , ICF ( DMark 52 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) + ( SAL + ( Cons 61 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 61 ) -, IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -486,9 +755,13 @@ , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) diff --git a/.output/actual/eta/il/parsed/original/hello.il b/.output/actual/eta/il/parsed/original/hello.il index 91d5f9d7d..2aaf1f225 100644 --- a/.output/actual/eta/il/parsed/original/hello.il +++ b/.output/actual/eta/il/parsed/original/hello.il @@ -1,85 +1,121 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer -, IAL Halibut -, IAL - ( Binaries - [ Mod - , Div - ] +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "1" ) , IAL ( SIO OutputChar ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL ( SIO InputChar ) , Transfer , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 2 ) , ICF ( DMark 3 ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( DMark 4 ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ICF ( CStatic "5" Jump ) , ICF ( DMark 5 ) , Transfer -, IAL ( Binary Sub ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "5" ) , ICF ( DMark 6 ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ICF ( DMark 7 ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 0 ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 8 ) , IAL ( SIO OutputChar ) @@ -92,23 +128,37 @@ , ICF ( DMark 9 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , ICF ( DMark 10 ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ICF ( DMark 11 ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , ICF ( DMark 12 ) , IAL ( SIO OutputChar ) diff --git a/.output/actual/eta/il/parsed/original/hello2.il b/.output/actual/eta/il/parsed/original/hello2.il index 902bbfd97..66290b364 100644 --- a/.output/actual/eta/il/parsed/original/hello2.il +++ b/.output/actual/eta/il/parsed/original/hello2.il @@ -1,117 +1,196 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( DMark 2 ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , Transfer , IAL ( SIO InputChar ) -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "3" ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , IAL ( SIO InputChar ) , IAL - ( Cons 337 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 337 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 4 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 5 ) -, IAL ( Binary Sub ) , IAL - ( Cons 11 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 6 ) , IAL ( SIO OutputChar ) , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , IAL ( SIO InputChar ) , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "7" Jump ) , ICF diff --git a/.output/actual/eta/il/parsed/original/pip.il b/.output/actual/eta/il/parsed/original/pip.il index 726190775..76b5ebe2a 100644 --- a/.output/actual/eta/il/parsed/original/pip.il +++ b/.output/actual/eta/il/parsed/original/pip.il @@ -4,35 +4,53 @@ , ICF ( DMark 2 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 3 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 4 ) , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 6 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 7 ) @@ -40,9 +58,13 @@ , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , ICF ( DMark 9 ) diff --git a/.output/actual/eta/il/parsed/original/pip2.il b/.output/actual/eta/il/parsed/original/pip2.il index 834aa3cf9..b3af748cd 100644 --- a/.output/actual/eta/il/parsed/original/pip2.il +++ b/.output/actual/eta/il/parsed/original/pip2.il @@ -2,35 +2,57 @@ ( DMark 1 ) , IAL ( SIO InputChar ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 2 ) + ) , Transfer , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 2 ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , ICF ( DMark 3 ) diff --git a/.output/actual/f/il/helma/add.il b/.output/actual/f/il/helma/add.il index 477173739..c5458f591 100644 --- a/.output/actual/f/il/helma/add.il +++ b/.output/actual/f/il/helma/add.il @@ -1,23 +1,35 @@ [ Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst ( IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst ( IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) ] \ No newline at end of file diff --git a/.output/actual/f/il/helma/copy.il b/.output/actual/f/il/helma/copy.il index 530a42aa4..bfa21c6c2 100644 --- a/.output/actual/f/il/helma/copy.il +++ b/.output/actual/f/il/helma/copy.il @@ -4,18 +4,28 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Inst diff --git a/.output/actual/f/il/helma/factorial.il b/.output/actual/f/il/helma/factorial.il index 707ad274c..3a58770ce 100644 --- a/.output/actual/f/il/helma/factorial.il +++ b/.output/actual/f/il/helma/factorial.il @@ -1,32 +1,48 @@ [ Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 5 , Fetch , Exec , Inst - ( IAL ( Binary Mul ) ) + ( IAL + ( SAL ( Binary Mul ) ) + ) ] , Cond ] @@ -40,20 +56,30 @@ , Flush , Inst ( IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) ] \ No newline at end of file diff --git a/.output/actual/f/il/helma/primeNumber.il b/.output/actual/f/il/helma/primeNumber.il index 78038a382..fcb478543 100644 --- a/.output/actual/f/il/helma/primeNumber.il +++ b/.output/actual/f/il/helma/primeNumber.il @@ -1,109 +1,164 @@ [ Inst ( IAL - ( Cons 99 ) + ( SAL + ( Cons 99 ) + ) ) , Inst ( IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) ) , Lambda [ Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) ] , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst - ( IAL ( Binary Div ) ) + ( IAL + ( SAL ( Binary Div ) ) + ) , Inst - ( IAL ( Binary Mul ) ) + ( IAL + ( SAL ( Binary Mul ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Lambda - [ Inst ( IAL Discard ) + [ Inst + ( IAL ( SAL Discard ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) ] , Cond , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL ( SIO OutputDec ) ) , Inst ( IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) ) , Inst ( IAL ( SIO OutputChar ) ) diff --git a/.output/actual/f/il/other/benHoyt/bin2f.il b/.output/actual/f/il/other/benHoyt/bin2f.il index af2d64126..400fe8bec 100644 --- a/.output/actual/f/il/other/benHoyt/bin2f.il +++ b/.output/actual/f/il/other/benHoyt/bin2f.il @@ -5,14 +5,20 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) ] , Lambda [ Inst @@ -20,6 +26,7 @@ , Str "`" ] , While -, Inst ( IAL Discard ) +, Inst + ( IAL ( SAL Discard ) ) , Str "]" ] \ No newline at end of file diff --git a/.output/actual/f/il/other/benHoyt/fac.il b/.output/actual/f/il/other/benHoyt/fac.il index 369ae44e6..ad3c88f84 100644 --- a/.output/actual/f/il/other/benHoyt/fac.il +++ b/.output/actual/f/il/other/benHoyt/fac.il @@ -2,52 +2,77 @@ , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Lambda [ Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) ] , Cond , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 5 , Fetch , Exec , Inst - ( IAL ( Binary Mul ) ) + ( IAL + ( SAL ( Binary Mul ) ) + ) ] , Cond ] @@ -61,20 +86,30 @@ , Ref 1 , Inst ( IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) ] \ No newline at end of file diff --git a/.output/actual/f/il/other/iliiliiliili/sum.il b/.output/actual/f/il/other/iliiliiliili/sum.il index 69d4d1ba5..b91f04ef9 100644 --- a/.output/actual/f/il/other/iliiliiliili/sum.il +++ b/.output/actual/f/il/other/iliiliiliili/sum.il @@ -10,7 +10,9 @@ , Fetch , Exec , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Inst ( IAL ( SIO OutputDec ) ) , Str " diff --git a/.output/actual/f/il/other/morphett/factorial.il b/.output/actual/f/il/other/morphett/factorial.il index 916371d92..6c1d12602 100644 --- a/.output/actual/f/il/other/morphett/factorial.il +++ b/.output/actual/f/il/other/morphett/factorial.il @@ -1,52 +1,77 @@ [ Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Lambda [ Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) ] , Cond , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 5 , Fetch , Exec , Inst - ( IAL ( Binary Mul ) ) + ( IAL + ( SAL ( Binary Mul ) ) + ) ] , Cond ] @@ -54,7 +79,9 @@ , Store , Inst ( IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) ) , Ref 5 , Fetch diff --git a/.output/actual/f/il/other/morphett/factorial2.il b/.output/actual/f/il/other/morphett/factorial2.il index 44b7c3aac..c74dd33e0 100644 --- a/.output/actual/f/il/other/morphett/factorial2.il +++ b/.output/actual/f/il/other/morphett/factorial2.il @@ -2,13 +2,19 @@ , Lambda [ Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst - ( IAL ( Binary Mul ) ) + ( IAL + ( SAL ( Binary Mul ) ) + ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Exec ] @@ -22,42 +28,64 @@ , Lambda [ Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Ref 0 @@ -72,7 +100,9 @@ , Store , Inst ( IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) ) , Ref 5 , Fetch diff --git a/.output/actual/f/il/other/morphett/reverse.il b/.output/actual/f/il/other/morphett/reverse.il index acb0acad2..607960a2a 100644 --- a/.output/actual/f/il/other/morphett/reverse.il +++ b/.output/actual/f/il/other/morphett/reverse.il @@ -4,18 +4,28 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Lambda @@ -25,6 +35,7 @@ ] ] , While -, Inst ( IAL Discard ) +, Inst + ( IAL ( SAL Discard ) ) , Exec ] \ No newline at end of file diff --git a/.output/actual/f/il/other/thunderseethe/prog.il b/.output/actual/f/il/other/thunderseethe/prog.il index e5149d4ac..b5a1f5397 100644 --- a/.output/actual/f/il/other/thunderseethe/prog.il +++ b/.output/actual/f/il/other/thunderseethe/prog.il @@ -2,60 +2,89 @@ , Lambda [ Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Lambda [ Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Ref 14 , Inst ( IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) ) , Ref 14 , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) ] , While - , Inst ( IAL Discard ) - , Inst ( IAL Discard ) - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) + , Inst + ( IAL ( SAL Discard ) ) + , Inst + ( IAL ( SAL Discard ) ) ] , Ref 5 , Store , Inst ( IAL - ( Cons 300 ) + ( SAL + ( Cons 300 ) + ) ) , Ref 5 , Fetch diff --git a/.output/actual/f/il/strlen/contrib/Ben_Schaeffer/detab.il b/.output/actual/f/il/strlen/contrib/Ben_Schaeffer/detab.il index c69ad1692..faa917cfa 100644 --- a/.output/actual/f/il/strlen/contrib/Ben_Schaeffer/detab.il +++ b/.output/actual/f/il/strlen/contrib/Ben_Schaeffer/detab.il @@ -9,35 +9,54 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Inst ( IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda - [ Inst ( IAL Discard ) + [ Inst + ( IAL ( SAL Discard ) ) , Inst ( IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) ) , Str " " ] diff --git a/.output/actual/f/il/strlen/contrib/Ben_Schaeffer/postfix_while.il b/.output/actual/f/il/strlen/contrib/Ben_Schaeffer/postfix_while.il index 71fac58e2..9dee5199b 100644 --- a/.output/actual/f/il/strlen/contrib/Ben_Schaeffer/postfix_while.il +++ b/.output/actual/f/il/strlen/contrib/Ben_Schaeffer/postfix_while.il @@ -1,7 +1,9 @@ [ Comment " postfix while loops (##)! " , Inst ( IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) ) , Ref 13 , Store @@ -10,12 +12,18 @@ , Fetch , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Str "Still going up @@ -24,10 +32,14 @@ , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Ref 13 , Store ] @@ -37,12 +49,18 @@ , Fetch , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Str "Down... @@ -51,17 +69,23 @@ , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 13 , Store ] , While , Inst ( IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) ) , Ref 13 , Store @@ -70,12 +94,18 @@ , Fetch , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Str "Still going up @@ -84,10 +114,14 @@ , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Ref 13 , Store ] @@ -96,12 +130,18 @@ , Fetch , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Str "Down... @@ -110,10 +150,14 @@ , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 13 , Store ] diff --git a/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/chkbrack.il b/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/chkbrack.il index ccb7c05a0..75a64d4ed 100644 --- a/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/chkbrack.il +++ b/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/chkbrack.il @@ -2,19 +2,25 @@ , Comment "checks brackets" , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 0 , Store , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 1 , Store , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 2 , Store @@ -23,154 +29,224 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Ref 0 , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Ref 0 , Store ] , Cond , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Ref 0 , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 0 , Store ] , Cond , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 91 ) + ( SAL + ( Cons 91 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Ref 1 , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Ref 1 , Store ] , Cond , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 93 ) + ( SAL + ( Cons 93 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Ref 1 , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 1 , Store ] , Cond , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 123 ) + ( SAL + ( Cons 123 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Ref 2 , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Ref 2 , Store ] , Cond , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 125 ) + ( SAL + ( Cons 125 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Ref 2 , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 2 , Store ] @@ -182,18 +258,28 @@ , Fetch , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Str "is ok. " ] @@ -207,18 +293,28 @@ , Fetch , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Str "is ok. " ] @@ -232,18 +328,28 @@ , Fetch , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Str "is ok. " ] diff --git a/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/countwl.il b/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/countwl.il index 2333bf9e8..f7265a779 100644 --- a/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/countwl.il +++ b/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/countwl.il @@ -2,19 +2,25 @@ , Comment "count lines and words " , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 0 , Store , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 1 , Store , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 2 , Store @@ -23,44 +29,66 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Ref 0 , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Ref 0 , Store , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 2 , Store @@ -68,66 +96,98 @@ , Cond , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Ref 3 , Store , Inst ( IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Ref 3 , Fetch , Inst ( IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Binary BOr ) ) + ( IAL + ( SAL ( Binary BOr ) ) + ) , Ref 3 , Fetch , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Binary BOr ) ) + ( IAL + ( SAL ( Binary BOr ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Lambda [ Ref 2 , Fetch , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Ref 1 , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Ref 1 , Store , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Ref 2 , Store ] @@ -135,37 +195,51 @@ ] , Cond , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 2 , Store ] , Cond , Inst - ( IAL ( Binary BOr ) ) + ( IAL + ( SAL ( Binary BOr ) ) + ) ] , Ref 0 , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 0 , Store , Ref 1 , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 1 , Store , While diff --git a/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/crunch.il b/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/crunch.il index 9050be4f9..abe09d2d2 100644 --- a/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/crunch.il +++ b/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/crunch.il @@ -4,16 +4,24 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [] , While @@ -24,7 +32,9 @@ , Comment " a is char-read " , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Ref 2 , Store @@ -32,16 +42,24 @@ , Lambda [ Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Ref 0 , Fetch , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Comment "while a<>EOF" ] \ No newline at end of file diff --git a/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/decrunch.il b/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/decrunch.il index dfca28d2a..4099af312 100644 --- a/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/decrunch.il +++ b/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/decrunch.il @@ -4,16 +4,24 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [] , While @@ -24,33 +32,49 @@ , Lambda [ Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Ref 0 , Fetch , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Comment "while a<>EOF" , Lambda [ Inst ( IAL - ( Cons 169 ) + ( SAL + ( Cons 169 ) + ) ) , Ref 0 , Fetch , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Comment "if char!=escapecode" , Ref 0 @@ -74,14 +98,20 @@ , Lambda [ Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 2 , Fetch , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Comment "while counter!=0" , Lambda @@ -94,10 +124,14 @@ , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 2 , Store , Comment "decrement counter" diff --git a/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/depack.il b/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/depack.il index 98db09ad5..55b0ecb3b 100644 --- a/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/depack.il +++ b/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/depack.il @@ -11,12 +11,18 @@ , Fetch , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , While , Comment "is first char a packcode?" @@ -24,12 +30,18 @@ , Fetch , Inst ( IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) ] \ No newline at end of file diff --git a/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/readable.il b/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/readable.il index 822a77974..d8a9bb4a3 100644 --- a/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/readable.il +++ b/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/readable.il @@ -4,13 +4,17 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 1 , Store , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 2 , Store diff --git a/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/remcom.il b/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/remcom.il index 01506043c..346ed263e 100644 --- a/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/remcom.il +++ b/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/remcom.il @@ -2,25 +2,33 @@ , Comment "removes comments like this..." , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 0 , Store , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 2 , Store , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 3 , Store , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 4 , Store @@ -29,27 +37,39 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 34 ) + ( SAL + ( Cons 34 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Ref 4 , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Ref 4 , Store ] @@ -58,13 +78,21 @@ , Store , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] ] \ No newline at end of file diff --git a/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/split.il b/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/split.il index d9b0c18b6..e1bcdb4a1 100644 --- a/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/split.il +++ b/.output/actual/f/il/strlen/contrib/Eelko_de_Vos/split.il @@ -8,10 +8,14 @@ , Fetch , Inst ( IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) ] , Lambda [ Inst @@ -25,33 +29,51 @@ , Fetch , Inst ( IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Ref 0 , Fetch , Inst ( IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Binary BOr ) ) + ( IAL + ( SAL ( Binary BOr ) ) + ) , Inst ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Binary BAnd ) ) + ( IAL + ( SAL ( Binary BAnd ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Comment " a has to be 'f' of 'b' followed by a space " ] \ No newline at end of file diff --git a/.output/actual/f/il/strlen/contrib/Herb_Wollman/Fibonacci.il b/.output/actual/f/il/strlen/contrib/Herb_Wollman/Fibonacci.il index 3ed6f8393..a808636d9 100644 --- a/.output/actual/f/il/strlen/contrib/Herb_Wollman/Fibonacci.il +++ b/.output/actual/f/il/strlen/contrib/Herb_Wollman/Fibonacci.il @@ -1,15 +1,21 @@ [ Comment "Fibonacci.f Prints the Fibonacci numbers " , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 2 , Store diff --git a/.output/actual/f/il/strlen/contrib/Marcel_van_Kervinck/queens.il b/.output/actual/f/il/strlen/contrib/Marcel_van_Kervinck/queens.il index a86103757..810b65ada 100644 --- a/.output/actual/f/il/strlen/contrib/Marcel_van_Kervinck/queens.il +++ b/.output/actual/f/il/strlen/contrib/Marcel_van_Kervinck/queens.il @@ -8,216 +8,333 @@ , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Lambda [ Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) ] , Cond , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst ( IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) ) , Ref 14 , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary BAnd ) ) + ( IAL + ( SAL ( Binary BAnd ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) ) , Ref 14 , Inst ( IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) ) , Ref 14 , Inst - ( IAL ( Binary BOr ) ) + ( IAL + ( SAL ( Binary BOr ) ) + ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst - ( IAL ( Binary BAnd ) ) + ( IAL + ( SAL ( Binary BAnd ) ) + ) , Lambda [ Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Ref 14 , Inst ( IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) ) , Ref 14 , Inst - ( IAL ( Binary BOr ) ) + ( IAL + ( SAL ( Binary BOr ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Inst ( IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) ) , Ref 14 , Inst ( IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) ) , Ref 14 , Inst - ( IAL ( Binary BOr ) ) + ( IAL + ( SAL ( Binary BOr ) ) + ) , Inst ( IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) ) , Inst - ( IAL ( Binary Div ) ) + ( IAL + ( SAL ( Binary Div ) ) + ) , Inst ( IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) ) , Ref 14 , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) ) , Ref 14 , Inst - ( IAL ( Binary BAnd ) ) + ( IAL + ( SAL ( Binary BAnd ) ) + ) , Inst ( IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) ) , Ref 14 , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 16 , Fetch , Exec , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) ] , Cond , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst - ( IAL ( Binary BAnd ) ) + ( IAL + ( SAL ( Binary BAnd ) ) + ) ] , While - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) ] , Cond , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) ] , Ref 16 , Store @@ -228,28 +345,42 @@ , Ref 1 , Inst ( IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) ] \ No newline at end of file diff --git a/.output/actual/f/il/strlen/contrib/Marcel_van_Kervinck/tic.il b/.output/actual/f/il/strlen/contrib/Marcel_van_Kervinck/tic.il index 2f9f40e92..e865510d5 100644 --- a/.output/actual/f/il/strlen/contrib/Marcel_van_Kervinck/tic.il +++ b/.output/actual/f/il/strlen/contrib/Marcel_van_Kervinck/tic.il @@ -8,62 +8,96 @@ [ Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary BAnd ) ) + ( IAL + ( SAL ( Binary BAnd ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst - ( IAL ( Binary BAnd ) ) + ( IAL + ( SAL ( Binary BAnd ) ) + ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Inst ( IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) ) , Ref 14 , Exec ] , While - , Inst ( IAL Discard ) - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) + , Inst + ( IAL ( SAL Discard ) ) ] , Ref 5 , Store @@ -73,94 +107,141 @@ [ Str " " , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Ref 23 , Fetch , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Inst - ( IAL ( Binary Div ) ) + ( IAL + ( SAL ( Binary Div ) ) + ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Ref 14 , Fetch , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Inst - ( IAL ( Binary Div ) ) + ( IAL + ( SAL ( Binary Div ) ) + ) , Lambda [ Inst ( IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) ) , Inst ( IAL ( SIO OutputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) ) , Ref 14 , Inst - ( IAL ( Binary BAnd ) ) + ( IAL + ( SAL ( Binary BAnd ) ) + ) , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Lambda [ Str "O" , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) ] , Cond , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Inst ( IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) ) , Ref 14 , Inst - ( IAL ( Binary BAnd ) ) + ( IAL + ( SAL ( Binary BAnd ) ) + ) , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Lambda [ Str "X" ] , Cond , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Str "." ] , Cond @@ -169,56 +250,78 @@ ] , Inst ( IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) ) , Ref 5 , Fetch , Exec , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst ( IAL ( SIO OutputChar ) ) - , Inst ( IAL Discard ) - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) + , Inst + ( IAL ( SAL Discard ) ) ] , Str "7 8 9" , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 64 ) + ( SAL + ( Cons 64 ) + ) ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Exec , Str "4 5 6" , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Exec , Str "1 2 3" , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Exec ] diff --git a/.output/actual/f/il/strlen/contrib/Peter_Bengtsson/DoASC.il b/.output/actual/f/il/strlen/contrib/Peter_Bengtsson/DoASC.il index 0ff51f459..d9f9097c2 100644 --- a/.output/actual/f/il/strlen/contrib/Peter_Bengtsson/DoASC.il +++ b/.output/actual/f/il/strlen/contrib/Peter_Bengtsson/DoASC.il @@ -7,37 +7,57 @@ , Fetch , Inst ( IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Fetch , Inst ( IAL - ( Cons 255 ) + ( SAL + ( Cons 255 ) + ) ) , Inst - ( IAL ( Binary BAnd ) ) + ( IAL + ( SAL ( Binary BAnd ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Str " \x1b[32mDoASC v1.21 By Peter Bengtsson\x1b[0m @@ -50,120 +70,184 @@ , Lambda [ Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 1 , Store , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Fetch , Inst ( IAL - ( Cons 255 ) + ( SAL + ( Cons 255 ) + ) ) , Inst - ( IAL ( Binary BAnd ) ) + ( IAL + ( SAL ( Binary BAnd ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Inst ( IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Binary BOr ) ) + ( IAL + ( SAL ( Binary BOr ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Inst ( IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 1 , Fetch , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary Mul ) ) + ( IAL + ( SAL ( Binary Mul ) ) + ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Ref 1 , Store , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) ] , While , Ref 1 , Fetch , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL ( SIO OutputDec ) ) @@ -171,7 +255,8 @@ ] , Cond , Lambda [] - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) , Inst ( IAL ( SIO OutputChar ) ) , Str " diff --git a/.output/actual/f/il/strlen/contrib/Steinar_Knutsen/htmlcol.il b/.output/actual/f/il/strlen/contrib/Steinar_Knutsen/htmlcol.il index 847d8f3c2..6b55c2a74 100644 --- a/.output/actual/f/il/strlen/contrib/Steinar_Knutsen/htmlcol.il +++ b/.output/actual/f/il/strlen/contrib/Steinar_Knutsen/htmlcol.il @@ -13,36 +13,57 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Lambda - [ Inst ( IAL Discard ) + [ Inst + ( IAL ( SAL Discard ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Cond ] @@ -51,7 +72,8 @@ ( IAL ( SIO OutputChar ) ) ] , While - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) , Str "" ] , Ref 15 @@ -61,18 +83,28 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Str " @@ -84,36 +116,57 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Lambda - [ Inst ( IAL Discard ) + [ Inst + ( IAL ( SAL Discard ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Cond ] @@ -122,7 +175,8 @@ ( IAL ( SIO OutputChar ) ) ] , While - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) , Str "" , Ref 15 , Fetch @@ -137,7 +191,8 @@ " ] , While -, Inst ( IAL Discard ) +, Inst + ( IAL ( SAL Discard ) ) , Str " " ] \ No newline at end of file diff --git a/.output/actual/f/il/strlen/contrib/Steinar_Knutsen/passwdc.il b/.output/actual/f/il/strlen/contrib/Steinar_Knutsen/passwdc.il index 640de9af0..b3bba8b01 100644 --- a/.output/actual/f/il/strlen/contrib/Steinar_Knutsen/passwdc.il +++ b/.output/actual/f/il/strlen/contrib/Steinar_Knutsen/passwdc.il @@ -10,17 +10,27 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] ] \ No newline at end of file diff --git a/.output/actual/f/il/strlen/contrib/Thomas_Fischbacher/life.il b/.output/actual/f/il/strlen/contrib/Thomas_Fischbacher/life.il index a2114c549..cee4dcc52 100644 --- a/.output/actual/f/il/strlen/contrib/Thomas_Fischbacher/life.il +++ b/.output/actual/f/il/strlen/contrib/Thomas_Fischbacher/life.il @@ -11,7 +11,9 @@ , Ref 1 , Inst ( IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) ) , Ref 6 , Store @@ -19,20 +21,30 @@ , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Lambda [ Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) ] , Lambda @@ -40,20 +52,30 @@ , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Lambda [ Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) ] , Lambda @@ -61,41 +83,58 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) ] , While - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) , Inst ( IAL ( SIO InputChar ) ) - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) ] , While -, Inst ( IAL Discard ) +, Inst + ( IAL ( SAL Discard ) ) , Ref 6 , Fetch , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Ref 25 , Store , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst - ( IAL ( Binary Mul ) ) + ( IAL + ( SAL ( Binary Mul ) ) + ) , Ref 4 , Store , Lambda @@ -103,25 +142,39 @@ , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Ref 25 , Store , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] ] \ No newline at end of file diff --git a/.output/actual/f/il/strlen/contrib/self.il b/.output/actual/f/il/strlen/contrib/self.il index 9d4834820..38e29d94e 100644 --- a/.output/actual/f/il/strlen/contrib/self.il +++ b/.output/actual/f/il/strlen/contrib/self.il @@ -2,30 +2,40 @@ [ Str "'[,34,$!34,'],!" ] , Inst ( IAL - ( Cons 91 ) + ( SAL + ( Cons 91 ) + ) ) , Inst ( IAL ( SIO OutputChar ) ) , Inst ( IAL - ( Cons 34 ) + ( SAL + ( Cons 34 ) + ) ) , Inst ( IAL ( SIO OutputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Exec , Inst ( IAL - ( Cons 34 ) + ( SAL + ( Cons 34 ) + ) ) , Inst ( IAL ( SIO OutputChar ) ) , Inst ( IAL - ( Cons 93 ) + ( SAL + ( Cons 93 ) + ) ) , Inst ( IAL ( SIO OutputChar ) ) diff --git a/.output/actual/f/il/strlen/examples/addcr.il b/.output/actual/f/il/strlen/examples/addcr.il index 4308a57e4..14ccba9cf 100644 --- a/.output/actual/f/il/strlen/examples/addcr.il +++ b/.output/actual/f/il/strlen/examples/addcr.il @@ -6,34 +6,52 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Inst ( IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) ) , Inst ( IAL ( SIO OutputChar ) ) @@ -45,7 +63,9 @@ , While , Inst ( IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) ) , Inst ( IAL ( SIO OutputChar ) ) diff --git a/.output/actual/f/il/strlen/examples/arg.il b/.output/actual/f/il/strlen/examples/arg.il index 7c8edb823..f86a47c1e 100644 --- a/.output/actual/f/il/strlen/examples/arg.il +++ b/.output/actual/f/il/strlen/examples/arg.il @@ -6,10 +6,14 @@ , Fetch , Inst ( IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 0 , Store , Lambda @@ -17,37 +21,55 @@ , Fetch , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Ref 0 , Store , Fetch , Inst ( IAL - ( Cons 255 ) + ( SAL + ( Cons 255 ) + ) ) , Inst - ( IAL ( Binary BAnd ) ) + ( IAL + ( SAL ( Binary BAnd ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Ref 2 , Store , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Ref 2 diff --git a/.output/actual/f/il/strlen/examples/argtest.il b/.output/actual/f/il/strlen/examples/argtest.il index 6cb5719d3..9a468f4cf 100644 --- a/.output/actual/f/il/strlen/examples/argtest.il +++ b/.output/actual/f/il/strlen/examples/argtest.il @@ -3,22 +3,32 @@ , Fetch , Inst ( IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Lambda [ Str "2 integer arguments expected " ] , Cond , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Ref 1 , Fetch @@ -35,7 +45,9 @@ , Ref 2 , Fetch , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Inst ( IAL ( SIO OutputDec ) ) , Str " diff --git a/.output/actual/f/il/strlen/examples/lambda.il b/.output/actual/f/il/strlen/examples/lambda.il index 99713ac45..bc35a0946 100644 --- a/.output/actual/f/il/strlen/examples/lambda.il +++ b/.output/actual/f/il/strlen/examples/lambda.il @@ -3,15 +3,20 @@ , Lambda [ Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) ] , Ref 0 , Store , Comment " true " , Lambda - [ Inst ( IAL Discard ) ] + [ Inst + ( IAL ( SAL Discard ) ) + ] , Ref 1 , Store , Comment " false " @@ -22,7 +27,9 @@ , Fetch , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Exec ] @@ -34,15 +41,21 @@ , Fetch , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Exec ] @@ -52,13 +65,17 @@ , Lambda [ Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Ref 0 , Fetch , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Exec ] @@ -68,18 +85,24 @@ , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Ref 3 , Fetch , Exec , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Exec ] @@ -89,17 +112,23 @@ , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Ref 0 , Fetch , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Str "true" , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst ( IAL ( SIO OutputChar ) ) @@ -108,12 +137,16 @@ , Ref 1 , Fetch , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Str "false" , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst ( IAL ( SIO OutputChar ) ) diff --git a/.output/actual/f/il/strlen/examples/prime.il b/.output/actual/f/il/strlen/examples/prime.il index 1ff365e0a..013f2157d 100644 --- a/.output/actual/f/il/strlen/examples/prime.il +++ b/.output/actual/f/il/strlen/examples/prime.il @@ -1,134 +1,201 @@ [ Comment " writes all prime numbers between 0 and 100 " , Inst ( IAL - ( Cons 99 ) + ( SAL + ( Cons 99 ) + ) ) , Inst ( IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) ) , Lambda [ Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) ] , Lambda [ Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Inst - ( IAL ( Binary Div ) ) + ( IAL + ( SAL ( Binary Div ) ) + ) , Inst - ( IAL ( Binary Mul ) ) + ( IAL + ( SAL ( Binary Mul ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Lambda - [ Inst ( IAL Discard ) + [ Inst + ( IAL ( SAL Discard ) ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) ] , Cond , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL ( SIO OutputDec ) ) , Inst ( IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) ) , Inst ( IAL ( SIO OutputChar ) ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) ] , Cond diff --git a/.output/actual/f/il/strlen/examples/strip.il b/.output/actual/f/il/strlen/examples/strip.il index 5a03dec03..bc898d2cb 100644 --- a/.output/actual/f/il/strlen/examples/strip.il +++ b/.output/actual/f/il/strlen/examples/strip.il @@ -5,42 +5,63 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Inst ( IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL ( SIO OutputChar ) ) ] , Cond - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) ] , While ] \ No newline at end of file diff --git a/.output/actual/f/il/strlen/inline/copy.il b/.output/actual/f/il/strlen/inline/copy.il index fc9617ab4..09fb5dbed 100644 --- a/.output/actual/f/il/strlen/inline/copy.il +++ b/.output/actual/f/il/strlen/inline/copy.il @@ -5,18 +5,28 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Inst diff --git a/.output/actual/f/il/strlen/inline/factorial.il b/.output/actual/f/il/strlen/inline/factorial.il index b7738a26a..2b42b9ef3 100644 --- a/.output/actual/f/il/strlen/inline/factorial.il +++ b/.output/actual/f/il/strlen/inline/factorial.il @@ -2,32 +2,48 @@ , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 5 , Fetch , Exec , Inst - ( IAL ( Binary Mul ) ) + ( IAL + ( SAL ( Binary Mul ) ) + ) ] , Cond ] @@ -41,20 +57,30 @@ , Flush , Inst ( IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) ] \ No newline at end of file diff --git a/.output/actual/f/il/strlen/inline/primeNumber.il b/.output/actual/f/il/strlen/inline/primeNumber.il index 6dbef494d..683c8a5ad 100644 --- a/.output/actual/f/il/strlen/inline/primeNumber.il +++ b/.output/actual/f/il/strlen/inline/primeNumber.il @@ -1,110 +1,165 @@ [ Comment " writes all prime numbers between 0 and 100 " , Inst ( IAL - ( Cons 99 ) + ( SAL + ( Cons 99 ) + ) ) , Inst ( IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) ) , Lambda [ Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) ] , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst - ( IAL ( Binary Div ) ) + ( IAL + ( SAL ( Binary Div ) ) + ) , Inst - ( IAL ( Binary Mul ) ) + ( IAL + ( SAL ( Binary Mul ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Lambda - [ Inst ( IAL Discard ) + [ Inst + ( IAL ( SAL Discard ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) ] , Cond , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL ( SIO OutputDec ) ) , Inst ( IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) ) , Inst ( IAL ( SIO OutputChar ) ) diff --git a/.output/actual/sq/eval/logged/esolangs/helloWorld.logged b/.output/actual/sq/eval/logged/esolangs/helloWorld.logged index 114f1076a..0f82a28b4 100644 --- a/.output/actual/sq/eval/logged/esolangs/helloWorld.logged +++ b/.output/actual/sq/eval/logged/esolangs/helloWorld.logged @@ -1,6 +1,6 @@ dump: Automaton - { unitIU = -1 - , unitRAM = + { memoryIC = -1 + , memoryRAM = [ 12 , 12 , 3 diff --git a/.output/actual/sq/eval/logged/hello.logged b/.output/actual/sq/eval/logged/hello.logged index 83ccd4255..c8c848323 100644 --- a/.output/actual/sq/eval/logged/hello.logged +++ b/.output/actual/sq/eval/logged/hello.logged @@ -1,6 +1,6 @@ dump: Automaton - { unitIU = -1 - , unitRAM = + { memoryIC = -1 + , memoryRAM = [ 15 , 31 , -1 diff --git a/.output/actual/sq/eval/logged/longHello.logged b/.output/actual/sq/eval/logged/longHello.logged index 83ccd4255..c8c848323 100644 --- a/.output/actual/sq/eval/logged/longHello.logged +++ b/.output/actual/sq/eval/logged/longHello.logged @@ -1,6 +1,6 @@ dump: Automaton - { unitIU = -1 - , unitRAM = + { memoryIC = -1 + , memoryRAM = [ 15 , 31 , -1 diff --git a/.output/actual/sq/eval/logged/mazonka/factorial.logged b/.output/actual/sq/eval/logged/mazonka/factorial.logged index 58e8300bd..778c154fa 100644 --- a/.output/actual/sq/eval/logged/mazonka/factorial.logged +++ b/.output/actual/sq/eval/logged/mazonka/factorial.logged @@ -1,6 +1,6 @@ dump: Automaton - { unitIU = -1 - , unitRAM = + { memoryIC = -1 + , memoryRAM = [ 0 , 0 , 8807 diff --git a/.output/actual/sq/eval/logged/mazonka/helloWorld.logged b/.output/actual/sq/eval/logged/mazonka/helloWorld.logged index 114f1076a..0f82a28b4 100644 --- a/.output/actual/sq/eval/logged/mazonka/helloWorld.logged +++ b/.output/actual/sq/eval/logged/mazonka/helloWorld.logged @@ -1,6 +1,6 @@ dump: Automaton - { unitIU = -1 - , unitRAM = + { memoryIC = -1 + , memoryRAM = [ 12 , 12 , 3 diff --git a/.output/actual/sq/eval/logged/mazonka/hi.logged b/.output/actual/sq/eval/logged/mazonka/hi.logged index 5421c264b..72d87899c 100644 --- a/.output/actual/sq/eval/logged/mazonka/hi.logged +++ b/.output/actual/sq/eval/logged/mazonka/hi.logged @@ -1,6 +1,6 @@ dump: Automaton - { unitIU = -1 - , unitRAM = + { memoryIC = -1 + , memoryRAM = [ 0 , -1 , 3 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 df4cf4004..ef7f86290 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 @@ -1,250 +1,479 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , ICF ( SMark "01001100010011110100111101010000" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL ( SIO OutputDec ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( CStatic "011100000111001001101001011011100111010001110011" Call ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL ( SIO OutputDec ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( CStatic "0111000001110010011010010110111001110100011100110110110001101110" Call ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 112 ) + ( SAL + ( Cons 112 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 107 ) + ( SAL + ( Cons 107 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 84 ) + ( SAL + ( Cons 84 ) + ) , ICF ( CStatic "0111000001110010011010010110111001110100011100110110110001101110" Call ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( SStatic 0 Copy ) + ) , IAL ( SIO OutputDec ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( CStatic "0111000001110010011010010110111001110100011100110110110001101110" Call ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111000001110010011010010110111001110100011100110110110001101110" Call ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "010011000100111101001111010100000011101000110001" ( Branch EZ ) ) , ICF @@ -255,7 +484,9 @@ dump: Automaton , ICF ( SMark "011100000111001001101001011011100111010001110011" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) @@ -263,20 +494,22 @@ dump: Automaton ( CStatic "011100000111001001101001011011100111010001110011" Jump ) , ICF ( SMark "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "0111000001110010011010010110111001110100011100110110110001101110" ) , ICF ( CStatic "011100000111001001101001011011100111010001110011" Call ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , ICF Return ] , programCounter = 128 , returnStack = IS [] } - , unitStack = fromList [ 0 ] - , unitRAM = [] + , memoryStack = fromList [ 0 ] + , memoryRAM = [] } diff --git a/.output/actual/ws/eval/logged/stn/asciiOff/from-wsa/hello.logged b/.output/actual/ws/eval/logged/stn/asciiOff/from-wsa/hello.logged index b1a229845..ee3cebcd4 100644 --- a/.output/actual/ws/eval/logged/stn/asciiOff/from-wsa/hello.logged +++ b/.output/actual/ws/eval/logged/stn/asciiOff/from-wsa/hello.logged @@ -1,20 +1,34 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) @@ -23,19 +37,33 @@ dump: Automaton , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) @@ -48,6 +76,6 @@ dump: Automaton , programCounter = 29 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } 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 64f6d9bac..b4b748880 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 @@ -1,43 +1,75 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ICF ( CStatic "011100000111001001101001011011100111010001110011" Call ) , End , ICF ( SMark "011100000111001001101001011011100111010001110011" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) @@ -45,20 +77,22 @@ dump: Automaton ( CStatic "011100000111001001101001011011100111010001110011" Jump ) , ICF ( SMark "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "0111000001110010011010010110111001110100011100110110110001101110" ) , ICF ( CStatic "011100000111001001101001011011100111010001110011" Call ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , ICF Return ] , programCounter = 17 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } 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 d109e75e9..9608f3d43 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 @@ -1,41 +1,71 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ICF ( CStatic "0111000001110010011010010110111001110100011100110110110001101110" Call ) , End , ICF ( SMark "011100000111001001101001011011100111010001110011" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) @@ -43,20 +73,22 @@ dump: Automaton ( CStatic "011100000111001001101001011011100111010001110011" Jump ) , ICF ( SMark "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "0111000001110010011010010110111001110100011100110110110001101110" ) , ICF ( CStatic "011100000111001001101001011011100111010001110011" Call ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , ICF Return ] , programCounter = 16 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } 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 63d06c01d..4039aab96 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 @@ -1,195 +1,325 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( SMark "0111001101110100" ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 93 ) + ( SAL + ( Cons 93 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL - ( Cons 49 ) + ( SAL + ( Cons 49 ) + ) , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , IAL - ( Cons 50 ) + ( SAL + ( Cons 50 ) + ) , IAL - ( Cons 91 ) + ( SAL + ( Cons 91 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 112 ) + ( SAL + ( Cons 112 ) + ) , ICF ( CStatic "0111000001110010011010010110111001110100011100110110110001101110" Call ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( SMark "011001100101111101110011011101000110000101110010011101000101111100110001" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 100 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 100 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110001" ( Branch EZ ) ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 100 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , ILS Store , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "011001100101111101110011011101000110000101110010011101000101111100110001" Jump ) , ICF ( SMark "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110001" ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , ICF ( SMark "011001100101111101110011011101000110000101110010011101000101111100110010" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 11 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 11 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110010" ( Branch EZ ) ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , ICF ( SMark "011001100101111101110011011101000110000101110010011101000101111100110011" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 100 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110011" ( Branch EZ ) ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , ILS Load , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , ILS Load - , IAL ( Binary Mul ) , IAL - ( Cons 100 ) - , IAL ( Binary Add ) + ( SAL ( Binary Mul ) ) + , IAL + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Add ) ) + , IAL + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "011001100101111101110011011101000110000101110010011101000101111100110011" Jump ) , ICF ( SMark "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110011" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "011001100101111101110011011101000110000101110010011101000101111100110010" Jump ) , ICF ( SMark "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110010" ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , ICF ( SMark "011001100101111101110011011101000110000101110010011101000101111100110100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 100 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 100 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110100" ( Branch EZ ) ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 100 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ILS Load , ICF ( CStatic "011011100110111101100100011100100110000101110111" ( Branch EZ ) ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL ( SIO OutputDec ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( CStatic "011100000111001001101001011011100111010001110011" Call ) , ICF ( SMark "011011100110111101100100011100100110000101110111" ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "011001100101111101110011011101000110000101110010011101000101111100110100" Jump ) , ICF ( SMark "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110100" ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111000001110010011010010110111001110100011100110110110001101110" Call ) , End , ICF ( SMark "011100000111001001101001011011100111010001110011" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) @@ -197,22 +327,24 @@ dump: Automaton ( CStatic "011100000111001001101001011011100111010001110011" Jump ) , ICF ( SMark "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "0111000001110010011010010110111001110100011100110110110001101110" ) , ICF ( CStatic "011100000111001001101001011011100111010001110011" Call ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , ICF Return ] , programCounter = 105 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 0 , 99 , 10 diff --git a/.output/actual/ws/eval/logged/stn/asciiOff/from-wsa/true.logged b/.output/actual/ws/eval/logged/stn/asciiOff/from-wsa/true.logged index 33aac2e2e..357a0bbab 100644 --- a/.output/actual/ws/eval/logged/stn/asciiOff/from-wsa/true.logged +++ b/.output/actual/ws/eval/logged/stn/asciiOff/from-wsa/true.logged @@ -1,9 +1,9 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ End ] , programCounter = 1 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } 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 2a88a24b9..2d817ef86 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" @@ -1,338 +1,590 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , ILS Store , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 25 ) + ( SAL + ( Cons 25 ) + ) , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , ILS Store , IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) , IAL - ( Cons 49 ) + ( SAL + ( Cons 49 ) + ) , ILS Store , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 28 ) + ( SAL + ( Cons 28 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 31 ) + ( SAL + ( Cons 31 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Store , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , ILS Store , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 34 ) + ( SAL + ( Cons 34 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , ILS Store , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 36 ) + ( SAL + ( Cons 36 ) + ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , ILS Store , IAL - ( Cons 37 ) + ( SAL + ( Cons 37 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , IAL - ( Cons 78 ) + ( SAL + ( Cons 78 ) + ) , ILS Store , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 47 ) + ( SAL + ( Cons 47 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 49 ) + ( SAL + ( Cons 49 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , IAL - ( Cons 84 ) + ( SAL + ( Cons 84 ) + ) , ILS Store , IAL - ( Cons 61 ) + ( SAL + ( Cons 61 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 62 ) + ( SAL + ( Cons 62 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 63 ) + ( SAL + ( Cons 63 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 64 ) + ( SAL + ( Cons 64 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 65 ) + ( SAL + ( Cons 65 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 66 ) + ( SAL + ( Cons 66 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , ILS Store , IAL - ( Cons 67 ) + ( SAL + ( Cons 67 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 68 ) + ( SAL + ( Cons 68 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , ICF ( CStatic "01101110011001010111011101101100011010010110111001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF ( SMark "01101100011011110110111101110000" ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons - ( -1 ) + ( SAL + ( Cons + ( -1 ) + ) ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "01110000011100100110111101100111011001010110111001100100" ( Branch EZ ) ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load - , IAL ( Binary Add ) , IAL - ( Cons 100 ) + ( SAL ( Binary Add ) ) , IAL - ( SStatic 1 Move ) + ( SAL + ( Cons 100 ) + ) + , IAL + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , ICF ( CStatic "01101100011011110110111101110000" Jump ) , ICF ( SMark "01110000011100100110111101100111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL ( SIO OutputDec ) , ICF @@ -340,65 +592,94 @@ dump: Automaton , End , ICF ( SMark "011000010110010001100100" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "0111011101110010011010010111010001100101" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "011101110111001001101001011101000110010101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "0111011101110010011010010111010001100101" Jump ) , ICF ( SMark "011101110111001001101001011101000110010101011111011001010110111001100100" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "01110010011001010110000101100100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0111001001100101011000010110010001011111011001010110111001100100" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "01110010011001010110000101100100" Jump ) , ICF ( SMark "0111001001100101011000010110010001011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "01101110011001010111011101101100011010010110111001100101" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -406,8 +687,8 @@ dump: Automaton , programCounter = 201 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 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 2648d45dd..b541f5f97 100644 --- a/.output/actual/ws/eval/logged/stn/asciiOff/original/count.logged +++ b/.output/actual/ws/eval/logged/stn/asciiOff/original/count.logged @@ -1,93 +1,136 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , ICF ( SMark "01000011" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL ( SIO OutputDec ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 11 ) - , IAL ( Binary Sub ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 11 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "01000101" ( Branch EZ ) ) , ICF ( CStatic "01000011" Jump ) , ICF ( SMark "01000101" ) - , IAL Discard + , IAL ( SAL Discard ) , End , ICF ( SMark "011000010110010001100100" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "0111011101110010011010010111010001100101" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "011101110111001001101001011101000110010101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "0111011101110010011010010111010001100101" Jump ) , ICF ( SMark "011101110111001001101001011101000110010101011111011001010110111001100100" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "01110010011001010110000101100100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0111001001100101011000010110010001011111011001010110111001100100" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "01110010011001010110000101100100" Jump ) , ICF ( SMark "0111001001100101011000010110010001011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "01101110011001010111011101101100011010010110111001100101" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -95,6 +138,6 @@ dump: Automaton , programCounter = 16 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } 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 d26e5bff4..84c88ff70 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" @@ -1,134 +1,232 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 61 ) + ( SAL + ( Cons 61 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , ICF ( CStatic "01100110011000010110001101110100" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL ( SIO OutputDec ) , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL ( SIO OutputDec ) @@ -138,88 +236,125 @@ dump: Automaton , ICF ( SMark "01100110011000010110001101110100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0110011001100001011000110111010001100010011000010111001101100101" ( Branch EZ ) ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "01100110011000010110001101110100" Call ) - , IAL ( Binary Mul ) + , IAL + ( SAL ( Binary Mul ) ) , ICF Return , ICF ( SMark "0110011001100001011000110111010001100010011000010111001101100101" ) - , IAL - ( Cons 1 ) - , IAL Discard , ICF Return , ICF ( SMark "011000010110010001100100" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "0111011101110010011010010111010001100101" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "011101110111001001101001011101000110010101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "0111011101110010011010010111010001100101" Jump ) , ICF ( SMark "011101110111001001101001011101000110010101011111011001010110111001100100" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "01110010011001010110000101100100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0111001001100101011000010110010001011111011001010110111001100100" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "01110010011001010110000101100100" Jump ) , ICF ( SMark "0111001001100101011000010110010001011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "01101110011001010111011101101100011010010110111001100101" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -227,8 +362,8 @@ dump: Automaton , programCounter = 81 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 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 f13a9a79d..454637fed 100644 --- a/.output/actual/ws/eval/logged/stn/asciiOff/original/hWorld.logged +++ b/.output/actual/ws/eval/logged/stn/asciiOff/original/hWorld.logged @@ -1,128 +1,226 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , IAL - ( Cons 112 ) + ( SAL + ( Cons 112 ) + ) , ILS Store , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 99 ) + ( SAL + ( Cons 99 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , ICF @@ -130,65 +228,94 @@ dump: Automaton , End , ICF ( SMark "011000010110010001100100" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "0111011101110010011010010111010001100101" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "011101110111001001101001011101000110010101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "0111011101110010011010010111010001100101" Jump ) , ICF ( SMark "011101110111001001101001011101000110010101011111011001010110111001100100" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "01110010011001010110000101100100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0111001001100101011000010110010001011111011001010110111001100100" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "01110010011001010110000101100100" Jump ) , ICF ( SMark "0111001001100101011000010110010001011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "01101110011001010111011101101100011010010110111001100101" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -196,8 +323,8 @@ dump: Automaton , programCounter = 76 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 72 , 101 , 108 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 a0eda82fa..e94358cdc 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" @@ -1,338 +1,561 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 62 ) + ( SAL + ( Cons 62 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , ICF ( CStatic "0110100001100001011011100110111101101001" Call ) , End , ICF ( SMark "0110100001100001011011100110111101101001" ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , ICF ( CStatic "0110010101101110011001000110100001100001011011100110111101101001" ( Branch EZ ) ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 101 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , ICF ( CStatic "0110100001100001011011100110111101101001" Call ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL ( SIO OutputDec ) , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL ( SIO OutputDec ) , ICF ( CStatic "01101110011001010111011101101100011010010110111001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , ICF ( CStatic "0110100001100001011011100110111101101001" Call ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , ICF ( SMark "0110010101101110011001000110100001100001011011100110111101101001" ) , ICF Return , ICF ( SMark "011000010110010001100100" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "0111011101110010011010010111010001100101" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "011101110111001001101001011101000110010101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "0111011101110010011010010111010001100101" Jump ) , ICF ( SMark "011101110111001001101001011101000110010101011111011001010110111001100100" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "01110010011001010110000101100100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0111001001100101011000010110010001011111011001010110111001100100" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "01110010011001010110000101100100" Jump ) , ICF ( SMark "0111001001100101011000010110010001011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "01101110011001010111011101101100011010010110111001100101" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -340,8 +563,8 @@ dump: Automaton , programCounter = 77 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 diff --git a/.output/actual/ws/eval/logged/stn/asciiOff/original/helloWorld.logged b/.output/actual/ws/eval/logged/stn/asciiOff/original/helloWorld.logged index 6fd076135..4705ee1a1 100644 --- a/.output/actual/ws/eval/logged/stn/asciiOff/original/helloWorld.logged +++ b/.output/actual/ws/eval/logged/stn/asciiOff/original/helloWorld.logged @@ -1,47 +1,71 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL ( SIO OutputChar ) , End ] , programCounter = 25 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } 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 1e4156de1..bc816ab53 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" @@ -1,110 +1,190 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , ICF ( CStatic "01101100011011110110001101110100011001010111001101110100" Call ) @@ -113,74 +193,110 @@ dump: Automaton , ICF ( SMark "01101100011011110110001101110100011001010111001101110100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 2 Copy ) - , IAL ( Binary Add ) + ( SAL + ( SStatic 2 Copy ) + ) , IAL - ( SStatic 2 Slide ) + ( SAL ( Binary Add ) ) + , IAL + ( SAL + ( SStatic 2 Slide ) + ) , ICF Return , ICF ( SMark "011000010110010001100100" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "0111011101110010011010010111010001100101" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "011101110111001001101001011101000110010101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "0111011101110010011010010111010001100101" Jump ) , ICF ( SMark "011101110111001001101001011101000110010101011111011001010110111001100100" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "01110010011001010110000101100100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0111001001100101011000010110010001011111011001010110111001100100" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "01110010011001010110000101100100" Jump ) , ICF ( SMark "0111001001100101011000010110010001011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "01101110011001010111011101101100011010010110111001100101" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -188,8 +304,8 @@ dump: Automaton , programCounter = 66 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 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 a8f5b0fcd..8d78eaf37 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" @@ -1,180 +1,316 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 80 ) + ( SAL + ( Cons 80 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 121 ) + ( SAL + ( Cons 121 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ILS Store , IAL - ( Cons 31 ) + ( SAL + ( Cons 31 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 34 ) + ( SAL + ( Cons 34 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 36 ) + ( SAL + ( Cons 36 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ICF ( CStatic "01110010011001010110000101100100" Call ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , ICF @@ -182,65 +318,94 @@ dump: Automaton , End , ICF ( SMark "011000010110010001100100" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "0111011101110010011010010111010001100101" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "011101110111001001101001011101000110010101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "0111011101110010011010010111010001100101" Jump ) , ICF ( SMark "011101110111001001101001011101000110010101011111011001010110111001100100" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "01110010011001010110000101100100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0111001001100101011000010110010001011111011001010110111001100100" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "01110010011001010110000101100100" Jump ) , ICF ( SMark "0111001001100101011000010110010001011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "01101110011001010111011101101100011010010110111001100101" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -248,8 +413,8 @@ dump: Automaton , programCounter = 106 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 80 , 108 , 101 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 5d4bbbff1..a2e0c339d 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" @@ -1,10 +1,14 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( Cons 0 ) + ) , ILS ( MIO InputDec ) , ILS Load , ICF @@ -12,20 +16,24 @@ dump: Automaton , ICF ( SMark "1" ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL ( SIO OutputDec ) , ICF ( CStatic "1" Jump ) , ICF ( SMark "0" ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL ( SIO OutputDec ) , End ] , programCounter = 13 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [ 0 ] + , memoryStack = fromList [] + , memoryRAM = [ 0 ] } 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 c4fbd6456..40c69b9b1 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 @@ -1,250 +1,479 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , ICF ( SMark "LOOP" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL ( SIO OutputDec ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( CStatic "prints" Call ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL ( SIO OutputDec ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( CStatic "printsln" Call ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 112 ) + ( SAL + ( Cons 112 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 107 ) + ( SAL + ( Cons 107 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 84 ) + ( SAL + ( Cons 84 ) + ) , ICF ( CStatic "printsln" Call ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( SStatic 0 Copy ) + ) , IAL ( SIO OutputDec ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( CStatic "printsln" Call ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "printsln" Call ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "LOOP:1" ( Branch EZ ) ) , ICF @@ -255,7 +484,9 @@ dump: Automaton , ICF ( SMark "prints" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "prints_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) @@ -263,20 +494,22 @@ dump: Automaton ( CStatic "prints" Jump ) , ICF ( SMark "prints_end" ) - , IAL Discard + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "printsln" ) , ICF ( CStatic "prints" Call ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , ICF Return ] , programCounter = 128 , returnStack = IS [] } - , unitStack = fromList [ 0 ] - , unitRAM = [] + , memoryStack = fromList [ 0 ] + , memoryRAM = [] } diff --git a/.output/actual/ws/eval/logged/stn/asciiOn/from-wsa/hello.logged b/.output/actual/ws/eval/logged/stn/asciiOn/from-wsa/hello.logged index b1a229845..ee3cebcd4 100644 --- a/.output/actual/ws/eval/logged/stn/asciiOn/from-wsa/hello.logged +++ b/.output/actual/ws/eval/logged/stn/asciiOn/from-wsa/hello.logged @@ -1,20 +1,34 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) @@ -23,19 +37,33 @@ dump: Automaton , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) @@ -48,6 +76,6 @@ dump: Automaton , programCounter = 29 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } 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 b2f696248..5f5810628 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 @@ -1,43 +1,75 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ICF ( CStatic "prints" Call ) , End , ICF ( SMark "prints" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "prints_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) @@ -45,20 +77,22 @@ dump: Automaton ( CStatic "prints" Jump ) , ICF ( SMark "prints_end" ) - , IAL Discard + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "printsln" ) , ICF ( CStatic "prints" Call ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , ICF Return ] , programCounter = 17 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } 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 3ed1f06bb..130c40d79 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 @@ -1,41 +1,71 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ICF ( CStatic "printsln" Call ) , End , ICF ( SMark "prints" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "prints_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) @@ -43,20 +73,22 @@ dump: Automaton ( CStatic "prints" Jump ) , ICF ( SMark "prints_end" ) - , IAL Discard + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "printsln" ) , ICF ( CStatic "prints" Call ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , ICF Return ] , programCounter = 16 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } 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 3859584a0..e4cb4575d 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 @@ -1,195 +1,325 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( SMark "st" ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 93 ) + ( SAL + ( Cons 93 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL - ( Cons 49 ) + ( SAL + ( Cons 49 ) + ) , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , IAL - ( Cons 50 ) + ( SAL + ( Cons 50 ) + ) , IAL - ( Cons 91 ) + ( SAL + ( Cons 91 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 112 ) + ( SAL + ( Cons 112 ) + ) , ICF ( CStatic "printsln" Call ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( SMark "f_start_1" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 100 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 100 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "f_finished_1" ( Branch EZ ) ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 100 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , ILS Store , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "f_start_1" Jump ) , ICF ( SMark "f_finished_1" ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , ICF ( SMark "f_start_2" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 11 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 11 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "f_finished_2" ( Branch EZ ) ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , ICF ( SMark "f_start_3" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 100 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "f_finished_3" ( Branch EZ ) ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , ILS Load , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , ILS Load - , IAL ( Binary Mul ) , IAL - ( Cons 100 ) - , IAL ( Binary Add ) + ( SAL ( Binary Mul ) ) + , IAL + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Add ) ) + , IAL + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "f_start_3" Jump ) , ICF ( SMark "f_finished_3" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "f_start_2" Jump ) , ICF ( SMark "f_finished_2" ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , ICF ( SMark "f_start_4" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 100 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 100 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "f_finished_4" ( Branch EZ ) ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 100 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ILS Load , ICF ( CStatic "nodraw" ( Branch EZ ) ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL ( SIO OutputDec ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( CStatic "prints" Call ) , ICF ( SMark "nodraw" ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "f_start_4" Jump ) , ICF ( SMark "f_finished_4" ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "printsln" Call ) , End , ICF ( SMark "prints" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "prints_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) @@ -197,22 +327,24 @@ dump: Automaton ( CStatic "prints" Jump ) , ICF ( SMark "prints_end" ) - , IAL Discard + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "printsln" ) , ICF ( CStatic "prints" Call ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , ICF Return ] , programCounter = 105 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 0 , 99 , 10 diff --git a/.output/actual/ws/eval/logged/stn/asciiOn/from-wsa/true.logged b/.output/actual/ws/eval/logged/stn/asciiOn/from-wsa/true.logged index 33aac2e2e..357a0bbab 100644 --- a/.output/actual/ws/eval/logged/stn/asciiOn/from-wsa/true.logged +++ b/.output/actual/ws/eval/logged/stn/asciiOn/from-wsa/true.logged @@ -1,9 +1,9 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ End ] , programCounter = 1 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } 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 39c7cb80a..dbeed2d63 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" @@ -1,338 +1,590 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , ILS Store , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 25 ) + ( SAL + ( Cons 25 ) + ) , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , ILS Store , IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) , IAL - ( Cons 49 ) + ( SAL + ( Cons 49 ) + ) , ILS Store , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 28 ) + ( SAL + ( Cons 28 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 31 ) + ( SAL + ( Cons 31 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Store , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , ILS Store , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 34 ) + ( SAL + ( Cons 34 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , ILS Store , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 36 ) + ( SAL + ( Cons 36 ) + ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , ILS Store , IAL - ( Cons 37 ) + ( SAL + ( Cons 37 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , IAL - ( Cons 78 ) + ( SAL + ( Cons 78 ) + ) , ILS Store , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 47 ) + ( SAL + ( Cons 47 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 49 ) + ( SAL + ( Cons 49 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , IAL - ( Cons 84 ) + ( SAL + ( Cons 84 ) + ) , ILS Store , IAL - ( Cons 61 ) + ( SAL + ( Cons 61 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 62 ) + ( SAL + ( Cons 62 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 63 ) + ( SAL + ( Cons 63 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 64 ) + ( SAL + ( Cons 64 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 65 ) + ( SAL + ( Cons 65 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 66 ) + ( SAL + ( Cons 66 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , ILS Store , IAL - ( Cons 67 ) + ( SAL + ( Cons 67 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 68 ) + ( SAL + ( Cons 68 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "write" Call ) , ICF ( CStatic "newline" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF ( SMark "loop" ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons - ( -1 ) + ( SAL + ( Cons + ( -1 ) + ) ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "progend" ( Branch EZ ) ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load - , IAL ( Binary Add ) , IAL - ( Cons 100 ) + ( SAL ( Binary Add ) ) , IAL - ( SStatic 1 Move ) + ( SAL + ( Cons 100 ) + ) + , IAL + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , ICF ( CStatic "loop" Jump ) , ICF ( SMark "progend" ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL ( SIO OutputDec ) , ICF @@ -340,65 +592,94 @@ dump: Automaton , End , ICF ( SMark "add" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "write" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "write_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "write" Jump ) , ICF ( SMark "write_end" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "read" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "read_end" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "read" Jump ) , ICF ( SMark "read_end" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "newline" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -406,8 +687,8 @@ dump: Automaton , programCounter = 201 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 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 0685bfc8f..54d428a75 100644 --- a/.output/actual/ws/eval/logged/stn/asciiOn/original/count.logged +++ b/.output/actual/ws/eval/logged/stn/asciiOn/original/count.logged @@ -1,93 +1,136 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , ICF ( SMark "C" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL ( SIO OutputDec ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 11 ) - , IAL ( Binary Sub ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 11 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "E" ( Branch EZ ) ) , ICF ( CStatic "C" Jump ) , ICF ( SMark "E" ) - , IAL Discard + , IAL ( SAL Discard ) , End , ICF ( SMark "add" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "write" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "write_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "write" Jump ) , ICF ( SMark "write_end" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "read" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "read_end" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "read" Jump ) , ICF ( SMark "read_end" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "newline" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -95,6 +138,6 @@ dump: Automaton , programCounter = 16 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } 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 757a1673e..67a7b98cf 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" @@ -1,134 +1,232 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 61 ) + ( SAL + ( Cons 61 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , ICF ( CStatic "fact" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL ( SIO OutputDec ) , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , ICF ( CStatic "write" Call ) , IAL ( SIO OutputDec ) @@ -138,88 +236,125 @@ dump: Automaton , ICF ( SMark "fact" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "factbase" ( Branch EZ ) ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "fact" Call ) - , IAL ( Binary Mul ) + , IAL + ( SAL ( Binary Mul ) ) , ICF Return , ICF ( SMark "factbase" ) - , IAL - ( Cons 1 ) - , IAL Discard , ICF Return , ICF ( SMark "add" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "write" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "write_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "write" Jump ) , ICF ( SMark "write_end" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "read" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "read_end" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "read" Jump ) , ICF ( SMark "read_end" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "newline" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -227,8 +362,8 @@ dump: Automaton , programCounter = 81 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 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 c3ccb3ce4..6299446f2 100644 --- a/.output/actual/ws/eval/logged/stn/asciiOn/original/hWorld.logged +++ b/.output/actual/ws/eval/logged/stn/asciiOn/original/hWorld.logged @@ -1,128 +1,226 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , IAL - ( Cons 112 ) + ( SAL + ( Cons 112 ) + ) , ILS Store , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 99 ) + ( SAL + ( Cons 99 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "write" Call ) , ICF @@ -130,65 +228,94 @@ dump: Automaton , End , ICF ( SMark "add" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "write" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "write_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "write" Jump ) , ICF ( SMark "write_end" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "read" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "read_end" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "read" Jump ) , ICF ( SMark "read_end" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "newline" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -196,8 +323,8 @@ dump: Automaton , programCounter = 76 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 72 , 101 , 108 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 a0eb35390..ff4778379 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" @@ -1,338 +1,561 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 62 ) + ( SAL + ( Cons 62 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , ICF ( CStatic "hanoi" Call ) , End , ICF ( SMark "hanoi" ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , ICF ( CStatic "endhanoi" ( Branch EZ ) ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 101 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , ICF ( CStatic "hanoi" Call ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL ( SIO OutputDec ) , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL ( SIO OutputDec ) , ICF ( CStatic "newline" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , ICF ( CStatic "hanoi" Call ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , ICF ( SMark "endhanoi" ) , ICF Return , ICF ( SMark "add" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "write" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "write_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "write" Jump ) , ICF ( SMark "write_end" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "read" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "read_end" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "read" Jump ) , ICF ( SMark "read_end" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "newline" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -340,8 +563,8 @@ dump: Automaton , programCounter = 77 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 diff --git a/.output/actual/ws/eval/logged/stn/asciiOn/original/helloWorld.logged b/.output/actual/ws/eval/logged/stn/asciiOn/original/helloWorld.logged index 6fd076135..4705ee1a1 100644 --- a/.output/actual/ws/eval/logged/stn/asciiOn/original/helloWorld.logged +++ b/.output/actual/ws/eval/logged/stn/asciiOn/original/helloWorld.logged @@ -1,47 +1,71 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL ( SIO OutputChar ) , End ] , programCounter = 25 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } 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 693b5ad2b..0a6381434 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" @@ -1,110 +1,190 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , ICF ( CStatic "loctest" Call ) @@ -113,74 +193,110 @@ dump: Automaton , ICF ( SMark "loctest" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 2 Copy ) - , IAL ( Binary Add ) + ( SAL + ( SStatic 2 Copy ) + ) , IAL - ( SStatic 2 Slide ) + ( SAL ( Binary Add ) ) + , IAL + ( SAL + ( SStatic 2 Slide ) + ) , ICF Return , ICF ( SMark "add" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "write" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "write_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "write" Jump ) , ICF ( SMark "write_end" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "read" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "read_end" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "read" Jump ) , ICF ( SMark "read_end" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "newline" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -188,8 +304,8 @@ dump: Automaton , programCounter = 66 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 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 8285d866a..870c9798c 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" @@ -1,180 +1,316 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 80 ) + ( SAL + ( Cons 80 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 121 ) + ( SAL + ( Cons 121 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ILS Store , IAL - ( Cons 31 ) + ( SAL + ( Cons 31 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 34 ) + ( SAL + ( Cons 34 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 36 ) + ( SAL + ( Cons 36 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ICF ( CStatic "read" Call ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ICF ( CStatic "write" Call ) , ICF @@ -182,65 +318,94 @@ dump: Automaton , End , ICF ( SMark "add" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "write" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "write_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "write" Jump ) , ICF ( SMark "write_end" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "read" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "read_end" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "read" Jump ) , ICF ( SMark "read_end" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "newline" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -248,8 +413,8 @@ dump: Automaton , programCounter = 106 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 80 , 108 , 101 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 8ff259ecc..4f3eda6a5 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" @@ -1,10 +1,14 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( Cons 0 ) + ) , ILS ( MIO InputDec ) , ILS Load , ICF @@ -12,20 +16,24 @@ dump: Automaton , ICF ( SMark "\x1" ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL ( SIO OutputDec ) , ICF ( CStatic "\x1" Jump ) , ICF ( SMark "\x0" ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL ( SIO OutputDec ) , End ] , programCounter = 13 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [ 0 ] + , memoryStack = fromList [] + , memoryRAM = [ 0 ] } 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 2a88a24b9..2d817ef86 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" @@ -1,338 +1,590 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , ILS Store , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 25 ) + ( SAL + ( Cons 25 ) + ) , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , ILS Store , IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) , IAL - ( Cons 49 ) + ( SAL + ( Cons 49 ) + ) , ILS Store , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 28 ) + ( SAL + ( Cons 28 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 31 ) + ( SAL + ( Cons 31 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Store , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , ILS Store , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 34 ) + ( SAL + ( Cons 34 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , ILS Store , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 36 ) + ( SAL + ( Cons 36 ) + ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , ILS Store , IAL - ( Cons 37 ) + ( SAL + ( Cons 37 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , IAL - ( Cons 78 ) + ( SAL + ( Cons 78 ) + ) , ILS Store , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 47 ) + ( SAL + ( Cons 47 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 49 ) + ( SAL + ( Cons 49 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , IAL - ( Cons 84 ) + ( SAL + ( Cons 84 ) + ) , ILS Store , IAL - ( Cons 61 ) + ( SAL + ( Cons 61 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 62 ) + ( SAL + ( Cons 62 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 63 ) + ( SAL + ( Cons 63 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 64 ) + ( SAL + ( Cons 64 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 65 ) + ( SAL + ( Cons 65 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 66 ) + ( SAL + ( Cons 66 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , ILS Store , IAL - ( Cons 67 ) + ( SAL + ( Cons 67 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 68 ) + ( SAL + ( Cons 68 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , ICF ( CStatic "01101110011001010111011101101100011010010110111001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF ( SMark "01101100011011110110111101110000" ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons - ( -1 ) + ( SAL + ( Cons + ( -1 ) + ) ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "01110000011100100110111101100111011001010110111001100100" ( Branch EZ ) ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load - , IAL ( Binary Add ) , IAL - ( Cons 100 ) + ( SAL ( Binary Add ) ) , IAL - ( SStatic 1 Move ) + ( SAL + ( Cons 100 ) + ) + , IAL + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , ICF ( CStatic "01101100011011110110111101110000" Jump ) , ICF ( SMark "01110000011100100110111101100111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL ( SIO OutputDec ) , ICF @@ -340,65 +592,94 @@ dump: Automaton , End , ICF ( SMark "011000010110010001100100" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "0111011101110010011010010111010001100101" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "011101110111001001101001011101000110010101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "0111011101110010011010010111010001100101" Jump ) , ICF ( SMark "011101110111001001101001011101000110010101011111011001010110111001100100" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "01110010011001010110000101100100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0111001001100101011000010110010001011111011001010110111001100100" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "01110010011001010110000101100100" Jump ) , ICF ( SMark "0111001001100101011000010110010001011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "01101110011001010111011101101100011010010110111001100101" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -406,8 +687,8 @@ dump: Automaton , programCounter = 201 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 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 2648d45dd..b541f5f97 100644 --- a/.output/actual/ws/eval/logged/ws/asciiOff/original/count.logged +++ b/.output/actual/ws/eval/logged/ws/asciiOff/original/count.logged @@ -1,93 +1,136 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , ICF ( SMark "01000011" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL ( SIO OutputDec ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 11 ) - , IAL ( Binary Sub ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 11 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "01000101" ( Branch EZ ) ) , ICF ( CStatic "01000011" Jump ) , ICF ( SMark "01000101" ) - , IAL Discard + , IAL ( SAL Discard ) , End , ICF ( SMark "011000010110010001100100" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "0111011101110010011010010111010001100101" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "011101110111001001101001011101000110010101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "0111011101110010011010010111010001100101" Jump ) , ICF ( SMark "011101110111001001101001011101000110010101011111011001010110111001100100" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "01110010011001010110000101100100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0111001001100101011000010110010001011111011001010110111001100100" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "01110010011001010110000101100100" Jump ) , ICF ( SMark "0111001001100101011000010110010001011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "01101110011001010111011101101100011010010110111001100101" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -95,6 +138,6 @@ dump: Automaton , programCounter = 16 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } 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 d26e5bff4..84c88ff70 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" @@ -1,134 +1,232 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 61 ) + ( SAL + ( Cons 61 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , ICF ( CStatic "01100110011000010110001101110100" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL ( SIO OutputDec ) , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL ( SIO OutputDec ) @@ -138,88 +236,125 @@ dump: Automaton , ICF ( SMark "01100110011000010110001101110100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0110011001100001011000110111010001100010011000010111001101100101" ( Branch EZ ) ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "01100110011000010110001101110100" Call ) - , IAL ( Binary Mul ) + , IAL + ( SAL ( Binary Mul ) ) , ICF Return , ICF ( SMark "0110011001100001011000110111010001100010011000010111001101100101" ) - , IAL - ( Cons 1 ) - , IAL Discard , ICF Return , ICF ( SMark "011000010110010001100100" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "0111011101110010011010010111010001100101" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "011101110111001001101001011101000110010101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "0111011101110010011010010111010001100101" Jump ) , ICF ( SMark "011101110111001001101001011101000110010101011111011001010110111001100100" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "01110010011001010110000101100100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0111001001100101011000010110010001011111011001010110111001100100" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "01110010011001010110000101100100" Jump ) , ICF ( SMark "0111001001100101011000010110010001011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "01101110011001010111011101101100011010010110111001100101" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -227,8 +362,8 @@ dump: Automaton , programCounter = 81 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 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 a0eda82fa..e94358cdc 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" @@ -1,338 +1,561 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 62 ) + ( SAL + ( Cons 62 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , ICF ( CStatic "0110100001100001011011100110111101101001" Call ) , End , ICF ( SMark "0110100001100001011011100110111101101001" ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , ICF ( CStatic "0110010101101110011001000110100001100001011011100110111101101001" ( Branch EZ ) ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 101 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , ICF ( CStatic "0110100001100001011011100110111101101001" Call ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL ( SIO OutputDec ) , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL ( SIO OutputDec ) , ICF ( CStatic "01101110011001010111011101101100011010010110111001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , ICF ( CStatic "0110100001100001011011100110111101101001" Call ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , ICF ( SMark "0110010101101110011001000110100001100001011011100110111101101001" ) , ICF Return , ICF ( SMark "011000010110010001100100" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "0111011101110010011010010111010001100101" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "011101110111001001101001011101000110010101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "0111011101110010011010010111010001100101" Jump ) , ICF ( SMark "011101110111001001101001011101000110010101011111011001010110111001100100" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "01110010011001010110000101100100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0111001001100101011000010110010001011111011001010110111001100100" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "01110010011001010110000101100100" Jump ) , ICF ( SMark "0111001001100101011000010110010001011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "01101110011001010111011101101100011010010110111001100101" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -340,8 +563,8 @@ dump: Automaton , programCounter = 77 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 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 f13a9a79d..454637fed 100644 --- a/.output/actual/ws/eval/logged/ws/asciiOff/original/hworld.logged +++ b/.output/actual/ws/eval/logged/ws/asciiOff/original/hworld.logged @@ -1,128 +1,226 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , IAL - ( Cons 112 ) + ( SAL + ( Cons 112 ) + ) , ILS Store , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 99 ) + ( SAL + ( Cons 99 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , ICF @@ -130,65 +228,94 @@ dump: Automaton , End , ICF ( SMark "011000010110010001100100" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "0111011101110010011010010111010001100101" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "011101110111001001101001011101000110010101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "0111011101110010011010010111010001100101" Jump ) , ICF ( SMark "011101110111001001101001011101000110010101011111011001010110111001100100" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "01110010011001010110000101100100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0111001001100101011000010110010001011111011001010110111001100100" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "01110010011001010110000101100100" Jump ) , ICF ( SMark "0111001001100101011000010110010001011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "01101110011001010111011101101100011010010110111001100101" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -196,8 +323,8 @@ dump: Automaton , programCounter = 76 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 72 , 101 , 108 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 1e4156de1..bc816ab53 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" @@ -1,110 +1,190 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , ICF ( CStatic "01101100011011110110001101110100011001010111001101110100" Call ) @@ -113,74 +193,110 @@ dump: Automaton , ICF ( SMark "01101100011011110110001101110100011001010111001101110100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 2 Copy ) - , IAL ( Binary Add ) + ( SAL + ( SStatic 2 Copy ) + ) , IAL - ( SStatic 2 Slide ) + ( SAL ( Binary Add ) ) + , IAL + ( SAL + ( SStatic 2 Slide ) + ) , ICF Return , ICF ( SMark "011000010110010001100100" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "0111011101110010011010010111010001100101" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "011101110111001001101001011101000110010101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "0111011101110010011010010111010001100101" Jump ) , ICF ( SMark "011101110111001001101001011101000110010101011111011001010110111001100100" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "01110010011001010110000101100100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0111001001100101011000010110010001011111011001010110111001100100" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "01110010011001010110000101100100" Jump ) , ICF ( SMark "0111001001100101011000010110010001011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "01101110011001010111011101101100011010010110111001100101" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -188,8 +304,8 @@ dump: Automaton , programCounter = 66 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 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 a8f5b0fcd..8d78eaf37 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" @@ -1,180 +1,316 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 80 ) + ( SAL + ( Cons 80 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 121 ) + ( SAL + ( Cons 121 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ILS Store , IAL - ( Cons 31 ) + ( SAL + ( Cons 31 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 34 ) + ( SAL + ( Cons 34 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 36 ) + ( SAL + ( Cons 36 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ICF ( CStatic "01110010011001010110000101100100" Call ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , ICF @@ -182,65 +318,94 @@ dump: Automaton , End , ICF ( SMark "011000010110010001100100" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "0111011101110010011010010111010001100101" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "011101110111001001101001011101000110010101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "0111011101110010011010010111010001100101" Jump ) , ICF ( SMark "011101110111001001101001011101000110010101011111011001010110111001100100" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "01110010011001010110000101100100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0111001001100101011000010110010001011111011001010110111001100100" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "01110010011001010110000101100100" Jump ) , ICF ( SMark "0111001001100101011000010110010001011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "01101110011001010111011101101100011010010110111001100101" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -248,8 +413,8 @@ dump: Automaton , programCounter = 106 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 80 , 108 , 101 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 39c7cb80a..dbeed2d63 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" @@ -1,338 +1,590 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , ILS Store , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 25 ) + ( SAL + ( Cons 25 ) + ) , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , ILS Store , IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) , IAL - ( Cons 49 ) + ( SAL + ( Cons 49 ) + ) , ILS Store , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 28 ) + ( SAL + ( Cons 28 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 31 ) + ( SAL + ( Cons 31 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Store , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , ILS Store , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 34 ) + ( SAL + ( Cons 34 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , ILS Store , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 36 ) + ( SAL + ( Cons 36 ) + ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , ILS Store , IAL - ( Cons 37 ) + ( SAL + ( Cons 37 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , IAL - ( Cons 78 ) + ( SAL + ( Cons 78 ) + ) , ILS Store , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 47 ) + ( SAL + ( Cons 47 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 49 ) + ( SAL + ( Cons 49 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , IAL - ( Cons 84 ) + ( SAL + ( Cons 84 ) + ) , ILS Store , IAL - ( Cons 61 ) + ( SAL + ( Cons 61 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 62 ) + ( SAL + ( Cons 62 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 63 ) + ( SAL + ( Cons 63 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 64 ) + ( SAL + ( Cons 64 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 65 ) + ( SAL + ( Cons 65 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 66 ) + ( SAL + ( Cons 66 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , ILS Store , IAL - ( Cons 67 ) + ( SAL + ( Cons 67 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 68 ) + ( SAL + ( Cons 68 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "write" Call ) , ICF ( CStatic "newline" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF ( SMark "loop" ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons - ( -1 ) + ( SAL + ( Cons + ( -1 ) + ) ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "progend" ( Branch EZ ) ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load - , IAL ( Binary Add ) , IAL - ( Cons 100 ) + ( SAL ( Binary Add ) ) , IAL - ( SStatic 1 Move ) + ( SAL + ( Cons 100 ) + ) + , IAL + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , ICF ( CStatic "loop" Jump ) , ICF ( SMark "progend" ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL ( SIO OutputDec ) , ICF @@ -340,65 +592,94 @@ dump: Automaton , End , ICF ( SMark "add" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "write" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "write_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "write" Jump ) , ICF ( SMark "write_end" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "read" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "read_end" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "read" Jump ) , ICF ( SMark "read_end" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "newline" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -406,8 +687,8 @@ dump: Automaton , programCounter = 201 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 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 0685bfc8f..54d428a75 100644 --- a/.output/actual/ws/eval/logged/ws/asciiOn/original/count.logged +++ b/.output/actual/ws/eval/logged/ws/asciiOn/original/count.logged @@ -1,93 +1,136 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , ICF ( SMark "C" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL ( SIO OutputDec ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 11 ) - , IAL ( Binary Sub ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 11 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "E" ( Branch EZ ) ) , ICF ( CStatic "C" Jump ) , ICF ( SMark "E" ) - , IAL Discard + , IAL ( SAL Discard ) , End , ICF ( SMark "add" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "write" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "write_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "write" Jump ) , ICF ( SMark "write_end" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "read" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "read_end" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "read" Jump ) , ICF ( SMark "read_end" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "newline" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -95,6 +138,6 @@ dump: Automaton , programCounter = 16 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } 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 757a1673e..67a7b98cf 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" @@ -1,134 +1,232 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 61 ) + ( SAL + ( Cons 61 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , ICF ( CStatic "fact" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL ( SIO OutputDec ) , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , ICF ( CStatic "write" Call ) , IAL ( SIO OutputDec ) @@ -138,88 +236,125 @@ dump: Automaton , ICF ( SMark "fact" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "factbase" ( Branch EZ ) ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "fact" Call ) - , IAL ( Binary Mul ) + , IAL + ( SAL ( Binary Mul ) ) , ICF Return , ICF ( SMark "factbase" ) - , IAL - ( Cons 1 ) - , IAL Discard , ICF Return , ICF ( SMark "add" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "write" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "write_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "write" Jump ) , ICF ( SMark "write_end" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "read" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "read_end" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "read" Jump ) , ICF ( SMark "read_end" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "newline" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -227,8 +362,8 @@ dump: Automaton , programCounter = 81 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 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 a0eb35390..ff4778379 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" @@ -1,338 +1,561 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 62 ) + ( SAL + ( Cons 62 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , ICF ( CStatic "hanoi" Call ) , End , ICF ( SMark "hanoi" ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , ICF ( CStatic "endhanoi" ( Branch EZ ) ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 101 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , ICF ( CStatic "hanoi" Call ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL ( SIO OutputDec ) , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL ( SIO OutputDec ) , ICF ( CStatic "newline" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , ICF ( CStatic "hanoi" Call ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , ICF ( SMark "endhanoi" ) , ICF Return , ICF ( SMark "add" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "write" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "write_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "write" Jump ) , ICF ( SMark "write_end" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "read" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "read_end" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "read" Jump ) , ICF ( SMark "read_end" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "newline" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -340,8 +563,8 @@ dump: Automaton , programCounter = 77 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 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 c3ccb3ce4..6299446f2 100644 --- a/.output/actual/ws/eval/logged/ws/asciiOn/original/hworld.logged +++ b/.output/actual/ws/eval/logged/ws/asciiOn/original/hworld.logged @@ -1,128 +1,226 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , IAL - ( Cons 112 ) + ( SAL + ( Cons 112 ) + ) , ILS Store , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 99 ) + ( SAL + ( Cons 99 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "write" Call ) , ICF @@ -130,65 +228,94 @@ dump: Automaton , End , ICF ( SMark "add" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "write" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "write_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "write" Jump ) , ICF ( SMark "write_end" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "read" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "read_end" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "read" Jump ) , ICF ( SMark "read_end" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "newline" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -196,8 +323,8 @@ dump: Automaton , programCounter = 76 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 72 , 101 , 108 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 693b5ad2b..0a6381434 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" @@ -1,110 +1,190 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , ICF ( CStatic "loctest" Call ) @@ -113,74 +193,110 @@ dump: Automaton , ICF ( SMark "loctest" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 2 Copy ) - , IAL ( Binary Add ) + ( SAL + ( SStatic 2 Copy ) + ) , IAL - ( SStatic 2 Slide ) + ( SAL ( Binary Add ) ) + , IAL + ( SAL + ( SStatic 2 Slide ) + ) , ICF Return , ICF ( SMark "add" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "write" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "write_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "write" Jump ) , ICF ( SMark "write_end" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "read" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "read_end" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "read" Jump ) , ICF ( SMark "read_end" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "newline" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -188,8 +304,8 @@ dump: Automaton , programCounter = 66 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 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 8285d866a..870c9798c 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" @@ -1,180 +1,316 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 80 ) + ( SAL + ( Cons 80 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 121 ) + ( SAL + ( Cons 121 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ILS Store , IAL - ( Cons 31 ) + ( SAL + ( Cons 31 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 34 ) + ( SAL + ( Cons 34 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 36 ) + ( SAL + ( Cons 36 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ICF ( CStatic "read" Call ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ICF ( CStatic "write" Call ) , ICF @@ -182,65 +318,94 @@ dump: Automaton , End , ICF ( SMark "add" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "write" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "write_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "write" Jump ) , ICF ( SMark "write_end" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "read" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "read_end" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "read" Jump ) , ICF ( SMark "read_end" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "newline" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -248,8 +413,8 @@ dump: Automaton , programCounter = 106 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 80 , 108 , 101 diff --git a/.output/actual/ws/il/from-wsa/bottles.il b/.output/actual/ws/il/from-wsa/bottles.il deleted file mode 100644 index b1a6fc84c..000000000 --- a/.output/actual/ws/il/from-wsa/bottles.il +++ /dev/null @@ -1,273 +0,0 @@ -[ IAL - ( Cons 3 ) -, ICF - ( SMark "LOOP" ) -, IAL - ( SStatic 0 Copy ) -, IAL ( SIO OutputDec ) -, IAL - ( Cons 0 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 44 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 97 ) -, IAL - ( Cons 119 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 104 ) -, IAL - ( Cons 116 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 110 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 114 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 98 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 102 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 115 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 116 ) -, IAL - ( Cons 116 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 98 ) -, IAL - ( Cons 32 ) -, ICF - ( CStatic "prints" Call ) -, IAL - ( SStatic 0 Copy ) -, IAL ( SIO OutputDec ) -, IAL - ( Cons 0 ) -, IAL - ( Cons 114 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 98 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 102 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 115 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 116 ) -, IAL - ( Cons 116 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 98 ) -, IAL - ( Cons 32 ) -, ICF - ( CStatic "printsln" Call ) -, IAL - ( Cons 0 ) -, IAL - ( Cons 100 ) -, IAL - ( Cons 110 ) -, IAL - ( Cons 117 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 114 ) -, IAL - ( Cons 97 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 116 ) -, IAL - ( Cons 105 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 115 ) -, IAL - ( Cons 115 ) -, IAL - ( Cons 97 ) -, IAL - ( Cons 112 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 44 ) -, IAL - ( Cons 110 ) -, IAL - ( Cons 119 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 100 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 110 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 107 ) -, IAL - ( Cons 97 ) -, IAL - ( Cons 84 ) -, ICF - ( CStatic "printsln" Call ) -, IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL - ( SStatic 0 Copy ) -, IAL ( SIO OutputDec ) -, IAL - ( Cons 0 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 97 ) -, IAL - ( Cons 119 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 104 ) -, IAL - ( Cons 116 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 110 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 114 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 98 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 102 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 115 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 116 ) -, IAL - ( Cons 116 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 98 ) -, IAL - ( Cons 32 ) -, ICF - ( CStatic "printsln" Call ) -, IAL - ( Cons 0 ) -, ICF - ( CStatic "printsln" Call ) -, IAL - ( SStatic 0 Copy ) -, ICF - ( CStatic "LOOP:1" ( Branch EZ ) ) -, ICF - ( CStatic "LOOP" Jump ) -, ICF - ( SMark "LOOP:1" ) -, End -, ICF - ( SMark "prints" ) -, IAL - ( SStatic 0 Copy ) -, ICF - ( CStatic "prints_end" ( Branch EZ ) ) -, IAL ( SIO OutputChar ) -, ICF - ( CStatic "prints" Jump ) -, ICF - ( SMark "prints_end" ) -, IAL Discard -, ICF Return -, ICF - ( SMark "printsln" ) -, ICF - ( CStatic "prints" Call ) -, IAL - ( Cons 10 ) -, IAL ( SIO OutputChar ) -, ICF Return -] \ No newline at end of file diff --git a/.output/actual/ws/il/from-wsa/hello.il b/.output/actual/ws/il/from-wsa/hello.il deleted file mode 100644 index 04d60e047..000000000 --- a/.output/actual/ws/il/from-wsa/hello.il +++ /dev/null @@ -1,44 +0,0 @@ -[ IAL - ( Cons 32 ) -, IAL - ( Cons 44 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 72 ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 10 ) -, IAL - ( Cons 33 ) -, IAL - ( Cons 100 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 114 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 119 ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, End -] \ No newline at end of file diff --git a/.output/actual/ws/il/from-wsa/hello2.il b/.output/actual/ws/il/from-wsa/hello2.il deleted file mode 100644 index ff5f4e456..000000000 --- a/.output/actual/ws/il/from-wsa/hello2.il +++ /dev/null @@ -1,55 +0,0 @@ -[ IAL - ( Cons 0 ) -, IAL - ( Cons 10 ) -, IAL - ( Cons 33 ) -, IAL - ( Cons 100 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 114 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 119 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 44 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 72 ) -, ICF - ( CStatic "prints" Call ) -, End -, ICF - ( SMark "prints" ) -, IAL - ( SStatic 0 Copy ) -, ICF - ( CStatic "prints_end" ( Branch EZ ) ) -, IAL ( SIO OutputChar ) -, ICF - ( CStatic "prints" Jump ) -, ICF - ( SMark "prints_end" ) -, IAL Discard -, ICF Return -, ICF - ( SMark "printsln" ) -, ICF - ( CStatic "prints" Call ) -, IAL - ( Cons 10 ) -, IAL ( SIO OutputChar ) -, ICF Return -] \ No newline at end of file diff --git a/.output/actual/ws/il/from-wsa/hello4.il b/.output/actual/ws/il/from-wsa/hello4.il deleted file mode 100644 index 14f6e7be7..000000000 --- a/.output/actual/ws/il/from-wsa/hello4.il +++ /dev/null @@ -1,53 +0,0 @@ -[ IAL - ( Cons 0 ) -, IAL - ( Cons 33 ) -, IAL - ( Cons 100 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 114 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 119 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 44 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 72 ) -, ICF - ( CStatic "printsln" Call ) -, End -, ICF - ( SMark "prints" ) -, IAL - ( SStatic 0 Copy ) -, ICF - ( CStatic "prints_end" ( Branch EZ ) ) -, IAL ( SIO OutputChar ) -, ICF - ( CStatic "prints" Jump ) -, ICF - ( SMark "prints_end" ) -, IAL Discard -, ICF Return -, ICF - ( SMark "printsln" ) -, ICF - ( CStatic "prints" Call ) -, IAL - ( Cons 10 ) -, IAL ( SIO OutputChar ) -, ICF Return -] \ No newline at end of file diff --git a/.output/actual/ws/il/from-wsa/prim.il b/.output/actual/ws/il/from-wsa/prim.il deleted file mode 100644 index 7a157cfac..000000000 --- a/.output/actual/ws/il/from-wsa/prim.il +++ /dev/null @@ -1,207 +0,0 @@ -[ ICF - ( SMark "st" ) -, IAL - ( Cons 0 ) -, IAL - ( Cons 93 ) -, IAL - ( Cons 48 ) -, IAL - ( Cons 48 ) -, IAL - ( Cons 49 ) -, IAL - ( Cons 45 ) -, IAL - ( Cons 50 ) -, IAL - ( Cons 91 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 115 ) -, IAL - ( Cons 114 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 98 ) -, IAL - ( Cons 109 ) -, IAL - ( Cons 117 ) -, IAL - ( Cons 110 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 109 ) -, IAL - ( Cons 105 ) -, IAL - ( Cons 114 ) -, IAL - ( Cons 112 ) -, ICF - ( CStatic "printsln" Call ) -, IAL - ( Cons 0 ) -, ICF - ( SMark "f_start_1" ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 100 ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "f_finished_1" ( Branch EZ ) ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 100 ) -, IAL ( Binary Add ) -, IAL - ( Cons 1 ) -, ILS Store -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "f_start_1" Jump ) -, ICF - ( SMark "f_finished_1" ) -, IAL Discard -, IAL - ( Cons 2 ) -, ICF - ( SMark "f_start_2" ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 11 ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "f_finished_2" ( Branch EZ ) ) -, IAL - ( Cons 2 ) -, ICF - ( SMark "f_start_3" ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 100 ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "f_finished_3" ( Branch EZ ) ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 1 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, IAL - ( SStatic 1 Move ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 2 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, IAL - ( SStatic 1 Move ) -, IAL - ( Cons 1 ) -, ILS Load -, IAL - ( Cons 2 ) -, ILS Load -, IAL ( Binary Mul ) -, IAL - ( Cons 100 ) -, IAL ( Binary Add ) -, IAL - ( Cons 0 ) -, ILS Store -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "f_start_3" Jump ) -, ICF - ( SMark "f_finished_3" ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "f_start_2" Jump ) -, ICF - ( SMark "f_finished_2" ) -, IAL Discard -, IAL - ( Cons 2 ) -, ICF - ( SMark "f_start_4" ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 100 ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "f_finished_4" ( Branch EZ ) ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 100 ) -, IAL ( Binary Add ) -, ILS Load -, ICF - ( CStatic "nodraw" ( Branch EZ ) ) -, IAL - ( SStatic 0 Copy ) -, IAL ( SIO OutputDec ) -, IAL - ( Cons 0 ) -, IAL - ( Cons 32 ) -, ICF - ( CStatic "prints" Call ) -, ICF - ( SMark "nodraw" ) -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "f_start_4" Jump ) -, ICF - ( SMark "f_finished_4" ) -, IAL Discard -, IAL - ( Cons 0 ) -, ICF - ( CStatic "printsln" Call ) -, End -, ICF - ( SMark "prints" ) -, IAL - ( SStatic 0 Copy ) -, ICF - ( CStatic "prints_end" ( Branch EZ ) ) -, IAL ( SIO OutputChar ) -, ICF - ( CStatic "prints" Jump ) -, ICF - ( SMark "prints_end" ) -, IAL Discard -, ICF Return -, ICF - ( SMark "printsln" ) -, ICF - ( CStatic "prints" Call ) -, IAL - ( Cons 10 ) -, IAL ( SIO OutputChar ) -, ICF Return -] \ No newline at end of file diff --git a/.output/actual/ws/il/optimized/from-wsa/bottles.il b/.output/actual/ws/il/optimized/from-wsa/bottles.il new file mode 100644 index 000000000..ba9a55c97 --- /dev/null +++ b/.output/actual/ws/il/optimized/from-wsa/bottles.il @@ -0,0 +1,506 @@ +[ IAL + ( SAL + ( Cons 3 ) + ) +, ICF + ( SMark "LOOP" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL ( SIO OutputDec ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 104 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 102 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ICF + ( CStatic "prints" Call ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL ( SIO OutputDec ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 102 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ICF + ( CStatic "printsln" Call ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 105 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 112 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 107 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 84 ) + ) +, ICF + ( CStatic "printsln" Call ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL ( SIO OutputDec ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 104 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 102 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ICF + ( CStatic "printsln" Call ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "printsln" Call ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "LOOP:1" ( Branch EZ ) ) +, ICF + ( CStatic "LOOP" Jump ) +, ICF + ( SMark "LOOP:1" ) +, End +, ICF + ( SMark "prints" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "prints_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, ICF + ( CStatic "prints" Jump ) +, ICF + ( SMark "prints_end" ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "printsln" ) +, ICF + ( CStatic "prints" Call ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/actual/ws/il/optimized/from-wsa/hello.il b/.output/actual/ws/il/optimized/from-wsa/hello.il new file mode 100644 index 000000000..3899be8eb --- /dev/null +++ b/.output/actual/ws/il/optimized/from-wsa/hello.il @@ -0,0 +1,72 @@ +[ IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, End +] \ No newline at end of file diff --git a/.output/actual/ws/il/optimized/from-wsa/hello2.il b/.output/actual/ws/il/optimized/from-wsa/hello2.il new file mode 100644 index 000000000..88f1d1ddf --- /dev/null +++ b/.output/actual/ws/il/optimized/from-wsa/hello2.il @@ -0,0 +1,89 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, ICF + ( CStatic "prints" Call ) +, End +, ICF + ( SMark "prints" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "prints_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, ICF + ( CStatic "prints" Jump ) +, ICF + ( SMark "prints_end" ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "printsln" ) +, ICF + ( CStatic "prints" Call ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/actual/ws/il/optimized/from-wsa/hello4.il b/.output/actual/ws/il/optimized/from-wsa/hello4.il new file mode 100644 index 000000000..bd7b32f75 --- /dev/null +++ b/.output/actual/ws/il/optimized/from-wsa/hello4.il @@ -0,0 +1,85 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, ICF + ( CStatic "printsln" Call ) +, End +, ICF + ( SMark "prints" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "prints_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, ICF + ( CStatic "prints" Jump ) +, ICF + ( SMark "prints_end" ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "printsln" ) +, ICF + ( CStatic "prints" Call ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/actual/ws/il/optimized/from-wsa/prim.il b/.output/actual/ws/il/optimized/from-wsa/prim.il new file mode 100644 index 000000000..3caf1a7c7 --- /dev/null +++ b/.output/actual/ws/il/optimized/from-wsa/prim.il @@ -0,0 +1,339 @@ +[ ICF + ( SMark "st" ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 93 ) + ) +, IAL + ( SAL + ( Cons 48 ) + ) +, IAL + ( SAL + ( Cons 48 ) + ) +, IAL + ( SAL + ( Cons 49 ) + ) +, IAL + ( SAL + ( Cons 45 ) + ) +, IAL + ( SAL + ( Cons 50 ) + ) +, IAL + ( SAL + ( Cons 91 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, IAL + ( SAL + ( Cons 105 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 112 ) + ) +, ICF + ( CStatic "printsln" Call ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( SMark "f_start_1" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "f_finished_1" ( Branch EZ ) ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "f_start_1" Jump ) +, ICF + ( SMark "f_finished_1" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 2 ) + ) +, ICF + ( SMark "f_start_2" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "f_finished_2" ( Branch EZ ) ) +, IAL + ( SAL + ( Cons 2 ) + ) +, ICF + ( SMark "f_start_3" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "f_finished_3" ( Branch EZ ) ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 2 ) + ) +, ILS Load +, IAL + ( SAL ( Binary Mul ) ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "f_start_3" Jump ) +, ICF + ( SMark "f_finished_3" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "f_start_2" Jump ) +, ICF + ( SMark "f_finished_2" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 2 ) + ) +, ICF + ( SMark "f_start_4" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "f_finished_4" ( Branch EZ ) ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ILS Load +, ICF + ( CStatic "nodraw" ( Branch EZ ) ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL ( SIO OutputDec ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ICF + ( CStatic "prints" Call ) +, ICF + ( SMark "nodraw" ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "f_start_4" Jump ) +, ICF + ( SMark "f_finished_4" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "printsln" Call ) +, End +, ICF + ( SMark "prints" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "prints_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, ICF + ( CStatic "prints" Jump ) +, ICF + ( SMark "prints_end" ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "printsln" ) +, ICF + ( CStatic "prints" Call ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/actual/ws/il/from-wsa/true.il b/.output/actual/ws/il/optimized/from-wsa/true.il similarity index 100% rename from .output/actual/ws/il/from-wsa/true.il rename to .output/actual/ws/il/optimized/from-wsa/true.il diff --git a/.output/actual/ws/il/optimized/original/calc.il b/.output/actual/ws/il/optimized/original/calc.il new file mode 100644 index 000000000..aee7a6970 --- /dev/null +++ b/.output/actual/ws/il/optimized/original/calc.il @@ -0,0 +1,683 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 69 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 5 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 6 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 7 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 8 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 9 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 14 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 15 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 16 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 17 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 18 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 19 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 20 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 21 ) + ) +, IAL + ( SAL + ( Cons 104 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 22 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 23 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 24 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 25 ) + ) +, IAL + ( SAL + ( Cons 45 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 26 ) + ) +, IAL + ( SAL + ( Cons 49 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 27 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 28 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 29 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 30 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 31 ) + ) +, IAL + ( SAL + ( Cons 102 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 105 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 34 ) + ) +, IAL + ( SAL + ( Cons 105 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 35 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 36 ) + ) +, IAL + ( SAL + ( Cons 104 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 37 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 42 ) + ) +, IAL + ( SAL + ( Cons 78 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 43 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 45 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 46 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 47 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 48 ) + ) +, IAL + ( SAL + ( Cons 58 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 49 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 60 ) + ) +, IAL + ( SAL + ( Cons 84 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 61 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 62 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 63 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 64 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 65 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 66 ) + ) +, IAL + ( SAL + ( Cons 105 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 67 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 68 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 69 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "write" Call ) +, ICF + ( CStatic "newline" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF + ( SMark "loop" ) +, IAL + ( SAL + ( Cons 42 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS ( MIO InputDec ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons + ( -1 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "progend" ( Branch EZ ) ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, ICF + ( CStatic "loop" Jump ) +, ICF + ( SMark "progend" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 60 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL ( SIO OutputDec ) +, ICF + ( CStatic "newline" Call ) +, End +, ICF + ( SMark "add" ) +, IAL + ( SAL ( Binary Add ) ) +, ICF Return +, ICF + ( SMark "write" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "write_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "write" Jump ) +, ICF + ( SMark "write_end" ) +, IAL ( SAL Discard ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "read" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputChar ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "read_end" ( Branch EZ ) ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "read" Jump ) +, ICF + ( SMark "read_end" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF Return +, ICF + ( SMark "newline" ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/actual/ws/il/optimized/original/count.il b/.output/actual/ws/il/optimized/original/count.il new file mode 100644 index 000000000..18a05cd56 --- /dev/null +++ b/.output/actual/ws/il/optimized/original/count.il @@ -0,0 +1,134 @@ +[ IAL + ( SAL + ( Cons 1 ) + ) +, ICF + ( SMark "C" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL ( SIO OutputDec ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "E" ( Branch EZ ) ) +, ICF + ( CStatic "C" Jump ) +, ICF + ( SMark "E" ) +, IAL ( SAL Discard ) +, End +, ICF + ( SMark "add" ) +, IAL + ( SAL ( Binary Add ) ) +, ICF Return +, ICF + ( SMark "write" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "write_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "write" Jump ) +, ICF + ( SMark "write_end" ) +, IAL ( SAL Discard ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "read" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputChar ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "read_end" ( Branch EZ ) ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "read" Jump ) +, ICF + ( SMark "read_end" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF Return +, ICF + ( SMark "newline" ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/actual/ws/il/optimized/original/fact.il b/.output/actual/ws/il/optimized/original/fact.il new file mode 100644 index 000000000..c8ff04c51 --- /dev/null +++ b/.output/actual/ws/il/optimized/original/fact.il @@ -0,0 +1,358 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 69 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 5 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 6 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 7 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 8 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 9 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 14 ) + ) +, IAL + ( SAL + ( Cons 58 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 15 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 16 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 20 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 21 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 22 ) + ) +, IAL + ( SAL + ( Cons 61 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 23 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 24 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS ( MIO InputDec ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, ICF + ( CStatic "fact" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL ( SIO OutputDec ) +, IAL + ( SAL + ( Cons 20 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL ( SIO OutputDec ) +, ICF + ( CStatic "newline" Call ) +, End +, ICF + ( SMark "fact" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "factbase" ( Branch EZ ) ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "fact" Call ) +, IAL + ( SAL ( Binary Mul ) ) +, ICF Return +, ICF + ( SMark "factbase" ) +, ICF Return +, ICF + ( SMark "add" ) +, IAL + ( SAL ( Binary Add ) ) +, ICF Return +, ICF + ( SMark "write" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "write_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "write" Jump ) +, ICF + ( SMark "write_end" ) +, IAL ( SAL Discard ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "read" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputChar ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "read_end" ( Branch EZ ) ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "read" Jump ) +, ICF + ( SMark "read_end" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF Return +, ICF + ( SMark "newline" ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/actual/ws/il/optimized/original/hWorld.il b/.output/actual/ws/il/optimized/original/hWorld.il new file mode 100644 index 000000000..f86f1e306 --- /dev/null +++ b/.output/actual/ws/il/optimized/original/hWorld.il @@ -0,0 +1,319 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 5 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 6 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 7 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 8 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 9 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 14 ) + ) +, IAL + ( SAL + ( Cons 102 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 15 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 16 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 17 ) + ) +, IAL + ( SAL + ( Cons 112 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 18 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 19 ) + ) +, IAL + ( SAL + ( Cons 99 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 20 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 21 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 22 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 23 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "write" Call ) +, ICF + ( CStatic "newline" Call ) +, End +, ICF + ( SMark "add" ) +, IAL + ( SAL ( Binary Add ) ) +, ICF Return +, ICF + ( SMark "write" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "write_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "write" Jump ) +, ICF + ( SMark "write_end" ) +, IAL ( SAL Discard ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "read" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputChar ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "read_end" ( Branch EZ ) ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "read" Jump ) +, ICF + ( SMark "read_end" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF Return +, ICF + ( SMark "newline" ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/actual/ws/il/optimized/original/hanoi.il b/.output/actual/ws/il/optimized/original/hanoi.il new file mode 100644 index 000000000..dd0ea6ac0 --- /dev/null +++ b/.output/actual/ws/il/optimized/original/hanoi.il @@ -0,0 +1,559 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 69 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 5 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 6 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 7 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 8 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 9 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 14 ) + ) +, IAL + ( SAL + ( Cons 58 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 15 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 16 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 20 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 21 ) + ) +, IAL + ( SAL + ( Cons 45 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 22 ) + ) +, IAL + ( SAL + ( Cons 62 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 23 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 24 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS ( MIO InputDec ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, ICF + ( CStatic "hanoi" Call ) +, End +, ICF + ( SMark "hanoi" ) +, IAL + ( SAL + ( Cons 103 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 102 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, ICF + ( CStatic "endhanoi" ( Branch EZ ) ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 102 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 103 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 103 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 102 ) + ) +, ILS Load +, ICF + ( CStatic "hanoi" Call ) +, IAL + ( SAL + ( Cons 103 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 102 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Load +, IAL ( SIO OutputDec ) +, IAL + ( SAL + ( Cons 20 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 102 ) + ) +, ILS Load +, IAL ( SIO OutputDec ) +, ICF + ( CStatic "newline" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 102 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 103 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 103 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 102 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Load +, ICF + ( CStatic "hanoi" Call ) +, IAL + ( SAL + ( Cons 103 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 102 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, ICF + ( SMark "endhanoi" ) +, ICF Return +, ICF + ( SMark "add" ) +, IAL + ( SAL ( Binary Add ) ) +, ICF Return +, ICF + ( SMark "write" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "write_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "write" Jump ) +, ICF + ( SMark "write_end" ) +, IAL ( SAL Discard ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "read" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputChar ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "read_end" ( Branch EZ ) ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "read" Jump ) +, ICF + ( SMark "read_end" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF Return +, ICF + ( SMark "newline" ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/actual/ws/il/optimized/original/helloWorld.il b/.output/actual/ws/il/optimized/original/helloWorld.il new file mode 100644 index 000000000..f5831b140 --- /dev/null +++ b/.output/actual/ws/il/optimized/original/helloWorld.il @@ -0,0 +1,62 @@ +[ IAL + ( SAL + ( Cons 72 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL ( SIO OutputChar ) +, End +] \ No newline at end of file diff --git a/.output/actual/ws/il/optimized/original/locTest.il b/.output/actual/ws/il/optimized/original/locTest.il new file mode 100644 index 000000000..4ae21f6fd --- /dev/null +++ b/.output/actual/ws/il/optimized/original/locTest.il @@ -0,0 +1,300 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 69 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 5 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 6 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 7 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 8 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 9 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 14 ) + ) +, IAL + ( SAL + ( Cons 58 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 15 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 16 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS ( MIO InputDec ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS ( MIO InputDec ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Load +, ICF + ( CStatic "loctest" Call ) +, IAL ( SIO OutputDec ) +, End +, ICF + ( SMark "loctest" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 2 Copy ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( SStatic 2 Slide ) + ) +, ICF Return +, ICF + ( SMark "add" ) +, IAL + ( SAL ( Binary Add ) ) +, ICF Return +, ICF + ( SMark "write" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "write_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "write" Jump ) +, ICF + ( SMark "write_end" ) +, IAL ( SAL Discard ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "read" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputChar ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "read_end" ( Branch EZ ) ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "read" Jump ) +, ICF + ( SMark "read_end" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF Return +, ICF + ( SMark "newline" ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/actual/ws/il/optimized/original/name.il b/.output/actual/ws/il/optimized/original/name.il new file mode 100644 index 000000000..369744f01 --- /dev/null +++ b/.output/actual/ws/il/optimized/original/name.il @@ -0,0 +1,409 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 80 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 5 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 6 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 7 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 8 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 9 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 121 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 14 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 15 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 16 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 17 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 18 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 19 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 20 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 21 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 22 ) + ) +, IAL + ( SAL + ( Cons 58 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 23 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 24 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 30 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 31 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 34 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 35 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 36 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ICF + ( CStatic "read" Call ) +, IAL + ( SAL + ( Cons 30 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ICF + ( CStatic "write" Call ) +, ICF + ( CStatic "newline" Call ) +, End +, ICF + ( SMark "add" ) +, IAL + ( SAL ( Binary Add ) ) +, ICF Return +, ICF + ( SMark "write" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "write_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "write" Jump ) +, ICF + ( SMark "write_end" ) +, IAL ( SAL Discard ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "read" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputChar ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "read_end" ( Branch EZ ) ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "read" Jump ) +, ICF + ( SMark "read_end" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF Return +, ICF + ( SMark "newline" ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/actual/ws/il/original/truthMachine.il b/.output/actual/ws/il/optimized/original/truthMachine.il similarity index 63% rename from .output/actual/ws/il/original/truthMachine.il rename to .output/actual/ws/il/optimized/original/truthMachine.il index c1548a866..e8ceda6e0 100644 --- a/.output/actual/ws/il/original/truthMachine.il +++ b/.output/actual/ws/il/optimized/original/truthMachine.il @@ -1,7 +1,11 @@ [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( Cons 0 ) + ) , ILS ( MIO InputDec ) , ILS Load , ICF @@ -9,14 +13,18 @@ , ICF ( SMark "\x1" ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL ( SIO OutputDec ) , ICF ( CStatic "\x1" Jump ) , ICF ( SMark "\x0" ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL ( SIO OutputDec ) , End ] \ No newline at end of file diff --git a/.output/actual/ws/il/original/calc.il b/.output/actual/ws/il/original/calc.il deleted file mode 100644 index d31461392..000000000 --- a/.output/actual/ws/il/original/calc.il +++ /dev/null @@ -1,402 +0,0 @@ -[ IAL - ( Cons 0 ) -, IAL - ( Cons 69 ) -, ILS Store -, IAL - ( Cons 1 ) -, IAL - ( Cons 110 ) -, ILS Store -, IAL - ( Cons 2 ) -, IAL - ( Cons 116 ) -, ILS Store -, IAL - ( Cons 3 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 4 ) -, IAL - ( Cons 114 ) -, ILS Store -, IAL - ( Cons 5 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 6 ) -, IAL - ( Cons 115 ) -, ILS Store -, IAL - ( Cons 7 ) -, IAL - ( Cons 111 ) -, ILS Store -, IAL - ( Cons 8 ) -, IAL - ( Cons 109 ) -, ILS Store -, IAL - ( Cons 9 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 10 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 11 ) -, IAL - ( Cons 110 ) -, ILS Store -, IAL - ( Cons 12 ) -, IAL - ( Cons 117 ) -, ILS Store -, IAL - ( Cons 13 ) -, IAL - ( Cons 109 ) -, ILS Store -, IAL - ( Cons 14 ) -, IAL - ( Cons 98 ) -, ILS Store -, IAL - ( Cons 15 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 16 ) -, IAL - ( Cons 114 ) -, ILS Store -, IAL - ( Cons 17 ) -, IAL - ( Cons 115 ) -, ILS Store -, IAL - ( Cons 18 ) -, IAL - ( Cons 44 ) -, ILS Store -, IAL - ( Cons 19 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 20 ) -, IAL - ( Cons 116 ) -, ILS Store -, IAL - ( Cons 21 ) -, IAL - ( Cons 104 ) -, ILS Store -, IAL - ( Cons 22 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 23 ) -, IAL - ( Cons 110 ) -, ILS Store -, IAL - ( Cons 24 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 25 ) -, IAL - ( Cons 45 ) -, ILS Store -, IAL - ( Cons 26 ) -, IAL - ( Cons 49 ) -, ILS Store -, IAL - ( Cons 27 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 28 ) -, IAL - ( Cons 116 ) -, ILS Store -, IAL - ( Cons 29 ) -, IAL - ( Cons 111 ) -, ILS Store -, IAL - ( Cons 30 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 31 ) -, IAL - ( Cons 102 ) -, ILS Store -, IAL - ( Cons 32 ) -, IAL - ( Cons 105 ) -, ILS Store -, IAL - ( Cons 33 ) -, IAL - ( Cons 110 ) -, ILS Store -, IAL - ( Cons 34 ) -, IAL - ( Cons 105 ) -, ILS Store -, IAL - ( Cons 35 ) -, IAL - ( Cons 115 ) -, ILS Store -, IAL - ( Cons 36 ) -, IAL - ( Cons 104 ) -, ILS Store -, IAL - ( Cons 37 ) -, IAL - ( Cons 0 ) -, ILS Store -, IAL - ( Cons 42 ) -, IAL - ( Cons 78 ) -, ILS Store -, IAL - ( Cons 43 ) -, IAL - ( Cons 117 ) -, ILS Store -, IAL - ( Cons 44 ) -, IAL - ( Cons 109 ) -, ILS Store -, IAL - ( Cons 45 ) -, IAL - ( Cons 98 ) -, ILS Store -, IAL - ( Cons 46 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 47 ) -, IAL - ( Cons 114 ) -, ILS Store -, IAL - ( Cons 48 ) -, IAL - ( Cons 58 ) -, ILS Store -, IAL - ( Cons 49 ) -, IAL - ( Cons 0 ) -, ILS Store -, IAL - ( Cons 60 ) -, IAL - ( Cons 84 ) -, ILS Store -, IAL - ( Cons 61 ) -, IAL - ( Cons 111 ) -, ILS Store -, IAL - ( Cons 62 ) -, IAL - ( Cons 116 ) -, ILS Store -, IAL - ( Cons 63 ) -, IAL - ( Cons 97 ) -, ILS Store -, IAL - ( Cons 64 ) -, IAL - ( Cons 108 ) -, ILS Store -, IAL - ( Cons 65 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 66 ) -, IAL - ( Cons 105 ) -, ILS Store -, IAL - ( Cons 67 ) -, IAL - ( Cons 115 ) -, ILS Store -, IAL - ( Cons 68 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 69 ) -, IAL - ( Cons 0 ) -, ILS Store -, IAL - ( Cons 0 ) -, ICF - ( CStatic "write" Call ) -, ICF - ( CStatic "newline" Call ) -, IAL - ( Cons 100 ) -, IAL - ( Cons 0 ) -, ILS Store -, ICF - ( SMark "loop" ) -, IAL - ( Cons 42 ) -, ICF - ( CStatic "write" Call ) -, IAL - ( Cons 101 ) -, ILS ( MIO InputDec ) -, IAL - ( Cons 101 ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons - ( -1 ) - ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "progend" ( Branch EZ ) ) -, IAL - ( Cons 100 ) -, ILS Load -, IAL ( Binary Add ) -, IAL - ( Cons 100 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, ICF - ( CStatic "loop" Jump ) -, ICF - ( SMark "progend" ) -, IAL Discard -, IAL - ( Cons 60 ) -, ICF - ( CStatic "write" Call ) -, IAL - ( Cons 100 ) -, ILS Load -, IAL ( SIO OutputDec ) -, ICF - ( CStatic "newline" Call ) -, End -, ICF - ( SMark "add" ) -, IAL ( Binary Add ) -, ICF Return -, ICF - ( SMark "write" ) -, IAL - ( SStatic 0 Copy ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, ICF - ( CStatic "write_end" ( Branch EZ ) ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "write" Jump ) -, ICF - ( SMark "write_end" ) -, IAL Discard -, IAL Discard -, ICF Return -, ICF - ( SMark "read" ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( SStatic 0 Copy ) -, ILS ( MIO InputChar ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 10 ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "read_end" ( Branch EZ ) ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "read" Jump ) -, ICF - ( SMark "read_end" ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, IAL - ( Cons 0 ) -, ILS Store -, ICF Return -, ICF - ( SMark "newline" ) -, IAL - ( Cons 10 ) -, IAL - ( Cons 13 ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, ICF Return -] \ No newline at end of file diff --git a/.output/actual/ws/il/original/count.il b/.output/actual/ws/il/original/count.il deleted file mode 100644 index d2cf384d3..000000000 --- a/.output/actual/ws/il/original/count.il +++ /dev/null @@ -1,91 +0,0 @@ -[ IAL - ( Cons 1 ) -, ICF - ( SMark "C" ) -, IAL - ( SStatic 0 Copy ) -, IAL ( SIO OutputDec ) -, IAL - ( Cons 10 ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 11 ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "E" ( Branch EZ ) ) -, ICF - ( CStatic "C" Jump ) -, ICF - ( SMark "E" ) -, IAL Discard -, End -, ICF - ( SMark "add" ) -, IAL ( Binary Add ) -, ICF Return -, ICF - ( SMark "write" ) -, IAL - ( SStatic 0 Copy ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, ICF - ( CStatic "write_end" ( Branch EZ ) ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "write" Jump ) -, ICF - ( SMark "write_end" ) -, IAL Discard -, IAL Discard -, ICF Return -, ICF - ( SMark "read" ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( SStatic 0 Copy ) -, ILS ( MIO InputChar ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 10 ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "read_end" ( Branch EZ ) ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "read" Jump ) -, ICF - ( SMark "read_end" ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, IAL - ( Cons 0 ) -, ILS Store -, ICF Return -, ICF - ( SMark "newline" ) -, IAL - ( Cons 10 ) -, IAL - ( Cons 13 ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, ICF Return -] \ No newline at end of file diff --git a/.output/actual/ws/il/original/fact.il b/.output/actual/ws/il/original/fact.il deleted file mode 100644 index 1d20af1f1..000000000 --- a/.output/actual/ws/il/original/fact.il +++ /dev/null @@ -1,223 +0,0 @@ -[ IAL - ( Cons 0 ) -, IAL - ( Cons 69 ) -, ILS Store -, IAL - ( Cons 1 ) -, IAL - ( Cons 110 ) -, ILS Store -, IAL - ( Cons 2 ) -, IAL - ( Cons 116 ) -, ILS Store -, IAL - ( Cons 3 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 4 ) -, IAL - ( Cons 114 ) -, ILS Store -, IAL - ( Cons 5 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 6 ) -, IAL - ( Cons 97 ) -, ILS Store -, IAL - ( Cons 7 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 8 ) -, IAL - ( Cons 110 ) -, ILS Store -, IAL - ( Cons 9 ) -, IAL - ( Cons 117 ) -, ILS Store -, IAL - ( Cons 10 ) -, IAL - ( Cons 109 ) -, ILS Store -, IAL - ( Cons 11 ) -, IAL - ( Cons 98 ) -, ILS Store -, IAL - ( Cons 12 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 13 ) -, IAL - ( Cons 114 ) -, ILS Store -, IAL - ( Cons 14 ) -, IAL - ( Cons 58 ) -, ILS Store -, IAL - ( Cons 15 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 16 ) -, IAL - ( Cons 0 ) -, ILS Store -, IAL - ( Cons 20 ) -, IAL - ( Cons 33 ) -, ILS Store -, IAL - ( Cons 21 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 22 ) -, IAL - ( Cons 61 ) -, ILS Store -, IAL - ( Cons 23 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 24 ) -, IAL - ( Cons 0 ) -, ILS Store -, IAL - ( Cons 0 ) -, ICF - ( CStatic "write" Call ) -, IAL - ( Cons 100 ) -, ILS ( MIO InputDec ) -, IAL - ( Cons 100 ) -, ILS Load -, ICF - ( CStatic "fact" Call ) -, IAL - ( Cons 100 ) -, ILS Load -, IAL ( SIO OutputDec ) -, IAL - ( Cons 20 ) -, ICF - ( CStatic "write" Call ) -, IAL ( SIO OutputDec ) -, ICF - ( CStatic "newline" Call ) -, End -, ICF - ( SMark "fact" ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "factbase" ( Branch EZ ) ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "fact" Call ) -, IAL ( Binary Mul ) -, ICF Return -, ICF - ( SMark "factbase" ) -, IAL - ( Cons 1 ) -, IAL Discard -, ICF Return -, ICF - ( SMark "add" ) -, IAL ( Binary Add ) -, ICF Return -, ICF - ( SMark "write" ) -, IAL - ( SStatic 0 Copy ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, ICF - ( CStatic "write_end" ( Branch EZ ) ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "write" Jump ) -, ICF - ( SMark "write_end" ) -, IAL Discard -, IAL Discard -, ICF Return -, ICF - ( SMark "read" ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( SStatic 0 Copy ) -, ILS ( MIO InputChar ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 10 ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "read_end" ( Branch EZ ) ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "read" Jump ) -, ICF - ( SMark "read_end" ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, IAL - ( Cons 0 ) -, ILS Store -, ICF Return -, ICF - ( SMark "newline" ) -, IAL - ( Cons 10 ) -, IAL - ( Cons 13 ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, ICF Return -] \ No newline at end of file diff --git a/.output/actual/ws/il/original/hWorld.il b/.output/actual/ws/il/original/hWorld.il deleted file mode 100644 index dacec7e80..000000000 --- a/.output/actual/ws/il/original/hWorld.il +++ /dev/null @@ -1,192 +0,0 @@ -[ IAL - ( Cons 0 ) -, IAL - ( Cons 72 ) -, ILS Store -, IAL - ( Cons 1 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 2 ) -, IAL - ( Cons 108 ) -, ILS Store -, IAL - ( Cons 3 ) -, IAL - ( Cons 108 ) -, ILS Store -, IAL - ( Cons 4 ) -, IAL - ( Cons 111 ) -, ILS Store -, IAL - ( Cons 5 ) -, IAL - ( Cons 44 ) -, ILS Store -, IAL - ( Cons 6 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 7 ) -, IAL - ( Cons 119 ) -, ILS Store -, IAL - ( Cons 8 ) -, IAL - ( Cons 111 ) -, ILS Store -, IAL - ( Cons 9 ) -, IAL - ( Cons 114 ) -, ILS Store -, IAL - ( Cons 10 ) -, IAL - ( Cons 108 ) -, ILS Store -, IAL - ( Cons 11 ) -, IAL - ( Cons 100 ) -, ILS Store -, IAL - ( Cons 12 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 13 ) -, IAL - ( Cons 111 ) -, ILS Store -, IAL - ( Cons 14 ) -, IAL - ( Cons 102 ) -, ILS Store -, IAL - ( Cons 15 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 16 ) -, IAL - ( Cons 115 ) -, ILS Store -, IAL - ( Cons 17 ) -, IAL - ( Cons 112 ) -, ILS Store -, IAL - ( Cons 18 ) -, IAL - ( Cons 97 ) -, ILS Store -, IAL - ( Cons 19 ) -, IAL - ( Cons 99 ) -, ILS Store -, IAL - ( Cons 20 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 21 ) -, IAL - ( Cons 115 ) -, ILS Store -, IAL - ( Cons 22 ) -, IAL - ( Cons 33 ) -, ILS Store -, IAL - ( Cons 23 ) -, IAL - ( Cons 0 ) -, ILS Store -, IAL - ( Cons 0 ) -, ICF - ( CStatic "write" Call ) -, ICF - ( CStatic "newline" Call ) -, End -, ICF - ( SMark "add" ) -, IAL ( Binary Add ) -, ICF Return -, ICF - ( SMark "write" ) -, IAL - ( SStatic 0 Copy ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, ICF - ( CStatic "write_end" ( Branch EZ ) ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "write" Jump ) -, ICF - ( SMark "write_end" ) -, IAL Discard -, IAL Discard -, ICF Return -, ICF - ( SMark "read" ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( SStatic 0 Copy ) -, ILS ( MIO InputChar ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 10 ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "read_end" ( Branch EZ ) ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "read" Jump ) -, ICF - ( SMark "read_end" ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, IAL - ( Cons 0 ) -, ILS Store -, ICF Return -, ICF - ( SMark "newline" ) -, IAL - ( Cons 10 ) -, IAL - ( Cons 13 ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, ICF Return -] \ No newline at end of file diff --git a/.output/actual/ws/il/original/hanoi.il b/.output/actual/ws/il/original/hanoi.il deleted file mode 100644 index 756055f14..000000000 --- a/.output/actual/ws/il/original/hanoi.il +++ /dev/null @@ -1,336 +0,0 @@ -[ IAL - ( Cons 0 ) -, IAL - ( Cons 69 ) -, ILS Store -, IAL - ( Cons 1 ) -, IAL - ( Cons 110 ) -, ILS Store -, IAL - ( Cons 2 ) -, IAL - ( Cons 116 ) -, ILS Store -, IAL - ( Cons 3 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 4 ) -, IAL - ( Cons 114 ) -, ILS Store -, IAL - ( Cons 5 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 6 ) -, IAL - ( Cons 97 ) -, ILS Store -, IAL - ( Cons 7 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 8 ) -, IAL - ( Cons 110 ) -, ILS Store -, IAL - ( Cons 9 ) -, IAL - ( Cons 117 ) -, ILS Store -, IAL - ( Cons 10 ) -, IAL - ( Cons 109 ) -, ILS Store -, IAL - ( Cons 11 ) -, IAL - ( Cons 98 ) -, ILS Store -, IAL - ( Cons 12 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 13 ) -, IAL - ( Cons 114 ) -, ILS Store -, IAL - ( Cons 14 ) -, IAL - ( Cons 58 ) -, ILS Store -, IAL - ( Cons 15 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 16 ) -, IAL - ( Cons 0 ) -, ILS Store -, IAL - ( Cons 20 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 21 ) -, IAL - ( Cons 45 ) -, ILS Store -, IAL - ( Cons 22 ) -, IAL - ( Cons 62 ) -, ILS Store -, IAL - ( Cons 23 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 24 ) -, IAL - ( Cons 0 ) -, ILS Store -, IAL - ( Cons 0 ) -, ICF - ( CStatic "write" Call ) -, IAL - ( Cons 100 ) -, ILS ( MIO InputDec ) -, IAL - ( Cons 100 ) -, ILS Load -, IAL - ( Cons 1 ) -, IAL - ( Cons 3 ) -, IAL - ( Cons 2 ) -, ICF - ( CStatic "hanoi" Call ) -, End -, ICF - ( SMark "hanoi" ) -, IAL - ( Cons 103 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, IAL - ( Cons 102 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, IAL - ( Cons 101 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, IAL - ( Cons 100 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, IAL - ( Cons 100 ) -, ILS Load -, ICF - ( CStatic "endhanoi" ( Branch EZ ) ) -, IAL - ( Cons 100 ) -, ILS Load -, IAL - ( Cons 101 ) -, ILS Load -, IAL - ( Cons 102 ) -, ILS Load -, IAL - ( Cons 103 ) -, ILS Load -, IAL - ( Cons 100 ) -, ILS Load -, IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL - ( Cons 101 ) -, ILS Load -, IAL - ( Cons 103 ) -, ILS Load -, IAL - ( Cons 102 ) -, ILS Load -, ICF - ( CStatic "hanoi" Call ) -, IAL - ( Cons 103 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, IAL - ( Cons 102 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, IAL - ( Cons 101 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, IAL - ( Cons 100 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, IAL - ( Cons 101 ) -, ILS Load -, IAL ( SIO OutputDec ) -, IAL - ( Cons 20 ) -, ICF - ( CStatic "write" Call ) -, IAL - ( Cons 102 ) -, ILS Load -, IAL ( SIO OutputDec ) -, ICF - ( CStatic "newline" Call ) -, IAL - ( Cons 100 ) -, ILS Load -, IAL - ( Cons 101 ) -, ILS Load -, IAL - ( Cons 102 ) -, ILS Load -, IAL - ( Cons 103 ) -, ILS Load -, IAL - ( Cons 100 ) -, ILS Load -, IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL - ( Cons 103 ) -, ILS Load -, IAL - ( Cons 102 ) -, ILS Load -, IAL - ( Cons 101 ) -, ILS Load -, ICF - ( CStatic "hanoi" Call ) -, IAL - ( Cons 103 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, IAL - ( Cons 102 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, IAL - ( Cons 101 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, IAL - ( Cons 100 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, ICF - ( SMark "endhanoi" ) -, ICF Return -, ICF - ( SMark "add" ) -, IAL ( Binary Add ) -, ICF Return -, ICF - ( SMark "write" ) -, IAL - ( SStatic 0 Copy ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, ICF - ( CStatic "write_end" ( Branch EZ ) ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "write" Jump ) -, ICF - ( SMark "write_end" ) -, IAL Discard -, IAL Discard -, ICF Return -, ICF - ( SMark "read" ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( SStatic 0 Copy ) -, ILS ( MIO InputChar ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 10 ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "read_end" ( Branch EZ ) ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "read" Jump ) -, ICF - ( SMark "read_end" ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, IAL - ( Cons 0 ) -, ILS Store -, ICF Return -, ICF - ( SMark "newline" ) -, IAL - ( Cons 10 ) -, IAL - ( Cons 13 ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, ICF Return -] \ No newline at end of file diff --git a/.output/actual/ws/il/original/helloWorld.il b/.output/actual/ws/il/original/helloWorld.il deleted file mode 100644 index 70eeb2247..000000000 --- a/.output/actual/ws/il/original/helloWorld.il +++ /dev/null @@ -1,38 +0,0 @@ -[ IAL - ( Cons 72 ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 101 ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 108 ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 108 ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 111 ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 44 ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 32 ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 119 ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 111 ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 114 ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 108 ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 100 ) -, IAL ( SIO OutputChar ) -, End -] \ No newline at end of file diff --git a/.output/actual/ws/il/original/locTest.il b/.output/actual/ws/il/original/locTest.il deleted file mode 100644 index 6db51c33d..000000000 --- a/.output/actual/ws/il/original/locTest.il +++ /dev/null @@ -1,184 +0,0 @@ -[ IAL - ( Cons 0 ) -, IAL - ( Cons 69 ) -, ILS Store -, IAL - ( Cons 1 ) -, IAL - ( Cons 110 ) -, ILS Store -, IAL - ( Cons 2 ) -, IAL - ( Cons 116 ) -, ILS Store -, IAL - ( Cons 3 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 4 ) -, IAL - ( Cons 114 ) -, ILS Store -, IAL - ( Cons 5 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 6 ) -, IAL - ( Cons 97 ) -, ILS Store -, IAL - ( Cons 7 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 8 ) -, IAL - ( Cons 110 ) -, ILS Store -, IAL - ( Cons 9 ) -, IAL - ( Cons 117 ) -, ILS Store -, IAL - ( Cons 10 ) -, IAL - ( Cons 109 ) -, ILS Store -, IAL - ( Cons 11 ) -, IAL - ( Cons 98 ) -, ILS Store -, IAL - ( Cons 12 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 13 ) -, IAL - ( Cons 114 ) -, ILS Store -, IAL - ( Cons 14 ) -, IAL - ( Cons 58 ) -, ILS Store -, IAL - ( Cons 15 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 16 ) -, IAL - ( Cons 0 ) -, ILS Store -, IAL - ( Cons 0 ) -, ICF - ( CStatic "write" Call ) -, IAL - ( Cons 100 ) -, ILS ( MIO InputDec ) -, IAL - ( Cons 0 ) -, ICF - ( CStatic "write" Call ) -, IAL - ( Cons 101 ) -, ILS ( MIO InputDec ) -, IAL - ( Cons 100 ) -, ILS Load -, IAL - ( Cons 101 ) -, ILS Load -, ICF - ( CStatic "loctest" Call ) -, IAL ( SIO OutputDec ) -, End -, ICF - ( SMark "loctest" ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( SStatic 2 Copy ) -, IAL ( Binary Add ) -, IAL - ( SStatic 2 Slide ) -, ICF Return -, ICF - ( SMark "add" ) -, IAL ( Binary Add ) -, ICF Return -, ICF - ( SMark "write" ) -, IAL - ( SStatic 0 Copy ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, ICF - ( CStatic "write_end" ( Branch EZ ) ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "write" Jump ) -, ICF - ( SMark "write_end" ) -, IAL Discard -, IAL Discard -, ICF Return -, ICF - ( SMark "read" ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( SStatic 0 Copy ) -, ILS ( MIO InputChar ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 10 ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "read_end" ( Branch EZ ) ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "read" Jump ) -, ICF - ( SMark "read_end" ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, IAL - ( Cons 0 ) -, ILS Store -, ICF Return -, ICF - ( SMark "newline" ) -, IAL - ( Cons 10 ) -, IAL - ( Cons 13 ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, ICF Return -] \ No newline at end of file diff --git a/.output/actual/ws/il/original/name.il b/.output/actual/ws/il/original/name.il deleted file mode 100644 index 2d6b723ec..000000000 --- a/.output/actual/ws/il/original/name.il +++ /dev/null @@ -1,244 +0,0 @@ -[ IAL - ( Cons 0 ) -, IAL - ( Cons 80 ) -, ILS Store -, IAL - ( Cons 1 ) -, IAL - ( Cons 108 ) -, ILS Store -, IAL - ( Cons 2 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 3 ) -, IAL - ( Cons 97 ) -, ILS Store -, IAL - ( Cons 4 ) -, IAL - ( Cons 115 ) -, ILS Store -, IAL - ( Cons 5 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 6 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 7 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 8 ) -, IAL - ( Cons 110 ) -, ILS Store -, IAL - ( Cons 9 ) -, IAL - ( Cons 116 ) -, ILS Store -, IAL - ( Cons 10 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 11 ) -, IAL - ( Cons 114 ) -, ILS Store -, IAL - ( Cons 12 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 13 ) -, IAL - ( Cons 121 ) -, ILS Store -, IAL - ( Cons 14 ) -, IAL - ( Cons 111 ) -, ILS Store -, IAL - ( Cons 15 ) -, IAL - ( Cons 117 ) -, ILS Store -, IAL - ( Cons 16 ) -, IAL - ( Cons 114 ) -, ILS Store -, IAL - ( Cons 17 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 18 ) -, IAL - ( Cons 110 ) -, ILS Store -, IAL - ( Cons 19 ) -, IAL - ( Cons 97 ) -, ILS Store -, IAL - ( Cons 20 ) -, IAL - ( Cons 109 ) -, ILS Store -, IAL - ( Cons 21 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 22 ) -, IAL - ( Cons 58 ) -, ILS Store -, IAL - ( Cons 23 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 24 ) -, IAL - ( Cons 0 ) -, ILS Store -, IAL - ( Cons 30 ) -, IAL - ( Cons 72 ) -, ILS Store -, IAL - ( Cons 31 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 32 ) -, IAL - ( Cons 108 ) -, ILS Store -, IAL - ( Cons 33 ) -, IAL - ( Cons 108 ) -, ILS Store -, IAL - ( Cons 34 ) -, IAL - ( Cons 111 ) -, ILS Store -, IAL - ( Cons 35 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 36 ) -, IAL - ( Cons 0 ) -, ILS Store -, IAL - ( Cons 0 ) -, ICF - ( CStatic "write" Call ) -, IAL - ( Cons 100 ) -, ICF - ( CStatic "read" Call ) -, IAL - ( Cons 30 ) -, ICF - ( CStatic "write" Call ) -, IAL - ( Cons 100 ) -, ICF - ( CStatic "write" Call ) -, ICF - ( CStatic "newline" Call ) -, End -, ICF - ( SMark "add" ) -, IAL ( Binary Add ) -, ICF Return -, ICF - ( SMark "write" ) -, IAL - ( SStatic 0 Copy ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, ICF - ( CStatic "write_end" ( Branch EZ ) ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "write" Jump ) -, ICF - ( SMark "write_end" ) -, IAL Discard -, IAL Discard -, ICF Return -, ICF - ( SMark "read" ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( SStatic 0 Copy ) -, ILS ( MIO InputChar ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 10 ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "read_end" ( Branch EZ ) ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "read" Jump ) -, ICF - ( SMark "read_end" ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, IAL - ( Cons 0 ) -, ILS Store -, ICF Return -, ICF - ( SMark "newline" ) -, IAL - ( Cons 10 ) -, IAL - ( Cons 13 ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, ICF Return -] \ No newline at end of file diff --git a/.output/actual/ws/il/parsed/from-wsa/bottles.il b/.output/actual/ws/il/parsed/from-wsa/bottles.il new file mode 100644 index 000000000..ba9a55c97 --- /dev/null +++ b/.output/actual/ws/il/parsed/from-wsa/bottles.il @@ -0,0 +1,506 @@ +[ IAL + ( SAL + ( Cons 3 ) + ) +, ICF + ( SMark "LOOP" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL ( SIO OutputDec ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 104 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 102 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ICF + ( CStatic "prints" Call ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL ( SIO OutputDec ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 102 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ICF + ( CStatic "printsln" Call ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 105 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 112 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 107 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 84 ) + ) +, ICF + ( CStatic "printsln" Call ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL ( SIO OutputDec ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 104 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 102 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ICF + ( CStatic "printsln" Call ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "printsln" Call ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "LOOP:1" ( Branch EZ ) ) +, ICF + ( CStatic "LOOP" Jump ) +, ICF + ( SMark "LOOP:1" ) +, End +, ICF + ( SMark "prints" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "prints_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, ICF + ( CStatic "prints" Jump ) +, ICF + ( SMark "prints_end" ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "printsln" ) +, ICF + ( CStatic "prints" Call ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/actual/ws/il/parsed/from-wsa/hello.il b/.output/actual/ws/il/parsed/from-wsa/hello.il new file mode 100644 index 000000000..3899be8eb --- /dev/null +++ b/.output/actual/ws/il/parsed/from-wsa/hello.il @@ -0,0 +1,72 @@ +[ IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, End +] \ No newline at end of file diff --git a/.output/actual/ws/il/parsed/from-wsa/hello2.il b/.output/actual/ws/il/parsed/from-wsa/hello2.il new file mode 100644 index 000000000..88f1d1ddf --- /dev/null +++ b/.output/actual/ws/il/parsed/from-wsa/hello2.il @@ -0,0 +1,89 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, ICF + ( CStatic "prints" Call ) +, End +, ICF + ( SMark "prints" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "prints_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, ICF + ( CStatic "prints" Jump ) +, ICF + ( SMark "prints_end" ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "printsln" ) +, ICF + ( CStatic "prints" Call ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/actual/ws/il/parsed/from-wsa/hello4.il b/.output/actual/ws/il/parsed/from-wsa/hello4.il new file mode 100644 index 000000000..bd7b32f75 --- /dev/null +++ b/.output/actual/ws/il/parsed/from-wsa/hello4.il @@ -0,0 +1,85 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, ICF + ( CStatic "printsln" Call ) +, End +, ICF + ( SMark "prints" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "prints_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, ICF + ( CStatic "prints" Jump ) +, ICF + ( SMark "prints_end" ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "printsln" ) +, ICF + ( CStatic "prints" Call ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/actual/ws/il/parsed/from-wsa/prim.il b/.output/actual/ws/il/parsed/from-wsa/prim.il new file mode 100644 index 000000000..3caf1a7c7 --- /dev/null +++ b/.output/actual/ws/il/parsed/from-wsa/prim.il @@ -0,0 +1,339 @@ +[ ICF + ( SMark "st" ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 93 ) + ) +, IAL + ( SAL + ( Cons 48 ) + ) +, IAL + ( SAL + ( Cons 48 ) + ) +, IAL + ( SAL + ( Cons 49 ) + ) +, IAL + ( SAL + ( Cons 45 ) + ) +, IAL + ( SAL + ( Cons 50 ) + ) +, IAL + ( SAL + ( Cons 91 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, IAL + ( SAL + ( Cons 105 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 112 ) + ) +, ICF + ( CStatic "printsln" Call ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( SMark "f_start_1" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "f_finished_1" ( Branch EZ ) ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "f_start_1" Jump ) +, ICF + ( SMark "f_finished_1" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 2 ) + ) +, ICF + ( SMark "f_start_2" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "f_finished_2" ( Branch EZ ) ) +, IAL + ( SAL + ( Cons 2 ) + ) +, ICF + ( SMark "f_start_3" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "f_finished_3" ( Branch EZ ) ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 2 ) + ) +, ILS Load +, IAL + ( SAL ( Binary Mul ) ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "f_start_3" Jump ) +, ICF + ( SMark "f_finished_3" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "f_start_2" Jump ) +, ICF + ( SMark "f_finished_2" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 2 ) + ) +, ICF + ( SMark "f_start_4" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "f_finished_4" ( Branch EZ ) ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ILS Load +, ICF + ( CStatic "nodraw" ( Branch EZ ) ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL ( SIO OutputDec ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ICF + ( CStatic "prints" Call ) +, ICF + ( SMark "nodraw" ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "f_start_4" Jump ) +, ICF + ( SMark "f_finished_4" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "printsln" Call ) +, End +, ICF + ( SMark "prints" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "prints_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, ICF + ( CStatic "prints" Jump ) +, ICF + ( SMark "prints_end" ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "printsln" ) +, ICF + ( CStatic "prints" Call ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/golden/ws/il/from-wsa/true.il b/.output/actual/ws/il/parsed/from-wsa/true.il similarity index 100% rename from .output/golden/ws/il/from-wsa/true.il rename to .output/actual/ws/il/parsed/from-wsa/true.il diff --git a/.output/actual/ws/il/parsed/original/calc.il b/.output/actual/ws/il/parsed/original/calc.il new file mode 100644 index 000000000..aee7a6970 --- /dev/null +++ b/.output/actual/ws/il/parsed/original/calc.il @@ -0,0 +1,683 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 69 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 5 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 6 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 7 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 8 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 9 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 14 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 15 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 16 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 17 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 18 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 19 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 20 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 21 ) + ) +, IAL + ( SAL + ( Cons 104 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 22 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 23 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 24 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 25 ) + ) +, IAL + ( SAL + ( Cons 45 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 26 ) + ) +, IAL + ( SAL + ( Cons 49 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 27 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 28 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 29 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 30 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 31 ) + ) +, IAL + ( SAL + ( Cons 102 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 105 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 34 ) + ) +, IAL + ( SAL + ( Cons 105 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 35 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 36 ) + ) +, IAL + ( SAL + ( Cons 104 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 37 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 42 ) + ) +, IAL + ( SAL + ( Cons 78 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 43 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 45 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 46 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 47 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 48 ) + ) +, IAL + ( SAL + ( Cons 58 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 49 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 60 ) + ) +, IAL + ( SAL + ( Cons 84 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 61 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 62 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 63 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 64 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 65 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 66 ) + ) +, IAL + ( SAL + ( Cons 105 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 67 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 68 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 69 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "write" Call ) +, ICF + ( CStatic "newline" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF + ( SMark "loop" ) +, IAL + ( SAL + ( Cons 42 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS ( MIO InputDec ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons + ( -1 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "progend" ( Branch EZ ) ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, ICF + ( CStatic "loop" Jump ) +, ICF + ( SMark "progend" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 60 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL ( SIO OutputDec ) +, ICF + ( CStatic "newline" Call ) +, End +, ICF + ( SMark "add" ) +, IAL + ( SAL ( Binary Add ) ) +, ICF Return +, ICF + ( SMark "write" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "write_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "write" Jump ) +, ICF + ( SMark "write_end" ) +, IAL ( SAL Discard ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "read" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputChar ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "read_end" ( Branch EZ ) ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "read" Jump ) +, ICF + ( SMark "read_end" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF Return +, ICF + ( SMark "newline" ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/actual/ws/il/parsed/original/count.il b/.output/actual/ws/il/parsed/original/count.il new file mode 100644 index 000000000..18a05cd56 --- /dev/null +++ b/.output/actual/ws/il/parsed/original/count.il @@ -0,0 +1,134 @@ +[ IAL + ( SAL + ( Cons 1 ) + ) +, ICF + ( SMark "C" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL ( SIO OutputDec ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "E" ( Branch EZ ) ) +, ICF + ( CStatic "C" Jump ) +, ICF + ( SMark "E" ) +, IAL ( SAL Discard ) +, End +, ICF + ( SMark "add" ) +, IAL + ( SAL ( Binary Add ) ) +, ICF Return +, ICF + ( SMark "write" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "write_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "write" Jump ) +, ICF + ( SMark "write_end" ) +, IAL ( SAL Discard ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "read" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputChar ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "read_end" ( Branch EZ ) ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "read" Jump ) +, ICF + ( SMark "read_end" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF Return +, ICF + ( SMark "newline" ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/actual/ws/il/parsed/original/fact.il b/.output/actual/ws/il/parsed/original/fact.il new file mode 100644 index 000000000..dc5f9ed89 --- /dev/null +++ b/.output/actual/ws/il/parsed/original/fact.il @@ -0,0 +1,363 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 69 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 5 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 6 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 7 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 8 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 9 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 14 ) + ) +, IAL + ( SAL + ( Cons 58 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 15 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 16 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 20 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 21 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 22 ) + ) +, IAL + ( SAL + ( Cons 61 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 23 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 24 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS ( MIO InputDec ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, ICF + ( CStatic "fact" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL ( SIO OutputDec ) +, IAL + ( SAL + ( Cons 20 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL ( SIO OutputDec ) +, ICF + ( CStatic "newline" Call ) +, End +, ICF + ( SMark "fact" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "factbase" ( Branch EZ ) ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "fact" Call ) +, IAL + ( SAL ( Binary Mul ) ) +, ICF Return +, ICF + ( SMark "factbase" ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "add" ) +, IAL + ( SAL ( Binary Add ) ) +, ICF Return +, ICF + ( SMark "write" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "write_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "write" Jump ) +, ICF + ( SMark "write_end" ) +, IAL ( SAL Discard ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "read" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputChar ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "read_end" ( Branch EZ ) ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "read" Jump ) +, ICF + ( SMark "read_end" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF Return +, ICF + ( SMark "newline" ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/actual/ws/il/parsed/original/hWorld.il b/.output/actual/ws/il/parsed/original/hWorld.il new file mode 100644 index 000000000..f86f1e306 --- /dev/null +++ b/.output/actual/ws/il/parsed/original/hWorld.il @@ -0,0 +1,319 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 5 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 6 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 7 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 8 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 9 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 14 ) + ) +, IAL + ( SAL + ( Cons 102 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 15 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 16 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 17 ) + ) +, IAL + ( SAL + ( Cons 112 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 18 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 19 ) + ) +, IAL + ( SAL + ( Cons 99 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 20 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 21 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 22 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 23 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "write" Call ) +, ICF + ( CStatic "newline" Call ) +, End +, ICF + ( SMark "add" ) +, IAL + ( SAL ( Binary Add ) ) +, ICF Return +, ICF + ( SMark "write" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "write_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "write" Jump ) +, ICF + ( SMark "write_end" ) +, IAL ( SAL Discard ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "read" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputChar ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "read_end" ( Branch EZ ) ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "read" Jump ) +, ICF + ( SMark "read_end" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF Return +, ICF + ( SMark "newline" ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/actual/ws/il/parsed/original/hanoi.il b/.output/actual/ws/il/parsed/original/hanoi.il new file mode 100644 index 000000000..dd0ea6ac0 --- /dev/null +++ b/.output/actual/ws/il/parsed/original/hanoi.il @@ -0,0 +1,559 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 69 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 5 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 6 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 7 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 8 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 9 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 14 ) + ) +, IAL + ( SAL + ( Cons 58 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 15 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 16 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 20 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 21 ) + ) +, IAL + ( SAL + ( Cons 45 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 22 ) + ) +, IAL + ( SAL + ( Cons 62 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 23 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 24 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS ( MIO InputDec ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, ICF + ( CStatic "hanoi" Call ) +, End +, ICF + ( SMark "hanoi" ) +, IAL + ( SAL + ( Cons 103 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 102 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, ICF + ( CStatic "endhanoi" ( Branch EZ ) ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 102 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 103 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 103 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 102 ) + ) +, ILS Load +, ICF + ( CStatic "hanoi" Call ) +, IAL + ( SAL + ( Cons 103 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 102 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Load +, IAL ( SIO OutputDec ) +, IAL + ( SAL + ( Cons 20 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 102 ) + ) +, ILS Load +, IAL ( SIO OutputDec ) +, ICF + ( CStatic "newline" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 102 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 103 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 103 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 102 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Load +, ICF + ( CStatic "hanoi" Call ) +, IAL + ( SAL + ( Cons 103 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 102 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, ICF + ( SMark "endhanoi" ) +, ICF Return +, ICF + ( SMark "add" ) +, IAL + ( SAL ( Binary Add ) ) +, ICF Return +, ICF + ( SMark "write" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "write_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "write" Jump ) +, ICF + ( SMark "write_end" ) +, IAL ( SAL Discard ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "read" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputChar ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "read_end" ( Branch EZ ) ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "read" Jump ) +, ICF + ( SMark "read_end" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF Return +, ICF + ( SMark "newline" ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/actual/ws/il/parsed/original/helloWorld.il b/.output/actual/ws/il/parsed/original/helloWorld.il new file mode 100644 index 000000000..f5831b140 --- /dev/null +++ b/.output/actual/ws/il/parsed/original/helloWorld.il @@ -0,0 +1,62 @@ +[ IAL + ( SAL + ( Cons 72 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL ( SIO OutputChar ) +, End +] \ No newline at end of file diff --git a/.output/actual/ws/il/parsed/original/locTest.il b/.output/actual/ws/il/parsed/original/locTest.il new file mode 100644 index 000000000..4ae21f6fd --- /dev/null +++ b/.output/actual/ws/il/parsed/original/locTest.il @@ -0,0 +1,300 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 69 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 5 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 6 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 7 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 8 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 9 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 14 ) + ) +, IAL + ( SAL + ( Cons 58 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 15 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 16 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS ( MIO InputDec ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS ( MIO InputDec ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Load +, ICF + ( CStatic "loctest" Call ) +, IAL ( SIO OutputDec ) +, End +, ICF + ( SMark "loctest" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 2 Copy ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( SStatic 2 Slide ) + ) +, ICF Return +, ICF + ( SMark "add" ) +, IAL + ( SAL ( Binary Add ) ) +, ICF Return +, ICF + ( SMark "write" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "write_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "write" Jump ) +, ICF + ( SMark "write_end" ) +, IAL ( SAL Discard ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "read" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputChar ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "read_end" ( Branch EZ ) ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "read" Jump ) +, ICF + ( SMark "read_end" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF Return +, ICF + ( SMark "newline" ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/actual/ws/il/parsed/original/name.il b/.output/actual/ws/il/parsed/original/name.il new file mode 100644 index 000000000..369744f01 --- /dev/null +++ b/.output/actual/ws/il/parsed/original/name.il @@ -0,0 +1,409 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 80 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 5 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 6 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 7 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 8 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 9 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 121 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 14 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 15 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 16 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 17 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 18 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 19 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 20 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 21 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 22 ) + ) +, IAL + ( SAL + ( Cons 58 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 23 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 24 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 30 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 31 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 34 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 35 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 36 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ICF + ( CStatic "read" Call ) +, IAL + ( SAL + ( Cons 30 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ICF + ( CStatic "write" Call ) +, ICF + ( CStatic "newline" Call ) +, End +, ICF + ( SMark "add" ) +, IAL + ( SAL ( Binary Add ) ) +, ICF Return +, ICF + ( SMark "write" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "write_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "write" Jump ) +, ICF + ( SMark "write_end" ) +, IAL ( SAL Discard ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "read" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputChar ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "read_end" ( Branch EZ ) ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "read" Jump ) +, ICF + ( SMark "read_end" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF Return +, ICF + ( SMark "newline" ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/actual/ws/il/parsed/original/truthMachine.il b/.output/actual/ws/il/parsed/original/truthMachine.il new file mode 100644 index 000000000..236fff896 --- /dev/null +++ b/.output/actual/ws/il/parsed/original/truthMachine.il @@ -0,0 +1,30 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputDec ) +, ILS Load +, ICF + ( CStatic "\x0" ( Branch EZ ) ) +, ICF + ( SMark "\x1" ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SIO OutputDec ) +, ICF + ( CStatic "\x1" Jump ) +, ICF + ( SMark "\x0" ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SIO OutputDec ) +, End +] \ No newline at end of file diff --git a/.output/golden/bf/eval/logged/FastType/Int16Type/99botles.logged b/.output/golden/bf/eval/logged/FastType/Int16Type/99botles.logged index b44f4515b..f4079ee7d 100644 --- a/.output/golden/bf/eval/logged/FastType/Int16Type/99botles.logged +++ b/.output/golden/bf/eval/logged/FastType/Int16Type/99botles.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Move 1 , Inc 9 , MulAddClr 11 @@ -942,7 +942,7 @@ dump: Automaton ( -3 ) ] ] 6 - , unitTape = + , memoryTape = ( [ 48 , 48 diff --git a/.output/golden/bf/eval/logged/FastType/Int16Type/fascistHelloWorld.logged b/.output/golden/bf/eval/logged/FastType/Int16Type/fascistHelloWorld.logged index 654e6a1ab..f50e9283f 100644 --- a/.output/golden/bf/eval/logged/FastType/Int16Type/fascistHelloWorld.logged +++ b/.output/golden/bf/eval/logged/FastType/Int16Type/fascistHelloWorld.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Move 1 , Inc 8 , MulAddClr 9 @@ -75,7 +75,7 @@ dump: Automaton , Inc 1 , Output ] 50 - , unitTape = + , memoryTape = ( [ 0 , 0 diff --git a/.output/golden/bf/eval/logged/FastType/Int16Type/helloWorld.logged b/.output/golden/bf/eval/logged/FastType/Int16Type/helloWorld.logged index 9f3c89023..18a4c08c4 100644 --- a/.output/golden/bf/eval/logged/FastType/Int16Type/helloWorld.logged +++ b/.output/golden/bf/eval/logged/FastType/Int16Type/helloWorld.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Inc 8 , While [ Move 1 @@ -72,7 +72,7 @@ dump: Automaton , Inc 2 , Output ] 32 - , unitTape = + , memoryTape = ( [ 0 ] , [ 10 diff --git a/.output/golden/bf/eval/logged/FastType/Int16Type/triangle.logged b/.output/golden/bf/eval/logged/FastType/Int16Type/triangle.logged index 21d5a4237..a73ff944a 100644 --- a/.output/golden/bf/eval/logged/FastType/Int16Type/triangle.logged +++ b/.output/golden/bf/eval/logged/FastType/Int16Type/triangle.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ While [ Inc ( -1 ) @@ -98,7 +98,7 @@ dump: Automaton ] , Inc 5 ] 17 - , unitTape = + , memoryTape = ( [ 0 , 0 diff --git a/.output/golden/bf/eval/logged/FastType/Int8Type/99botles.logged b/.output/golden/bf/eval/logged/FastType/Int8Type/99botles.logged index b44f4515b..f4079ee7d 100644 --- a/.output/golden/bf/eval/logged/FastType/Int8Type/99botles.logged +++ b/.output/golden/bf/eval/logged/FastType/Int8Type/99botles.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Move 1 , Inc 9 , MulAddClr 11 @@ -942,7 +942,7 @@ dump: Automaton ( -3 ) ] ] 6 - , unitTape = + , memoryTape = ( [ 48 , 48 diff --git a/.output/golden/bf/eval/logged/FastType/Int8Type/fascistHelloWorld.logged b/.output/golden/bf/eval/logged/FastType/Int8Type/fascistHelloWorld.logged index 654e6a1ab..f50e9283f 100644 --- a/.output/golden/bf/eval/logged/FastType/Int8Type/fascistHelloWorld.logged +++ b/.output/golden/bf/eval/logged/FastType/Int8Type/fascistHelloWorld.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Move 1 , Inc 8 , MulAddClr 9 @@ -75,7 +75,7 @@ dump: Automaton , Inc 1 , Output ] 50 - , unitTape = + , memoryTape = ( [ 0 , 0 diff --git a/.output/golden/bf/eval/logged/FastType/Int8Type/fibonacci.logged b/.output/golden/bf/eval/logged/FastType/Int8Type/fibonacci.logged index d378bc724..0a4dc5501 100644 --- a/.output/golden/bf/eval/logged/FastType/Int8Type/fibonacci.logged +++ b/.output/golden/bf/eval/logged/FastType/Int8Type/fibonacci.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Input , Output , Input @@ -265,7 +265,7 @@ dump: Automaton ( -1 ) ] ] 25 - , unitTape = + , memoryTape = ( [ 114 , 94 diff --git a/.output/golden/bf/eval/logged/FastType/Int8Type/helloWorld.logged b/.output/golden/bf/eval/logged/FastType/Int8Type/helloWorld.logged index 9f3c89023..18a4c08c4 100644 --- a/.output/golden/bf/eval/logged/FastType/Int8Type/helloWorld.logged +++ b/.output/golden/bf/eval/logged/FastType/Int8Type/helloWorld.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Inc 8 , While [ Move 1 @@ -72,7 +72,7 @@ dump: Automaton , Inc 2 , Output ] 32 - , unitTape = + , memoryTape = ( [ 0 ] , [ 10 diff --git a/.output/golden/bf/eval/logged/FastType/Int8Type/padHelloWorld.logged b/.output/golden/bf/eval/logged/FastType/Int8Type/padHelloWorld.logged index 8c787557a..60192ca56 100644 --- a/.output/golden/bf/eval/logged/FastType/Int8Type/padHelloWorld.logged +++ b/.output/golden/bf/eval/logged/FastType/Int8Type/padHelloWorld.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Inc ( -2 ) , Move @@ -74,7 +74,7 @@ dump: Automaton , Inc 1 , Output ] 38 - , unitTape = + , memoryTape = ( [ 108 , 87 diff --git a/.output/golden/bf/eval/logged/FastType/Int8Type/theShortestHelloWorld.logged b/.output/golden/bf/eval/logged/FastType/Int8Type/theShortestHelloWorld.logged index d1716706f..816bbea9e 100644 --- a/.output/golden/bf/eval/logged/FastType/Int8Type/theShortestHelloWorld.logged +++ b/.output/golden/bf/eval/logged/FastType/Int8Type/theShortestHelloWorld.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Inc 1 , While [ Inc @@ -57,7 +57,7 @@ dump: Automaton , Inc 1 , Output ] 26 - , unitTape = + , memoryTape = ( [ 87 , 0 diff --git a/.output/golden/bf/eval/logged/FastType/Int8Type/triangle.logged b/.output/golden/bf/eval/logged/FastType/Int8Type/triangle.logged index 21d5a4237..a73ff944a 100644 --- a/.output/golden/bf/eval/logged/FastType/Int8Type/triangle.logged +++ b/.output/golden/bf/eval/logged/FastType/Int8Type/triangle.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ While [ Inc ( -1 ) @@ -98,7 +98,7 @@ dump: Automaton ] , Inc 5 ] 17 - , unitTape = + , memoryTape = ( [ 0 , 0 diff --git a/.output/golden/bf/eval/logged/FastType/Int8Type/value256.logged b/.output/golden/bf/eval/logged/FastType/Int8Type/value256.logged index 91f192ef7..f6aa354b0 100644 --- a/.output/golden/bf/eval/logged/FastType/Int8Type/value256.logged +++ b/.output/golden/bf/eval/logged/FastType/Int8Type/value256.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Inc 8 , MulAddClr 8 1 , Move 1 @@ -127,7 +127,7 @@ dump: Automaton ( -1 ) ] ] 39 - , unitTape = + , memoryTape = ( [ 0 , 0 diff --git a/.output/golden/bf/eval/logged/FastType/Word16Type/99botles.logged b/.output/golden/bf/eval/logged/FastType/Word16Type/99botles.logged index b44f4515b..f4079ee7d 100644 --- a/.output/golden/bf/eval/logged/FastType/Word16Type/99botles.logged +++ b/.output/golden/bf/eval/logged/FastType/Word16Type/99botles.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Move 1 , Inc 9 , MulAddClr 11 @@ -942,7 +942,7 @@ dump: Automaton ( -3 ) ] ] 6 - , unitTape = + , memoryTape = ( [ 48 , 48 diff --git a/.output/golden/bf/eval/logged/FastType/Word16Type/fascistHelloWorld.logged b/.output/golden/bf/eval/logged/FastType/Word16Type/fascistHelloWorld.logged index 654e6a1ab..f50e9283f 100644 --- a/.output/golden/bf/eval/logged/FastType/Word16Type/fascistHelloWorld.logged +++ b/.output/golden/bf/eval/logged/FastType/Word16Type/fascistHelloWorld.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Move 1 , Inc 8 , MulAddClr 9 @@ -75,7 +75,7 @@ dump: Automaton , Inc 1 , Output ] 50 - , unitTape = + , memoryTape = ( [ 0 , 0 diff --git a/.output/golden/bf/eval/logged/FastType/Word16Type/helloWorld.logged b/.output/golden/bf/eval/logged/FastType/Word16Type/helloWorld.logged index 9f3c89023..18a4c08c4 100644 --- a/.output/golden/bf/eval/logged/FastType/Word16Type/helloWorld.logged +++ b/.output/golden/bf/eval/logged/FastType/Word16Type/helloWorld.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Inc 8 , While [ Move 1 @@ -72,7 +72,7 @@ dump: Automaton , Inc 2 , Output ] 32 - , unitTape = + , memoryTape = ( [ 0 ] , [ 10 diff --git a/.output/golden/bf/eval/logged/FastType/Word16Type/triangle.logged b/.output/golden/bf/eval/logged/FastType/Word16Type/triangle.logged index 21d5a4237..a73ff944a 100644 --- a/.output/golden/bf/eval/logged/FastType/Word16Type/triangle.logged +++ b/.output/golden/bf/eval/logged/FastType/Word16Type/triangle.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ While [ Inc ( -1 ) @@ -98,7 +98,7 @@ dump: Automaton ] , Inc 5 ] 17 - , unitTape = + , memoryTape = ( [ 0 , 0 diff --git a/.output/golden/bf/eval/logged/FastType/Word8Type/99botles.logged b/.output/golden/bf/eval/logged/FastType/Word8Type/99botles.logged index b44f4515b..f4079ee7d 100644 --- a/.output/golden/bf/eval/logged/FastType/Word8Type/99botles.logged +++ b/.output/golden/bf/eval/logged/FastType/Word8Type/99botles.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Move 1 , Inc 9 , MulAddClr 11 @@ -942,7 +942,7 @@ dump: Automaton ( -3 ) ] ] 6 - , unitTape = + , memoryTape = ( [ 48 , 48 diff --git a/.output/golden/bf/eval/logged/FastType/Word8Type/fascistHelloWorld.logged b/.output/golden/bf/eval/logged/FastType/Word8Type/fascistHelloWorld.logged index 654e6a1ab..f50e9283f 100644 --- a/.output/golden/bf/eval/logged/FastType/Word8Type/fascistHelloWorld.logged +++ b/.output/golden/bf/eval/logged/FastType/Word8Type/fascistHelloWorld.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Move 1 , Inc 8 , MulAddClr 9 @@ -75,7 +75,7 @@ dump: Automaton , Inc 1 , Output ] 50 - , unitTape = + , memoryTape = ( [ 0 , 0 diff --git a/.output/golden/bf/eval/logged/FastType/Word8Type/fibonacci.logged b/.output/golden/bf/eval/logged/FastType/Word8Type/fibonacci.logged index d378bc724..0a4dc5501 100644 --- a/.output/golden/bf/eval/logged/FastType/Word8Type/fibonacci.logged +++ b/.output/golden/bf/eval/logged/FastType/Word8Type/fibonacci.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Input , Output , Input @@ -265,7 +265,7 @@ dump: Automaton ( -1 ) ] ] 25 - , unitTape = + , memoryTape = ( [ 114 , 94 diff --git a/.output/golden/bf/eval/logged/FastType/Word8Type/helloWorld.logged b/.output/golden/bf/eval/logged/FastType/Word8Type/helloWorld.logged index 9f3c89023..18a4c08c4 100644 --- a/.output/golden/bf/eval/logged/FastType/Word8Type/helloWorld.logged +++ b/.output/golden/bf/eval/logged/FastType/Word8Type/helloWorld.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Inc 8 , While [ Move 1 @@ -72,7 +72,7 @@ dump: Automaton , Inc 2 , Output ] 32 - , unitTape = + , memoryTape = ( [ 0 ] , [ 10 diff --git a/.output/golden/bf/eval/logged/FastType/Word8Type/padHelloWorld.logged b/.output/golden/bf/eval/logged/FastType/Word8Type/padHelloWorld.logged index ed9ab3cdb..c4958f6cf 100644 --- a/.output/golden/bf/eval/logged/FastType/Word8Type/padHelloWorld.logged +++ b/.output/golden/bf/eval/logged/FastType/Word8Type/padHelloWorld.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Inc ( -2 ) , Move @@ -74,7 +74,7 @@ dump: Automaton , Inc 1 , Output ] 38 - , unitTape = + , memoryTape = ( [ 108 , 87 diff --git a/.output/golden/bf/eval/logged/FastType/Word8Type/theShortestHelloWorld.logged b/.output/golden/bf/eval/logged/FastType/Word8Type/theShortestHelloWorld.logged index 6e3b8412c..f3f9087f6 100644 --- a/.output/golden/bf/eval/logged/FastType/Word8Type/theShortestHelloWorld.logged +++ b/.output/golden/bf/eval/logged/FastType/Word8Type/theShortestHelloWorld.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Inc 1 , While [ Inc @@ -57,7 +57,7 @@ dump: Automaton , Inc 1 , Output ] 26 - , unitTape = + , memoryTape = ( [ 87 , 0 diff --git a/.output/golden/bf/eval/logged/FastType/Word8Type/triangle.logged b/.output/golden/bf/eval/logged/FastType/Word8Type/triangle.logged index 21d5a4237..a73ff944a 100644 --- a/.output/golden/bf/eval/logged/FastType/Word8Type/triangle.logged +++ b/.output/golden/bf/eval/logged/FastType/Word8Type/triangle.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ While [ Inc ( -1 ) @@ -98,7 +98,7 @@ dump: Automaton ] , Inc 5 ] 17 - , unitTape = + , memoryTape = ( [ 0 , 0 diff --git a/.output/golden/bf/eval/logged/FastType/Word8Type/value256.logged b/.output/golden/bf/eval/logged/FastType/Word8Type/value256.logged index 91f192ef7..f6aa354b0 100644 --- a/.output/golden/bf/eval/logged/FastType/Word8Type/value256.logged +++ b/.output/golden/bf/eval/logged/FastType/Word8Type/value256.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitUI = IU +dump: Memory + { memoryIM = IM [ Inc 8 , MulAddClr 8 1 , Move 1 @@ -127,7 +127,7 @@ dump: Automaton ( -1 ) ] ] 39 - , unitTape = + , memoryTape = ( [ 0 , 0 diff --git a/.output/golden/eta/eval/logged/Fast/False/from-eas/bottles.logged b/.output/golden/eta/eval/logged/Fast/False/from-eas/bottles.logged index fa4388e06..a40bb326a 100644 --- a/.output/golden/eta/eval/logged/Fast/False/from-eas/bottles.logged +++ b/.output/golden/eta/eval/logged/Fast/False/from-eas/bottles.logged @@ -1,42 +1,51 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 31 ) + ( SAL + ( Cons 31 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 3 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 4 ) , IAL - ( Cons 5 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 6 ) + ) , Transfer , ICF ( DMark 5 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 6 ) @@ -44,403 +53,649 @@ dump: Automaton , ICF ( DMark 7 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 11 ) + ) , Transfer , ICF ( DMark 10 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 11 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 12 ) , IAL - ( Cons 13 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 13 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 14 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "14" ) , ICF ( DMark 15 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 17 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 19 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 20 ) , ICF ( DMark 21 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 22 ) , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , Transfer , ICF ( DMark 23 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( DMark 24 ) , IAL - ( Cons 25 ) + ( SAL + ( Cons 25 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 25 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 27 ) , IAL - ( Cons 28 ) + ( SAL + ( Cons 28 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( DMark 29 ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , ICF ( DMark 32 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) , Transfer , ICF ( DMark 33 ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 34 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , Transfer , ICF ( DMark 35 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 36 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 112 ) + ( SAL + ( Cons 112 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 107 ) + ( SAL + ( Cons 107 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 84 ) + ( SAL + ( Cons 84 ) + ) , ICF ( DMark 37 ) , IAL - ( Cons 38 ) + ( SAL + ( Cons 38 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 39 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF ( DMark 41 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 43 ) , End ] - , programCounter = 246 + , programCounter = 232 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git a/.output/golden/eta/eval/logged/Fast/False/from-eas/divmod.logged b/.output/golden/eta/eval/logged/Fast/False/from-eas/divmod.logged index 0cd9d37fb..08d7bd5b8 100644 --- a/.output/golden/eta/eval/logged/Fast/False/from-eas/divmod.logged +++ b/.output/golden/eta/eval/logged/Fast/False/from-eas/divmod.logged @@ -1,17 +1,15 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Cons 0 ) ) , ICF ( SMark "1" ) @@ -19,12 +17,12 @@ dump: Automaton ( DMark 2 ) , End ] - , programCounter = 7 + , programCounter = 6 , returnStack = IS [] } - , unitStack = fromList + , memoryStack = fromList [ 0 , 2 ] - , unitRAM = [] + , memoryRAM = [] } diff --git "a/.output/golden/eta/eval/logged/Fast/False/from-eas/fact0\n.logged" "b/.output/golden/eta/eval/logged/Fast/False/from-eas/fact0\n.logged" index 21731cdee..bdfe9a478 100644 --- "a/.output/golden/eta/eval/logged/Fast/False/from-eas/fact0\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/False/from-eas/fact0\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,513 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 16 ) + ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 35 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 36 ) , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 38 ) + ) , Transfer , ICF ( DMark 37 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 38 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "38" ) , ICF ( DMark 39 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 40 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 43 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 46 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 48 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 49 ) , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 51 ) + ) , Transfer , ICF ( DMark 50 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 51 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 52 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 53 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 55 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 56 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 59 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 60 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 61 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 62 ) , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 64 ) + ) , Transfer , ICF ( DMark 63 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 64 ) @@ -489,20 +677,24 @@ dump: Automaton , ICF ( DMark 65 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 66 ) , End ] - , programCounter = 148 + , programCounter = 136 , returnStack = IS [] } - , unitStack = fromList + , memoryStack = fromList [ 496 , 2 ] - , unitRAM = [] + , memoryRAM = [] } diff --git "a/.output/golden/eta/eval/logged/Fast/False/from-eas/fact1\n.logged" "b/.output/golden/eta/eval/logged/Fast/False/from-eas/fact1\n.logged" index d0524355a..9d2a670b8 100644 --- "a/.output/golden/eta/eval/logged/Fast/False/from-eas/fact1\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/False/from-eas/fact1\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,513 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 16 ) + ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 35 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 36 ) , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 38 ) + ) , Transfer , ICF ( DMark 37 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 38 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "38" ) , ICF ( DMark 39 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 40 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 43 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 46 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 48 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 49 ) , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 51 ) + ) , Transfer , ICF ( DMark 50 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 51 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 52 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 53 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 55 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 56 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 59 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 60 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 61 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 62 ) , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 64 ) + ) , Transfer , ICF ( DMark 63 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 64 ) @@ -489,20 +677,24 @@ dump: Automaton , ICF ( DMark 65 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 66 ) , End ] - , programCounter = 148 + , programCounter = 136 , returnStack = IS [] } - , unitStack = fromList + , memoryStack = fromList [ 506 , 2 ] - , unitRAM = [] + , memoryRAM = [] } diff --git "a/.output/golden/eta/eval/logged/Fast/False/from-eas/fact2\n.logged" "b/.output/golden/eta/eval/logged/Fast/False/from-eas/fact2\n.logged" index 9056ebf56..06019efb2 100644 --- "a/.output/golden/eta/eval/logged/Fast/False/from-eas/fact2\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/False/from-eas/fact2\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,513 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 16 ) + ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 35 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 36 ) , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 38 ) + ) , Transfer , ICF ( DMark 37 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 38 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "38" ) , ICF ( DMark 39 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 40 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 43 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 46 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 48 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 49 ) , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 51 ) + ) , Transfer , ICF ( DMark 50 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 51 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 52 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 53 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 55 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 56 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 59 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 60 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 61 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 62 ) , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 64 ) + ) , Transfer , ICF ( DMark 63 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 64 ) @@ -489,20 +677,24 @@ dump: Automaton , ICF ( DMark 65 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 66 ) , End ] - , programCounter = 148 + , programCounter = 136 , returnStack = IS [] } - , unitStack = fromList + , memoryStack = fromList [ 516 , 2 ] - , unitRAM = [] + , memoryRAM = [] } diff --git "a/.output/golden/eta/eval/logged/Fast/False/from-eas/fact3\n.logged" "b/.output/golden/eta/eval/logged/Fast/False/from-eas/fact3\n.logged" index 01ff51bef..b2995434d 100644 --- "a/.output/golden/eta/eval/logged/Fast/False/from-eas/fact3\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/False/from-eas/fact3\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,513 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 16 ) + ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 35 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 36 ) , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 38 ) + ) , Transfer , ICF ( DMark 37 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 38 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "38" ) , ICF ( DMark 39 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 40 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 43 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 46 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 48 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 49 ) , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 51 ) + ) , Transfer , ICF ( DMark 50 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 51 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 52 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 53 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 55 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 56 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 59 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 60 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 61 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 62 ) , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 64 ) + ) , Transfer , ICF ( DMark 63 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 64 ) @@ -489,20 +677,24 @@ dump: Automaton , ICF ( DMark 65 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 66 ) , End ] - , programCounter = 148 + , programCounter = 136 , returnStack = IS [] } - , unitStack = fromList + , memoryStack = fromList [ 526 , 2 ] - , unitRAM = [] + , memoryRAM = [] } diff --git "a/.output/golden/eta/eval/logged/Fast/False/from-eas/fact4\n.logged" "b/.output/golden/eta/eval/logged/Fast/False/from-eas/fact4\n.logged" index 79a61894b..9cc70c121 100644 --- "a/.output/golden/eta/eval/logged/Fast/False/from-eas/fact4\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/False/from-eas/fact4\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,513 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 16 ) + ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 35 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 36 ) , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 38 ) + ) , Transfer , ICF ( DMark 37 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 38 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "38" ) , ICF ( DMark 39 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 40 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 43 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 46 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 48 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 49 ) , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 51 ) + ) , Transfer , ICF ( DMark 50 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 51 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 52 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 53 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 55 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 56 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 59 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 60 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 61 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 62 ) , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 64 ) + ) , Transfer , ICF ( DMark 63 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 64 ) @@ -489,20 +677,24 @@ dump: Automaton , ICF ( DMark 65 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 66 ) , End ] - , programCounter = 148 + , programCounter = 136 , returnStack = IS [] } - , unitStack = fromList + , memoryStack = fromList [ 536 , 2 ] - , unitRAM = [] + , memoryRAM = [] } diff --git "a/.output/golden/eta/eval/logged/Fast/False/from-eas/fact5\n.logged" "b/.output/golden/eta/eval/logged/Fast/False/from-eas/fact5\n.logged" index 51b356411..3773a24e0 100644 --- "a/.output/golden/eta/eval/logged/Fast/False/from-eas/fact5\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/False/from-eas/fact5\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,513 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 16 ) + ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 35 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 36 ) , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 38 ) + ) , Transfer , ICF ( DMark 37 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 38 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "38" ) , ICF ( DMark 39 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 40 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 43 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 46 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 48 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 49 ) , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 51 ) + ) , Transfer , ICF ( DMark 50 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 51 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 52 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 53 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 55 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 56 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 59 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 60 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 61 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 62 ) , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 64 ) + ) , Transfer , ICF ( DMark 63 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 64 ) @@ -489,20 +677,24 @@ dump: Automaton , ICF ( DMark 65 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 66 ) , End ] - , programCounter = 148 + , programCounter = 136 , returnStack = IS [] } - , unitStack = fromList + , memoryStack = fromList [ 546 , 2 ] - , unitRAM = [] + , memoryRAM = [] } diff --git "a/.output/golden/eta/eval/logged/Fast/False/from-eas/fact6\n.logged" "b/.output/golden/eta/eval/logged/Fast/False/from-eas/fact6\n.logged" index b4839c7e2..d24dd431f 100644 --- "a/.output/golden/eta/eval/logged/Fast/False/from-eas/fact6\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/False/from-eas/fact6\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,513 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 16 ) + ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 35 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 36 ) , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 38 ) + ) , Transfer , ICF ( DMark 37 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 38 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "38" ) , ICF ( DMark 39 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 40 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 43 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 46 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 48 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 49 ) , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 51 ) + ) , Transfer , ICF ( DMark 50 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 51 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 52 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 53 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 55 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 56 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 59 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 60 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 61 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 62 ) , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 64 ) + ) , Transfer , ICF ( DMark 63 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 64 ) @@ -489,20 +677,24 @@ dump: Automaton , ICF ( DMark 65 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 66 ) , End ] - , programCounter = 148 + , programCounter = 136 , returnStack = IS [] } - , unitStack = fromList + , memoryStack = fromList [ 556 , 2 ] - , unitRAM = [] + , memoryRAM = [] } diff --git "a/.output/golden/eta/eval/logged/Fast/False/from-eas/fact7\n.logged" "b/.output/golden/eta/eval/logged/Fast/False/from-eas/fact7\n.logged" index b7c5d5ea2..1cfa310f9 100644 --- "a/.output/golden/eta/eval/logged/Fast/False/from-eas/fact7\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/False/from-eas/fact7\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,513 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 16 ) + ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 35 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 36 ) , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 38 ) + ) , Transfer , ICF ( DMark 37 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 38 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "38" ) , ICF ( DMark 39 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 40 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 43 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 46 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 48 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 49 ) , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 51 ) + ) , Transfer , ICF ( DMark 50 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 51 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 52 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 53 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 55 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 56 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 59 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 60 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 61 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 62 ) , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 64 ) + ) , Transfer , ICF ( DMark 63 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 64 ) @@ -489,20 +677,24 @@ dump: Automaton , ICF ( DMark 65 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 66 ) , End ] - , programCounter = 148 + , programCounter = 136 , returnStack = IS [] } - , unitStack = fromList + , memoryStack = fromList [ 566 , 2 ] - , unitRAM = [] + , memoryRAM = [] } diff --git "a/.output/golden/eta/eval/logged/Fast/False/from-eas/fact8\n.logged" "b/.output/golden/eta/eval/logged/Fast/False/from-eas/fact8\n.logged" index 75f191133..d18a648c0 100644 --- "a/.output/golden/eta/eval/logged/Fast/False/from-eas/fact8\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/False/from-eas/fact8\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,513 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 16 ) + ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 35 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 36 ) , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 38 ) + ) , Transfer , ICF ( DMark 37 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 38 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "38" ) , ICF ( DMark 39 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 40 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 43 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 46 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 48 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 49 ) , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 51 ) + ) , Transfer , ICF ( DMark 50 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 51 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 52 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 53 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 55 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 56 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 59 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 60 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 61 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 62 ) , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 64 ) + ) , Transfer , ICF ( DMark 63 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 64 ) @@ -489,20 +677,24 @@ dump: Automaton , ICF ( DMark 65 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 66 ) , End ] - , programCounter = 148 + , programCounter = 136 , returnStack = IS [] } - , unitStack = fromList + , memoryStack = fromList [ 576 , 2 ] - , unitRAM = [] + , memoryRAM = [] } diff --git "a/.output/golden/eta/eval/logged/Fast/False/from-eas/fact9\n.logged" "b/.output/golden/eta/eval/logged/Fast/False/from-eas/fact9\n.logged" index a0a495d10..e835f10f2 100644 --- "a/.output/golden/eta/eval/logged/Fast/False/from-eas/fact9\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/False/from-eas/fact9\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,513 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 16 ) + ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 35 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 36 ) , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 38 ) + ) , Transfer , ICF ( DMark 37 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 38 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "38" ) , ICF ( DMark 39 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 40 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 43 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 46 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 48 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 49 ) , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 51 ) + ) , Transfer , ICF ( DMark 50 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 51 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 52 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 53 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 55 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 56 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 59 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 60 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 61 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 62 ) , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 64 ) + ) , Transfer , ICF ( DMark 63 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 64 ) @@ -489,20 +677,24 @@ dump: Automaton , ICF ( DMark 65 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 66 ) , End ] - , programCounter = 148 + , programCounter = 136 , returnStack = IS [] } - , unitStack = fromList + , memoryStack = fromList [ 586 , 2 ] - , unitRAM = [] + , memoryRAM = [] } diff --git a/.output/golden/eta/eval/logged/Fast/False/from-eas/hello.logged b/.output/golden/eta/eval/logged/Fast/False/from-eas/hello.logged index 677f9216f..d174229ba 100644 --- a/.output/golden/eta/eval/logged/Fast/False/from-eas/hello.logged +++ b/.output/golden/eta/eval/logged/Fast/False/from-eas/hello.logged @@ -1,24 +1,38 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( DMark 2 ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ICF ( DMark 3 ) , IAL ( SIO OutputChar ) @@ -31,21 +45,35 @@ dump: Automaton , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , ICF ( DMark 5 ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , ICF ( DMark 6 ) , IAL ( SIO OutputChar ) @@ -62,6 +90,6 @@ dump: Automaton , programCounter = 36 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git a/.output/golden/eta/eval/logged/Fast/False/from-eas/hello2.logged b/.output/golden/eta/eval/logged/Fast/False/from-eas/hello2.logged index bbe7e76a8..bd0d5cdb1 100644 --- a/.output/golden/eta/eval/logged/Fast/False/from-eas/hello2.logged +++ b/.output/golden/eta/eval/logged/Fast/False/from-eas/hello2.logged @@ -1,83 +1,128 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 5 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 7 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 8 ) + ) , Transfer , ICF ( DMark 7 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 8 ) @@ -85,9 +130,13 @@ dump: Automaton , ICF ( DMark 9 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 10 ) @@ -96,6 +145,6 @@ dump: Automaton , programCounter = 25 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git a/.output/golden/eta/eval/logged/Fast/False/from-eas/hello3.logged b/.output/golden/eta/eval/logged/Fast/False/from-eas/hello3.logged index bbe7e76a8..bd0d5cdb1 100644 --- a/.output/golden/eta/eval/logged/Fast/False/from-eas/hello3.logged +++ b/.output/golden/eta/eval/logged/Fast/False/from-eas/hello3.logged @@ -1,83 +1,128 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 5 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 7 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 8 ) + ) , Transfer , ICF ( DMark 7 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 8 ) @@ -85,9 +130,13 @@ dump: Automaton , ICF ( DMark 9 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 10 ) @@ -96,6 +145,6 @@ dump: Automaton , programCounter = 25 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git a/.output/golden/eta/eval/logged/Fast/False/from-eas/hello4.logged b/.output/golden/eta/eval/logged/Fast/False/from-eas/hello4.logged index bbe7e76a8..bd0d5cdb1 100644 --- a/.output/golden/eta/eval/logged/Fast/False/from-eas/hello4.logged +++ b/.output/golden/eta/eval/logged/Fast/False/from-eas/hello4.logged @@ -1,83 +1,128 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 5 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 7 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 8 ) + ) , Transfer , ICF ( DMark 7 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 8 ) @@ -85,9 +130,13 @@ dump: Automaton , ICF ( DMark 9 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 10 ) @@ -96,6 +145,6 @@ dump: Automaton , programCounter = 25 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git a/.output/golden/eta/eval/logged/Fast/False/from-eas/readcharA.logged b/.output/golden/eta/eval/logged/Fast/False/from-eas/readcharA.logged index 0f849610d..00863b7dd 100644 --- a/.output/golden/eta/eval/logged/Fast/False/from-eas/readcharA.logged +++ b/.output/golden/eta/eval/logged/Fast/False/from-eas/readcharA.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) @@ -11,6 +11,6 @@ dump: Automaton , programCounter = 4 , returnStack = IS [] } - , unitStack = fromList [ 65 ] - , unitRAM = [] + , memoryStack = fromList [ 65 ] + , memoryRAM = [] } diff --git "a/.output/golden/eta/eval/logged/Fast/False/from-eas/readnum0\n.logged" "b/.output/golden/eta/eval/logged/Fast/False/from-eas/readnum0\n.logged" index 82fd01c75..6a2e0c9d9 100644 --- "a/.output/golden/eta/eval/logged/Fast/False/from-eas/readnum0\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/False/from-eas/readnum0\n.logged" @@ -1,5 +1,5 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) @@ -7,249 +7,347 @@ dump: Automaton , ICF ( DMark 2 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 32 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 3 ) , IAL - ( Cons 4 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 16 ) + ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 8 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL ( SIO InputChar ) , ICF ( DMark 12 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , Transfer , ICF ( DMark 14 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 16 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 16 ) + ) , Transfer , ICF ( DMark 15 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , Transfer , ICF ( DMark 16 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 19 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 20 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 21 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 22 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 24 ) , IAL - ( Cons 25 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 26 ) + ) , Transfer , ICF ( DMark 25 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 27 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 28 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 29 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 30 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 31 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 32 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , Transfer , ICF ( DMark 33 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 35 ) , End ] - , programCounter = 87 + , programCounter = 79 , returnStack = IS [] } - , unitStack = fromList [ 496 ] - , unitRAM = [] + , memoryStack = fromList [ 496 ] + , memoryRAM = [] } diff --git "a/.output/golden/eta/eval/logged/Fast/False/from-eas/readnum1\n.logged" "b/.output/golden/eta/eval/logged/Fast/False/from-eas/readnum1\n.logged" index ed8b5d90b..b1e21e3d2 100644 --- "a/.output/golden/eta/eval/logged/Fast/False/from-eas/readnum1\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/False/from-eas/readnum1\n.logged" @@ -1,5 +1,5 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) @@ -7,249 +7,347 @@ dump: Automaton , ICF ( DMark 2 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 32 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 3 ) , IAL - ( Cons 4 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 16 ) + ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 8 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL ( SIO InputChar ) , ICF ( DMark 12 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , Transfer , ICF ( DMark 14 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 16 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 16 ) + ) , Transfer , ICF ( DMark 15 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , Transfer , ICF ( DMark 16 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 19 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 20 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 21 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 22 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 24 ) , IAL - ( Cons 25 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 26 ) + ) , Transfer , ICF ( DMark 25 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 27 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 28 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 29 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 30 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 31 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 32 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , Transfer , ICF ( DMark 33 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 35 ) , End ] - , programCounter = 87 + , programCounter = 79 , returnStack = IS [] } - , unitStack = fromList [ 506 ] - , unitRAM = [] + , memoryStack = fromList [ 506 ] + , memoryRAM = [] } diff --git a/.output/golden/eta/eval/logged/Fast/False/from-eas/true.logged b/.output/golden/eta/eval/logged/Fast/False/from-eas/true.logged index 8a8f91324..d3f18cf2d 100644 --- a/.output/golden/eta/eval/logged/Fast/False/from-eas/true.logged +++ b/.output/golden/eta/eval/logged/Fast/False/from-eas/true.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) @@ -8,6 +8,6 @@ dump: Automaton , programCounter = 2 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git a/.output/golden/eta/eval/logged/Fast/False/original/bottles.logged b/.output/golden/eta/eval/logged/Fast/False/original/bottles.logged index b3271b4de..7b78e5e28 100644 --- a/.output/golden/eta/eval/logged/Fast/False/original/bottles.logged +++ b/.output/golden/eta/eval/logged/Fast/False/original/bottles.logged @@ -1,89 +1,127 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 141 ) + ( SAL + ( Cons 141 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , IAL ( SIO OutputChar ) , IAL - ( Cons 155 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 155 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "1" ) , Transfer , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL ( SIO InputChar ) , Transfer , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 2 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , Transfer - , IAL ( Binary Sub ) , IAL - ( Cons 3 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 3 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "2" ) , IAL ( SIO InputChar ) , IAL ( SIO OutputChar ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL ( SIO InputChar ) , Transfer - , IAL ( Binary Sub ) - , IAL Halibut , IAL - ( Cons 3 ) + ( SAL ( Binary Sub ) ) + , IAL ( SAL Halibut ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) + , IAL + ( SAL + ( Cons 3 ) + ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL ( SIO InputChar ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer , IAL ( SIO InputChar ) , IAL ( SIO OutputChar ) @@ -91,51 +129,68 @@ dump: Automaton , ICF ( DMark 3 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer - , IAL ( Binary Sub ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "3" ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , IAL ( SIO InputChar ) , Transfer - , IAL ( Binary Sub ) , IAL - ( Cons 18828800 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 18828800 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , ICF ( DMark 4 ) , IAL - ( Cons 5 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 6 ) + ) , Transfer , ICF ( DMark 5 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 6 ) @@ -143,498 +198,783 @@ dump: Automaton , ICF ( DMark 7 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 11 ) + ) , Transfer , ICF ( DMark 10 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 11 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 12 ) , IAL - ( Cons 13 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 13 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 18 ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 14 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "14" ) , ICF ( DMark 15 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 17 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , Transfer , IAL - ( Cons 18 ) - , IAL - ( Cons 11 ) - , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 13128773 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut - , IAL ( Binary Sub ) + ( SAL + ( Cons 13128755 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 19 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , Transfer , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , Transfer , IAL - ( Cons 2348471754576 ) + ( SAL + ( Cons 2348471754576 ) + ) , ICF ( CStatic "23" Jump ) , ICF ( DMark 23 ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , Transfer , IAL - ( Cons 335495964812 ) + ( SAL + ( Cons 335495964812 ) + ) , ICF ( CStatic "24" Jump ) , ICF ( DMark 24 ) , IAL - ( Cons 25 ) + ( SAL + ( Cons 25 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 25 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 27 ) , IAL - ( Cons 28 ) + ( SAL + ( Cons 28 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , IAL - ( Cons 2348471754565 ) + ( SAL + ( Cons 2348471754565 ) + ) , ICF ( CStatic "29" Jump ) , ICF ( DMark 29 ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , IAL - ( Cons 335495964812 ) + ( SAL + ( Cons 335495964812 ) + ) , ICF ( CStatic "30" Jump ) , ICF ( DMark 30 ) , IAL - ( Cons 31 ) + ( SAL + ( Cons 31 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "31" ) - , IAL ( Binary Sub ) , IAL - ( Cons 32 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 32 ) + ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL ( SIO InputChar ) , IAL - ( Cons 402523 ) + ( SAL + ( Cons 402523 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL ( SIO InputChar ) , IAL - ( Cons 1814 ) + ( SAL + ( Cons 1814 ) + ) , ICF ( CStatic "32" Jump ) , ICF ( DMark 32 ) , IAL - ( Cons 99 ) + ( SAL + ( Cons 99 ) + ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 34 ) + ( SAL + ( Cons 34 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 35 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 36 ) + ( SAL + ( Cons 36 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ICF ( DMark 38 ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( DMark 39 ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 112 ) + ( SAL + ( Cons 112 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , ICF ( DMark 40 ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ICF ( DMark 41 ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 107 ) + ( SAL + ( Cons 107 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 84 ) + ( SAL + ( Cons 84 ) + ) , ICF ( DMark 42 ) , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 43 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 44 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) , Transfer , ICF ( DMark 45 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 47 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 48 ) , End ] - , programCounter = 347 + , programCounter = 329 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git a/.output/golden/eta/eval/logged/Fast/False/original/crlf.logged b/.output/golden/eta/eval/logged/Fast/False/original/crlf.logged index 8e603fad1..27112c718 100644 --- a/.output/golden/eta/eval/logged/Fast/False/original/crlf.logged +++ b/.output/golden/eta/eval/logged/Fast/False/original/crlf.logged @@ -1,72 +1,114 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 49 ) + ( SAL + ( Cons 49 ) + ) , IAL - ( Cons 68 ) + ( SAL + ( Cons 68 ) + ) , IAL - ( Cons 65 ) + ( SAL + ( Cons 65 ) + ) , IAL - ( Cons 66 ) + ( SAL + ( Cons 66 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 75 ) + ( SAL + ( Cons 75 ) + ) , IAL - ( Cons 79 ) + ( SAL + ( Cons 79 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 50 ) + ( SAL + ( Cons 50 ) + ) , IAL - ( Cons 68 ) + ( SAL + ( Cons 68 ) + ) , IAL - ( Cons 65 ) + ( SAL + ( Cons 65 ) + ) , IAL - ( Cons 66 ) + ( SAL + ( Cons 66 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) @@ -75,6 +117,6 @@ dump: Automaton , programCounter = 28 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/golden/eta/eval/logged/Fast/False/original/fact1\n.logged" "b/.output/golden/eta/eval/logged/Fast/False/original/fact1\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/golden/eta/eval/logged/Fast/False/original/fact1\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/False/original/fact1\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/golden/eta/eval/logged/Fast/False/original/fact2\n.logged" "b/.output/golden/eta/eval/logged/Fast/False/original/fact2\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/golden/eta/eval/logged/Fast/False/original/fact2\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/False/original/fact2\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/golden/eta/eval/logged/Fast/False/original/fact3\n.logged" "b/.output/golden/eta/eval/logged/Fast/False/original/fact3\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/golden/eta/eval/logged/Fast/False/original/fact3\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/False/original/fact3\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/golden/eta/eval/logged/Fast/False/original/fact4\n.logged" "b/.output/golden/eta/eval/logged/Fast/False/original/fact4\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/golden/eta/eval/logged/Fast/False/original/fact4\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/False/original/fact4\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/golden/eta/eval/logged/Fast/False/original/fact5\n.logged" "b/.output/golden/eta/eval/logged/Fast/False/original/fact5\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/golden/eta/eval/logged/Fast/False/original/fact5\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/False/original/fact5\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/golden/eta/eval/logged/Fast/False/original/fact6\n.logged" "b/.output/golden/eta/eval/logged/Fast/False/original/fact6\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/golden/eta/eval/logged/Fast/False/original/fact6\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/False/original/fact6\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/golden/eta/eval/logged/Fast/False/original/fact7\n.logged" "b/.output/golden/eta/eval/logged/Fast/False/original/fact7\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/golden/eta/eval/logged/Fast/False/original/fact7\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/False/original/fact7\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/golden/eta/eval/logged/Fast/False/original/fact8\n.logged" "b/.output/golden/eta/eval/logged/Fast/False/original/fact8\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/golden/eta/eval/logged/Fast/False/original/fact8\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/False/original/fact8\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git a/.output/golden/eta/eval/logged/Fast/False/original/hello.logged b/.output/golden/eta/eval/logged/Fast/False/original/hello.logged index f3c59ec13..3d6152bb8 100644 --- a/.output/golden/eta/eval/logged/Fast/False/original/hello.logged +++ b/.output/golden/eta/eval/logged/Fast/False/original/hello.logged @@ -1,88 +1,118 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer - , IAL Halibut - , IAL - ( Binaries - [ Mod - , Div - ] + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "1" ) , IAL ( SIO OutputChar ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL ( SIO InputChar ) , Transfer , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 2 ) , ICF ( DMark 3 ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( DMark 4 ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ICF ( CStatic "5" Jump ) , ICF ( DMark 5 ) , Transfer - , IAL ( Binary Sub ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "5" ) , ICF ( DMark 6 ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ICF ( DMark 7 ) , IAL - ( Cons 72 ) - , IAL - ( Cons 0 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 72 ) + ) , ICF ( DMark 8 ) , IAL ( SIO OutputChar ) @@ -95,23 +125,37 @@ dump: Automaton , ICF ( DMark 9 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , ICF ( DMark 10 ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ICF ( DMark 11 ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , ICF ( DMark 12 ) , IAL ( SIO OutputChar ) @@ -125,9 +169,9 @@ dump: Automaton ( DMark 13 ) , End ] - , programCounter = 67 + , programCounter = 65 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git a/.output/golden/eta/eval/logged/Fast/False/original/hello2.logged b/.output/golden/eta/eval/logged/Fast/False/original/hello2.logged index 2e4fd5847..fe6f3f9de 100644 --- a/.output/golden/eta/eval/logged/Fast/False/original/hello2.logged +++ b/.output/golden/eta/eval/logged/Fast/False/original/hello2.logged @@ -1,120 +1,187 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( DMark 2 ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , Transfer , IAL ( SIO InputChar ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "3" ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , IAL ( SIO InputChar ) , IAL - ( Cons 337 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 337 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 4 ) , IAL - ( Cons 1 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 5 ) + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 6 ) + ) , Transfer , ICF ( DMark 5 ) - , IAL ( Binary Sub ) , IAL - ( Cons 11 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 6 ) , IAL ( SIO OutputChar ) , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , IAL ( SIO InputChar ) , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "7" Jump ) , ICF @@ -124,6 +191,6 @@ dump: Automaton , programCounter = 25 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git a/.output/golden/eta/eval/logged/Fast/True/original/bottles.logged b/.output/golden/eta/eval/logged/Fast/True/original/bottles.logged index b3271b4de..7b78e5e28 100644 --- a/.output/golden/eta/eval/logged/Fast/True/original/bottles.logged +++ b/.output/golden/eta/eval/logged/Fast/True/original/bottles.logged @@ -1,89 +1,127 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 141 ) + ( SAL + ( Cons 141 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , IAL ( SIO OutputChar ) , IAL - ( Cons 155 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 155 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "1" ) , Transfer , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL ( SIO InputChar ) , Transfer , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 2 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , Transfer - , IAL ( Binary Sub ) , IAL - ( Cons 3 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 3 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "2" ) , IAL ( SIO InputChar ) , IAL ( SIO OutputChar ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL ( SIO InputChar ) , Transfer - , IAL ( Binary Sub ) - , IAL Halibut , IAL - ( Cons 3 ) + ( SAL ( Binary Sub ) ) + , IAL ( SAL Halibut ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) + , IAL + ( SAL + ( Cons 3 ) + ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL ( SIO InputChar ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer , IAL ( SIO InputChar ) , IAL ( SIO OutputChar ) @@ -91,51 +129,68 @@ dump: Automaton , ICF ( DMark 3 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer - , IAL ( Binary Sub ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "3" ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , IAL ( SIO InputChar ) , Transfer - , IAL ( Binary Sub ) , IAL - ( Cons 18828800 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 18828800 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , ICF ( DMark 4 ) , IAL - ( Cons 5 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 6 ) + ) , Transfer , ICF ( DMark 5 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 6 ) @@ -143,498 +198,783 @@ dump: Automaton , ICF ( DMark 7 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 11 ) + ) , Transfer , ICF ( DMark 10 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 11 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 12 ) , IAL - ( Cons 13 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 13 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 18 ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 14 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "14" ) , ICF ( DMark 15 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 17 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , Transfer , IAL - ( Cons 18 ) - , IAL - ( Cons 11 ) - , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 13128773 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut - , IAL ( Binary Sub ) + ( SAL + ( Cons 13128755 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 19 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , Transfer , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , Transfer , IAL - ( Cons 2348471754576 ) + ( SAL + ( Cons 2348471754576 ) + ) , ICF ( CStatic "23" Jump ) , ICF ( DMark 23 ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , Transfer , IAL - ( Cons 335495964812 ) + ( SAL + ( Cons 335495964812 ) + ) , ICF ( CStatic "24" Jump ) , ICF ( DMark 24 ) , IAL - ( Cons 25 ) + ( SAL + ( Cons 25 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 25 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 27 ) , IAL - ( Cons 28 ) + ( SAL + ( Cons 28 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , IAL - ( Cons 2348471754565 ) + ( SAL + ( Cons 2348471754565 ) + ) , ICF ( CStatic "29" Jump ) , ICF ( DMark 29 ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , IAL - ( Cons 335495964812 ) + ( SAL + ( Cons 335495964812 ) + ) , ICF ( CStatic "30" Jump ) , ICF ( DMark 30 ) , IAL - ( Cons 31 ) + ( SAL + ( Cons 31 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "31" ) - , IAL ( Binary Sub ) , IAL - ( Cons 32 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 32 ) + ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL ( SIO InputChar ) , IAL - ( Cons 402523 ) + ( SAL + ( Cons 402523 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL ( SIO InputChar ) , IAL - ( Cons 1814 ) + ( SAL + ( Cons 1814 ) + ) , ICF ( CStatic "32" Jump ) , ICF ( DMark 32 ) , IAL - ( Cons 99 ) + ( SAL + ( Cons 99 ) + ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 34 ) + ( SAL + ( Cons 34 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 35 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 36 ) + ( SAL + ( Cons 36 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ICF ( DMark 38 ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( DMark 39 ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 112 ) + ( SAL + ( Cons 112 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , ICF ( DMark 40 ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ICF ( DMark 41 ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 107 ) + ( SAL + ( Cons 107 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 84 ) + ( SAL + ( Cons 84 ) + ) , ICF ( DMark 42 ) , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 43 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 44 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) , Transfer , ICF ( DMark 45 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 47 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 48 ) , End ] - , programCounter = 347 + , programCounter = 329 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/golden/eta/eval/logged/Fast/True/original/fact1\n.logged" "b/.output/golden/eta/eval/logged/Fast/True/original/fact1\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/golden/eta/eval/logged/Fast/True/original/fact1\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/True/original/fact1\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/golden/eta/eval/logged/Fast/True/original/fact2\n.logged" "b/.output/golden/eta/eval/logged/Fast/True/original/fact2\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/golden/eta/eval/logged/Fast/True/original/fact2\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/True/original/fact2\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/golden/eta/eval/logged/Fast/True/original/fact3\n.logged" "b/.output/golden/eta/eval/logged/Fast/True/original/fact3\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/golden/eta/eval/logged/Fast/True/original/fact3\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/True/original/fact3\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/golden/eta/eval/logged/Fast/True/original/fact4\n.logged" "b/.output/golden/eta/eval/logged/Fast/True/original/fact4\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/golden/eta/eval/logged/Fast/True/original/fact4\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/True/original/fact4\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/golden/eta/eval/logged/Fast/True/original/fact5\n.logged" "b/.output/golden/eta/eval/logged/Fast/True/original/fact5\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/golden/eta/eval/logged/Fast/True/original/fact5\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/True/original/fact5\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/golden/eta/eval/logged/Fast/True/original/fact6\n.logged" "b/.output/golden/eta/eval/logged/Fast/True/original/fact6\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/golden/eta/eval/logged/Fast/True/original/fact6\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/True/original/fact6\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/golden/eta/eval/logged/Fast/True/original/fact7\n.logged" "b/.output/golden/eta/eval/logged/Fast/True/original/fact7\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/golden/eta/eval/logged/Fast/True/original/fact7\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/True/original/fact7\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git "a/.output/golden/eta/eval/logged/Fast/True/original/fact8\n.logged" "b/.output/golden/eta/eval/logged/Fast/True/original/fact8\n.logged" index 73b5e0edd..7fbe48d6d 100644 --- "a/.output/golden/eta/eval/logged/Fast/True/original/fact8\n.logged" +++ "b/.output/golden/eta/eval/logged/Fast/True/original/fact8\n.logged" @@ -1,109 +1,161 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 9 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -111,377 +163,522 @@ dump: Automaton , ICF ( DMark 15 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , Transfer - , IAL Halibut + , IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -1 ) + ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 36 ) + ) , Transfer , ICF ( DMark 35 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons + ( -48 ) + ) + ) , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 49 ) + ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut + ( SAL + ( Cons + ( -3 ) + ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) - , IAL Halibut + ( SAL + ( Cons 2 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) - , IAL Halibut + ( SAL + ( Cons 0 ) + ) + , IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 62 ) + ) , Transfer , ICF ( DMark 61 ) - , IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL Halibut + ( SAL + ( Cons 1 ) + ) + , IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -489,9 +686,13 @@ dump: Automaton , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) @@ -500,6 +701,6 @@ dump: Automaton , programCounter = 21 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } diff --git a/.output/golden/eta/eval/logged/Fast/from-eas/bottles.logged b/.output/golden/eta/eval/logged/Fast/from-eas/bottles.logged deleted file mode 100644 index fa4388e06..000000000 --- a/.output/golden/eta/eval/logged/Fast/from-eas/bottles.logged +++ /dev/null @@ -1,446 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 31 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 3 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 4 ) - , IAL - ( Cons 5 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 5 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 6 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 10 ) - , IAL - ( Cons 48 ) - , IAL ( SIO OutputChar ) - , Transfer - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 11 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 13 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 18 ) - , Transfer - , ICF - ( DMark 14 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "14" ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 17 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 11 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 19 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , Transfer - , ICF - ( DMark 19 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 20 ) - , ICF - ( DMark 21 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 22 ) - , IAL - ( Cons 23 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 8 ) - , Transfer - , ICF - ( DMark 23 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 114 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 98 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 102 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 115 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 116 ) - , IAL - ( Cons 116 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 98 ) - , IAL - ( Cons 32 ) - , ICF - ( DMark 24 ) - , IAL - ( Cons 25 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , Transfer - , ICF - ( DMark 25 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 27 ) - , IAL - ( Cons 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 21 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 97 ) - , IAL - ( Cons 119 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 104 ) - , IAL - ( Cons 116 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 110 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 32 ) - , ICF - ( DMark 29 ) - , IAL - ( Cons 30 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 3 ) - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 33 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 26 ) - , Transfer - , ICF - ( DMark 33 ) - , IAL - ( Cons 44 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 32 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 34 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 35 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 21 ) - , Transfer - , ICF - ( DMark 35 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 36 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 100 ) - , IAL - ( Cons 110 ) - , IAL - ( Cons 117 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 114 ) - , IAL - ( Cons 97 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 116 ) - , IAL - ( Cons 105 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 115 ) - , IAL - ( Cons 115 ) - , IAL - ( Cons 97 ) - , IAL - ( Cons 112 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 44 ) - , IAL - ( Cons 110 ) - , IAL - ( Cons 119 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 100 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 110 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 107 ) - , IAL - ( Cons 97 ) - , IAL - ( Cons 84 ) - , ICF - ( DMark 37 ) - , IAL - ( Cons 38 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , Transfer - , ICF - ( DMark 38 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 39 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 40 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 26 ) - , Transfer - , ICF - ( DMark 40 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 41 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 43 ) - , End - ] - , programCounter = 246 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git a/.output/golden/eta/eval/logged/Fast/from-eas/divmod.logged b/.output/golden/eta/eval/logged/Fast/from-eas/divmod.logged deleted file mode 100644 index 0cd9d37fb..000000000 --- a/.output/golden/eta/eval/logged/Fast/from-eas/divmod.logged +++ /dev/null @@ -1,30 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "1" ) - , ICF - ( DMark 2 ) - , End - ] - , programCounter = 7 - , returnStack = IS [] - } - , unitStack = fromList - [ 0 - , 2 - ] - , unitRAM = [] - } 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" deleted file mode 100644 index 21731cdee..000000000 --- "a/.output/golden/eta/eval/logged/Fast/from-eas/fact0\n.logged" +++ /dev/null @@ -1,508 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 34 ) - , IAL - ( Cons 48 ) - , IAL ( SIO OutputChar ) - , Transfer - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 35 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 36 ) - , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 37 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 38 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "38" ) - , ICF - ( DMark 39 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 40 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 35 ) - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 46 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 48 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 49 ) - , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 50 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 51 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 52 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 53 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 55 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 56 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 48 ) - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 59 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 60 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 61 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 62 ) - , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 63 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 64 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 65 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 66 ) - , End - ] - , programCounter = 148 - , returnStack = IS [] - } - , unitStack = fromList - [ 496 - , 2 - ] - , unitRAM = [] - } 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" deleted file mode 100644 index d0524355a..000000000 --- "a/.output/golden/eta/eval/logged/Fast/from-eas/fact1\n.logged" +++ /dev/null @@ -1,508 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 34 ) - , IAL - ( Cons 48 ) - , IAL ( SIO OutputChar ) - , Transfer - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 35 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 36 ) - , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 37 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 38 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "38" ) - , ICF - ( DMark 39 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 40 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 35 ) - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 46 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 48 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 49 ) - , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 50 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 51 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 52 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 53 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 55 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 56 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 48 ) - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 59 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 60 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 61 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 62 ) - , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 63 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 64 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 65 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 66 ) - , End - ] - , programCounter = 148 - , returnStack = IS [] - } - , unitStack = fromList - [ 506 - , 2 - ] - , unitRAM = [] - } diff --git "a/.output/golden/eta/eval/logged/Fast/from-eas/fact2\n.logged" "b/.output/golden/eta/eval/logged/Fast/from-eas/fact2\n.logged" deleted file mode 100644 index 9056ebf56..000000000 --- "a/.output/golden/eta/eval/logged/Fast/from-eas/fact2\n.logged" +++ /dev/null @@ -1,508 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 34 ) - , IAL - ( Cons 48 ) - , IAL ( SIO OutputChar ) - , Transfer - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 35 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 36 ) - , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 37 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 38 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "38" ) - , ICF - ( DMark 39 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 40 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 35 ) - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 46 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 48 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 49 ) - , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 50 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 51 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 52 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 53 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 55 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 56 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 48 ) - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 59 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 60 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 61 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 62 ) - , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 63 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 64 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 65 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 66 ) - , End - ] - , programCounter = 148 - , returnStack = IS [] - } - , unitStack = fromList - [ 516 - , 2 - ] - , unitRAM = [] - } diff --git "a/.output/golden/eta/eval/logged/Fast/from-eas/fact3\n.logged" "b/.output/golden/eta/eval/logged/Fast/from-eas/fact3\n.logged" deleted file mode 100644 index 01ff51bef..000000000 --- "a/.output/golden/eta/eval/logged/Fast/from-eas/fact3\n.logged" +++ /dev/null @@ -1,508 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 34 ) - , IAL - ( Cons 48 ) - , IAL ( SIO OutputChar ) - , Transfer - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 35 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 36 ) - , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 37 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 38 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "38" ) - , ICF - ( DMark 39 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 40 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 35 ) - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 46 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 48 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 49 ) - , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 50 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 51 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 52 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 53 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 55 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 56 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 48 ) - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 59 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 60 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 61 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 62 ) - , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 63 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 64 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 65 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 66 ) - , End - ] - , programCounter = 148 - , returnStack = IS [] - } - , unitStack = fromList - [ 526 - , 2 - ] - , unitRAM = [] - } diff --git "a/.output/golden/eta/eval/logged/Fast/from-eas/fact4\n.logged" "b/.output/golden/eta/eval/logged/Fast/from-eas/fact4\n.logged" deleted file mode 100644 index 79a61894b..000000000 --- "a/.output/golden/eta/eval/logged/Fast/from-eas/fact4\n.logged" +++ /dev/null @@ -1,508 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 34 ) - , IAL - ( Cons 48 ) - , IAL ( SIO OutputChar ) - , Transfer - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 35 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 36 ) - , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 37 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 38 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "38" ) - , ICF - ( DMark 39 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 40 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 35 ) - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 46 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 48 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 49 ) - , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 50 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 51 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 52 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 53 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 55 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 56 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 48 ) - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 59 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 60 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 61 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 62 ) - , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 63 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 64 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 65 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 66 ) - , End - ] - , programCounter = 148 - , returnStack = IS [] - } - , unitStack = fromList - [ 536 - , 2 - ] - , unitRAM = [] - } diff --git "a/.output/golden/eta/eval/logged/Fast/from-eas/fact5\n.logged" "b/.output/golden/eta/eval/logged/Fast/from-eas/fact5\n.logged" deleted file mode 100644 index 51b356411..000000000 --- "a/.output/golden/eta/eval/logged/Fast/from-eas/fact5\n.logged" +++ /dev/null @@ -1,508 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 34 ) - , IAL - ( Cons 48 ) - , IAL ( SIO OutputChar ) - , Transfer - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 35 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 36 ) - , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 37 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 38 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "38" ) - , ICF - ( DMark 39 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 40 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 35 ) - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 46 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 48 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 49 ) - , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 50 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 51 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 52 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 53 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 55 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 56 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 48 ) - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 59 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 60 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 61 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 62 ) - , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 63 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 64 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 65 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 66 ) - , End - ] - , programCounter = 148 - , returnStack = IS [] - } - , unitStack = fromList - [ 546 - , 2 - ] - , unitRAM = [] - } diff --git "a/.output/golden/eta/eval/logged/Fast/from-eas/fact6\n.logged" "b/.output/golden/eta/eval/logged/Fast/from-eas/fact6\n.logged" deleted file mode 100644 index b4839c7e2..000000000 --- "a/.output/golden/eta/eval/logged/Fast/from-eas/fact6\n.logged" +++ /dev/null @@ -1,508 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 34 ) - , IAL - ( Cons 48 ) - , IAL ( SIO OutputChar ) - , Transfer - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 35 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 36 ) - , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 37 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 38 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "38" ) - , ICF - ( DMark 39 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 40 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 35 ) - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 46 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 48 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 49 ) - , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 50 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 51 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 52 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 53 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 55 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 56 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 48 ) - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 59 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 60 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 61 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 62 ) - , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 63 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 64 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 65 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 66 ) - , End - ] - , programCounter = 148 - , returnStack = IS [] - } - , unitStack = fromList - [ 556 - , 2 - ] - , unitRAM = [] - } diff --git "a/.output/golden/eta/eval/logged/Fast/from-eas/fact7\n.logged" "b/.output/golden/eta/eval/logged/Fast/from-eas/fact7\n.logged" deleted file mode 100644 index b7c5d5ea2..000000000 --- "a/.output/golden/eta/eval/logged/Fast/from-eas/fact7\n.logged" +++ /dev/null @@ -1,508 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 34 ) - , IAL - ( Cons 48 ) - , IAL ( SIO OutputChar ) - , Transfer - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 35 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 36 ) - , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 37 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 38 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "38" ) - , ICF - ( DMark 39 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 40 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 35 ) - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 46 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 48 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 49 ) - , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 50 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 51 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 52 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 53 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 55 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 56 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 48 ) - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 59 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 60 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 61 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 62 ) - , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 63 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 64 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 65 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 66 ) - , End - ] - , programCounter = 148 - , returnStack = IS [] - } - , unitStack = fromList - [ 566 - , 2 - ] - , unitRAM = [] - } diff --git "a/.output/golden/eta/eval/logged/Fast/from-eas/fact8\n.logged" "b/.output/golden/eta/eval/logged/Fast/from-eas/fact8\n.logged" deleted file mode 100644 index 75f191133..000000000 --- "a/.output/golden/eta/eval/logged/Fast/from-eas/fact8\n.logged" +++ /dev/null @@ -1,508 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 34 ) - , IAL - ( Cons 48 ) - , IAL ( SIO OutputChar ) - , Transfer - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 35 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 36 ) - , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 37 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 38 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "38" ) - , ICF - ( DMark 39 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 40 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 35 ) - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 46 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 48 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 49 ) - , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 50 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 51 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 52 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 53 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 55 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 56 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 48 ) - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 59 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 60 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 61 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 62 ) - , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 63 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 64 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 65 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 66 ) - , End - ] - , programCounter = 148 - , returnStack = IS [] - } - , unitStack = fromList - [ 576 - , 2 - ] - , unitRAM = [] - } 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" deleted file mode 100644 index a0a495d10..000000000 --- "a/.output/golden/eta/eval/logged/Fast/from-eas/fact9\n.logged" +++ /dev/null @@ -1,508 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 44 ) - , Transfer - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 34 ) - , IAL - ( Cons 48 ) - , IAL ( SIO OutputChar ) - , Transfer - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 35 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 36 ) - , IAL - ( Cons 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 37 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 38 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "38" ) - , ICF - ( DMark 39 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 40 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 35 ) - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 46 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 48 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 49 ) - , IAL - ( Cons 50 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 50 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 51 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 52 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 53 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 55 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 56 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 48 ) - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 59 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 60 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 61 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 62 ) - , IAL - ( Cons 63 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 63 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 64 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 65 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 60 ) - , Transfer - , ICF - ( DMark 66 ) - , End - ] - , programCounter = 148 - , returnStack = IS [] - } - , unitStack = fromList - [ 586 - , 2 - ] - , unitRAM = [] - } diff --git a/.output/golden/eta/eval/logged/Fast/from-eas/hello.logged b/.output/golden/eta/eval/logged/Fast/from-eas/hello.logged deleted file mode 100644 index 677f9216f..000000000 --- a/.output/golden/eta/eval/logged/Fast/from-eas/hello.logged +++ /dev/null @@ -1,67 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 32 ) - , ICF - ( DMark 2 ) - , IAL - ( Cons 44 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 72 ) - , ICF - ( DMark 3 ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , ICF - ( DMark 5 ) - , IAL - ( Cons 33 ) - , IAL - ( Cons 100 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 114 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 119 ) - , ICF - ( DMark 6 ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 7 ) - , End - ] - , programCounter = 36 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git a/.output/golden/eta/eval/logged/Fast/from-eas/hello2.logged b/.output/golden/eta/eval/logged/Fast/from-eas/hello2.logged deleted file mode 100644 index bbe7e76a8..000000000 --- a/.output/golden/eta/eval/logged/Fast/from-eas/hello2.logged +++ /dev/null @@ -1,101 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 33 ) - , IAL - ( Cons 100 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 114 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 119 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 44 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 72 ) - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 4 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 5 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 7 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 7 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 8 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 9 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 4 ) - , Transfer - , ICF - ( DMark 10 ) - , End - ] - , programCounter = 25 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git a/.output/golden/eta/eval/logged/Fast/from-eas/hello3.logged b/.output/golden/eta/eval/logged/Fast/from-eas/hello3.logged deleted file mode 100644 index bbe7e76a8..000000000 --- a/.output/golden/eta/eval/logged/Fast/from-eas/hello3.logged +++ /dev/null @@ -1,101 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 33 ) - , IAL - ( Cons 100 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 114 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 119 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 44 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 72 ) - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 4 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 5 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 7 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 7 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 8 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 9 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 4 ) - , Transfer - , ICF - ( DMark 10 ) - , End - ] - , programCounter = 25 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git a/.output/golden/eta/eval/logged/Fast/from-eas/hello4.logged b/.output/golden/eta/eval/logged/Fast/from-eas/hello4.logged deleted file mode 100644 index bbe7e76a8..000000000 --- a/.output/golden/eta/eval/logged/Fast/from-eas/hello4.logged +++ /dev/null @@ -1,101 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 33 ) - , IAL - ( Cons 100 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 114 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 119 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 44 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 72 ) - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 4 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 5 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 7 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 7 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 8 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 9 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 4 ) - , Transfer - , ICF - ( DMark 10 ) - , End - ] - , programCounter = 25 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git a/.output/golden/eta/eval/logged/Fast/from-eas/readcharA.logged b/.output/golden/eta/eval/logged/Fast/from-eas/readcharA.logged deleted file mode 100644 index 0f849610d..000000000 --- a/.output/golden/eta/eval/logged/Fast/from-eas/readcharA.logged +++ /dev/null @@ -1,16 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 2 ) - , End - ] - , programCounter = 4 - , returnStack = IS [] - } - , unitStack = fromList [ 65 ] - , unitRAM = [] - } 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" deleted file mode 100644 index 82fd01c75..000000000 --- "a/.output/golden/eta/eval/logged/Fast/from-eas/readnum0\n.logged" +++ /dev/null @@ -1,255 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 2 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 1 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 8 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 9 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 12 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 17 ) - , Transfer - , ICF - ( DMark 14 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 16 ) - , Transfer - , ICF - ( DMark 15 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 17 ) - , Transfer - , ICF - ( DMark 16 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 6 ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 19 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 20 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 21 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 22 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 24 ) - , IAL - ( Cons 25 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 25 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 33 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 27 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 28 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 29 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 30 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 31 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 32 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 23 ) - , Transfer - , ICF - ( DMark 33 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 34 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 35 ) - , End - ] - , programCounter = 87 - , returnStack = IS [] - } - , unitStack = fromList [ 496 ] - , unitRAM = [] - } 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" deleted file mode 100644 index ed8b5d90b..000000000 --- "a/.output/golden/eta/eval/logged/Fast/from-eas/readnum1\n.logged" +++ /dev/null @@ -1,255 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 2 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 1 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 8 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 9 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 12 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 17 ) - , Transfer - , ICF - ( DMark 14 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 16 ) - , Transfer - , ICF - ( DMark 15 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 17 ) - , Transfer - , ICF - ( DMark 16 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 6 ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 19 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 20 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 21 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 22 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 24 ) - , IAL - ( Cons 25 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 25 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 33 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 27 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 28 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 29 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 30 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 31 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 32 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 23 ) - , Transfer - , ICF - ( DMark 33 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 34 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 35 ) - , End - ] - , programCounter = 87 - , returnStack = IS [] - } - , unitStack = fromList [ 506 ] - , unitRAM = [] - } diff --git a/.output/golden/eta/eval/logged/Fast/from-eas/true.logged b/.output/golden/eta/eval/logged/Fast/from-eas/true.logged deleted file mode 100644 index 8a8f91324..000000000 --- a/.output/golden/eta/eval/logged/Fast/from-eas/true.logged +++ /dev/null @@ -1,13 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , End - ] - , programCounter = 2 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git a/.output/golden/eta/eval/logged/Fast/original/bottles.logged b/.output/golden/eta/eval/logged/Fast/original/bottles.logged deleted file mode 100644 index b3271b4de..000000000 --- a/.output/golden/eta/eval/logged/Fast/original/bottles.logged +++ /dev/null @@ -1,640 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 141 ) - , IAL - ( Cons 32 ) - , Transfer - , IAL ( SIO OutputChar ) - , IAL - ( Cons 155 ) - , IAL ( Binary Sub ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "1" ) - , Transfer - , IAL - ( Cons 2 ) - , IAL ( SIO InputChar ) - , Transfer - , Transfer - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , IAL - ( Cons 4 ) - , Transfer - , IAL - ( Cons 2 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 2 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , IAL - ( Cons 1 ) - , IAL - ( Cons 3 ) - , Transfer - , IAL ( Binary Sub ) - , IAL - ( Cons 3 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "2" ) - , IAL ( SIO InputChar ) - , IAL ( SIO OutputChar ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , IAL ( SIO InputChar ) - , Transfer - , IAL ( Binary Sub ) - , IAL Halibut - , IAL - ( Cons 3 ) - , IAL - ( Cons 3 ) - , Transfer - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , IAL ( SIO InputChar ) - , IAL ( Binary Sub ) - , Transfer - , IAL ( SIO InputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 3 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 1 ) - , IAL - ( Cons 4 ) - , Transfer - , IAL ( Binary Sub ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "3" ) - , IAL ( Binary Sub ) - , Transfer - , IAL ( Binary Sub ) - , IAL ( SIO InputChar ) - , Transfer - , IAL ( Binary Sub ) - , IAL - ( Cons 18828800 ) - , IAL - ( Cons 4 ) - , ICF - ( DMark 4 ) - , IAL - ( Cons 5 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 5 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 6 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 10 ) - , IAL - ( Cons 48 ) - , IAL ( SIO OutputChar ) - , Transfer - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 11 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 13 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 18 ) - , Transfer - , ICF - ( DMark 14 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "14" ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 17 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 11 ) - , Transfer - , IAL - ( Cons 18 ) - , IAL - ( Cons 11 ) - , IAL - ( Cons 18 ) - , IAL - ( Cons 13128773 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 19 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , Transfer - , ICF - ( DMark 19 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 8 ) - , Transfer - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 114 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 98 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 102 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 23 ) - , Transfer - , IAL - ( Cons 2348471754576 ) - , ICF - ( CStatic "23" Jump ) - , ICF - ( DMark 23 ) - , IAL - ( Cons 115 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 116 ) - , IAL - ( Cons 116 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 98 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 24 ) - , Transfer - , IAL - ( Cons 335495964812 ) - , ICF - ( CStatic "24" Jump ) - , ICF - ( DMark 24 ) - , IAL - ( Cons 25 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , Transfer - , ICF - ( DMark 25 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 27 ) - , IAL - ( Cons 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 20 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 97 ) - , IAL - ( Cons 119 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 29 ) - , Transfer - , IAL - ( Cons 2348471754565 ) - , ICF - ( CStatic "29" Jump ) - , ICF - ( DMark 29 ) - , IAL - ( Cons 104 ) - , IAL - ( Cons 116 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 110 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , IAL - ( Cons 335495964812 ) - , ICF - ( CStatic "30" Jump ) - , ICF - ( DMark 30 ) - , IAL - ( Cons 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , IAL ( SIO InputChar ) - , Transfer - , IAL - ( Cons 0 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "31" ) - , IAL ( Binary Sub ) - , IAL - ( Cons 32 ) - , Transfer - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , IAL ( SIO InputChar ) - , IAL - ( Cons 402523 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , IAL ( SIO InputChar ) - , IAL - ( Cons 1814 ) - , ICF - ( CStatic "32" Jump ) - , ICF - ( DMark 32 ) - , IAL - ( Cons 99 ) - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 34 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 26 ) - , Transfer - , ICF - ( DMark 34 ) - , IAL - ( Cons 44 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 32 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 35 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 36 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 20 ) - , Transfer - , ICF - ( DMark 36 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 100 ) - , IAL - ( Cons 110 ) - , IAL - ( Cons 117 ) - , IAL - ( Cons 111 ) - , ICF - ( DMark 38 ) - , IAL - ( Cons 114 ) - , IAL - ( Cons 97 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 116 ) - , IAL - ( Cons 105 ) - , IAL - ( Cons 32 ) - , ICF - ( DMark 39 ) - , IAL - ( Cons 115 ) - , IAL - ( Cons 115 ) - , IAL - ( Cons 97 ) - , IAL - ( Cons 112 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 44 ) - , ICF - ( DMark 40 ) - , IAL - ( Cons 110 ) - , IAL - ( Cons 119 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 100 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 101 ) - , ICF - ( DMark 41 ) - , IAL - ( Cons 110 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 32 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 107 ) - , IAL - ( Cons 97 ) - , IAL - ( Cons 84 ) - , ICF - ( DMark 42 ) - , IAL - ( Cons 43 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , Transfer - , ICF - ( DMark 43 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 44 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 45 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 26 ) - , Transfer - , ICF - ( DMark 45 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 46 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 33 ) - , Transfer - , ICF - ( DMark 47 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 48 ) - , End - ] - , programCounter = 347 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git a/.output/golden/eta/eval/logged/Fast/original/crlf.logged b/.output/golden/eta/eval/logged/Fast/original/crlf.logged deleted file mode 100644 index 8e603fad1..000000000 --- a/.output/golden/eta/eval/logged/Fast/original/crlf.logged +++ /dev/null @@ -1,80 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 3 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 49 ) - , IAL - ( Cons 68 ) - , IAL - ( Cons 65 ) - , IAL - ( Cons 66 ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 75 ) - , IAL - ( Cons 79 ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 50 ) - , IAL - ( Cons 68 ) - , IAL - ( Cons 65 ) - , IAL - ( Cons 66 ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , End - ] - , programCounter = 28 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git "a/.output/golden/eta/eval/logged/Fast/original/fact1\n.logged" "b/.output/golden/eta/eval/logged/Fast/original/fact1\n.logged" deleted file mode 100644 index 73b5e0edd..000000000 --- "a/.output/golden/eta/eval/logged/Fast/original/fact1\n.logged" +++ /dev/null @@ -1,505 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , IAL ( Binary Sub ) - , Transfer - , IAL Halibut - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "21" ) - , IAL - ( Cons 22 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , Transfer - , IAL ( SIO InputChar ) - , Transfer - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 34 ) - , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 35 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 40 ) - , Transfer - , ICF - ( DMark 36 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "36" ) - , ICF - ( DMark 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 38 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 39 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 33 ) - , Transfer - , ICF - ( DMark 40 ) - , IAL - ( Cons 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 43 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 46 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 48 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 56 ) - , Transfer - , ICF - ( DMark 49 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 50 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 51 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 53 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 55 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 46 ) - , Transfer - , ICF - ( DMark 56 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 59 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 60 ) - , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 61 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 62 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 63 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 64 ) - , End - ] - , programCounter = 21 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git "a/.output/golden/eta/eval/logged/Fast/original/fact2\n.logged" "b/.output/golden/eta/eval/logged/Fast/original/fact2\n.logged" deleted file mode 100644 index 73b5e0edd..000000000 --- "a/.output/golden/eta/eval/logged/Fast/original/fact2\n.logged" +++ /dev/null @@ -1,505 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , IAL ( Binary Sub ) - , Transfer - , IAL Halibut - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "21" ) - , IAL - ( Cons 22 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , Transfer - , IAL ( SIO InputChar ) - , Transfer - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 34 ) - , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 35 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 40 ) - , Transfer - , ICF - ( DMark 36 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "36" ) - , ICF - ( DMark 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 38 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 39 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 33 ) - , Transfer - , ICF - ( DMark 40 ) - , IAL - ( Cons 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 43 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 46 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 48 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 56 ) - , Transfer - , ICF - ( DMark 49 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 50 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 51 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 53 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 55 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 46 ) - , Transfer - , ICF - ( DMark 56 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 59 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 60 ) - , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 61 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 62 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 63 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 64 ) - , End - ] - , programCounter = 21 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git "a/.output/golden/eta/eval/logged/Fast/original/fact3\n.logged" "b/.output/golden/eta/eval/logged/Fast/original/fact3\n.logged" deleted file mode 100644 index 73b5e0edd..000000000 --- "a/.output/golden/eta/eval/logged/Fast/original/fact3\n.logged" +++ /dev/null @@ -1,505 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , IAL ( Binary Sub ) - , Transfer - , IAL Halibut - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "21" ) - , IAL - ( Cons 22 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , Transfer - , IAL ( SIO InputChar ) - , Transfer - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 34 ) - , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 35 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 40 ) - , Transfer - , ICF - ( DMark 36 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "36" ) - , ICF - ( DMark 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 38 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 39 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 33 ) - , Transfer - , ICF - ( DMark 40 ) - , IAL - ( Cons 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 43 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 46 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 48 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 56 ) - , Transfer - , ICF - ( DMark 49 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 50 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 51 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 53 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 55 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 46 ) - , Transfer - , ICF - ( DMark 56 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 59 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 60 ) - , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 61 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 62 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 63 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 64 ) - , End - ] - , programCounter = 21 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git "a/.output/golden/eta/eval/logged/Fast/original/fact4\n.logged" "b/.output/golden/eta/eval/logged/Fast/original/fact4\n.logged" deleted file mode 100644 index 73b5e0edd..000000000 --- "a/.output/golden/eta/eval/logged/Fast/original/fact4\n.logged" +++ /dev/null @@ -1,505 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , IAL ( Binary Sub ) - , Transfer - , IAL Halibut - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "21" ) - , IAL - ( Cons 22 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , Transfer - , IAL ( SIO InputChar ) - , Transfer - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 34 ) - , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 35 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 40 ) - , Transfer - , ICF - ( DMark 36 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "36" ) - , ICF - ( DMark 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 38 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 39 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 33 ) - , Transfer - , ICF - ( DMark 40 ) - , IAL - ( Cons 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 43 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 46 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 48 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 56 ) - , Transfer - , ICF - ( DMark 49 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 50 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 51 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 53 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 55 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 46 ) - , Transfer - , ICF - ( DMark 56 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 59 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 60 ) - , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 61 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 62 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 63 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 64 ) - , End - ] - , programCounter = 21 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git "a/.output/golden/eta/eval/logged/Fast/original/fact5\n.logged" "b/.output/golden/eta/eval/logged/Fast/original/fact5\n.logged" deleted file mode 100644 index 73b5e0edd..000000000 --- "a/.output/golden/eta/eval/logged/Fast/original/fact5\n.logged" +++ /dev/null @@ -1,505 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , IAL ( Binary Sub ) - , Transfer - , IAL Halibut - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "21" ) - , IAL - ( Cons 22 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , Transfer - , IAL ( SIO InputChar ) - , Transfer - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 34 ) - , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 35 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 40 ) - , Transfer - , ICF - ( DMark 36 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "36" ) - , ICF - ( DMark 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 38 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 39 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 33 ) - , Transfer - , ICF - ( DMark 40 ) - , IAL - ( Cons 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 43 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 46 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 48 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 56 ) - , Transfer - , ICF - ( DMark 49 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 50 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 51 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 53 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 55 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 46 ) - , Transfer - , ICF - ( DMark 56 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 59 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 60 ) - , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 61 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 62 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 63 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 64 ) - , End - ] - , programCounter = 21 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git "a/.output/golden/eta/eval/logged/Fast/original/fact6\n.logged" "b/.output/golden/eta/eval/logged/Fast/original/fact6\n.logged" deleted file mode 100644 index 73b5e0edd..000000000 --- "a/.output/golden/eta/eval/logged/Fast/original/fact6\n.logged" +++ /dev/null @@ -1,505 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , IAL ( Binary Sub ) - , Transfer - , IAL Halibut - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "21" ) - , IAL - ( Cons 22 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , Transfer - , IAL ( SIO InputChar ) - , Transfer - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 34 ) - , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 35 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 40 ) - , Transfer - , ICF - ( DMark 36 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "36" ) - , ICF - ( DMark 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 38 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 39 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 33 ) - , Transfer - , ICF - ( DMark 40 ) - , IAL - ( Cons 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 43 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 46 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 48 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 56 ) - , Transfer - , ICF - ( DMark 49 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 50 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 51 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 53 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 55 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 46 ) - , Transfer - , ICF - ( DMark 56 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 59 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 60 ) - , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 61 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 62 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 63 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 64 ) - , End - ] - , programCounter = 21 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git "a/.output/golden/eta/eval/logged/Fast/original/fact7\n.logged" "b/.output/golden/eta/eval/logged/Fast/original/fact7\n.logged" deleted file mode 100644 index 73b5e0edd..000000000 --- "a/.output/golden/eta/eval/logged/Fast/original/fact7\n.logged" +++ /dev/null @@ -1,505 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , IAL ( Binary Sub ) - , Transfer - , IAL Halibut - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "21" ) - , IAL - ( Cons 22 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , Transfer - , IAL ( SIO InputChar ) - , Transfer - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 34 ) - , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 35 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 40 ) - , Transfer - , ICF - ( DMark 36 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "36" ) - , ICF - ( DMark 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 38 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 39 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 33 ) - , Transfer - , ICF - ( DMark 40 ) - , IAL - ( Cons 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 43 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 46 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 48 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 56 ) - , Transfer - , ICF - ( DMark 49 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 50 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 51 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 53 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 55 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 46 ) - , Transfer - , ICF - ( DMark 56 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 59 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 60 ) - , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 61 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 62 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 63 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 64 ) - , End - ] - , programCounter = 21 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git "a/.output/golden/eta/eval/logged/Fast/original/fact8\n.logged" "b/.output/golden/eta/eval/logged/Fast/original/fact8\n.logged" deleted file mode 100644 index 73b5e0edd..000000000 --- "a/.output/golden/eta/eval/logged/Fast/original/fact8\n.logged" +++ /dev/null @@ -1,505 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 2 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 2 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 4 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 32 ) - , Transfer - , ICF - ( DMark 4 ) - , IAL - ( Cons 10 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , ICF - ( DMark 5 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 6 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 7 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 8 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 8 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 13 ) - , Transfer - , ICF - ( DMark 9 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 10 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 12 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 5 ) - , Transfer - , ICF - ( DMark 12 ) - , IAL - ( Cons 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , ICF - ( DMark 13 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 14 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 15 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 16 ) - , IAL - ( Cons 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 17 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , Transfer - , IAL - ( Cons 14 ) - , Transfer - , ICF - ( DMark 18 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 19 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 20 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 21 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 22 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 42 ) - , Transfer - , IAL ( Binary Sub ) - , Transfer - , IAL Halibut - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "21" ) - , IAL - ( Cons 22 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , Transfer - , IAL ( SIO InputChar ) - , Transfer - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( DMark 22 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 23 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 24 ) - , IAL ( SIO InputChar ) - , ICF - ( DMark 25 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 32 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 27 ) - , Transfer - , ICF - ( DMark 26 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 27 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 29 ) - , Transfer - , ICF - ( DMark 28 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 30 ) - , Transfer - , ICF - ( DMark 29 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL - ( Cons 19 ) - , Transfer - , ICF - ( DMark 30 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 31 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 32 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 33 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 34 ) - , IAL - ( Cons 35 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 35 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 40 ) - , Transfer - , ICF - ( DMark 36 ) - , IAL - ( Cons 10 ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "36" ) - , ICF - ( DMark 37 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 48 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 38 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 39 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 33 ) - , Transfer - , ICF - ( DMark 40 ) - , IAL - ( Cons 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 41 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 42 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 43 ) - , IAL - ( Cons 0 ) - , ICF - ( DMark 44 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 45 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 46 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 47 ) - , IAL - ( Cons 48 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 48 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 56 ) - , Transfer - , ICF - ( DMark 49 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 50 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 51 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 3 ) - , IAL ( Binary Sub ) - , IAL Halibut - , ICF - ( DMark 52 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , ICF - ( DMark 53 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 54 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , ICF - ( DMark 55 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 46 ) - , Transfer - , ICF - ( DMark 56 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 57 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 2 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 58 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , ICF - ( DMark 59 ) - , IAL - ( Cons 0 ) - , IAL Halibut - , ICF - ( DMark 60 ) - , IAL - ( Cons 61 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 61 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 62 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 63 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 58 ) - , Transfer - , ICF - ( DMark 64 ) - , End - ] - , programCounter = 21 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git a/.output/golden/eta/eval/logged/Fast/original/hello.logged b/.output/golden/eta/eval/logged/Fast/original/hello.logged deleted file mode 100644 index f3c59ec13..000000000 --- a/.output/golden/eta/eval/logged/Fast/original/hello.logged +++ /dev/null @@ -1,133 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 21 ) - , IAL - ( Cons 2 ) - , Transfer - , IAL Halibut - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "1" ) - , IAL ( SIO OutputChar ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , Transfer - , IAL - ( Cons 2 ) - , IAL ( SIO InputChar ) - , Transfer - , Transfer - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , IAL - ( Cons 4 ) - , Transfer - , IAL - ( Cons 2 ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 2 ) - , ICF - ( DMark 3 ) - , IAL - ( Cons 32 ) - , ICF - ( DMark 4 ) - , IAL - ( Cons 44 ) - , IAL - ( Cons 111 ) - , ICF - ( CStatic "5" Jump ) - , ICF - ( DMark 5 ) - , Transfer - , IAL ( Binary Sub ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "5" ) - , ICF - ( DMark 6 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 101 ) - , ICF - ( DMark 7 ) - , IAL - ( Cons 72 ) - , IAL - ( Cons 0 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 8 ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 9 ) - , IAL - ( Cons 10 ) - , ICF - ( DMark 10 ) - , IAL - ( Cons 33 ) - , IAL - ( Cons 100 ) - , IAL - ( Cons 108 ) - , ICF - ( DMark 11 ) - , IAL - ( Cons 114 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 119 ) - , ICF - ( DMark 12 ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , ICF - ( DMark 13 ) - , End - ] - , programCounter = 67 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git a/.output/golden/eta/eval/logged/Fast/original/hello2.logged b/.output/golden/eta/eval/logged/Fast/original/hello2.logged deleted file mode 100644 index 2e4fd5847..000000000 --- a/.output/golden/eta/eval/logged/Fast/original/hello2.logged +++ /dev/null @@ -1,129 +0,0 @@ -dump: Automaton - { unitCU = CU - { program = - [ ICF - ( DMark 1 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 10 ) - , IAL - ( Cons 33 ) - , IAL - ( Cons 100 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 114 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 119 ) - , IAL - ( Cons 32 ) - , ICF - ( DMark 2 ) - , IAL - ( Cons 44 ) - , IAL - ( Cons 111 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 108 ) - , IAL - ( Cons 101 ) - , IAL - ( Cons 72 ) - , IAL - ( Cons 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 4 ) - , Transfer - , ICF - ( DMark 3 ) - , IAL - ( Cons 1 ) - , IAL - ( Cons 0 ) - , Transfer - , IAL - ( Cons 4 ) - , IAL - ( Cons 22 ) - , Transfer - , IAL ( SIO InputChar ) - , IAL ( Binary Sub ) - , Transfer - , IAL ( SIO OutputChar ) - , IAL ( SIO OutputChar ) - , IAL - ( Binaries - [ Mod - , Div - ] - ) - , ICF - ( SMark "3" ) - , IAL - ( Cons 4 ) - , Transfer - , IAL ( SIO InputChar ) - , IAL - ( Cons 337 ) - , IAL ( Binary Sub ) - , ICF - ( DMark 4 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , IAL - ( Cons 0 ) - , IAL Halibut - , IAL - ( Cons 5 ) - , IAL - ( Cons 0 ) - , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , Transfer - , ICF - ( DMark 5 ) - , IAL ( Binary Sub ) - , IAL - ( Cons 11 ) - , IAL - ( Cons 1 ) - , IAL Halibut - , Transfer - , ICF - ( DMark 6 ) - , IAL ( SIO OutputChar ) - , IAL - ( Cons 7 ) - , IAL - ( Cons 4 ) - , Transfer - , IAL ( Binary Sub ) - , IAL ( Binary Sub ) - , IAL ( SIO InputChar ) - , IAL - ( Cons 7 ) - , IAL - ( Cons 0 ) - , ICF - ( CStatic "7" Jump ) - , ICF - ( DMark 7 ) - , End - ] - , programCounter = 25 - , returnStack = IS [] - } - , unitStack = fromList [] - , unitRAM = [] - } diff --git a/.output/golden/eta/eval/logged/Original/False/from-eas/bottles.logged b/.output/golden/eta/eval/logged/Original/False/from-eas/bottles.logged index 733cb9597..da0f86435 100644 --- a/.output/golden/eta/eval/logged/Original/False/from-eas/bottles.logged +++ b/.output/golden/eta/eval/logged/Original/False/from-eas/bottles.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ N , T @@ -609,5 +609,5 @@ dump: Automaton ] , programCounter = 605 } - , unitStack = fromList [] + , memoryStack = fromList [] } diff --git a/.output/golden/eta/eval/logged/Original/False/from-eas/divmod.logged b/.output/golden/eta/eval/logged/Original/False/from-eas/divmod.logged index 176d0da2c..92245a505 100644 --- a/.output/golden/eta/eval/logged/Original/False/from-eas/divmod.logged +++ b/.output/golden/eta/eval/logged/Original/False/from-eas/divmod.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ N , A @@ -12,7 +12,7 @@ dump: Automaton ] , programCounter = 8 } - , unitStack = fromList + , memoryStack = fromList [ 0 , 2 ] diff --git "a/.output/golden/eta/eval/logged/Original/False/from-eas/fact0\n.logged" "b/.output/golden/eta/eval/logged/Original/False/from-eas/fact0\n.logged" index 4430eba59..7395d6bd1 100644 --- "a/.output/golden/eta/eval/logged/Original/False/from-eas/fact0\n.logged" +++ "b/.output/golden/eta/eval/logged/Original/False/from-eas/fact0\n.logged" @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ A , N @@ -526,7 +526,7 @@ dump: Automaton ] , programCounter = 269 } - , unitStack = fromList + , memoryStack = fromList [ 496 , 2 ] diff --git "a/.output/golden/eta/eval/logged/Original/False/from-eas/fact1\n.logged" "b/.output/golden/eta/eval/logged/Original/False/from-eas/fact1\n.logged" index bbeec4304..b6805b878 100644 --- "a/.output/golden/eta/eval/logged/Original/False/from-eas/fact1\n.logged" +++ "b/.output/golden/eta/eval/logged/Original/False/from-eas/fact1\n.logged" @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ A , N @@ -526,7 +526,7 @@ dump: Automaton ] , programCounter = 269 } - , unitStack = fromList + , memoryStack = fromList [ 506 , 2 ] diff --git "a/.output/golden/eta/eval/logged/Original/False/from-eas/fact2\n.logged" "b/.output/golden/eta/eval/logged/Original/False/from-eas/fact2\n.logged" index d66b3dbe0..136455bf3 100644 --- "a/.output/golden/eta/eval/logged/Original/False/from-eas/fact2\n.logged" +++ "b/.output/golden/eta/eval/logged/Original/False/from-eas/fact2\n.logged" @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ A , N @@ -526,7 +526,7 @@ dump: Automaton ] , programCounter = 269 } - , unitStack = fromList + , memoryStack = fromList [ 516 , 2 ] diff --git "a/.output/golden/eta/eval/logged/Original/False/from-eas/fact3\n.logged" "b/.output/golden/eta/eval/logged/Original/False/from-eas/fact3\n.logged" index 8ed3e05b5..405114a84 100644 --- "a/.output/golden/eta/eval/logged/Original/False/from-eas/fact3\n.logged" +++ "b/.output/golden/eta/eval/logged/Original/False/from-eas/fact3\n.logged" @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ A , N @@ -526,7 +526,7 @@ dump: Automaton ] , programCounter = 269 } - , unitStack = fromList + , memoryStack = fromList [ 526 , 2 ] diff --git "a/.output/golden/eta/eval/logged/Original/False/from-eas/fact4\n.logged" "b/.output/golden/eta/eval/logged/Original/False/from-eas/fact4\n.logged" index 12e7b80ec..43f73ed08 100644 --- "a/.output/golden/eta/eval/logged/Original/False/from-eas/fact4\n.logged" +++ "b/.output/golden/eta/eval/logged/Original/False/from-eas/fact4\n.logged" @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ A , N @@ -526,7 +526,7 @@ dump: Automaton ] , programCounter = 269 } - , unitStack = fromList + , memoryStack = fromList [ 536 , 2 ] diff --git "a/.output/golden/eta/eval/logged/Original/False/from-eas/fact5\n.logged" "b/.output/golden/eta/eval/logged/Original/False/from-eas/fact5\n.logged" index 8fb99a0d6..e448ca0b3 100644 --- "a/.output/golden/eta/eval/logged/Original/False/from-eas/fact5\n.logged" +++ "b/.output/golden/eta/eval/logged/Original/False/from-eas/fact5\n.logged" @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ A , N @@ -526,7 +526,7 @@ dump: Automaton ] , programCounter = 269 } - , unitStack = fromList + , memoryStack = fromList [ 546 , 2 ] diff --git "a/.output/golden/eta/eval/logged/Original/False/from-eas/fact6\n.logged" "b/.output/golden/eta/eval/logged/Original/False/from-eas/fact6\n.logged" index 0b95ebf86..f50a339f9 100644 --- "a/.output/golden/eta/eval/logged/Original/False/from-eas/fact6\n.logged" +++ "b/.output/golden/eta/eval/logged/Original/False/from-eas/fact6\n.logged" @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ A , N @@ -526,7 +526,7 @@ dump: Automaton ] , programCounter = 269 } - , unitStack = fromList + , memoryStack = fromList [ 556 , 2 ] diff --git "a/.output/golden/eta/eval/logged/Original/False/from-eas/fact7\n.logged" "b/.output/golden/eta/eval/logged/Original/False/from-eas/fact7\n.logged" index 31709b52e..8575dbb00 100644 --- "a/.output/golden/eta/eval/logged/Original/False/from-eas/fact7\n.logged" +++ "b/.output/golden/eta/eval/logged/Original/False/from-eas/fact7\n.logged" @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ A , N @@ -526,7 +526,7 @@ dump: Automaton ] , programCounter = 269 } - , unitStack = fromList + , memoryStack = fromList [ 566 , 2 ] diff --git "a/.output/golden/eta/eval/logged/Original/False/from-eas/fact8\n.logged" "b/.output/golden/eta/eval/logged/Original/False/from-eas/fact8\n.logged" index 934ca5b73..0d753cd45 100644 --- "a/.output/golden/eta/eval/logged/Original/False/from-eas/fact8\n.logged" +++ "b/.output/golden/eta/eval/logged/Original/False/from-eas/fact8\n.logged" @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ A , N @@ -526,7 +526,7 @@ dump: Automaton ] , programCounter = 269 } - , unitStack = fromList + , memoryStack = fromList [ 576 , 2 ] diff --git "a/.output/golden/eta/eval/logged/Original/False/from-eas/fact9\n.logged" "b/.output/golden/eta/eval/logged/Original/False/from-eas/fact9\n.logged" index 5a095dd36..485fc474a 100644 --- "a/.output/golden/eta/eval/logged/Original/False/from-eas/fact9\n.logged" +++ "b/.output/golden/eta/eval/logged/Original/False/from-eas/fact9\n.logged" @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ A , N @@ -526,7 +526,7 @@ dump: Automaton ] , programCounter = 269 } - , unitStack = fromList + , memoryStack = fromList [ 586 , 2 ] diff --git a/.output/golden/eta/eval/logged/Original/False/from-eas/hello.logged b/.output/golden/eta/eval/logged/Original/False/from-eas/hello.logged index af7e38085..090d6eb28 100644 --- a/.output/golden/eta/eval/logged/Original/False/from-eas/hello.logged +++ b/.output/golden/eta/eval/logged/Original/False/from-eas/hello.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ N , I @@ -90,5 +90,5 @@ dump: Automaton ] , programCounter = 86 } - , unitStack = fromList [] + , memoryStack = fromList [] } diff --git a/.output/golden/eta/eval/logged/Original/False/from-eas/hello2.logged b/.output/golden/eta/eval/logged/Original/False/from-eas/hello2.logged index 239f71d0f..0e9847351 100644 --- a/.output/golden/eta/eval/logged/Original/False/from-eas/hello2.logged +++ b/.output/golden/eta/eval/logged/Original/False/from-eas/hello2.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ N , E @@ -128,5 +128,5 @@ dump: Automaton ] , programCounter = 84 } - , unitStack = fromList [] + , memoryStack = fromList [] } diff --git a/.output/golden/eta/eval/logged/Original/False/from-eas/hello3.logged b/.output/golden/eta/eval/logged/Original/False/from-eas/hello3.logged index 239f71d0f..0e9847351 100644 --- a/.output/golden/eta/eval/logged/Original/False/from-eas/hello3.logged +++ b/.output/golden/eta/eval/logged/Original/False/from-eas/hello3.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ N , E @@ -128,5 +128,5 @@ dump: Automaton ] , programCounter = 84 } - , unitStack = fromList [] + , memoryStack = fromList [] } diff --git a/.output/golden/eta/eval/logged/Original/False/from-eas/hello4.logged b/.output/golden/eta/eval/logged/Original/False/from-eas/hello4.logged index 239f71d0f..0e9847351 100644 --- a/.output/golden/eta/eval/logged/Original/False/from-eas/hello4.logged +++ b/.output/golden/eta/eval/logged/Original/False/from-eas/hello4.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ N , E @@ -128,5 +128,5 @@ dump: Automaton ] , programCounter = 84 } - , unitStack = fromList [] + , memoryStack = fromList [] } diff --git a/.output/golden/eta/eval/logged/Original/False/from-eas/readcharA.logged b/.output/golden/eta/eval/logged/Original/False/from-eas/readcharA.logged index a57087fca..ebc722be7 100644 --- a/.output/golden/eta/eval/logged/Original/False/from-eas/readcharA.logged +++ b/.output/golden/eta/eval/logged/Original/False/from-eas/readcharA.logged @@ -1,10 +1,10 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ I , R ] , programCounter = 2 } - , unitStack = fromList [ 65 ] + , memoryStack = fromList [ 65 ] } diff --git "a/.output/golden/eta/eval/logged/Original/False/from-eas/readnum0\n.logged" "b/.output/golden/eta/eval/logged/Original/False/from-eas/readnum0\n.logged" index c9b0028aa..b0248cef7 100644 --- "a/.output/golden/eta/eval/logged/Original/False/from-eas/readnum0\n.logged" +++ "b/.output/golden/eta/eval/logged/Original/False/from-eas/readnum0\n.logged" @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ I , R @@ -264,5 +264,5 @@ dump: Automaton ] , programCounter = 157 } - , unitStack = fromList [ 496 ] + , memoryStack = fromList [ 496 ] } diff --git "a/.output/golden/eta/eval/logged/Original/False/from-eas/readnum1\n.logged" "b/.output/golden/eta/eval/logged/Original/False/from-eas/readnum1\n.logged" index 30bc74edc..c7a26d08a 100644 --- "a/.output/golden/eta/eval/logged/Original/False/from-eas/readnum1\n.logged" +++ "b/.output/golden/eta/eval/logged/Original/False/from-eas/readnum1\n.logged" @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ I , R @@ -264,5 +264,5 @@ dump: Automaton ] , programCounter = 157 } - , unitStack = fromList [ 506 ] + , memoryStack = fromList [ 506 ] } diff --git a/.output/golden/eta/eval/logged/Original/False/from-eas/true.logged b/.output/golden/eta/eval/logged/Original/False/from-eas/true.logged index 0ddd7fa1f..b025006e9 100644 --- a/.output/golden/eta/eval/logged/Original/False/from-eas/true.logged +++ b/.output/golden/eta/eval/logged/Original/False/from-eas/true.logged @@ -1,7 +1,7 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [] , programCounter = 0 } - , unitStack = fromList [] + , memoryStack = fromList [] } diff --git a/.output/golden/eta/eval/logged/Original/False/original/crlf.logged b/.output/golden/eta/eval/logged/Original/False/original/crlf.logged index f410aa572..271b56d70 100644 --- a/.output/golden/eta/eval/logged/Original/False/original/crlf.logged +++ b/.output/golden/eta/eval/logged/Original/False/original/crlf.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ N , T @@ -108,5 +108,5 @@ dump: Automaton ] , programCounter = 67 } - , unitStack = fromList [] + , memoryStack = fromList [] } diff --git a/.output/golden/eta/eval/logged/Original/False/original/hello.logged b/.output/golden/eta/eval/logged/Original/False/original/hello.logged index 0e102d806..39a10ea8d 100644 --- a/.output/golden/eta/eval/logged/Original/False/original/hello.logged +++ b/.output/golden/eta/eval/logged/Original/False/original/hello.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ N , O @@ -121,5 +121,5 @@ dump: Automaton ] , programCounter = 117 } - , unitStack = fromList [] + , memoryStack = fromList [] } diff --git a/.output/golden/eta/eval/logged/Original/False/original/hello2.logged b/.output/golden/eta/eval/logged/Original/False/original/hello2.logged index e944a35c4..389a7edbf 100644 --- a/.output/golden/eta/eval/logged/Original/False/original/hello2.logged +++ b/.output/golden/eta/eval/logged/Original/False/original/hello2.logged @@ -1,5 +1,5 @@ -dump: Automaton - { unitIU = IU +dump: Memory + { memoryIM = IM { program = [ N , E @@ -153,5 +153,5 @@ dump: Automaton ] , programCounter = 84 } - , unitStack = fromList [] + , memoryStack = fromList [] } diff --git a/.output/golden/eta/eval/logged/Original/from-eas/bottles.logged b/.output/golden/eta/eval/logged/Original/from-eas/bottles.logged deleted file mode 100644 index 733cb9597..000000000 --- a/.output/golden/eta/eval/logged/Original/from-eas/bottles.logged +++ /dev/null @@ -1,613 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ N - , T - , E - , N - , I - , O - , E - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , T - , E - , H - , T - , R - , O - , R - , N - , T - , E - , N - , A - , E - , T - , R - , N - , E - , N - , A - , E - , H - , R - , N - , E - , H - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , S - , S - , E - , O - , T - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , A - , I - , E - , T - , R - , N - , T - , O - , E - , E - , R - , N - , E - , N - , S - , S - , E - , S - , S - , R - , N - , T - , E - , H - , R - , N - , T - , E - , N - , T - , I - , E - , T - , R - , A - , N - , T - , E - , N - , A - , E - , T - , R - , N - , T - , E - , N - , T - , E - , H - , T - , R - , R - , N - , T - , E - , H - , R - , A - , N - , T - , E - , N - , T - , T - , E - , T - , R - , N - , E - , N - , A - , A - , A - , E - , N - , A - , H - , O - , E - , N - , A - , H - , O - , E - , N - , A - , H - , H - , E - , N - , I - , I - , E - , N - , A - , H - , I - , E - , N - , A - , T - , S - , E - , N - , I - , I - , E - , N - , A - , A - , O - , E - , N - , A - , H - , O - , E - , N - , A - , T - , O - , E - , N - , A - , A - , I - , E - , N - , A - , A - , I - , E - , N - , A - , T - , S - , E - , N - , A - , H - , H - , E - , N - , I - , I - , E - , R - , A - , N - , T - , E - , N - , A - , E - , T - , R - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , T - , E - , H - , R - , A - , N - , T - , E - , N - , O - , H - , E - , T - , R - , N - , E - , N - , A - , T - , O - , E - , N - , A - , T - , O - , E - , N - , T - , S - , S - , E - , N - , A - , O - , H - , E - , N - , I - , I - , E - , N - , A - , H - , O - , E - , N - , A - , H - , S - , E - , N - , A - , A - , I - , E - , N - , I - , I - , E - , N - , A - , T - , N - , E - , N - , A - , T - , S - , E - , N - , I - , I - , E - , R - , A - , N - , T - , E - , N - , A - , E - , T - , R - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , O - , E - , R - , N - , E - , H - , A - , N - , T - , E - , N - , O - , N - , E - , T - , R - , N - , S - , A - , E - , O - , N - , I - , I - , E - , O - , R - , N - , E - , H - , A - , N - , T - , E - , N - , O - , H - , E - , T - , R - , N - , T - , O - , E - , O - , R - , N - , E - , N - , T - , O - , E - , N - , A - , H - , A - , E - , N - , A - , T - , N - , E - , N - , A - , A - , N - , E - , N - , A - , T - , S - , E - , N - , A - , A - , A - , E - , N - , T - , S - , S - , E - , N - , I - , I - , E - , N - , A - , A - , I - , E - , N - , A - , T - , H - , E - , N - , I - , I - , E - , N - , A - , A - , O - , E - , N - , A - , A - , O - , E - , N - , T - , S - , S - , E - , N - , A - , A - , H - , E - , N - , I - , I - , E - , N - , S - , A - , E - , N - , A - , T - , N - , E - , N - , A - , O - , H - , E - , N - , A - , T - , S - , E - , N - , A - , H - , A - , E - , N - , I - , I - , E - , N - , A - , H - , O - , E - , N - , A - , T - , N - , E - , N - , A - , T - , S - , E - , N - , I - , I - , E - , N - , A - , H - , O - , E - , N - , A - , T - , A - , E - , N - , T - , S - , S - , E - , N - , T - , N - , H - , E - , R - , A - , N - , T - , E - , N - , A - , E - , T - , R - , N - , T - , E - , S - , R - , N - , E - , H - , A - , N - , T - , E - , N - , O - , N - , E - , T - , R - , N - , T - , O - , E - , N - , T - , O - , E - , O - , O - , R - , N - , E - , H - , N - , I - , I - , E - , T - , R - , N - , E - , T - , R - ] - , programCounter = 605 - } - , unitStack = fromList [] - } diff --git a/.output/golden/eta/eval/logged/Original/from-eas/divmod.logged b/.output/golden/eta/eval/logged/Original/from-eas/divmod.logged deleted file mode 100644 index 176d0da2c..000000000 --- a/.output/golden/eta/eval/logged/Original/from-eas/divmod.logged +++ /dev/null @@ -1,19 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ N - , A - , E - , N - , T - , E - , E - , R - ] - , programCounter = 8 - } - , unitStack = fromList - [ 0 - , 2 - ] - } diff --git "a/.output/golden/eta/eval/logged/Original/from-eas/fact0\n.logged" "b/.output/golden/eta/eval/logged/Original/from-eas/fact0\n.logged" deleted file mode 100644 index 4430eba59..000000000 --- "a/.output/golden/eta/eval/logged/Original/from-eas/fact0\n.logged" +++ /dev/null @@ -1,533 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ A - , N - , T - , E - , N - , A - , H - , E - , T - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , I - , I - , E - , T - , R - , N - , T - , O - , E - , O - , N - , T - , E - , N - , E - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , N - , T - , E - , S - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , S - , E - , T - , R - , N - , E - , H - , R - , N - , T - , E - , S - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , E - , N - , T - , E - , T - , N - , A - , H - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , N - , S - , S - , E - , N - , I - , I - , E - , S - , R - , N - , T - , E - , H - , R - , N - , T - , O - , E - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , S - , S - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , N - , O - , S - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , T - , O - , E - , S - , N - , I - , T - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , E - , N - , T - , E - , S - , S - , N - , A - , N - , E - , T - , R - , N - , E - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , E - , N - , A - , E - , H - , R - , N - , E - , H - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , S - , S - , E - , O - , T - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , S - , H - , E - , T - , R - , N - , T - , O - , E - , E - , R - , N - , E - , N - , S - , S - , E - , S - , S - , R - , N - , T - , E - , H - , R - , N - , T - , E - , N - , N - , H - , E - , T - , R - , A - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , A - , E - , H - , N - , A - , E - , H - , R - , N - , E - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , T - , A - , E - , T - , R - , N - , T - , E - , S - , R - , N - , A - , E - , H - , R - , N - , E - , N - , E - , N - , O - , E - , S - , H - , R - , S - , S - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , T - , E - , N - , S - , S - , E - , T - , R - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , T - , E - , H - , T - , R - , O - , R - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - ] - , programCounter = 269 - } - , unitStack = fromList - [ 496 - , 2 - ] - } diff --git "a/.output/golden/eta/eval/logged/Original/from-eas/fact1\n.logged" "b/.output/golden/eta/eval/logged/Original/from-eas/fact1\n.logged" deleted file mode 100644 index bbeec4304..000000000 --- "a/.output/golden/eta/eval/logged/Original/from-eas/fact1\n.logged" +++ /dev/null @@ -1,533 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ A - , N - , T - , E - , N - , A - , H - , E - , T - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , I - , I - , E - , T - , R - , N - , T - , O - , E - , O - , N - , T - , E - , N - , E - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , N - , T - , E - , S - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , S - , E - , T - , R - , N - , E - , H - , R - , N - , T - , E - , S - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , E - , N - , T - , E - , T - , N - , A - , H - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , N - , S - , S - , E - , N - , I - , I - , E - , S - , R - , N - , T - , E - , H - , R - , N - , T - , O - , E - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , S - , S - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , N - , O - , S - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , T - , O - , E - , S - , N - , I - , T - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , E - , N - , T - , E - , S - , S - , N - , A - , N - , E - , T - , R - , N - , E - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , E - , N - , A - , E - , H - , R - , N - , E - , H - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , S - , S - , E - , O - , T - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , S - , H - , E - , T - , R - , N - , T - , O - , E - , E - , R - , N - , E - , N - , S - , S - , E - , S - , S - , R - , N - , T - , E - , H - , R - , N - , T - , E - , N - , N - , H - , E - , T - , R - , A - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , A - , E - , H - , N - , A - , E - , H - , R - , N - , E - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , T - , A - , E - , T - , R - , N - , T - , E - , S - , R - , N - , A - , E - , H - , R - , N - , E - , N - , E - , N - , O - , E - , S - , H - , R - , S - , S - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , T - , E - , N - , S - , S - , E - , T - , R - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , T - , E - , H - , T - , R - , O - , R - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - ] - , programCounter = 269 - } - , unitStack = fromList - [ 506 - , 2 - ] - } diff --git "a/.output/golden/eta/eval/logged/Original/from-eas/fact2\n.logged" "b/.output/golden/eta/eval/logged/Original/from-eas/fact2\n.logged" deleted file mode 100644 index d66b3dbe0..000000000 --- "a/.output/golden/eta/eval/logged/Original/from-eas/fact2\n.logged" +++ /dev/null @@ -1,533 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ A - , N - , T - , E - , N - , A - , H - , E - , T - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , I - , I - , E - , T - , R - , N - , T - , O - , E - , O - , N - , T - , E - , N - , E - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , N - , T - , E - , S - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , S - , E - , T - , R - , N - , E - , H - , R - , N - , T - , E - , S - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , E - , N - , T - , E - , T - , N - , A - , H - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , N - , S - , S - , E - , N - , I - , I - , E - , S - , R - , N - , T - , E - , H - , R - , N - , T - , O - , E - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , S - , S - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , N - , O - , S - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , T - , O - , E - , S - , N - , I - , T - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , E - , N - , T - , E - , S - , S - , N - , A - , N - , E - , T - , R - , N - , E - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , E - , N - , A - , E - , H - , R - , N - , E - , H - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , S - , S - , E - , O - , T - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , S - , H - , E - , T - , R - , N - , T - , O - , E - , E - , R - , N - , E - , N - , S - , S - , E - , S - , S - , R - , N - , T - , E - , H - , R - , N - , T - , E - , N - , N - , H - , E - , T - , R - , A - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , A - , E - , H - , N - , A - , E - , H - , R - , N - , E - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , T - , A - , E - , T - , R - , N - , T - , E - , S - , R - , N - , A - , E - , H - , R - , N - , E - , N - , E - , N - , O - , E - , S - , H - , R - , S - , S - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , T - , E - , N - , S - , S - , E - , T - , R - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , T - , E - , H - , T - , R - , O - , R - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - ] - , programCounter = 269 - } - , unitStack = fromList - [ 516 - , 2 - ] - } diff --git "a/.output/golden/eta/eval/logged/Original/from-eas/fact3\n.logged" "b/.output/golden/eta/eval/logged/Original/from-eas/fact3\n.logged" deleted file mode 100644 index 8ed3e05b5..000000000 --- "a/.output/golden/eta/eval/logged/Original/from-eas/fact3\n.logged" +++ /dev/null @@ -1,533 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ A - , N - , T - , E - , N - , A - , H - , E - , T - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , I - , I - , E - , T - , R - , N - , T - , O - , E - , O - , N - , T - , E - , N - , E - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , N - , T - , E - , S - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , S - , E - , T - , R - , N - , E - , H - , R - , N - , T - , E - , S - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , E - , N - , T - , E - , T - , N - , A - , H - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , N - , S - , S - , E - , N - , I - , I - , E - , S - , R - , N - , T - , E - , H - , R - , N - , T - , O - , E - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , S - , S - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , N - , O - , S - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , T - , O - , E - , S - , N - , I - , T - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , E - , N - , T - , E - , S - , S - , N - , A - , N - , E - , T - , R - , N - , E - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , E - , N - , A - , E - , H - , R - , N - , E - , H - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , S - , S - , E - , O - , T - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , S - , H - , E - , T - , R - , N - , T - , O - , E - , E - , R - , N - , E - , N - , S - , S - , E - , S - , S - , R - , N - , T - , E - , H - , R - , N - , T - , E - , N - , N - , H - , E - , T - , R - , A - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , A - , E - , H - , N - , A - , E - , H - , R - , N - , E - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , T - , A - , E - , T - , R - , N - , T - , E - , S - , R - , N - , A - , E - , H - , R - , N - , E - , N - , E - , N - , O - , E - , S - , H - , R - , S - , S - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , T - , E - , N - , S - , S - , E - , T - , R - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , T - , E - , H - , T - , R - , O - , R - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - ] - , programCounter = 269 - } - , unitStack = fromList - [ 526 - , 2 - ] - } diff --git "a/.output/golden/eta/eval/logged/Original/from-eas/fact4\n.logged" "b/.output/golden/eta/eval/logged/Original/from-eas/fact4\n.logged" deleted file mode 100644 index 12e7b80ec..000000000 --- "a/.output/golden/eta/eval/logged/Original/from-eas/fact4\n.logged" +++ /dev/null @@ -1,533 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ A - , N - , T - , E - , N - , A - , H - , E - , T - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , I - , I - , E - , T - , R - , N - , T - , O - , E - , O - , N - , T - , E - , N - , E - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , N - , T - , E - , S - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , S - , E - , T - , R - , N - , E - , H - , R - , N - , T - , E - , S - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , E - , N - , T - , E - , T - , N - , A - , H - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , N - , S - , S - , E - , N - , I - , I - , E - , S - , R - , N - , T - , E - , H - , R - , N - , T - , O - , E - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , S - , S - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , N - , O - , S - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , T - , O - , E - , S - , N - , I - , T - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , E - , N - , T - , E - , S - , S - , N - , A - , N - , E - , T - , R - , N - , E - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , E - , N - , A - , E - , H - , R - , N - , E - , H - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , S - , S - , E - , O - , T - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , S - , H - , E - , T - , R - , N - , T - , O - , E - , E - , R - , N - , E - , N - , S - , S - , E - , S - , S - , R - , N - , T - , E - , H - , R - , N - , T - , E - , N - , N - , H - , E - , T - , R - , A - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , A - , E - , H - , N - , A - , E - , H - , R - , N - , E - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , T - , A - , E - , T - , R - , N - , T - , E - , S - , R - , N - , A - , E - , H - , R - , N - , E - , N - , E - , N - , O - , E - , S - , H - , R - , S - , S - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , T - , E - , N - , S - , S - , E - , T - , R - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , T - , E - , H - , T - , R - , O - , R - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - ] - , programCounter = 269 - } - , unitStack = fromList - [ 536 - , 2 - ] - } diff --git "a/.output/golden/eta/eval/logged/Original/from-eas/fact5\n.logged" "b/.output/golden/eta/eval/logged/Original/from-eas/fact5\n.logged" deleted file mode 100644 index 8fb99a0d6..000000000 --- "a/.output/golden/eta/eval/logged/Original/from-eas/fact5\n.logged" +++ /dev/null @@ -1,533 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ A - , N - , T - , E - , N - , A - , H - , E - , T - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , I - , I - , E - , T - , R - , N - , T - , O - , E - , O - , N - , T - , E - , N - , E - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , N - , T - , E - , S - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , S - , E - , T - , R - , N - , E - , H - , R - , N - , T - , E - , S - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , E - , N - , T - , E - , T - , N - , A - , H - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , N - , S - , S - , E - , N - , I - , I - , E - , S - , R - , N - , T - , E - , H - , R - , N - , T - , O - , E - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , S - , S - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , N - , O - , S - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , T - , O - , E - , S - , N - , I - , T - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , E - , N - , T - , E - , S - , S - , N - , A - , N - , E - , T - , R - , N - , E - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , E - , N - , A - , E - , H - , R - , N - , E - , H - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , S - , S - , E - , O - , T - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , S - , H - , E - , T - , R - , N - , T - , O - , E - , E - , R - , N - , E - , N - , S - , S - , E - , S - , S - , R - , N - , T - , E - , H - , R - , N - , T - , E - , N - , N - , H - , E - , T - , R - , A - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , A - , E - , H - , N - , A - , E - , H - , R - , N - , E - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , T - , A - , E - , T - , R - , N - , T - , E - , S - , R - , N - , A - , E - , H - , R - , N - , E - , N - , E - , N - , O - , E - , S - , H - , R - , S - , S - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , T - , E - , N - , S - , S - , E - , T - , R - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , T - , E - , H - , T - , R - , O - , R - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - ] - , programCounter = 269 - } - , unitStack = fromList - [ 546 - , 2 - ] - } diff --git "a/.output/golden/eta/eval/logged/Original/from-eas/fact6\n.logged" "b/.output/golden/eta/eval/logged/Original/from-eas/fact6\n.logged" deleted file mode 100644 index 0b95ebf86..000000000 --- "a/.output/golden/eta/eval/logged/Original/from-eas/fact6\n.logged" +++ /dev/null @@ -1,533 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ A - , N - , T - , E - , N - , A - , H - , E - , T - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , I - , I - , E - , T - , R - , N - , T - , O - , E - , O - , N - , T - , E - , N - , E - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , N - , T - , E - , S - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , S - , E - , T - , R - , N - , E - , H - , R - , N - , T - , E - , S - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , E - , N - , T - , E - , T - , N - , A - , H - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , N - , S - , S - , E - , N - , I - , I - , E - , S - , R - , N - , T - , E - , H - , R - , N - , T - , O - , E - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , S - , S - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , N - , O - , S - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , T - , O - , E - , S - , N - , I - , T - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , E - , N - , T - , E - , S - , S - , N - , A - , N - , E - , T - , R - , N - , E - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , E - , N - , A - , E - , H - , R - , N - , E - , H - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , S - , S - , E - , O - , T - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , S - , H - , E - , T - , R - , N - , T - , O - , E - , E - , R - , N - , E - , N - , S - , S - , E - , S - , S - , R - , N - , T - , E - , H - , R - , N - , T - , E - , N - , N - , H - , E - , T - , R - , A - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , A - , E - , H - , N - , A - , E - , H - , R - , N - , E - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , T - , A - , E - , T - , R - , N - , T - , E - , S - , R - , N - , A - , E - , H - , R - , N - , E - , N - , E - , N - , O - , E - , S - , H - , R - , S - , S - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , T - , E - , N - , S - , S - , E - , T - , R - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , T - , E - , H - , T - , R - , O - , R - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - ] - , programCounter = 269 - } - , unitStack = fromList - [ 556 - , 2 - ] - } diff --git "a/.output/golden/eta/eval/logged/Original/from-eas/fact7\n.logged" "b/.output/golden/eta/eval/logged/Original/from-eas/fact7\n.logged" deleted file mode 100644 index 31709b52e..000000000 --- "a/.output/golden/eta/eval/logged/Original/from-eas/fact7\n.logged" +++ /dev/null @@ -1,533 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ A - , N - , T - , E - , N - , A - , H - , E - , T - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , I - , I - , E - , T - , R - , N - , T - , O - , E - , O - , N - , T - , E - , N - , E - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , N - , T - , E - , S - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , S - , E - , T - , R - , N - , E - , H - , R - , N - , T - , E - , S - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , E - , N - , T - , E - , T - , N - , A - , H - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , N - , S - , S - , E - , N - , I - , I - , E - , S - , R - , N - , T - , E - , H - , R - , N - , T - , O - , E - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , S - , S - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , N - , O - , S - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , T - , O - , E - , S - , N - , I - , T - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , E - , N - , T - , E - , S - , S - , N - , A - , N - , E - , T - , R - , N - , E - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , E - , N - , A - , E - , H - , R - , N - , E - , H - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , S - , S - , E - , O - , T - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , S - , H - , E - , T - , R - , N - , T - , O - , E - , E - , R - , N - , E - , N - , S - , S - , E - , S - , S - , R - , N - , T - , E - , H - , R - , N - , T - , E - , N - , N - , H - , E - , T - , R - , A - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , A - , E - , H - , N - , A - , E - , H - , R - , N - , E - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , T - , A - , E - , T - , R - , N - , T - , E - , S - , R - , N - , A - , E - , H - , R - , N - , E - , N - , E - , N - , O - , E - , S - , H - , R - , S - , S - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , T - , E - , N - , S - , S - , E - , T - , R - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , T - , E - , H - , T - , R - , O - , R - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - ] - , programCounter = 269 - } - , unitStack = fromList - [ 566 - , 2 - ] - } diff --git "a/.output/golden/eta/eval/logged/Original/from-eas/fact8\n.logged" "b/.output/golden/eta/eval/logged/Original/from-eas/fact8\n.logged" deleted file mode 100644 index 934ca5b73..000000000 --- "a/.output/golden/eta/eval/logged/Original/from-eas/fact8\n.logged" +++ /dev/null @@ -1,533 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ A - , N - , T - , E - , N - , A - , H - , E - , T - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , I - , I - , E - , T - , R - , N - , T - , O - , E - , O - , N - , T - , E - , N - , E - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , N - , T - , E - , S - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , S - , E - , T - , R - , N - , E - , H - , R - , N - , T - , E - , S - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , E - , N - , T - , E - , T - , N - , A - , H - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , N - , S - , S - , E - , N - , I - , I - , E - , S - , R - , N - , T - , E - , H - , R - , N - , T - , O - , E - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , S - , S - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , N - , O - , S - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , T - , O - , E - , S - , N - , I - , T - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , E - , N - , T - , E - , S - , S - , N - , A - , N - , E - , T - , R - , N - , E - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , E - , N - , A - , E - , H - , R - , N - , E - , H - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , S - , S - , E - , O - , T - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , S - , H - , E - , T - , R - , N - , T - , O - , E - , E - , R - , N - , E - , N - , S - , S - , E - , S - , S - , R - , N - , T - , E - , H - , R - , N - , T - , E - , N - , N - , H - , E - , T - , R - , A - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , A - , E - , H - , N - , A - , E - , H - , R - , N - , E - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , T - , A - , E - , T - , R - , N - , T - , E - , S - , R - , N - , A - , E - , H - , R - , N - , E - , N - , E - , N - , O - , E - , S - , H - , R - , S - , S - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , T - , E - , N - , S - , S - , E - , T - , R - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , T - , E - , H - , T - , R - , O - , R - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - ] - , programCounter = 269 - } - , unitStack = fromList - [ 576 - , 2 - ] - } diff --git "a/.output/golden/eta/eval/logged/Original/from-eas/fact9\n.logged" "b/.output/golden/eta/eval/logged/Original/from-eas/fact9\n.logged" deleted file mode 100644 index 5a095dd36..000000000 --- "a/.output/golden/eta/eval/logged/Original/from-eas/fact9\n.logged" +++ /dev/null @@ -1,533 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ A - , N - , T - , E - , N - , A - , H - , E - , T - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , I - , I - , E - , T - , R - , N - , T - , O - , E - , O - , N - , T - , E - , N - , E - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , N - , T - , E - , S - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , S - , E - , T - , R - , N - , E - , H - , R - , N - , T - , E - , S - , R - , A - , N - , T - , E - , N - , N - , E - , T - , R - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , E - , N - , T - , E - , T - , N - , A - , H - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , N - , S - , S - , E - , N - , I - , I - , E - , S - , R - , N - , T - , E - , H - , R - , N - , T - , O - , E - , A - , N - , T - , E - , N - , S - , A - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , S - , S - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , N - , O - , S - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , T - , O - , E - , S - , N - , I - , T - , E - , T - , R - , N - , T - , E - , N - , I - , A - , E - , T - , R - , N - , E - , H - , N - , E - , N - , T - , E - , S - , S - , N - , A - , N - , E - , T - , R - , N - , E - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , E - , N - , A - , E - , H - , R - , N - , E - , H - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , S - , S - , E - , O - , T - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , S - , H - , E - , T - , R - , N - , T - , O - , E - , E - , R - , N - , E - , N - , S - , S - , E - , S - , S - , R - , N - , T - , E - , H - , R - , N - , T - , E - , N - , N - , H - , E - , T - , R - , A - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - , N - , T - , E - , N - , T - , E - , H - , T - , R - , N - , A - , E - , H - , N - , A - , E - , H - , R - , N - , E - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , T - , T - , A - , E - , T - , R - , N - , T - , E - , S - , R - , N - , A - , E - , H - , R - , N - , E - , N - , E - , N - , O - , E - , S - , H - , R - , S - , S - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , T - , E - , N - , S - , S - , E - , T - , R - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , T - , E - , H - , T - , R - , O - , R - , N - , T - , E - , N - , T - , T - , I - , E - , T - , R - ] - , programCounter = 269 - } - , unitStack = fromList - [ 586 - , 2 - ] - } diff --git a/.output/golden/eta/eval/logged/Original/from-eas/hello.logged b/.output/golden/eta/eval/logged/Original/from-eas/hello.logged deleted file mode 100644 index af7e38085..000000000 --- a/.output/golden/eta/eval/logged/Original/from-eas/hello.logged +++ /dev/null @@ -1,94 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ N - , I - , I - , E - , R - , N - , S - , A - , E - , N - , A - , T - , S - , E - , N - , A - , T - , O - , E - , N - , A - , T - , O - , E - , N - , A - , H - , O - , E - , N - , T - , O - , A - , E - , R - , O - , O - , O - , O - , O - , O - , O - , R - , N - , T - , O - , E - , R - , N - , I - , N - , E - , N - , A - , H - , A - , E - , N - , A - , T - , O - , E - , N - , A - , A - , A - , E - , N - , A - , T - , S - , E - , N - , A - , O - , H - , E - , R - , O - , O - , O - , O - , O - , O - , O - , R - ] - , programCounter = 86 - } - , unitStack = fromList [] - } diff --git a/.output/golden/eta/eval/logged/Original/from-eas/hello2.logged b/.output/golden/eta/eval/logged/Original/from-eas/hello2.logged deleted file mode 100644 index 239f71d0f..000000000 --- a/.output/golden/eta/eval/logged/Original/from-eas/hello2.logged +++ /dev/null @@ -1,132 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ N - , E - , N - , T - , O - , E - , N - , I - , N - , E - , N - , A - , H - , A - , E - , N - , A - , T - , O - , E - , N - , A - , A - , A - , E - , N - , A - , T - , S - , E - , N - , A - , O - , H - , E - , N - , I - , I - , E - , N - , S - , A - , E - , N - , A - , T - , S - , E - , N - , A - , T - , O - , E - , N - , A - , T - , O - , E - , N - , A - , H - , O - , E - , N - , T - , O - , A - , E - , R - , A - , N - , T - , E - , N - , I - , E - , T - , R - , N - , T - , E - , N - , E - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , T - , E - , H - , T - , R - , O - , R - , N - , T - , E - , N - , I - , E - , T - , R - ] - , programCounter = 84 - } - , unitStack = fromList [] - } diff --git a/.output/golden/eta/eval/logged/Original/from-eas/hello3.logged b/.output/golden/eta/eval/logged/Original/from-eas/hello3.logged deleted file mode 100644 index 239f71d0f..000000000 --- a/.output/golden/eta/eval/logged/Original/from-eas/hello3.logged +++ /dev/null @@ -1,132 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ N - , E - , N - , T - , O - , E - , N - , I - , N - , E - , N - , A - , H - , A - , E - , N - , A - , T - , O - , E - , N - , A - , A - , A - , E - , N - , A - , T - , S - , E - , N - , A - , O - , H - , E - , N - , I - , I - , E - , N - , S - , A - , E - , N - , A - , T - , S - , E - , N - , A - , T - , O - , E - , N - , A - , T - , O - , E - , N - , A - , H - , O - , E - , N - , T - , O - , A - , E - , R - , A - , N - , T - , E - , N - , I - , E - , T - , R - , N - , T - , E - , N - , E - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , T - , E - , H - , T - , R - , O - , R - , N - , T - , E - , N - , I - , E - , T - , R - ] - , programCounter = 84 - } - , unitStack = fromList [] - } diff --git a/.output/golden/eta/eval/logged/Original/from-eas/hello4.logged b/.output/golden/eta/eval/logged/Original/from-eas/hello4.logged deleted file mode 100644 index 239f71d0f..000000000 --- a/.output/golden/eta/eval/logged/Original/from-eas/hello4.logged +++ /dev/null @@ -1,132 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ N - , E - , N - , T - , O - , E - , N - , I - , N - , E - , N - , A - , H - , A - , E - , N - , A - , T - , O - , E - , N - , A - , A - , A - , E - , N - , A - , T - , S - , E - , N - , A - , O - , H - , E - , N - , I - , I - , E - , N - , S - , A - , E - , N - , A - , T - , S - , E - , N - , A - , T - , O - , E - , N - , A - , T - , O - , E - , N - , A - , H - , O - , E - , N - , T - , O - , A - , E - , R - , A - , N - , T - , E - , N - , I - , E - , T - , R - , N - , T - , E - , N - , E - , T - , R - , N - , T - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , E - , N - , T - , E - , H - , T - , R - , O - , R - , N - , T - , E - , N - , I - , E - , T - , R - ] - , programCounter = 84 - } - , unitStack = fromList [] - } diff --git a/.output/golden/eta/eval/logged/Original/from-eas/readcharA.logged b/.output/golden/eta/eval/logged/Original/from-eas/readcharA.logged deleted file mode 100644 index a57087fca..000000000 --- a/.output/golden/eta/eval/logged/Original/from-eas/readcharA.logged +++ /dev/null @@ -1,10 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ I - , R - ] - , programCounter = 2 - } - , unitStack = fromList [ 65 ] - } diff --git "a/.output/golden/eta/eval/logged/Original/from-eas/readnum0\n.logged" "b/.output/golden/eta/eval/logged/Original/from-eas/readnum0\n.logged" deleted file mode 100644 index c9b0028aa..000000000 --- "a/.output/golden/eta/eval/logged/Original/from-eas/readnum0\n.logged" +++ /dev/null @@ -1,268 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , E - , N - , T - , E - , T - , N - , T - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , N - , S - , S - , E - , N - , I - , I - , E - , S - , R - , N - , T - , E - , H - , R - , N - , T - , O - , E - , A - , N - , T - , E - , N - , A - , N - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , S - , S - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , N - , A - , H - , E - , T - , R - , N - , T - , E - , N - , A - , O - , E - , T - , R - , N - , E - , H - , N - , T - , O - , E - , S - , N - , A - , A - , E - , T - , R - , N - , T - , E - , N - , A - , O - , E - , T - , R - , N - , E - , H - , N - , E - , N - , T - , E - , S - , S - , N - , S - , E - , T - , R - , N - , E - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , A - , E - , H - , N - , A - , E - , H - , R - , N - , E - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , I - , N - , E - , T - , R - , N - , T - , E - , S - , R - , N - , A - , E - , H - , R - , N - , E - , N - , E - , N - , O - , E - , S - , H - , R - , S - , S - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , T - , E - , N - , O - , A - , E - , T - , R - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - ] - , programCounter = 157 - } - , unitStack = fromList [ 496 ] - } diff --git "a/.output/golden/eta/eval/logged/Original/from-eas/readnum1\n.logged" "b/.output/golden/eta/eval/logged/Original/from-eas/readnum1\n.logged" deleted file mode 100644 index 30bc74edc..000000000 --- "a/.output/golden/eta/eval/logged/Original/from-eas/readnum1\n.logged" +++ /dev/null @@ -1,268 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , E - , N - , T - , E - , T - , N - , T - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , N - , S - , S - , E - , N - , I - , I - , E - , S - , R - , N - , T - , E - , H - , R - , N - , T - , O - , E - , A - , N - , T - , E - , N - , A - , N - , E - , T - , R - , N - , E - , N - , T - , E - , H - , R - , S - , S - , R - , I - , R - , N - , E - , H - , N - , I - , I - , E - , S - , N - , A - , H - , E - , T - , R - , N - , T - , E - , N - , A - , O - , E - , T - , R - , N - , E - , H - , N - , T - , O - , E - , S - , N - , A - , A - , E - , T - , R - , N - , T - , E - , N - , A - , O - , E - , T - , R - , N - , E - , H - , N - , E - , N - , T - , E - , S - , S - , N - , S - , E - , T - , R - , N - , E - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - , N - , A - , E - , H - , N - , A - , E - , H - , R - , N - , E - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , E - , H - , R - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , N - , T - , E - , N - , I - , N - , E - , T - , R - , N - , T - , E - , S - , R - , N - , A - , E - , H - , R - , N - , E - , N - , E - , N - , O - , E - , S - , H - , R - , S - , S - , R - , N - , A - , E - , H - , R - , N - , A - , E - , H - , R - , N - , T - , E - , N - , O - , A - , E - , T - , R - , N - , T - , E - , H - , T - , R - , N - , T - , E - , N - , A - , E - , H - , T - , R - ] - , programCounter = 157 - } - , unitStack = fromList [ 506 ] - } diff --git a/.output/golden/eta/eval/logged/Original/from-eas/true.logged b/.output/golden/eta/eval/logged/Original/from-eas/true.logged deleted file mode 100644 index 0ddd7fa1f..000000000 --- a/.output/golden/eta/eval/logged/Original/from-eas/true.logged +++ /dev/null @@ -1,7 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = [] - , programCounter = 0 - } - , unitStack = fromList [] - } diff --git a/.output/golden/eta/eval/logged/Original/original/crlf.logged b/.output/golden/eta/eval/logged/Original/original/crlf.logged deleted file mode 100644 index f410aa572..000000000 --- a/.output/golden/eta/eval/logged/Original/original/crlf.logged +++ /dev/null @@ -1,112 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ N - , T - , E - , N - , O - , E - , T - , R - , N - , T - , O - , E - , N - , T - , H - , H - , E - , N - , T - , A - , N - , E - , N - , T - , A - , A - , E - , N - , T - , A - , O - , E - , O - , O - , O - , O - , O - , N - , T - , E - , N - , E - , T - , R - , N - , T - , O - , E - , N - , T - , O - , N - , E - , N - , T - , I - , A - , E - , O - , O - , O - , N - , T - , E - , N - , E - , T - , R - , N - , T - , O - , E - , N - , T - , H - , T - , E - , N - , T - , A - , N - , E - , N - , T - , A - , A - , E - , N - , T - , A - , O - , E - , O - , O - , O - , O - , O - , N - , T - , E - , N - , E - , T - , R - ] - , programCounter = 67 - } - , unitStack = fromList [] - } diff --git a/.output/golden/eta/eval/logged/Original/original/hello.logged b/.output/golden/eta/eval/logged/Original/original/hello.logged deleted file mode 100644 index 0e102d806..000000000 --- a/.output/golden/eta/eval/logged/Original/original/hello.logged +++ /dev/null @@ -1,125 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ N - , O - , H - , E - , A - , T - , H - , E - , O - , E - , T - , A - , I - , T - , T - , E - , N - , I - , E - , T - , A - , O - , R - , R - , N - , I - , I - , E - , R - , N - , S - , A - , E - , N - , A - , R - , T - , S - , E - , R - , N - , A - , T - , O - , E - , N - , A - , T - , O - , E - , N - , A - , H - , O - , E - , R - , N - , T - , O - , A - , E - , N - , E - , S - , R - , O - , O - , O - , O - , O - , O - , O - , R - , N - , T - , O - , E - , R - , N - , I - , N - , E - , N - , A - , H - , A - , E - , N - , A - , T - , O - , E - , R - , N - , A - , A - , A - , E - , N - , A - , T - , S - , E - , N - , A - , O - , H - , E - , R - , O - , O - , O - , O - , O - , O - , O - , R - ] - , programCounter = 117 - } - , unitStack = fromList [] - } diff --git a/.output/golden/eta/eval/logged/Original/original/hello2.logged b/.output/golden/eta/eval/logged/Original/original/hello2.logged deleted file mode 100644 index e944a35c4..000000000 --- a/.output/golden/eta/eval/logged/Original/original/hello2.logged +++ /dev/null @@ -1,157 +0,0 @@ -dump: Automaton - { unitIU = IU - { program = - [ N - , E - , N - , T - , O - , E - , N - , I - , N - , E - , N - , A - , H - , A - , E - , N - , A - , T - , O - , E - , N - , A - , A - , A - , E - , N - , A - , T - , S - , E - , N - , A - , O - , H - , E - , N - , I - , I - , E - , R - , N - , S - , A - , E - , N - , A - , T - , S - , E - , N - , A - , T - , O - , E - , N - , A - , T - , O - , E - , N - , A - , H - , O - , E - , N - , T - , O - , A - , E - , A - , N - , T - , E - , N - , I - , E - , T - , R - , N - , T - , E - , N - , E - , T - , A - , N - , O - , T - , E - , T - , I - , S - , T - , O - , O - , E - , A - , T - , I - , N - , S - , S - , T - , E - , S - , R - , N - , T - , E - , H - , N - , E - , H - , A - , N - , E - , N - , T - , E - , S - , S - , T - , R - , S - , N - , T - , I - , E - , N - , T - , E - , H - , T - , R - , O - , N - , T - , H - , E - , N - , I - , E - , T - , S - , S - , I - , A - , N - , R - ] - , programCounter = 84 - } - , unitStack = fromList [] - } diff --git a/.output/golden/eta/eval/output/Fast/from-eas/bottles.output b/.output/golden/eta/eval/output/Fast/from-eas/bottles.output deleted file mode 100644 index 6d9316acf..000000000 --- a/.output/golden/eta/eval/output/Fast/from-eas/bottles.output +++ /dev/null @@ -1,12 +0,0 @@ -3 bottles of beer on the wall, 3 bottles of beer -Take one down, pass it around -2 bottles of beer on the wall - -2 bottles of beer on the wall, 2 bottles of beer -Take one down, pass it around -1 bottles of beer on the wall - -1 bottles of beer on the wall, 1 bottles of beer -Take one down, pass it around -0 bottles of beer on the wall - diff --git a/.output/golden/eta/eval/output/Fast/from-eas/divmod.output b/.output/golden/eta/eval/output/Fast/from-eas/divmod.output deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/golden/eta/eval/output/Fast/from-eas/fact0\n.output" "b/.output/golden/eta/eval/output/Fast/from-eas/fact0\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/golden/eta/eval/output/Fast/from-eas/fact1\n.output" "b/.output/golden/eta/eval/output/Fast/from-eas/fact1\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/golden/eta/eval/output/Fast/from-eas/fact2\n.output" "b/.output/golden/eta/eval/output/Fast/from-eas/fact2\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/golden/eta/eval/output/Fast/from-eas/fact3\n.output" "b/.output/golden/eta/eval/output/Fast/from-eas/fact3\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/golden/eta/eval/output/Fast/from-eas/fact4\n.output" "b/.output/golden/eta/eval/output/Fast/from-eas/fact4\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/golden/eta/eval/output/Fast/from-eas/fact5\n.output" "b/.output/golden/eta/eval/output/Fast/from-eas/fact5\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/golden/eta/eval/output/Fast/from-eas/fact6\n.output" "b/.output/golden/eta/eval/output/Fast/from-eas/fact6\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/golden/eta/eval/output/Fast/from-eas/fact7\n.output" "b/.output/golden/eta/eval/output/Fast/from-eas/fact7\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/golden/eta/eval/output/Fast/from-eas/fact8\n.output" "b/.output/golden/eta/eval/output/Fast/from-eas/fact8\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/golden/eta/eval/output/Fast/from-eas/fact9\n.output" "b/.output/golden/eta/eval/output/Fast/from-eas/fact9\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git a/.output/golden/eta/eval/output/Fast/from-eas/hello.output b/.output/golden/eta/eval/output/Fast/from-eas/hello.output deleted file mode 100644 index af5626b4a..000000000 --- a/.output/golden/eta/eval/output/Fast/from-eas/hello.output +++ /dev/null @@ -1 +0,0 @@ -Hello, world! diff --git a/.output/golden/eta/eval/output/Fast/from-eas/hello2.output b/.output/golden/eta/eval/output/Fast/from-eas/hello2.output deleted file mode 100644 index af5626b4a..000000000 --- a/.output/golden/eta/eval/output/Fast/from-eas/hello2.output +++ /dev/null @@ -1 +0,0 @@ -Hello, world! diff --git a/.output/golden/eta/eval/output/Fast/from-eas/hello3.output b/.output/golden/eta/eval/output/Fast/from-eas/hello3.output deleted file mode 100644 index af5626b4a..000000000 --- a/.output/golden/eta/eval/output/Fast/from-eas/hello3.output +++ /dev/null @@ -1 +0,0 @@ -Hello, world! diff --git a/.output/golden/eta/eval/output/Fast/from-eas/hello4.output b/.output/golden/eta/eval/output/Fast/from-eas/hello4.output deleted file mode 100644 index af5626b4a..000000000 --- a/.output/golden/eta/eval/output/Fast/from-eas/hello4.output +++ /dev/null @@ -1 +0,0 @@ -Hello, world! diff --git a/.output/golden/eta/eval/output/Fast/from-eas/readcharA.output b/.output/golden/eta/eval/output/Fast/from-eas/readcharA.output deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/golden/eta/eval/output/Fast/from-eas/readnum0\n.output" "b/.output/golden/eta/eval/output/Fast/from-eas/readnum0\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/golden/eta/eval/output/Fast/from-eas/readnum1\n.output" "b/.output/golden/eta/eval/output/Fast/from-eas/readnum1\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git a/.output/golden/eta/eval/output/Fast/from-eas/true.output b/.output/golden/eta/eval/output/Fast/from-eas/true.output deleted file mode 100644 index e69de29bb..000000000 diff --git a/.output/golden/eta/eval/output/Fast/original/bottles.output b/.output/golden/eta/eval/output/Fast/original/bottles.output deleted file mode 100644 index 9fa0b1d3c..000000000 --- a/.output/golden/eta/eval/output/Fast/original/bottles.output +++ /dev/null @@ -1,396 +0,0 @@ -99 bottles of beer on the wall, 99 bottles of beer -Take one down, pass it around -98 bottles of beer on the wall - -98 bottles of beer on the wall, 98 bottles of beer -Take one down, pass it around -97 bottles of beer on the wall - -97 bottles of beer on the wall, 97 bottles of beer -Take one down, pass it around -96 bottles of beer on the wall - -96 bottles of beer on the wall, 96 bottles of beer -Take one down, pass it around -95 bottles of beer on the wall - -95 bottles of beer on the wall, 95 bottles of beer -Take one down, pass it around -94 bottles of beer on the wall - -94 bottles of beer on the wall, 94 bottles of beer -Take one down, pass it around -93 bottles of beer on the wall - -93 bottles of beer on the wall, 93 bottles of beer -Take one down, pass it around -92 bottles of beer on the wall - -92 bottles of beer on the wall, 92 bottles of beer -Take one down, pass it around -91 bottles of beer on the wall - -91 bottles of beer on the wall, 91 bottles of beer -Take one down, pass it around -90 bottles of beer on the wall - -90 bottles of beer on the wall, 90 bottles of beer -Take one down, pass it around -89 bottles of beer on the wall - -89 bottles of beer on the wall, 89 bottles of beer -Take one down, pass it around -88 bottles of beer on the wall - -88 bottles of beer on the wall, 88 bottles of beer -Take one down, pass it around -87 bottles of beer on the wall - -87 bottles of beer on the wall, 87 bottles of beer -Take one down, pass it around -86 bottles of beer on the wall - -86 bottles of beer on the wall, 86 bottles of beer -Take one down, pass it around -85 bottles of beer on the wall - -85 bottles of beer on the wall, 85 bottles of beer -Take one down, pass it around -84 bottles of beer on the wall - -84 bottles of beer on the wall, 84 bottles of beer -Take one down, pass it around -83 bottles of beer on the wall - -83 bottles of beer on the wall, 83 bottles of beer -Take one down, pass it around -82 bottles of beer on the wall - -82 bottles of beer on the wall, 82 bottles of beer -Take one down, pass it around -81 bottles of beer on the wall - -81 bottles of beer on the wall, 81 bottles of beer -Take one down, pass it around -80 bottles of beer on the wall - -80 bottles of beer on the wall, 80 bottles of beer -Take one down, pass it around -79 bottles of beer on the wall - -79 bottles of beer on the wall, 79 bottles of beer -Take one down, pass it around -78 bottles of beer on the wall - -78 bottles of beer on the wall, 78 bottles of beer -Take one down, pass it around -77 bottles of beer on the wall - -77 bottles of beer on the wall, 77 bottles of beer -Take one down, pass it around -76 bottles of beer on the wall - -76 bottles of beer on the wall, 76 bottles of beer -Take one down, pass it around -75 bottles of beer on the wall - -75 bottles of beer on the wall, 75 bottles of beer -Take one down, pass it around -74 bottles of beer on the wall - -74 bottles of beer on the wall, 74 bottles of beer -Take one down, pass it around -73 bottles of beer on the wall - -73 bottles of beer on the wall, 73 bottles of beer -Take one down, pass it around -72 bottles of beer on the wall - -72 bottles of beer on the wall, 72 bottles of beer -Take one down, pass it around -71 bottles of beer on the wall - -71 bottles of beer on the wall, 71 bottles of beer -Take one down, pass it around -70 bottles of beer on the wall - -70 bottles of beer on the wall, 70 bottles of beer -Take one down, pass it around -69 bottles of beer on the wall - -69 bottles of beer on the wall, 69 bottles of beer -Take one down, pass it around -68 bottles of beer on the wall - -68 bottles of beer on the wall, 68 bottles of beer -Take one down, pass it around -67 bottles of beer on the wall - -67 bottles of beer on the wall, 67 bottles of beer -Take one down, pass it around -66 bottles of beer on the wall - -66 bottles of beer on the wall, 66 bottles of beer -Take one down, pass it around -65 bottles of beer on the wall - -65 bottles of beer on the wall, 65 bottles of beer -Take one down, pass it around -64 bottles of beer on the wall - -64 bottles of beer on the wall, 64 bottles of beer -Take one down, pass it around -63 bottles of beer on the wall - -63 bottles of beer on the wall, 63 bottles of beer -Take one down, pass it around -62 bottles of beer on the wall - -62 bottles of beer on the wall, 62 bottles of beer -Take one down, pass it around -61 bottles of beer on the wall - -61 bottles of beer on the wall, 61 bottles of beer -Take one down, pass it around -60 bottles of beer on the wall - -60 bottles of beer on the wall, 60 bottles of beer -Take one down, pass it around -59 bottles of beer on the wall - -59 bottles of beer on the wall, 59 bottles of beer -Take one down, pass it around -58 bottles of beer on the wall - -58 bottles of beer on the wall, 58 bottles of beer -Take one down, pass it around -57 bottles of beer on the wall - -57 bottles of beer on the wall, 57 bottles of beer -Take one down, pass it around -56 bottles of beer on the wall - -56 bottles of beer on the wall, 56 bottles of beer -Take one down, pass it around -55 bottles of beer on the wall - -55 bottles of beer on the wall, 55 bottles of beer -Take one down, pass it around -54 bottles of beer on the wall - -54 bottles of beer on the wall, 54 bottles of beer -Take one down, pass it around -53 bottles of beer on the wall - -53 bottles of beer on the wall, 53 bottles of beer -Take one down, pass it around -52 bottles of beer on the wall - -52 bottles of beer on the wall, 52 bottles of beer -Take one down, pass it around -51 bottles of beer on the wall - -51 bottles of beer on the wall, 51 bottles of beer -Take one down, pass it around -50 bottles of beer on the wall - -50 bottles of beer on the wall, 50 bottles of beer -Take one down, pass it around -49 bottles of beer on the wall - -49 bottles of beer on the wall, 49 bottles of beer -Take one down, pass it around -48 bottles of beer on the wall - -48 bottles of beer on the wall, 48 bottles of beer -Take one down, pass it around -47 bottles of beer on the wall - -47 bottles of beer on the wall, 47 bottles of beer -Take one down, pass it around -46 bottles of beer on the wall - -46 bottles of beer on the wall, 46 bottles of beer -Take one down, pass it around -45 bottles of beer on the wall - -45 bottles of beer on the wall, 45 bottles of beer -Take one down, pass it around -44 bottles of beer on the wall - -44 bottles of beer on the wall, 44 bottles of beer -Take one down, pass it around -43 bottles of beer on the wall - -43 bottles of beer on the wall, 43 bottles of beer -Take one down, pass it around -42 bottles of beer on the wall - -42 bottles of beer on the wall, 42 bottles of beer -Take one down, pass it around -41 bottles of beer on the wall - -41 bottles of beer on the wall, 41 bottles of beer -Take one down, pass it around -40 bottles of beer on the wall - -40 bottles of beer on the wall, 40 bottles of beer -Take one down, pass it around -39 bottles of beer on the wall - -39 bottles of beer on the wall, 39 bottles of beer -Take one down, pass it around -38 bottles of beer on the wall - -38 bottles of beer on the wall, 38 bottles of beer -Take one down, pass it around -37 bottles of beer on the wall - -37 bottles of beer on the wall, 37 bottles of beer -Take one down, pass it around -36 bottles of beer on the wall - -36 bottles of beer on the wall, 36 bottles of beer -Take one down, pass it around -35 bottles of beer on the wall - -35 bottles of beer on the wall, 35 bottles of beer -Take one down, pass it around -34 bottles of beer on the wall - -34 bottles of beer on the wall, 34 bottles of beer -Take one down, pass it around -33 bottles of beer on the wall - -33 bottles of beer on the wall, 33 bottles of beer -Take one down, pass it around -32 bottles of beer on the wall - -32 bottles of beer on the wall, 32 bottles of beer -Take one down, pass it around -31 bottles of beer on the wall - -31 bottles of beer on the wall, 31 bottles of beer -Take one down, pass it around -30 bottles of beer on the wall - -30 bottles of beer on the wall, 30 bottles of beer -Take one down, pass it around -29 bottles of beer on the wall - -29 bottles of beer on the wall, 29 bottles of beer -Take one down, pass it around -28 bottles of beer on the wall - -28 bottles of beer on the wall, 28 bottles of beer -Take one down, pass it around -27 bottles of beer on the wall - -27 bottles of beer on the wall, 27 bottles of beer -Take one down, pass it around -26 bottles of beer on the wall - -26 bottles of beer on the wall, 26 bottles of beer -Take one down, pass it around -25 bottles of beer on the wall - -25 bottles of beer on the wall, 25 bottles of beer -Take one down, pass it around -24 bottles of beer on the wall - -24 bottles of beer on the wall, 24 bottles of beer -Take one down, pass it around -23 bottles of beer on the wall - -23 bottles of beer on the wall, 23 bottles of beer -Take one down, pass it around -22 bottles of beer on the wall - -22 bottles of beer on the wall, 22 bottles of beer -Take one down, pass it around -21 bottles of beer on the wall - -21 bottles of beer on the wall, 21 bottles of beer -Take one down, pass it around -20 bottles of beer on the wall - -20 bottles of beer on the wall, 20 bottles of beer -Take one down, pass it around -19 bottles of beer on the wall - -19 bottles of beer on the wall, 19 bottles of beer -Take one down, pass it around -18 bottles of beer on the wall - -18 bottles of beer on the wall, 18 bottles of beer -Take one down, pass it around -17 bottles of beer on the wall - -17 bottles of beer on the wall, 17 bottles of beer -Take one down, pass it around -16 bottles of beer on the wall - -16 bottles of beer on the wall, 16 bottles of beer -Take one down, pass it around -15 bottles of beer on the wall - -15 bottles of beer on the wall, 15 bottles of beer -Take one down, pass it around -14 bottles of beer on the wall - -14 bottles of beer on the wall, 14 bottles of beer -Take one down, pass it around -13 bottles of beer on the wall - -13 bottles of beer on the wall, 13 bottles of beer -Take one down, pass it around -12 bottles of beer on the wall - -12 bottles of beer on the wall, 12 bottles of beer -Take one down, pass it around -11 bottles of beer on the wall - -11 bottles of beer on the wall, 11 bottles of beer -Take one down, pass it around -10 bottles of beer on the wall - -10 bottles of beer on the wall, 10 bottles of beer -Take one down, pass it around -9 bottles of beer on the wall - -9 bottles of beer on the wall, 9 bottles of beer -Take one down, pass it around -8 bottles of beer on the wall - -8 bottles of beer on the wall, 8 bottles of beer -Take one down, pass it around -7 bottles of beer on the wall - -7 bottles of beer on the wall, 7 bottles of beer -Take one down, pass it around -6 bottles of beer on the wall - -6 bottles of beer on the wall, 6 bottles of beer -Take one down, pass it around -5 bottles of beer on the wall - -5 bottles of beer on the wall, 5 bottles of beer -Take one down, pass it around -4 bottles of beer on the wall - -4 bottles of beer on the wall, 4 bottles of beer -Take one down, pass it around -3 bottles of beer on the wall - -3 bottles of beer on the wall, 3 bottles of beer -Take one down, pass it around -2 bottles of beer on the wall - -2 bottles of beer on the wall, 2 bottles of beer -Take one down, pass it around -1 bottles of beer on the wall - -1 bottles of beer on the wall, 1 bottles of beer -Take one down, pass it around -0 bottles of beer on the wall - diff --git a/.output/golden/eta/eval/output/Fast/original/crlf.output b/.output/golden/eta/eval/output/Fast/original/crlf.output deleted file mode 100644 index d86bac9de..000000000 --- a/.output/golden/eta/eval/output/Fast/original/crlf.output +++ /dev/null @@ -1 +0,0 @@ -OK diff --git "a/.output/golden/eta/eval/output/Fast/original/fact1\n.output" "b/.output/golden/eta/eval/output/Fast/original/fact1\n.output" deleted file mode 100644 index d00491fd7..000000000 --- "a/.output/golden/eta/eval/output/Fast/original/fact1\n.output" +++ /dev/null @@ -1 +0,0 @@ -1 diff --git "a/.output/golden/eta/eval/output/Fast/original/fact2\n.output" "b/.output/golden/eta/eval/output/Fast/original/fact2\n.output" deleted file mode 100644 index 0cfbf0888..000000000 --- "a/.output/golden/eta/eval/output/Fast/original/fact2\n.output" +++ /dev/null @@ -1 +0,0 @@ -2 diff --git "a/.output/golden/eta/eval/output/Fast/original/fact3\n.output" "b/.output/golden/eta/eval/output/Fast/original/fact3\n.output" deleted file mode 100644 index 1e8b31496..000000000 --- "a/.output/golden/eta/eval/output/Fast/original/fact3\n.output" +++ /dev/null @@ -1 +0,0 @@ -6 diff --git "a/.output/golden/eta/eval/output/Fast/original/fact4\n.output" "b/.output/golden/eta/eval/output/Fast/original/fact4\n.output" deleted file mode 100644 index a45fd52cc..000000000 --- "a/.output/golden/eta/eval/output/Fast/original/fact4\n.output" +++ /dev/null @@ -1 +0,0 @@ -24 diff --git "a/.output/golden/eta/eval/output/Fast/original/fact5\n.output" "b/.output/golden/eta/eval/output/Fast/original/fact5\n.output" deleted file mode 100644 index 52bd8e43a..000000000 --- "a/.output/golden/eta/eval/output/Fast/original/fact5\n.output" +++ /dev/null @@ -1 +0,0 @@ -120 diff --git "a/.output/golden/eta/eval/output/Fast/original/fact6\n.output" "b/.output/golden/eta/eval/output/Fast/original/fact6\n.output" deleted file mode 100644 index a1708fb1c..000000000 --- "a/.output/golden/eta/eval/output/Fast/original/fact6\n.output" +++ /dev/null @@ -1 +0,0 @@ -720 diff --git "a/.output/golden/eta/eval/output/Fast/original/fact7\n.output" "b/.output/golden/eta/eval/output/Fast/original/fact7\n.output" deleted file mode 100644 index 89810b154..000000000 --- "a/.output/golden/eta/eval/output/Fast/original/fact7\n.output" +++ /dev/null @@ -1 +0,0 @@ -5040 diff --git "a/.output/golden/eta/eval/output/Fast/original/fact8\n.output" "b/.output/golden/eta/eval/output/Fast/original/fact8\n.output" deleted file mode 100644 index 47ae14062..000000000 --- "a/.output/golden/eta/eval/output/Fast/original/fact8\n.output" +++ /dev/null @@ -1 +0,0 @@ -40320 diff --git a/.output/golden/eta/eval/output/Fast/original/hello.output b/.output/golden/eta/eval/output/Fast/original/hello.output deleted file mode 100644 index af5626b4a..000000000 --- a/.output/golden/eta/eval/output/Fast/original/hello.output +++ /dev/null @@ -1 +0,0 @@ -Hello, world! diff --git a/.output/golden/eta/eval/output/Fast/original/hello2.output b/.output/golden/eta/eval/output/Fast/original/hello2.output deleted file mode 100644 index af5626b4a..000000000 --- a/.output/golden/eta/eval/output/Fast/original/hello2.output +++ /dev/null @@ -1 +0,0 @@ -Hello, world! diff --git a/.output/golden/eta/eval/output/Original/from-eas/bottles.output b/.output/golden/eta/eval/output/Original/from-eas/bottles.output deleted file mode 100644 index 6d9316acf..000000000 --- a/.output/golden/eta/eval/output/Original/from-eas/bottles.output +++ /dev/null @@ -1,12 +0,0 @@ -3 bottles of beer on the wall, 3 bottles of beer -Take one down, pass it around -2 bottles of beer on the wall - -2 bottles of beer on the wall, 2 bottles of beer -Take one down, pass it around -1 bottles of beer on the wall - -1 bottles of beer on the wall, 1 bottles of beer -Take one down, pass it around -0 bottles of beer on the wall - diff --git a/.output/golden/eta/eval/output/Original/from-eas/divmod.output b/.output/golden/eta/eval/output/Original/from-eas/divmod.output deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/golden/eta/eval/output/Original/from-eas/fact0\n.output" "b/.output/golden/eta/eval/output/Original/from-eas/fact0\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/golden/eta/eval/output/Original/from-eas/fact1\n.output" "b/.output/golden/eta/eval/output/Original/from-eas/fact1\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/golden/eta/eval/output/Original/from-eas/fact2\n.output" "b/.output/golden/eta/eval/output/Original/from-eas/fact2\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/golden/eta/eval/output/Original/from-eas/fact3\n.output" "b/.output/golden/eta/eval/output/Original/from-eas/fact3\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/golden/eta/eval/output/Original/from-eas/fact4\n.output" "b/.output/golden/eta/eval/output/Original/from-eas/fact4\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/golden/eta/eval/output/Original/from-eas/fact5\n.output" "b/.output/golden/eta/eval/output/Original/from-eas/fact5\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/golden/eta/eval/output/Original/from-eas/fact6\n.output" "b/.output/golden/eta/eval/output/Original/from-eas/fact6\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/golden/eta/eval/output/Original/from-eas/fact7\n.output" "b/.output/golden/eta/eval/output/Original/from-eas/fact7\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/golden/eta/eval/output/Original/from-eas/fact8\n.output" "b/.output/golden/eta/eval/output/Original/from-eas/fact8\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/golden/eta/eval/output/Original/from-eas/fact9\n.output" "b/.output/golden/eta/eval/output/Original/from-eas/fact9\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git a/.output/golden/eta/eval/output/Original/from-eas/hello.output b/.output/golden/eta/eval/output/Original/from-eas/hello.output deleted file mode 100644 index af5626b4a..000000000 --- a/.output/golden/eta/eval/output/Original/from-eas/hello.output +++ /dev/null @@ -1 +0,0 @@ -Hello, world! diff --git a/.output/golden/eta/eval/output/Original/from-eas/hello2.output b/.output/golden/eta/eval/output/Original/from-eas/hello2.output deleted file mode 100644 index af5626b4a..000000000 --- a/.output/golden/eta/eval/output/Original/from-eas/hello2.output +++ /dev/null @@ -1 +0,0 @@ -Hello, world! diff --git a/.output/golden/eta/eval/output/Original/from-eas/hello3.output b/.output/golden/eta/eval/output/Original/from-eas/hello3.output deleted file mode 100644 index af5626b4a..000000000 --- a/.output/golden/eta/eval/output/Original/from-eas/hello3.output +++ /dev/null @@ -1 +0,0 @@ -Hello, world! diff --git a/.output/golden/eta/eval/output/Original/from-eas/hello4.output b/.output/golden/eta/eval/output/Original/from-eas/hello4.output deleted file mode 100644 index af5626b4a..000000000 --- a/.output/golden/eta/eval/output/Original/from-eas/hello4.output +++ /dev/null @@ -1 +0,0 @@ -Hello, world! diff --git a/.output/golden/eta/eval/output/Original/from-eas/readcharA.output b/.output/golden/eta/eval/output/Original/from-eas/readcharA.output deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/golden/eta/eval/output/Original/from-eas/readnum0\n.output" "b/.output/golden/eta/eval/output/Original/from-eas/readnum0\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/.output/golden/eta/eval/output/Original/from-eas/readnum1\n.output" "b/.output/golden/eta/eval/output/Original/from-eas/readnum1\n.output" deleted file mode 100644 index e69de29bb..000000000 diff --git a/.output/golden/eta/eval/output/Original/from-eas/true.output b/.output/golden/eta/eval/output/Original/from-eas/true.output deleted file mode 100644 index e69de29bb..000000000 diff --git a/.output/golden/eta/eval/output/Original/original/crlf.output b/.output/golden/eta/eval/output/Original/original/crlf.output deleted file mode 100644 index d86bac9de..000000000 --- a/.output/golden/eta/eval/output/Original/original/crlf.output +++ /dev/null @@ -1 +0,0 @@ -OK diff --git a/.output/golden/eta/eval/output/Original/original/hello.output b/.output/golden/eta/eval/output/Original/original/hello.output deleted file mode 100644 index af5626b4a..000000000 --- a/.output/golden/eta/eval/output/Original/original/hello.output +++ /dev/null @@ -1 +0,0 @@ -Hello, world! diff --git a/.output/golden/eta/eval/output/Original/original/hello2.output b/.output/golden/eta/eval/output/Original/original/hello2.output deleted file mode 100644 index af5626b4a..000000000 --- a/.output/golden/eta/eval/output/Original/original/hello2.output +++ /dev/null @@ -1 +0,0 @@ -Hello, world! diff --git a/.output/golden/eta/il/optimized/from-eas/bottles.il b/.output/golden/eta/il/optimized/from-eas/bottles.il new file mode 100644 index 000000000..dcb193fd0 --- /dev/null +++ b/.output/golden/eta/il/optimized/from-eas/bottles.il @@ -0,0 +1,692 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 31 ) + ) +, Transfer +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 6 ) + ) +, Transfer +, ICF + ( DMark 5 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 6 ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 7 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, ICF + ( DMark 8 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 9 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 11 ) + ) +, Transfer +, ICF + ( DMark 10 ) +, IAL + ( SAL + ( Cons 48 ) + ) +, IAL ( SIO OutputChar ) +, Transfer +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 11 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 12 ) +, IAL + ( SAL + ( Cons 14 ) + ) +, Transfer +, ICF + ( DMark 13 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 18 ) + ) +, Transfer +, ICF + ( DMark 14 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( SMark "14" ) +, ICF + ( DMark 15 ) +, IAL + ( SAL + ( Cons + ( -48 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 16 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 17 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 11 ) + ) +, Transfer +, ICF + ( DMark 18 ) +, IAL + ( SAL + ( Cons 19 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, ICF + ( DMark 19 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 20 ) +, ICF + ( DMark 21 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 22 ) +, IAL + ( SAL + ( Cons 23 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 8 ) + ) +, Transfer +, ICF + ( DMark 23 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 102 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ICF + ( DMark 24 ) +, IAL + ( SAL + ( Cons 25 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, ICF + ( DMark 25 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 26 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 27 ) +, IAL + ( SAL + ( Cons 28 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 21 ) + ) +, Transfer +, ICF + ( DMark 28 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 104 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ICF + ( DMark 29 ) +, IAL + ( SAL + ( Cons 30 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, ICF + ( DMark 30 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 31 ) +, IAL + ( SAL + ( Cons 3 ) + ) +, ICF + ( DMark 32 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 26 ) + ) +, Transfer +, ICF + ( DMark 33 ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 34 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 35 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 21 ) + ) +, Transfer +, ICF + ( DMark 35 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 36 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 105 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 112 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 107 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 84 ) + ) +, ICF + ( DMark 37 ) +, IAL + ( SAL + ( Cons 38 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, ICF + ( DMark 38 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 39 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 40 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 26 ) + ) +, Transfer +, ICF + ( DMark 40 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 41 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 32 ) + ) +, Transfer +, ICF + ( DMark 42 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 43 ) +, End +] \ No newline at end of file diff --git a/.output/golden/eta/il/optimized/from-eas/euclid.il b/.output/golden/eta/il/optimized/from-eas/euclid.il new file mode 100644 index 000000000..67cf4bfd2 --- /dev/null +++ b/.output/golden/eta/il/optimized/from-eas/euclid.il @@ -0,0 +1,113 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 5 ) + ) +, Transfer +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, Transfer +, ICF + ( DMark 5 ) +, IAL + ( SAL + ( Cons + ( -1 ) + ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 6 ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( SMark "6" ) +, ICF + ( DMark 7 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 8 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 9 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, ICF + ( DMark 10 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 11 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 12 ) +, Transfer +, ICF + ( DMark 13 ) +, End +] \ No newline at end of file diff --git a/.output/golden/eta/il/optimized/from-eas/fact.il b/.output/golden/eta/il/optimized/from-eas/fact.il new file mode 100644 index 000000000..7e5822f11 --- /dev/null +++ b/.output/golden/eta/il/optimized/from-eas/fact.il @@ -0,0 +1,688 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 14 ) + ) +, Transfer +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 5 ) + ) +, Transfer +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, Transfer +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 5 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 6 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 7 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 9 ) + ) +, Transfer +, ICF + ( DMark 8 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, Transfer +, ICF + ( DMark 9 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 10 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 11 ) +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 5 ) + ) +, Transfer +, ICF + ( DMark 12 ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, Transfer +, ICF + ( DMark 13 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 14 ) +, IAL ( SIO InputChar ) +, ICF + ( DMark 15 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 16 ) +, IAL + ( SAL + ( Cons 18 ) + ) +, Transfer +, ICF + ( DMark 17 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, Transfer +, IAL + ( SAL + ( Cons 14 ) + ) +, Transfer +, ICF + ( DMark 18 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 19 ) +, IAL + ( SAL + ( Cons 16 ) + ) +, ICF + ( DMark 20 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 21 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 22 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, Transfer +, ICF + ( DMark 22 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 23 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 24 ) +, IAL ( SIO InputChar ) +, ICF + ( DMark 25 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 27 ) + ) +, Transfer +, ICF + ( DMark 26 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 30 ) + ) +, Transfer +, ICF + ( DMark 27 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 29 ) + ) +, Transfer +, ICF + ( DMark 28 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 30 ) + ) +, Transfer +, ICF + ( DMark 29 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons + ( -1 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 19 ) + ) +, Transfer +, ICF + ( DMark 30 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 31 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 32 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 33 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 35 ) + ) +, Transfer +, ICF + ( DMark 34 ) +, IAL + ( SAL + ( Cons 48 ) + ) +, IAL ( SIO OutputChar ) +, Transfer +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 35 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 36 ) +, IAL + ( SAL + ( Cons 38 ) + ) +, Transfer +, ICF + ( DMark 37 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 42 ) + ) +, Transfer +, ICF + ( DMark 38 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( SMark "38" ) +, ICF + ( DMark 39 ) +, IAL + ( SAL + ( Cons + ( -48 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 40 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 41 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 35 ) + ) +, Transfer +, ICF + ( DMark 42 ) +, IAL + ( SAL + ( Cons 43 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 60 ) + ) +, Transfer +, ICF + ( DMark 43 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 44 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 45 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( DMark 46 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 47 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 48 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 49 ) +, IAL + ( SAL + ( Cons 51 ) + ) +, Transfer +, ICF + ( DMark 50 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 58 ) + ) +, Transfer +, ICF + ( DMark 51 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 52 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 53 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons + ( -3 ) + ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 54 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 55 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 56 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 57 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 48 ) + ) +, Transfer +, ICF + ( DMark 58 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 59 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 60 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 61 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 62 ) +, IAL + ( SAL + ( Cons 64 ) + ) +, Transfer +, ICF + ( DMark 63 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 64 ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 65 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 60 ) + ) +, Transfer +, ICF + ( DMark 66 ) +, End +] \ No newline at end of file diff --git a/.output/golden/eta/il/optimized/from-eas/function.il b/.output/golden/eta/il/optimized/from-eas/function.il new file mode 100644 index 000000000..a8e326dbe --- /dev/null +++ b/.output/golden/eta/il/optimized/from-eas/function.il @@ -0,0 +1,55 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 5 ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 6 ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 7 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, ICF + ( DMark 8 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 9 ) +, Transfer +, ICF + ( DMark 10 ) +, End +] \ No newline at end of file diff --git a/.output/golden/eta/il/optimized/from-eas/hello.il b/.output/golden/eta/il/optimized/from-eas/hello.il new file mode 100644 index 000000000..bb2fc89e7 --- /dev/null +++ b/.output/golden/eta/il/optimized/from-eas/hello.il @@ -0,0 +1,86 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, ICF + ( DMark 3 ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, ICF + ( DMark 5 ) +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, ICF + ( DMark 6 ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 7 ) +, End +] \ No newline at end of file diff --git a/.output/golden/eta/il/optimized/from-eas/hello2.il b/.output/golden/eta/il/optimized/from-eas/hello2.il new file mode 100644 index 000000000..527ee5bcd --- /dev/null +++ b/.output/golden/eta/il/optimized/from-eas/hello2.il @@ -0,0 +1,141 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 4 ) + ) +, Transfer +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 5 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 6 ) +, IAL + ( SAL + ( Cons 8 ) + ) +, Transfer +, ICF + ( DMark 7 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 8 ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 9 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 4 ) + ) +, Transfer +, ICF + ( DMark 10 ) +, End +] \ No newline at end of file diff --git a/.output/golden/eta/il/optimized/from-eas/hello3.il b/.output/golden/eta/il/optimized/from-eas/hello3.il new file mode 100644 index 000000000..527ee5bcd --- /dev/null +++ b/.output/golden/eta/il/optimized/from-eas/hello3.il @@ -0,0 +1,141 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 4 ) + ) +, Transfer +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 5 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 6 ) +, IAL + ( SAL + ( Cons 8 ) + ) +, Transfer +, ICF + ( DMark 7 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 8 ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 9 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 4 ) + ) +, Transfer +, ICF + ( DMark 10 ) +, End +] \ No newline at end of file diff --git a/.output/golden/eta/il/optimized/from-eas/hello4.il b/.output/golden/eta/il/optimized/from-eas/hello4.il new file mode 100644 index 000000000..527ee5bcd --- /dev/null +++ b/.output/golden/eta/il/optimized/from-eas/hello4.il @@ -0,0 +1,141 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 4 ) + ) +, Transfer +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 5 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 6 ) +, IAL + ( SAL + ( Cons 8 ) + ) +, Transfer +, ICF + ( DMark 7 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 8 ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 9 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 4 ) + ) +, Transfer +, ICF + ( DMark 10 ) +, End +] \ No newline at end of file diff --git a/.output/golden/eta/il/optimized/from-eas/multiply.il b/.output/golden/eta/il/optimized/from-eas/multiply.il new file mode 100644 index 000000000..084fb5643 --- /dev/null +++ b/.output/golden/eta/il/optimized/from-eas/multiply.il @@ -0,0 +1,140 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 5 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 6 ) +, IAL + ( SAL + ( Cons 8 ) + ) +, Transfer +, ICF + ( DMark 7 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 15 ) + ) +, Transfer +, ICF + ( DMark 8 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 9 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 10 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons + ( -3 ) + ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 11 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 12 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 13 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 14 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 5 ) + ) +, Transfer +, ICF + ( DMark 15 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 16 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 17 ) +, End +] \ No newline at end of file diff --git a/.output/golden/eta/il/optimized/from-eas/pip.il b/.output/golden/eta/il/optimized/from-eas/pip.il new file mode 100644 index 000000000..0c137c9fb --- /dev/null +++ b/.output/golden/eta/il/optimized/from-eas/pip.il @@ -0,0 +1,68 @@ +[ ICF + ( DMark 1 ) +, IAL ( SIO InputChar ) +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons + ( -1 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 7 ) + ) +, Transfer +, ICF + ( DMark 5 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 6 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 7 ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 8 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, Transfer +, ICF + ( DMark 9 ) +, End +] \ No newline at end of file diff --git a/.output/golden/eta/il/optimized/from-eas/pip2.il b/.output/golden/eta/il/optimized/from-eas/pip2.il new file mode 100644 index 000000000..ad7cdb019 --- /dev/null +++ b/.output/golden/eta/il/optimized/from-eas/pip2.il @@ -0,0 +1,56 @@ +[ ICF + ( DMark 1 ) +, IAL ( SIO InputChar ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons + ( -1 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 2 ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, Transfer +, ICF + ( DMark 3 ) +, End +] \ No newline at end of file diff --git a/.output/golden/eta/il/optimized/from-eas/readnum.il b/.output/golden/eta/il/optimized/from-eas/readnum.il new file mode 100644 index 000000000..233404150 --- /dev/null +++ b/.output/golden/eta/il/optimized/from-eas/readnum.il @@ -0,0 +1,344 @@ +[ ICF + ( DMark 1 ) +, IAL ( SIO InputChar ) +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 5 ) + ) +, Transfer +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, Transfer +, IAL + ( SAL + ( Cons 1 ) + ) +, Transfer +, ICF + ( DMark 5 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 6 ) +, IAL + ( SAL + ( Cons 16 ) + ) +, ICF + ( DMark 7 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 8 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 9 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 19 ) + ) +, Transfer +, ICF + ( DMark 9 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 10 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 11 ) +, IAL ( SIO InputChar ) +, ICF + ( DMark 12 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 14 ) + ) +, Transfer +, ICF + ( DMark 13 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 17 ) + ) +, Transfer +, ICF + ( DMark 14 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 16 ) + ) +, Transfer +, ICF + ( DMark 15 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 17 ) + ) +, Transfer +, ICF + ( DMark 16 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons + ( -1 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 6 ) + ) +, Transfer +, ICF + ( DMark 17 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 18 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 19 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 20 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( DMark 21 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 22 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 23 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 24 ) +, IAL + ( SAL + ( Cons 26 ) + ) +, Transfer +, ICF + ( DMark 25 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, Transfer +, ICF + ( DMark 26 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 27 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 28 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons + ( -3 ) + ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 29 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 30 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 31 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 32 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 23 ) + ) +, Transfer +, ICF + ( DMark 33 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 34 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 35 ) +, End +] \ No newline at end of file diff --git a/.output/golden/eta/il/optimized/from-eas/reverse.il b/.output/golden/eta/il/optimized/from-eas/reverse.il new file mode 100644 index 000000000..92103d1f3 --- /dev/null +++ b/.output/golden/eta/il/optimized/from-eas/reverse.il @@ -0,0 +1,100 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons + ( -1 ) + ) + ) +, ICF + ( DMark 2 ) +, IAL ( SIO InputChar ) +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons + ( -1 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 5 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons + ( -1 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 7 ) + ) +, Transfer +, ICF + ( DMark 6 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 7 ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 5 ) + ) +, Transfer +, ICF + ( DMark 8 ) +, End +] \ No newline at end of file diff --git a/.output/golden/eta/il/optimized/from-eas/true.il b/.output/golden/eta/il/optimized/from-eas/true.il new file mode 100644 index 000000000..2e0854629 --- /dev/null +++ b/.output/golden/eta/il/optimized/from-eas/true.il @@ -0,0 +1,4 @@ +[ ICF + ( DMark 1 ) +, End +] \ No newline at end of file diff --git a/.output/golden/eta/il/optimized/from-eas/writenum.il b/.output/golden/eta/il/optimized/from-eas/writenum.il new file mode 100644 index 000000000..64fa1dbdc --- /dev/null +++ b/.output/golden/eta/il/optimized/from-eas/writenum.il @@ -0,0 +1,192 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 4 ) + ) +, Transfer +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 48 ) + ) +, IAL ( SIO OutputChar ) +, Transfer +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 5 ) +, IAL + ( SAL + ( Cons 7 ) + ) +, Transfer +, ICF + ( DMark 6 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 11 ) + ) +, Transfer +, ICF + ( DMark 7 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( SMark "7" ) +, ICF + ( DMark 8 ) +, IAL + ( SAL + ( Cons + ( -48 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 9 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 10 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 4 ) + ) +, Transfer +, ICF + ( DMark 11 ) +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, Transfer +, ICF + ( DMark 12 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 13 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 14 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 15 ) +, IAL + ( SAL + ( Cons 17 ) + ) +, Transfer +, ICF + ( DMark 16 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 17 ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 18 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, Transfer +, ICF + ( DMark 19 ) +, End +] \ No newline at end of file diff --git a/.output/golden/eta/il/optimized/from-eas/writestr.il b/.output/golden/eta/il/optimized/from-eas/writestr.il new file mode 100644 index 000000000..f26924264 --- /dev/null +++ b/.output/golden/eta/il/optimized/from-eas/writestr.il @@ -0,0 +1,53 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 5 ) + ) +, Transfer +, ICF + ( DMark 4 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 5 ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 6 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, Transfer +, ICF + ( DMark 7 ) +, End +] \ No newline at end of file diff --git a/.output/golden/eta/il/optimized/original/bottles.il b/.output/golden/eta/il/optimized/original/bottles.il new file mode 100644 index 000000000..039dbd237 --- /dev/null +++ b/.output/golden/eta/il/optimized/original/bottles.il @@ -0,0 +1,971 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 141 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, Transfer +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 155 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( SMark "1" ) +, Transfer +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SIO InputChar ) +, Transfer +, Transfer +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, IAL + ( SAL + ( Cons 4 ) + ) +, Transfer +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 3 ) + ) +, Transfer +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( SMark "2" ) +, IAL ( SIO InputChar ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, IAL ( SIO InputChar ) +, Transfer +, IAL + ( SAL ( Binary Sub ) ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 3 ) + ) +, Transfer +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, IAL ( SIO InputChar ) +, IAL + ( SAL ( Binary Sub ) ) +, Transfer +, IAL ( SIO InputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 4 ) + ) +, Transfer +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( SMark "3" ) +, IAL + ( SAL ( Binary Sub ) ) +, Transfer +, IAL + ( SAL ( Binary Sub ) ) +, IAL ( SIO InputChar ) +, Transfer +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 18828800 ) + ) +, IAL + ( SAL + ( Cons 4 ) + ) +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 6 ) + ) +, Transfer +, ICF + ( DMark 5 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 6 ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 7 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, ICF + ( DMark 8 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 9 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 11 ) + ) +, Transfer +, ICF + ( DMark 10 ) +, IAL + ( SAL + ( Cons 48 ) + ) +, IAL ( SIO OutputChar ) +, Transfer +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 11 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 12 ) +, IAL + ( SAL + ( Cons 14 ) + ) +, Transfer +, ICF + ( DMark 13 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 18 ) + ) +, Transfer +, ICF + ( DMark 14 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( SMark "14" ) +, ICF + ( DMark 15 ) +, IAL + ( SAL + ( Cons + ( -48 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 16 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 17 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 11 ) + ) +, Transfer +, IAL + ( SAL + ( Cons 18 ) + ) +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL + ( Cons 13128755 ) + ) +, Transfer +, ICF + ( DMark 18 ) +, IAL + ( SAL + ( Cons 19 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, ICF + ( DMark 19 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 20 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 21 ) +, IAL + ( SAL + ( Cons 22 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 8 ) + ) +, Transfer +, ICF + ( DMark 22 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 102 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 23 ) + ) +, Transfer +, IAL + ( SAL + ( Cons 2348471754576 ) + ) +, ICF + ( CStatic "23" Jump ) +, ICF + ( DMark 23 ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 24 ) + ) +, Transfer +, IAL + ( SAL + ( Cons 335495964812 ) + ) +, ICF + ( CStatic "24" Jump ) +, ICF + ( DMark 24 ) +, IAL + ( SAL + ( Cons 25 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, ICF + ( DMark 25 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 26 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 27 ) +, IAL + ( SAL + ( Cons 28 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 20 ) + ) +, Transfer +, ICF + ( DMark 28 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 29 ) + ) +, Transfer +, IAL + ( SAL + ( Cons 2348471754565 ) + ) +, ICF + ( CStatic "29" Jump ) +, ICF + ( DMark 29 ) +, IAL + ( SAL + ( Cons 104 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 30 ) + ) +, Transfer +, IAL + ( SAL + ( Cons 335495964812 ) + ) +, ICF + ( CStatic "30" Jump ) +, ICF + ( DMark 30 ) +, IAL + ( SAL + ( Cons 31 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, ICF + ( DMark 31 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, IAL ( SIO InputChar ) +, Transfer +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( SMark "31" ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 32 ) + ) +, Transfer +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, IAL ( SIO InputChar ) +, IAL + ( SAL + ( Cons 402523 ) + ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, IAL ( SIO InputChar ) +, IAL + ( SAL + ( Cons 1814 ) + ) +, ICF + ( CStatic "32" Jump ) +, ICF + ( DMark 32 ) +, IAL + ( SAL + ( Cons 99 ) + ) +, ICF + ( DMark 33 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 34 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 26 ) + ) +, Transfer +, ICF + ( DMark 34 ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 35 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 36 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 20 ) + ) +, Transfer +, ICF + ( DMark 36 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 37 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ICF + ( DMark 38 ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 105 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ICF + ( DMark 39 ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 112 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, ICF + ( DMark 40 ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ICF + ( DMark 41 ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 107 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 84 ) + ) +, ICF + ( DMark 42 ) +, IAL + ( SAL + ( Cons 43 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, ICF + ( DMark 43 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 44 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 45 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 26 ) + ) +, Transfer +, ICF + ( DMark 45 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 46 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 33 ) + ) +, Transfer +, ICF + ( DMark 47 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 48 ) +, End +] \ No newline at end of file diff --git a/.output/golden/eta/il/optimized/original/crlf.il b/.output/golden/eta/il/optimized/original/crlf.il new file mode 100644 index 000000000..0007ac0e1 --- /dev/null +++ b/.output/golden/eta/il/optimized/original/crlf.il @@ -0,0 +1,113 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 3 ) + ) +, Transfer +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 49 ) + ) +, IAL + ( SAL + ( Cons 68 ) + ) +, IAL + ( SAL + ( Cons 65 ) + ) +, IAL + ( SAL + ( Cons 66 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 75 ) + ) +, IAL + ( SAL + ( Cons 79 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 50 ) + ) +, IAL + ( SAL + ( Cons 68 ) + ) +, IAL + ( SAL + ( Cons 65 ) + ) +, IAL + ( SAL + ( Cons 66 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 5 ) +, End +] \ No newline at end of file diff --git a/.output/golden/eta/il/optimized/original/fact.il b/.output/golden/eta/il/optimized/original/fact.il new file mode 100644 index 000000000..a3ba873c2 --- /dev/null +++ b/.output/golden/eta/il/optimized/original/fact.il @@ -0,0 +1,697 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 14 ) + ) +, Transfer +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 5 ) + ) +, Transfer +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, Transfer +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 5 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 6 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 7 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 9 ) + ) +, Transfer +, ICF + ( DMark 8 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, Transfer +, ICF + ( DMark 9 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 10 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 11 ) +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 5 ) + ) +, Transfer +, ICF + ( DMark 12 ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 42 ) + ) +, Transfer +, ICF + ( DMark 13 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 14 ) +, IAL ( SIO InputChar ) +, ICF + ( DMark 15 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 16 ) +, IAL + ( SAL + ( Cons 18 ) + ) +, Transfer +, ICF + ( DMark 17 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, Transfer +, IAL + ( SAL + ( Cons 14 ) + ) +, Transfer +, ICF + ( DMark 18 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 19 ) +, IAL + ( SAL + ( Cons 48 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 20 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 21 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 22 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 42 ) + ) +, Transfer +, IAL + ( SAL ( Binary Sub ) ) +, Transfer +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( SMark "21" ) +, IAL + ( SAL + ( Cons 22 ) + ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, Transfer +, IAL ( SIO InputChar ) +, Transfer +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( DMark 22 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 23 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 24 ) +, IAL ( SIO InputChar ) +, ICF + ( DMark 25 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 27 ) + ) +, Transfer +, ICF + ( DMark 26 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 30 ) + ) +, Transfer +, ICF + ( DMark 27 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 29 ) + ) +, Transfer +, ICF + ( DMark 28 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 30 ) + ) +, Transfer +, ICF + ( DMark 29 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons + ( -1 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 19 ) + ) +, Transfer +, ICF + ( DMark 30 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 31 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 32 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 33 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 34 ) +, IAL + ( SAL + ( Cons 36 ) + ) +, Transfer +, ICF + ( DMark 35 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 40 ) + ) +, Transfer +, ICF + ( DMark 36 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( SMark "36" ) +, ICF + ( DMark 37 ) +, IAL + ( SAL + ( Cons + ( -48 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 38 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 39 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, Transfer +, ICF + ( DMark 40 ) +, IAL + ( SAL + ( Cons 41 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 58 ) + ) +, Transfer +, ICF + ( DMark 41 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 42 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 43 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( DMark 44 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 45 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 46 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 47 ) +, IAL + ( SAL + ( Cons 49 ) + ) +, Transfer +, ICF + ( DMark 48 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 56 ) + ) +, Transfer +, ICF + ( DMark 49 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 50 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 51 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons + ( -3 ) + ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 52 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 53 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 54 ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 55 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 46 ) + ) +, Transfer +, ICF + ( DMark 56 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 57 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 58 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 59 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 60 ) +, IAL + ( SAL + ( Cons 62 ) + ) +, Transfer +, ICF + ( DMark 61 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 62 ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 63 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 58 ) + ) +, Transfer +, ICF + ( DMark 64 ) +, End +] \ No newline at end of file diff --git a/.output/golden/eta/il/optimized/original/hello.il b/.output/golden/eta/il/optimized/original/hello.il new file mode 100644 index 000000000..b53b0e8ed --- /dev/null +++ b/.output/golden/eta/il/optimized/original/hello.il @@ -0,0 +1,168 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 21 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( SMark "1" ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, Transfer +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SIO InputChar ) +, Transfer +, Transfer +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, IAL + ( SAL + ( Cons 4 ) + ) +, Transfer +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 2 ) +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ICF + ( CStatic "5" Jump ) +, ICF + ( DMark 5 ) +, Transfer +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( SMark "5" ) +, ICF + ( DMark 6 ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ICF + ( DMark 7 ) +, IAL + ( SAL + ( Cons 72 ) + ) +, ICF + ( DMark 8 ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 9 ) +, IAL + ( SAL + ( Cons 10 ) + ) +, ICF + ( DMark 10 ) +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ICF + ( DMark 11 ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, ICF + ( DMark 12 ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 13 ) +, End +] \ No newline at end of file diff --git a/.output/golden/eta/il/optimized/original/hello2.il b/.output/golden/eta/il/optimized/original/hello2.il new file mode 100644 index 000000000..2dd961ddf --- /dev/null +++ b/.output/golden/eta/il/optimized/original/hello2.il @@ -0,0 +1,187 @@ +[ ICF + ( DMark 1 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 4 ) + ) +, Transfer +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 22 ) + ) +, Transfer +, IAL ( SIO InputChar ) +, IAL + ( SAL ( Binary Sub ) ) +, Transfer +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) + ) +, ICF + ( SMark "3" ) +, IAL + ( SAL + ( Cons 4 ) + ) +, Transfer +, IAL ( SIO InputChar ) +, IAL + ( SAL + ( Cons 337 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 6 ) + ) +, Transfer +, ICF + ( DMark 5 ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 6 ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 7 ) + ) +, IAL + ( SAL + ( Cons 4 ) + ) +, Transfer +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL ( SIO InputChar ) +, IAL + ( SAL + ( Cons 7 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "7" Jump ) +, ICF + ( DMark 7 ) +, End +] \ No newline at end of file diff --git a/.output/golden/eta/il/optimized/original/pip.il b/.output/golden/eta/il/optimized/original/pip.il new file mode 100644 index 000000000..0c137c9fb --- /dev/null +++ b/.output/golden/eta/il/optimized/original/pip.il @@ -0,0 +1,68 @@ +[ ICF + ( DMark 1 ) +, IAL ( SIO InputChar ) +, ICF + ( DMark 2 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, ICF + ( DMark 3 ) +, IAL + ( SAL + ( Cons + ( -1 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( DMark 4 ) +, IAL + ( SAL + ( Cons 7 ) + ) +, Transfer +, ICF + ( DMark 5 ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, ICF + ( DMark 6 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 7 ) +, IAL ( SIO OutputChar ) +, ICF + ( DMark 8 ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, Transfer +, ICF + ( DMark 9 ) +, End +] \ No newline at end of file diff --git a/.output/golden/eta/il/optimized/original/pip2.il b/.output/golden/eta/il/optimized/original/pip2.il new file mode 100644 index 000000000..ad7cdb019 --- /dev/null +++ b/.output/golden/eta/il/optimized/original/pip2.il @@ -0,0 +1,56 @@ +[ ICF + ( DMark 1 ) +, IAL ( SIO InputChar ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons + ( -1 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 2 ) + ) +, Transfer +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) +, Transfer +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, Transfer +, ICF + ( DMark 2 ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, Transfer +, ICF + ( DMark 3 ) +, End +] \ No newline at end of file diff --git a/.output/golden/eta/il/parsed/from-eas/bottles.il b/.output/golden/eta/il/parsed/from-eas/bottles.il index 630fe5e3f..f5e5f7b38 100644 --- a/.output/golden/eta/il/parsed/from-eas/bottles.il +++ b/.output/golden/eta/il/parsed/from-eas/bottles.il @@ -1,39 +1,60 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 31 ) + ( SAL + ( Cons 31 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 3 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 4 ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 5 ) -, IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 6 ) @@ -41,395 +62,669 @@ , ICF ( DMark 7 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 9 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 10 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 11 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 13 ) -, IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 18 ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 14 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "14" ) , ICF ( DMark 15 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 48 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , IAL - ( Cons 48 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 17 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 19 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 20 ) , ICF ( DMark 21 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 22 ) , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , Transfer , ICF ( DMark 23 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( DMark 24 ) , IAL - ( Cons 25 ) + ( SAL + ( Cons 25 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 25 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 27 ) , IAL - ( Cons 28 ) + ( SAL + ( Cons 28 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( DMark 29 ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , ICF ( DMark 32 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) , Transfer , ICF ( DMark 33 ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 34 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , Transfer , ICF ( DMark 35 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 36 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 112 ) + ( SAL + ( Cons 112 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 107 ) + ( SAL + ( Cons 107 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 84 ) + ( SAL + ( Cons 84 ) + ) , ICF ( DMark 37 ) , IAL - ( Cons 38 ) + ( SAL + ( Cons 38 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 38 ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 39 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF ( DMark 41 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 43 ) diff --git a/.output/golden/eta/il/parsed/from-eas/euclid.il b/.output/golden/eta/il/parsed/from-eas/euclid.il index 54e4bf524..8fcef7f35 100644 --- a/.output/golden/eta/il/parsed/from-eas/euclid.il +++ b/.output/golden/eta/il/parsed/from-eas/euclid.il @@ -1,84 +1,125 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 2 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "6" ) , ICF ( DMark 7 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 9 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 10 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 11 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 12 ) , Transfer diff --git a/.output/golden/eta/il/parsed/from-eas/fact.il b/.output/golden/eta/il/parsed/from-eas/fact.il index 58d703206..4b70ea6d8 100644 --- a/.output/golden/eta/il/parsed/from-eas/fact.il +++ b/.output/golden/eta/il/parsed/from-eas/fact.il @@ -1,106 +1,170 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -108,377 +172,591 @@ , ICF ( DMark 15 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 32 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , Transfer , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 23 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 10 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 29 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 19 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 34 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 34 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 35 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 36 ) , IAL - ( Cons 37 ) + ( SAL + ( Cons 37 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 37 ) -, IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 38 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "38" ) , ICF ( DMark 39 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 48 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , IAL - ( Cons 48 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 40 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 43 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 44 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 46 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 48 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 49 ) , IAL - ( Cons 50 ) + ( SAL + ( Cons 50 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 50 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 51 ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 52 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 53 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) -, IAL ( Binary Sub ) -, IAL Halibut + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL ( SAL Halibut ) , ICF ( DMark 54 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 55 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 56 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 59 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 60 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 61 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 62 ) , IAL - ( Cons 63 ) + ( SAL + ( Cons 63 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 63 ) -, IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 64 ) @@ -486,9 +764,13 @@ , ICF ( DMark 65 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , Transfer , ICF ( DMark 66 ) diff --git a/.output/golden/eta/il/parsed/from-eas/function.il b/.output/golden/eta/il/parsed/from-eas/function.il index 0a37ef62f..a8e326dbe 100644 --- a/.output/golden/eta/il/parsed/from-eas/function.il +++ b/.output/golden/eta/il/parsed/from-eas/function.il @@ -1,37 +1,51 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 2 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 3 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 4 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 5 ) -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 6 ) -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , ICF ( DMark 8 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 9 ) , Transfer diff --git a/.output/golden/eta/il/parsed/from-eas/hello.il b/.output/golden/eta/il/parsed/from-eas/hello.il index 1364e48ac..bb2fc89e7 100644 --- a/.output/golden/eta/il/parsed/from-eas/hello.il +++ b/.output/golden/eta/il/parsed/from-eas/hello.il @@ -1,21 +1,35 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( DMark 2 ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ICF ( DMark 3 ) , IAL ( SIO OutputChar ) @@ -28,21 +42,35 @@ , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , ICF ( DMark 5 ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , ICF ( DMark 6 ) , IAL ( SIO OutputChar ) diff --git a/.output/golden/eta/il/parsed/from-eas/hello2.il b/.output/golden/eta/il/parsed/from-eas/hello2.il index a7fd322a4..65fac6667 100644 --- a/.output/golden/eta/il/parsed/from-eas/hello2.il +++ b/.output/golden/eta/il/parsed/from-eas/hello2.il @@ -1,80 +1,137 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 5 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 7 ) -, IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 8 ) @@ -82,9 +139,13 @@ , ICF ( DMark 9 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 10 ) diff --git a/.output/golden/eta/il/parsed/from-eas/hello3.il b/.output/golden/eta/il/parsed/from-eas/hello3.il index a7fd322a4..65fac6667 100644 --- a/.output/golden/eta/il/parsed/from-eas/hello3.il +++ b/.output/golden/eta/il/parsed/from-eas/hello3.il @@ -1,80 +1,137 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 5 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 7 ) -, IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 8 ) @@ -82,9 +139,13 @@ , ICF ( DMark 9 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 10 ) diff --git a/.output/golden/eta/il/parsed/from-eas/hello4.il b/.output/golden/eta/il/parsed/from-eas/hello4.il index a7fd322a4..65fac6667 100644 --- a/.output/golden/eta/il/parsed/from-eas/hello4.il +++ b/.output/golden/eta/il/parsed/from-eas/hello4.il @@ -1,80 +1,137 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 5 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 7 ) -, IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 8 ) @@ -82,9 +139,13 @@ , ICF ( DMark 9 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 10 ) diff --git a/.output/golden/eta/il/parsed/from-eas/multiply.il b/.output/golden/eta/il/parsed/from-eas/multiply.il index ca8952efb..75a8809d7 100644 --- a/.output/golden/eta/il/parsed/from-eas/multiply.il +++ b/.output/golden/eta/il/parsed/from-eas/multiply.il @@ -1,102 +1,154 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 2 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 3 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 4 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 5 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 7 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 9 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) -, IAL ( Binary Sub ) -, IAL Halibut + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL ( SAL Halibut ) , ICF ( DMark 11 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 12 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 13 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 14 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 15 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 16 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 17 ) diff --git a/.output/golden/eta/il/parsed/from-eas/pip.il b/.output/golden/eta/il/parsed/from-eas/pip.il index 726190775..76b5ebe2a 100644 --- a/.output/golden/eta/il/parsed/from-eas/pip.il +++ b/.output/golden/eta/il/parsed/from-eas/pip.il @@ -4,35 +4,53 @@ , ICF ( DMark 2 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 3 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 4 ) , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 6 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 7 ) @@ -40,9 +58,13 @@ , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , ICF ( DMark 9 ) diff --git a/.output/golden/eta/il/parsed/from-eas/pip2.il b/.output/golden/eta/il/parsed/from-eas/pip2.il index 834aa3cf9..b3af748cd 100644 --- a/.output/golden/eta/il/parsed/from-eas/pip2.il +++ b/.output/golden/eta/il/parsed/from-eas/pip2.il @@ -2,35 +2,57 @@ ( DMark 1 ) , IAL ( SIO InputChar ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 2 ) + ) , Transfer , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 2 ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , ICF ( DMark 3 ) diff --git a/.output/golden/eta/il/parsed/from-eas/readnum.il b/.output/golden/eta/il/parsed/from-eas/readnum.il index 6cfa6e03c..312b9c4e0 100644 --- a/.output/golden/eta/il/parsed/from-eas/readnum.il +++ b/.output/golden/eta/il/parsed/from-eas/readnum.il @@ -4,241 +4,377 @@ , ICF ( DMark 2 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 32 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 8 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 10 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL ( SIO InputChar ) , ICF ( DMark 12 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 32 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 14 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , Transfer , ICF ( DMark 14 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , Transfer , ICF ( DMark 15 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , Transfer , ICF ( DMark 16 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 6 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 6 ) + ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 19 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 20 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 21 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 22 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 23 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 24 ) , IAL - ( Cons 25 ) + ( SAL + ( Cons 25 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 25 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 27 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 28 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 3 ) -, IAL ( Binary Sub ) -, IAL Halibut + ( SAL ( Binary Sub ) ) +, IAL ( SAL Halibut ) , ICF ( DMark 29 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 30 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 31 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 32 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , Transfer , ICF ( DMark 33 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 35 ) diff --git a/.output/golden/eta/il/parsed/from-eas/reverse.il b/.output/golden/eta/il/parsed/from-eas/reverse.il index 471179445..021d0644c 100644 --- a/.output/golden/eta/il/parsed/from-eas/reverse.il +++ b/.output/golden/eta/il/parsed/from-eas/reverse.il @@ -1,75 +1,122 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 2 ) , IAL ( SIO InputChar ) , ICF ( DMark 3 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 2 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 6 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 6 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 7 ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 8 ) diff --git a/.output/golden/eta/il/parsed/from-eas/writenum.il b/.output/golden/eta/il/parsed/from-eas/writenum.il index a76166d49..f8e0ea829 100644 --- a/.output/golden/eta/il/parsed/from-eas/writenum.il +++ b/.output/golden/eta/il/parsed/from-eas/writenum.il @@ -1,138 +1,216 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 2 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 5 ) , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 6 ) -, IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 11 ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 11 ) + ) , Transfer , ICF ( DMark 7 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "7" ) , ICF ( DMark 8 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 48 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 9 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 14 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 15 ) , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 16 ) -, IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 17 ) @@ -140,9 +218,13 @@ , ICF ( DMark 18 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 19 ) diff --git a/.output/golden/eta/il/parsed/from-eas/writestr.il b/.output/golden/eta/il/parsed/from-eas/writestr.il index c590a3384..3b72641d2 100644 --- a/.output/golden/eta/il/parsed/from-eas/writestr.il +++ b/.output/golden/eta/il/parsed/from-eas/writestr.il @@ -1,32 +1,49 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 2 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 4 ) -, IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 5 ) @@ -34,9 +51,13 @@ , ICF ( DMark 6 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , ICF ( DMark 7 ) diff --git a/.output/golden/eta/il/parsed/original/bottles.il b/.output/golden/eta/il/parsed/original/bottles.il index f008ee77c..dfb3eba8c 100644 --- a/.output/golden/eta/il/parsed/original/bottles.il +++ b/.output/golden/eta/il/parsed/original/bottles.il @@ -1,86 +1,124 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 141 ) + ( SAL + ( Cons 141 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , IAL ( SIO OutputChar ) , IAL - ( Cons 155 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 155 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "1" ) , Transfer , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL ( SIO InputChar ) , Transfer , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 2 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , Transfer -, IAL ( Binary Sub ) , IAL - ( Cons 3 ) + ( SAL ( Binary Sub ) ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "2" ) , IAL ( SIO InputChar ) , IAL ( SIO OutputChar ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL ( SIO InputChar ) , Transfer -, IAL ( Binary Sub ) -, IAL Halibut , IAL - ( Cons 3 ) + ( SAL ( Binary Sub ) ) +, IAL ( SAL Halibut ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 3 ) + ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL ( SIO InputChar ) -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , IAL ( SIO InputChar ) , IAL ( SIO OutputChar ) @@ -88,51 +126,80 @@ , ICF ( DMark 3 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer -, IAL ( Binary Sub ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "3" ) -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) , IAL ( SIO InputChar ) , Transfer -, IAL ( Binary Sub ) , IAL - ( Cons 18828800 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 18828800 ) + ) +, IAL + ( SAL + ( Cons 4 ) + ) , ICF ( DMark 4 ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 5 ) -, IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 6 ) @@ -140,490 +207,814 @@ , ICF ( DMark 7 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 9 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 10 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL ( SIO OutputChar ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 11 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 13 ) -, IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 18 ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 18 ) + ) , Transfer , ICF ( DMark 14 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "14" ) , ICF ( DMark 15 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 48 ) + ) , IAL - ( Cons 48 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 17 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , Transfer , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) +, IAL + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 11 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 18 ) + ( SAL + ( Cons 13128773 ) + ) , IAL - ( Cons 13128773 ) + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 1 ) -, IAL Halibut -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 19 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 20 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , Transfer , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , Transfer , IAL - ( Cons 2348471754576 ) + ( SAL + ( Cons 2348471754576 ) + ) , ICF ( CStatic "23" Jump ) , ICF ( DMark 23 ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , Transfer , IAL - ( Cons 335495964812 ) + ( SAL + ( Cons 335495964812 ) + ) , ICF ( CStatic "24" Jump ) , ICF ( DMark 24 ) , IAL - ( Cons 25 ) + ( SAL + ( Cons 25 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 25 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 27 ) , IAL - ( Cons 28 ) + ( SAL + ( Cons 28 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , Transfer , IAL - ( Cons 2348471754565 ) + ( SAL + ( Cons 2348471754565 ) + ) , ICF ( CStatic "29" Jump ) , ICF ( DMark 29 ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , IAL - ( Cons 335495964812 ) + ( SAL + ( Cons 335495964812 ) + ) , ICF ( CStatic "30" Jump ) , ICF ( DMark 30 ) , IAL - ( Cons 31 ) + ( SAL + ( Cons 31 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "31" ) -, IAL ( Binary Sub ) , IAL - ( Cons 32 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 32 ) + ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL ( SIO InputChar ) , IAL - ( Cons 402523 ) + ( SAL + ( Cons 402523 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL ( SIO InputChar ) , IAL - ( Cons 1814 ) + ( SAL + ( Cons 1814 ) + ) , ICF ( CStatic "32" Jump ) , ICF ( DMark 32 ) , IAL - ( Cons 99 ) + ( SAL + ( Cons 99 ) + ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 34 ) + ( SAL + ( Cons 34 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) , Transfer , ICF ( DMark 34 ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 35 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 36 ) + ( SAL + ( Cons 36 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ICF ( DMark 38 ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( DMark 39 ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 112 ) + ( SAL + ( Cons 112 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , ICF ( DMark 40 ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ICF ( DMark 41 ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 107 ) + ( SAL + ( Cons 107 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 84 ) + ( SAL + ( Cons 84 ) + ) , ICF ( DMark 42 ) , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer , ICF ( DMark 43 ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 44 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) , Transfer , ICF ( DMark 45 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 47 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 48 ) diff --git a/.output/golden/eta/il/parsed/original/crlf.il b/.output/golden/eta/il/parsed/original/crlf.il index 51f78f188..0007ac0e1 100644 --- a/.output/golden/eta/il/parsed/original/crlf.il +++ b/.output/golden/eta/il/parsed/original/crlf.il @@ -1,69 +1,111 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 49 ) + ( SAL + ( Cons 49 ) + ) , IAL - ( Cons 68 ) + ( SAL + ( Cons 68 ) + ) , IAL - ( Cons 65 ) + ( SAL + ( Cons 65 ) + ) , IAL - ( Cons 66 ) + ( SAL + ( Cons 66 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 75 ) + ( SAL + ( Cons 75 ) + ) , IAL - ( Cons 79 ) + ( SAL + ( Cons 79 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 50 ) + ( SAL + ( Cons 50 ) + ) , IAL - ( Cons 68 ) + ( SAL + ( Cons 68 ) + ) , IAL - ( Cons 65 ) + ( SAL + ( Cons 65 ) + ) , IAL - ( Cons 66 ) + ( SAL + ( Cons 66 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) diff --git a/.output/golden/eta/il/parsed/original/fact.il b/.output/golden/eta/il/parsed/original/fact.il index a6ce40c1c..b60e59a42 100644 --- a/.output/golden/eta/il/parsed/original/fact.il +++ b/.output/golden/eta/il/parsed/original/fact.il @@ -1,106 +1,170 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 2 ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , Transfer , ICF ( DMark 4 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 6 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 7 ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 8 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 8 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , Transfer , ICF ( DMark 9 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 10 ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 11 ) , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , Transfer , ICF ( DMark 12 ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer , ICF ( DMark 13 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 14 ) @@ -108,377 +172,582 @@ , ICF ( DMark 15 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 32 ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 16 ) , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 17 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , Transfer , ICF ( DMark 18 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 19 ) , IAL - ( Cons 48 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 48 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 20 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 21 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , Transfer -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer -, IAL Halibut +, IAL ( SAL Halibut ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "21" ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL ( SIO InputChar ) , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( DMark 22 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 23 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 24 ) , IAL ( SIO InputChar ) , ICF ( DMark 25 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 32 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , Transfer , ICF ( DMark 26 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 27 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 10 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 29 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 29 ) + ) , Transfer , ICF ( DMark 28 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , Transfer , ICF ( DMark 29 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , Transfer , ICF ( DMark 30 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 31 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 32 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 33 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 34 ) , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 35 ) -, IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) , Transfer , ICF ( DMark 36 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "36" ) , ICF ( DMark 37 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 48 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , IAL - ( Cons 48 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 38 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 39 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , Transfer , ICF ( DMark 40 ) , IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 41 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 42 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 43 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( DMark 44 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 45 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 46 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 47 ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 48 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 56 ) + ( SAL + ( Cons 56 ) + ) , Transfer , ICF ( DMark 49 ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 50 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 51 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 3 ) -, IAL ( Binary Sub ) -, IAL Halibut + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL ( SAL Halibut ) , ICF ( DMark 52 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 53 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 54 ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 55 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , Transfer , ICF ( DMark 56 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 57 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) -, IAL Halibut + ( SAL + ( Cons 2 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 58 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 59 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 60 ) , IAL - ( Cons 61 ) + ( SAL + ( Cons 61 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 61 ) -, IAL ( Binary Sub ) , IAL - ( Cons 1 ) + ( SAL ( Binary Sub ) ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 62 ) @@ -486,9 +755,13 @@ , ICF ( DMark 63 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , Transfer , ICF ( DMark 64 ) diff --git a/.output/golden/eta/il/parsed/original/hello.il b/.output/golden/eta/il/parsed/original/hello.il index 91d5f9d7d..2aaf1f225 100644 --- a/.output/golden/eta/il/parsed/original/hello.il +++ b/.output/golden/eta/il/parsed/original/hello.il @@ -1,85 +1,121 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , Transfer -, IAL Halibut -, IAL - ( Binaries - [ Mod - , Div - ] +, IAL ( SAL Halibut ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "1" ) , IAL ( SIO OutputChar ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , Transfer , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL ( SIO InputChar ) , Transfer , Transfer , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL ( SIO OutputChar ) , ICF ( DMark 2 ) , ICF ( DMark 3 ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( DMark 4 ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ICF ( CStatic "5" Jump ) , ICF ( DMark 5 ) , Transfer -, IAL ( Binary Sub ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "5" ) , ICF ( DMark 6 ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ICF ( DMark 7 ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 0 ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( DMark 8 ) , IAL ( SIO OutputChar ) @@ -92,23 +128,37 @@ , ICF ( DMark 9 ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , ICF ( DMark 10 ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ICF ( DMark 11 ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , ICF ( DMark 12 ) , IAL ( SIO OutputChar ) diff --git a/.output/golden/eta/il/parsed/original/hello2.il b/.output/golden/eta/il/parsed/original/hello2.il index 902bbfd97..66290b364 100644 --- a/.output/golden/eta/il/parsed/original/hello2.il +++ b/.output/golden/eta/il/parsed/original/hello2.il @@ -1,117 +1,196 @@ [ ICF ( DMark 1 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( DMark 2 ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , ICF ( DMark 3 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , Transfer , IAL ( SIO InputChar ) -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL - ( Binaries - [ Mod - , Div - ] + ( SAL + ( Binaries + [ Mod + , Div + ] + ) ) , ICF ( SMark "3" ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer , IAL ( SIO InputChar ) , IAL - ( Cons 337 ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 337 ) + ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 4 ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , Transfer , ICF ( DMark 5 ) -, IAL ( Binary Sub ) , IAL - ( Cons 11 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 6 ) , IAL ( SIO OutputChar ) , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , Transfer -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , IAL ( SIO InputChar ) , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "7" Jump ) , ICF diff --git a/.output/golden/eta/il/parsed/original/pip.il b/.output/golden/eta/il/parsed/original/pip.il index 726190775..76b5ebe2a 100644 --- a/.output/golden/eta/il/parsed/original/pip.il +++ b/.output/golden/eta/il/parsed/original/pip.il @@ -4,35 +4,53 @@ , ICF ( DMark 2 ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , ICF ( DMark 3 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) , ICF ( DMark 4 ) , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , Transfer , ICF ( DMark 5 ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , ICF ( DMark 6 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 7 ) @@ -40,9 +58,13 @@ , ICF ( DMark 8 ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , ICF ( DMark 9 ) diff --git a/.output/golden/eta/il/parsed/original/pip2.il b/.output/golden/eta/il/parsed/original/pip2.il index 834aa3cf9..b3af748cd 100644 --- a/.output/golden/eta/il/parsed/original/pip2.il +++ b/.output/golden/eta/il/parsed/original/pip2.il @@ -2,35 +2,57 @@ ( DMark 1 ) , IAL ( SIO InputChar ) , IAL - ( Cons 0 ) -, IAL Halibut + ( SAL + ( Cons 0 ) + ) +, IAL ( SAL Halibut ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 2 ) + ( SAL ( Binary Sub ) ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 2 ) + ) , Transfer , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 1 ) -, IAL Halibut + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Halibut ) , Transfer , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , Transfer , ICF ( DMark 2 ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , Transfer , ICF ( DMark 3 ) diff --git a/.output/golden/f/il/helma/add.il b/.output/golden/f/il/helma/add.il index 477173739..c5458f591 100644 --- a/.output/golden/f/il/helma/add.il +++ b/.output/golden/f/il/helma/add.il @@ -1,23 +1,35 @@ [ Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst ( IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst ( IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) ] \ No newline at end of file diff --git a/.output/golden/f/il/helma/copy.il b/.output/golden/f/il/helma/copy.il index 530a42aa4..bfa21c6c2 100644 --- a/.output/golden/f/il/helma/copy.il +++ b/.output/golden/f/il/helma/copy.il @@ -4,18 +4,28 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Inst diff --git a/.output/golden/f/il/helma/factorial.il b/.output/golden/f/il/helma/factorial.il index 707ad274c..3a58770ce 100644 --- a/.output/golden/f/il/helma/factorial.il +++ b/.output/golden/f/il/helma/factorial.il @@ -1,32 +1,48 @@ [ Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 5 , Fetch , Exec , Inst - ( IAL ( Binary Mul ) ) + ( IAL + ( SAL ( Binary Mul ) ) + ) ] , Cond ] @@ -40,20 +56,30 @@ , Flush , Inst ( IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) ] \ No newline at end of file diff --git a/.output/golden/f/il/helma/primeNumber.il b/.output/golden/f/il/helma/primeNumber.il index 78038a382..fcb478543 100644 --- a/.output/golden/f/il/helma/primeNumber.il +++ b/.output/golden/f/il/helma/primeNumber.il @@ -1,109 +1,164 @@ [ Inst ( IAL - ( Cons 99 ) + ( SAL + ( Cons 99 ) + ) ) , Inst ( IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) ) , Lambda [ Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) ] , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst - ( IAL ( Binary Div ) ) + ( IAL + ( SAL ( Binary Div ) ) + ) , Inst - ( IAL ( Binary Mul ) ) + ( IAL + ( SAL ( Binary Mul ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Lambda - [ Inst ( IAL Discard ) + [ Inst + ( IAL ( SAL Discard ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) ] , Cond , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL ( SIO OutputDec ) ) , Inst ( IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) ) , Inst ( IAL ( SIO OutputChar ) ) diff --git a/.output/golden/f/il/other/benHoyt/bin2f.il b/.output/golden/f/il/other/benHoyt/bin2f.il index af2d64126..400fe8bec 100644 --- a/.output/golden/f/il/other/benHoyt/bin2f.il +++ b/.output/golden/f/il/other/benHoyt/bin2f.il @@ -5,14 +5,20 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) ] , Lambda [ Inst @@ -20,6 +26,7 @@ , Str "`" ] , While -, Inst ( IAL Discard ) +, Inst + ( IAL ( SAL Discard ) ) , Str "]" ] \ No newline at end of file diff --git a/.output/golden/f/il/other/benHoyt/fac.il b/.output/golden/f/il/other/benHoyt/fac.il index 369ae44e6..ad3c88f84 100644 --- a/.output/golden/f/il/other/benHoyt/fac.il +++ b/.output/golden/f/il/other/benHoyt/fac.il @@ -2,52 +2,77 @@ , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Lambda [ Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) ] , Cond , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 5 , Fetch , Exec , Inst - ( IAL ( Binary Mul ) ) + ( IAL + ( SAL ( Binary Mul ) ) + ) ] , Cond ] @@ -61,20 +86,30 @@ , Ref 1 , Inst ( IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) ] \ No newline at end of file diff --git a/.output/golden/f/il/other/iliiliiliili/sum.il b/.output/golden/f/il/other/iliiliiliili/sum.il index 69d4d1ba5..b91f04ef9 100644 --- a/.output/golden/f/il/other/iliiliiliili/sum.il +++ b/.output/golden/f/il/other/iliiliiliili/sum.il @@ -10,7 +10,9 @@ , Fetch , Exec , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Inst ( IAL ( SIO OutputDec ) ) , Str " diff --git a/.output/golden/f/il/other/morphett/factorial.il b/.output/golden/f/il/other/morphett/factorial.il index 916371d92..6c1d12602 100644 --- a/.output/golden/f/il/other/morphett/factorial.il +++ b/.output/golden/f/il/other/morphett/factorial.il @@ -1,52 +1,77 @@ [ Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Lambda [ Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) ] , Cond , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 5 , Fetch , Exec , Inst - ( IAL ( Binary Mul ) ) + ( IAL + ( SAL ( Binary Mul ) ) + ) ] , Cond ] @@ -54,7 +79,9 @@ , Store , Inst ( IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) ) , Ref 5 , Fetch diff --git a/.output/golden/f/il/other/morphett/factorial2.il b/.output/golden/f/il/other/morphett/factorial2.il index 44b7c3aac..c74dd33e0 100644 --- a/.output/golden/f/il/other/morphett/factorial2.il +++ b/.output/golden/f/il/other/morphett/factorial2.il @@ -2,13 +2,19 @@ , Lambda [ Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst - ( IAL ( Binary Mul ) ) + ( IAL + ( SAL ( Binary Mul ) ) + ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Exec ] @@ -22,42 +28,64 @@ , Lambda [ Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Ref 0 @@ -72,7 +100,9 @@ , Store , Inst ( IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) ) , Ref 5 , Fetch diff --git a/.output/golden/f/il/other/morphett/reverse.il b/.output/golden/f/il/other/morphett/reverse.il index acb0acad2..607960a2a 100644 --- a/.output/golden/f/il/other/morphett/reverse.il +++ b/.output/golden/f/il/other/morphett/reverse.il @@ -4,18 +4,28 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Lambda @@ -25,6 +35,7 @@ ] ] , While -, Inst ( IAL Discard ) +, Inst + ( IAL ( SAL Discard ) ) , Exec ] \ No newline at end of file diff --git a/.output/golden/f/il/other/thunderseethe/prog.il b/.output/golden/f/il/other/thunderseethe/prog.il index e5149d4ac..b5a1f5397 100644 --- a/.output/golden/f/il/other/thunderseethe/prog.il +++ b/.output/golden/f/il/other/thunderseethe/prog.il @@ -2,60 +2,89 @@ , Lambda [ Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Lambda [ Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Ref 14 , Inst ( IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) ) , Ref 14 , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) ] , While - , Inst ( IAL Discard ) - , Inst ( IAL Discard ) - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) + , Inst + ( IAL ( SAL Discard ) ) + , Inst + ( IAL ( SAL Discard ) ) ] , Ref 5 , Store , Inst ( IAL - ( Cons 300 ) + ( SAL + ( Cons 300 ) + ) ) , Ref 5 , Fetch diff --git a/.output/golden/f/il/strlen/contrib/Ben_Schaeffer/detab.il b/.output/golden/f/il/strlen/contrib/Ben_Schaeffer/detab.il index c69ad1692..faa917cfa 100644 --- a/.output/golden/f/il/strlen/contrib/Ben_Schaeffer/detab.il +++ b/.output/golden/f/il/strlen/contrib/Ben_Schaeffer/detab.il @@ -9,35 +9,54 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Inst ( IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda - [ Inst ( IAL Discard ) + [ Inst + ( IAL ( SAL Discard ) ) , Inst ( IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) ) , Str " " ] diff --git a/.output/golden/f/il/strlen/contrib/Ben_Schaeffer/postfix_while.il b/.output/golden/f/il/strlen/contrib/Ben_Schaeffer/postfix_while.il index 71fac58e2..9dee5199b 100644 --- a/.output/golden/f/il/strlen/contrib/Ben_Schaeffer/postfix_while.il +++ b/.output/golden/f/il/strlen/contrib/Ben_Schaeffer/postfix_while.il @@ -1,7 +1,9 @@ [ Comment " postfix while loops (##)! " , Inst ( IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) ) , Ref 13 , Store @@ -10,12 +12,18 @@ , Fetch , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Str "Still going up @@ -24,10 +32,14 @@ , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Ref 13 , Store ] @@ -37,12 +49,18 @@ , Fetch , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Str "Down... @@ -51,17 +69,23 @@ , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 13 , Store ] , While , Inst ( IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) ) , Ref 13 , Store @@ -70,12 +94,18 @@ , Fetch , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Str "Still going up @@ -84,10 +114,14 @@ , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Ref 13 , Store ] @@ -96,12 +130,18 @@ , Fetch , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Str "Down... @@ -110,10 +150,14 @@ , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 13 , Store ] diff --git a/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/chkbrack.il b/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/chkbrack.il index ccb7c05a0..75a64d4ed 100644 --- a/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/chkbrack.il +++ b/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/chkbrack.il @@ -2,19 +2,25 @@ , Comment "checks brackets" , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 0 , Store , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 1 , Store , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 2 , Store @@ -23,154 +29,224 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 40 ) + ( SAL + ( Cons 40 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Ref 0 , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Ref 0 , Store ] , Cond , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 41 ) + ( SAL + ( Cons 41 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Ref 0 , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 0 , Store ] , Cond , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 91 ) + ( SAL + ( Cons 91 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Ref 1 , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Ref 1 , Store ] , Cond , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 93 ) + ( SAL + ( Cons 93 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Ref 1 , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 1 , Store ] , Cond , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 123 ) + ( SAL + ( Cons 123 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Ref 2 , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Ref 2 , Store ] , Cond , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 125 ) + ( SAL + ( Cons 125 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Ref 2 , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 2 , Store ] @@ -182,18 +258,28 @@ , Fetch , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Str "is ok. " ] @@ -207,18 +293,28 @@ , Fetch , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Str "is ok. " ] @@ -232,18 +328,28 @@ , Fetch , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Str "is ok. " ] diff --git a/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/countwl.il b/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/countwl.il index 2333bf9e8..f7265a779 100644 --- a/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/countwl.il +++ b/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/countwl.il @@ -2,19 +2,25 @@ , Comment "count lines and words " , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 0 , Store , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 1 , Store , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 2 , Store @@ -23,44 +29,66 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Ref 0 , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Ref 0 , Store , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 2 , Store @@ -68,66 +96,98 @@ , Cond , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Ref 3 , Store , Inst ( IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Ref 3 , Fetch , Inst ( IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Binary BOr ) ) + ( IAL + ( SAL ( Binary BOr ) ) + ) , Ref 3 , Fetch , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Binary BOr ) ) + ( IAL + ( SAL ( Binary BOr ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Lambda [ Ref 2 , Fetch , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Ref 1 , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Ref 1 , Store , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Ref 2 , Store ] @@ -135,37 +195,51 @@ ] , Cond , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 2 , Store ] , Cond , Inst - ( IAL ( Binary BOr ) ) + ( IAL + ( SAL ( Binary BOr ) ) + ) ] , Ref 0 , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 0 , Store , Ref 1 , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 1 , Store , While diff --git a/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/crunch.il b/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/crunch.il index 9050be4f9..abe09d2d2 100644 --- a/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/crunch.il +++ b/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/crunch.il @@ -4,16 +4,24 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [] , While @@ -24,7 +32,9 @@ , Comment " a is char-read " , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Ref 2 , Store @@ -32,16 +42,24 @@ , Lambda [ Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Ref 0 , Fetch , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Comment "while a<>EOF" ] \ No newline at end of file diff --git a/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/decrunch.il b/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/decrunch.il index dfca28d2a..4099af312 100644 --- a/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/decrunch.il +++ b/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/decrunch.il @@ -4,16 +4,24 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [] , While @@ -24,33 +32,49 @@ , Lambda [ Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Ref 0 , Fetch , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Comment "while a<>EOF" , Lambda [ Inst ( IAL - ( Cons 169 ) + ( SAL + ( Cons 169 ) + ) ) , Ref 0 , Fetch , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Comment "if char!=escapecode" , Ref 0 @@ -74,14 +98,20 @@ , Lambda [ Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 2 , Fetch , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Comment "while counter!=0" , Lambda @@ -94,10 +124,14 @@ , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 2 , Store , Comment "decrement counter" diff --git a/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/depack.il b/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/depack.il index 98db09ad5..55b0ecb3b 100644 --- a/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/depack.il +++ b/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/depack.il @@ -11,12 +11,18 @@ , Fetch , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , While , Comment "is first char a packcode?" @@ -24,12 +30,18 @@ , Fetch , Inst ( IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) ] \ No newline at end of file diff --git a/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/readable.il b/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/readable.il index 822a77974..d8a9bb4a3 100644 --- a/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/readable.il +++ b/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/readable.il @@ -4,13 +4,17 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 1 , Store , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 2 , Store diff --git a/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/remcom.il b/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/remcom.il index 01506043c..346ed263e 100644 --- a/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/remcom.il +++ b/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/remcom.il @@ -2,25 +2,33 @@ , Comment "removes comments like this..." , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 0 , Store , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 2 , Store , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 3 , Store , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 4 , Store @@ -29,27 +37,39 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 34 ) + ( SAL + ( Cons 34 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Ref 4 , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Ref 4 , Store ] @@ -58,13 +78,21 @@ , Store , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] ] \ No newline at end of file diff --git a/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/split.il b/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/split.il index d9b0c18b6..e1bcdb4a1 100644 --- a/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/split.il +++ b/.output/golden/f/il/strlen/contrib/Eelko_de_Vos/split.il @@ -8,10 +8,14 @@ , Fetch , Inst ( IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) ] , Lambda [ Inst @@ -25,33 +29,51 @@ , Fetch , Inst ( IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Ref 0 , Fetch , Inst ( IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Binary BOr ) ) + ( IAL + ( SAL ( Binary BOr ) ) + ) , Inst ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Binary BAnd ) ) + ( IAL + ( SAL ( Binary BAnd ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Comment " a has to be 'f' of 'b' followed by a space " ] \ No newline at end of file diff --git a/.output/golden/f/il/strlen/contrib/Herb_Wollman/Fibonacci.il b/.output/golden/f/il/strlen/contrib/Herb_Wollman/Fibonacci.il index 3ed6f8393..a808636d9 100644 --- a/.output/golden/f/il/strlen/contrib/Herb_Wollman/Fibonacci.il +++ b/.output/golden/f/il/strlen/contrib/Herb_Wollman/Fibonacci.il @@ -1,15 +1,21 @@ [ Comment "Fibonacci.f Prints the Fibonacci numbers " , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 2 , Store diff --git a/.output/golden/f/il/strlen/contrib/Marcel_van_Kervinck/queens.il b/.output/golden/f/il/strlen/contrib/Marcel_van_Kervinck/queens.il index a86103757..810b65ada 100644 --- a/.output/golden/f/il/strlen/contrib/Marcel_van_Kervinck/queens.il +++ b/.output/golden/f/il/strlen/contrib/Marcel_van_Kervinck/queens.il @@ -8,216 +8,333 @@ , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Lambda [ Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) ] , Cond , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst ( IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) ) , Ref 14 , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary BAnd ) ) + ( IAL + ( SAL ( Binary BAnd ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) ) , Ref 14 , Inst ( IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) ) , Ref 14 , Inst - ( IAL ( Binary BOr ) ) + ( IAL + ( SAL ( Binary BOr ) ) + ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst - ( IAL ( Binary BAnd ) ) + ( IAL + ( SAL ( Binary BAnd ) ) + ) , Lambda [ Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Ref 14 , Inst ( IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) ) , Ref 14 , Inst - ( IAL ( Binary BOr ) ) + ( IAL + ( SAL ( Binary BOr ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Inst ( IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) ) , Ref 14 , Inst ( IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) ) , Ref 14 , Inst - ( IAL ( Binary BOr ) ) + ( IAL + ( SAL ( Binary BOr ) ) + ) , Inst ( IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) ) , Inst - ( IAL ( Binary Div ) ) + ( IAL + ( SAL ( Binary Div ) ) + ) , Inst ( IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) ) , Ref 14 , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) ) , Ref 14 , Inst - ( IAL ( Binary BAnd ) ) + ( IAL + ( SAL ( Binary BAnd ) ) + ) , Inst ( IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) ) , Ref 14 , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 16 , Fetch , Exec , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) ] , Cond , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst - ( IAL ( Binary BAnd ) ) + ( IAL + ( SAL ( Binary BAnd ) ) + ) ] , While - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) ] , Cond , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) ] , Ref 16 , Store @@ -228,28 +345,42 @@ , Ref 1 , Inst ( IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) ] \ No newline at end of file diff --git a/.output/golden/f/il/strlen/contrib/Marcel_van_Kervinck/tic.il b/.output/golden/f/il/strlen/contrib/Marcel_van_Kervinck/tic.il index 2f9f40e92..e865510d5 100644 --- a/.output/golden/f/il/strlen/contrib/Marcel_van_Kervinck/tic.il +++ b/.output/golden/f/il/strlen/contrib/Marcel_van_Kervinck/tic.il @@ -8,62 +8,96 @@ [ Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary BAnd ) ) + ( IAL + ( SAL ( Binary BAnd ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst - ( IAL ( Binary BAnd ) ) + ( IAL + ( SAL ( Binary BAnd ) ) + ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Inst ( IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) ) , Ref 14 , Exec ] , While - , Inst ( IAL Discard ) - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) + , Inst + ( IAL ( SAL Discard ) ) ] , Ref 5 , Store @@ -73,94 +107,141 @@ [ Str " " , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Ref 23 , Fetch , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Inst - ( IAL ( Binary Div ) ) + ( IAL + ( SAL ( Binary Div ) ) + ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Ref 14 , Fetch , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Inst - ( IAL ( Binary Div ) ) + ( IAL + ( SAL ( Binary Div ) ) + ) , Lambda [ Inst ( IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) ) , Inst ( IAL ( SIO OutputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) ) , Ref 14 , Inst - ( IAL ( Binary BAnd ) ) + ( IAL + ( SAL ( Binary BAnd ) ) + ) , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Lambda [ Str "O" , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) ] , Cond , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Inst ( IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) ) , Ref 14 , Inst - ( IAL ( Binary BAnd ) ) + ( IAL + ( SAL ( Binary BAnd ) ) + ) , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Lambda [ Str "X" ] , Cond , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Str "." ] , Cond @@ -169,56 +250,78 @@ ] , Inst ( IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) ) , Ref 5 , Fetch , Exec , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst ( IAL ( SIO OutputChar ) ) - , Inst ( IAL Discard ) - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) + , Inst + ( IAL ( SAL Discard ) ) ] , Str "7 8 9" , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 64 ) + ( SAL + ( Cons 64 ) + ) ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Exec , Str "4 5 6" , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Exec , Str "1 2 3" , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Exec ] diff --git a/.output/golden/f/il/strlen/contrib/Peter_Bengtsson/DoASC.il b/.output/golden/f/il/strlen/contrib/Peter_Bengtsson/DoASC.il index 0ff51f459..d9f9097c2 100644 --- a/.output/golden/f/il/strlen/contrib/Peter_Bengtsson/DoASC.il +++ b/.output/golden/f/il/strlen/contrib/Peter_Bengtsson/DoASC.il @@ -7,37 +7,57 @@ , Fetch , Inst ( IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Fetch , Inst ( IAL - ( Cons 255 ) + ( SAL + ( Cons 255 ) + ) ) , Inst - ( IAL ( Binary BAnd ) ) + ( IAL + ( SAL ( Binary BAnd ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Str " \x1b[32mDoASC v1.21 By Peter Bengtsson\x1b[0m @@ -50,120 +70,184 @@ , Lambda [ Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Ref 1 , Store , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Fetch , Inst ( IAL - ( Cons 255 ) + ( SAL + ( Cons 255 ) + ) ) , Inst - ( IAL ( Binary BAnd ) ) + ( IAL + ( SAL ( Binary BAnd ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Inst ( IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Binary BOr ) ) + ( IAL + ( SAL ( Binary BOr ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Inst ( IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 1 , Fetch , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary Mul ) ) + ( IAL + ( SAL ( Binary Mul ) ) + ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Ref 1 , Store , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) ] , While , Ref 1 , Fetch , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL ( SIO OutputDec ) ) @@ -171,7 +255,8 @@ ] , Cond , Lambda [] - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) , Inst ( IAL ( SIO OutputChar ) ) , Str " diff --git a/.output/golden/f/il/strlen/contrib/Steinar_Knutsen/htmlcol.il b/.output/golden/f/il/strlen/contrib/Steinar_Knutsen/htmlcol.il index 847d8f3c2..6b55c2a74 100644 --- a/.output/golden/f/il/strlen/contrib/Steinar_Knutsen/htmlcol.il +++ b/.output/golden/f/il/strlen/contrib/Steinar_Knutsen/htmlcol.il @@ -13,36 +13,57 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Lambda - [ Inst ( IAL Discard ) + [ Inst + ( IAL ( SAL Discard ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Cond ] @@ -51,7 +72,8 @@ ( IAL ( SIO OutputChar ) ) ] , While - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) , Str "" ] , Ref 15 @@ -61,18 +83,28 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Str " @@ -84,36 +116,57 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Lambda - [ Inst ( IAL Discard ) + [ Inst + ( IAL ( SAL Discard ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Cond ] @@ -122,7 +175,8 @@ ( IAL ( SIO OutputChar ) ) ] , While - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) , Str "" , Ref 15 , Fetch @@ -137,7 +191,8 @@ " ] , While -, Inst ( IAL Discard ) +, Inst + ( IAL ( SAL Discard ) ) , Str " " ] \ No newline at end of file diff --git a/.output/golden/f/il/strlen/contrib/Steinar_Knutsen/passwdc.il b/.output/golden/f/il/strlen/contrib/Steinar_Knutsen/passwdc.il index 640de9af0..b3bba8b01 100644 --- a/.output/golden/f/il/strlen/contrib/Steinar_Knutsen/passwdc.il +++ b/.output/golden/f/il/strlen/contrib/Steinar_Knutsen/passwdc.il @@ -10,17 +10,27 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] ] \ No newline at end of file diff --git a/.output/golden/f/il/strlen/contrib/Thomas_Fischbacher/life.il b/.output/golden/f/il/strlen/contrib/Thomas_Fischbacher/life.il index a2114c549..cee4dcc52 100644 --- a/.output/golden/f/il/strlen/contrib/Thomas_Fischbacher/life.il +++ b/.output/golden/f/il/strlen/contrib/Thomas_Fischbacher/life.il @@ -11,7 +11,9 @@ , Ref 1 , Inst ( IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) ) , Ref 6 , Store @@ -19,20 +21,30 @@ , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Lambda [ Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) ] , Lambda @@ -40,20 +52,30 @@ , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Lambda [ Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) ] , Lambda @@ -61,41 +83,58 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) ] , While - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) , Inst ( IAL ( SIO InputChar ) ) - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) ] , While -, Inst ( IAL Discard ) +, Inst + ( IAL ( SAL Discard ) ) , Ref 6 , Fetch , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Ref 25 , Store , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst - ( IAL ( Binary Mul ) ) + ( IAL + ( SAL ( Binary Mul ) ) + ) , Ref 4 , Store , Lambda @@ -103,25 +142,39 @@ , Fetch , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Ref 25 , Store , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] ] \ No newline at end of file diff --git a/.output/golden/f/il/strlen/contrib/self.il b/.output/golden/f/il/strlen/contrib/self.il index 9d4834820..38e29d94e 100644 --- a/.output/golden/f/il/strlen/contrib/self.il +++ b/.output/golden/f/il/strlen/contrib/self.il @@ -2,30 +2,40 @@ [ Str "'[,34,$!34,'],!" ] , Inst ( IAL - ( Cons 91 ) + ( SAL + ( Cons 91 ) + ) ) , Inst ( IAL ( SIO OutputChar ) ) , Inst ( IAL - ( Cons 34 ) + ( SAL + ( Cons 34 ) + ) ) , Inst ( IAL ( SIO OutputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Exec , Inst ( IAL - ( Cons 34 ) + ( SAL + ( Cons 34 ) + ) ) , Inst ( IAL ( SIO OutputChar ) ) , Inst ( IAL - ( Cons 93 ) + ( SAL + ( Cons 93 ) + ) ) , Inst ( IAL ( SIO OutputChar ) ) diff --git a/.output/golden/f/il/strlen/examples/addcr.il b/.output/golden/f/il/strlen/examples/addcr.il index 4308a57e4..14ccba9cf 100644 --- a/.output/golden/f/il/strlen/examples/addcr.il +++ b/.output/golden/f/il/strlen/examples/addcr.il @@ -6,34 +6,52 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Inst ( IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) ) , Inst ( IAL ( SIO OutputChar ) ) @@ -45,7 +63,9 @@ , While , Inst ( IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) ) , Inst ( IAL ( SIO OutputChar ) ) diff --git a/.output/golden/f/il/strlen/examples/arg.il b/.output/golden/f/il/strlen/examples/arg.il index 7c8edb823..f86a47c1e 100644 --- a/.output/golden/f/il/strlen/examples/arg.il +++ b/.output/golden/f/il/strlen/examples/arg.il @@ -6,10 +6,14 @@ , Fetch , Inst ( IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 0 , Store , Lambda @@ -17,37 +21,55 @@ , Fetch , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Ref 0 , Store , Fetch , Inst ( IAL - ( Cons 255 ) + ( SAL + ( Cons 255 ) + ) ) , Inst - ( IAL ( Binary BAnd ) ) + ( IAL + ( SAL ( Binary BAnd ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Ref 2 , Store , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Ref 2 diff --git a/.output/golden/f/il/strlen/examples/argtest.il b/.output/golden/f/il/strlen/examples/argtest.il index 6cb5719d3..9a468f4cf 100644 --- a/.output/golden/f/il/strlen/examples/argtest.il +++ b/.output/golden/f/il/strlen/examples/argtest.il @@ -3,22 +3,32 @@ , Fetch , Inst ( IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Lambda [ Str "2 integer arguments expected " ] , Cond , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Ref 1 , Fetch @@ -35,7 +45,9 @@ , Ref 2 , Fetch , Inst - ( IAL ( Binary Add ) ) + ( IAL + ( SAL ( Binary Add ) ) + ) , Inst ( IAL ( SIO OutputDec ) ) , Str " diff --git a/.output/golden/f/il/strlen/examples/lambda.il b/.output/golden/f/il/strlen/examples/lambda.il index 99713ac45..bc35a0946 100644 --- a/.output/golden/f/il/strlen/examples/lambda.il +++ b/.output/golden/f/il/strlen/examples/lambda.il @@ -3,15 +3,20 @@ , Lambda [ Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) ] , Ref 0 , Store , Comment " true " , Lambda - [ Inst ( IAL Discard ) ] + [ Inst + ( IAL ( SAL Discard ) ) + ] , Ref 1 , Store , Comment " false " @@ -22,7 +27,9 @@ , Fetch , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Exec ] @@ -34,15 +41,21 @@ , Fetch , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Exec ] @@ -52,13 +65,17 @@ , Lambda [ Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Ref 0 , Fetch , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Exec ] @@ -68,18 +85,24 @@ , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Ref 3 , Fetch , Exec , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Exec ] @@ -89,17 +112,23 @@ , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Ref 0 , Fetch , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Str "true" , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst ( IAL ( SIO OutputChar ) ) @@ -108,12 +137,16 @@ , Ref 1 , Fetch , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Str "false" , Inst ( IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) ) , Inst ( IAL ( SIO OutputChar ) ) diff --git a/.output/golden/f/il/strlen/examples/prime.il b/.output/golden/f/il/strlen/examples/prime.il index 1ff365e0a..013f2157d 100644 --- a/.output/golden/f/il/strlen/examples/prime.il +++ b/.output/golden/f/il/strlen/examples/prime.il @@ -1,134 +1,201 @@ [ Comment " writes all prime numbers between 0 and 100 " , Inst ( IAL - ( Cons 99 ) + ( SAL + ( Cons 99 ) + ) ) , Inst ( IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) ) , Lambda [ Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) ] , Lambda [ Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Inst - ( IAL ( Binary Div ) ) + ( IAL + ( SAL ( Binary Div ) ) + ) , Inst - ( IAL ( Binary Mul ) ) + ( IAL + ( SAL ( Binary Mul ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Lambda - [ Inst ( IAL Discard ) + [ Inst + ( IAL ( SAL Discard ) ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) ] , Cond , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL ( SIO OutputDec ) ) , Inst ( IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) ) , Inst ( IAL ( SIO OutputChar ) ) , Inst ( IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) ) ] , Cond diff --git a/.output/golden/f/il/strlen/examples/strip.il b/.output/golden/f/il/strlen/examples/strip.il index 5a03dec03..bc898d2cb 100644 --- a/.output/golden/f/il/strlen/examples/strip.il +++ b/.output/golden/f/il/strlen/examples/strip.il @@ -5,42 +5,63 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Inst ( IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL ( SIO OutputChar ) ) ] , Cond - , Inst ( IAL Discard ) + , Inst + ( IAL ( SAL Discard ) ) ] , While ] \ No newline at end of file diff --git a/.output/golden/f/il/strlen/inline/copy.il b/.output/golden/f/il/strlen/inline/copy.il index fc9617ab4..09fb5dbed 100644 --- a/.output/golden/f/il/strlen/inline/copy.il +++ b/.output/golden/f/il/strlen/inline/copy.il @@ -5,18 +5,28 @@ ( IAL ( SIO InputChar ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Unary Neg ) ) + ( IAL + ( SAL ( Unary Neg ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) ] , Lambda [ Inst diff --git a/.output/golden/f/il/strlen/inline/factorial.il b/.output/golden/f/il/strlen/inline/factorial.il index b7738a26a..2b42b9ef3 100644 --- a/.output/golden/f/il/strlen/inline/factorial.il +++ b/.output/golden/f/il/strlen/inline/factorial.il @@ -2,32 +2,48 @@ , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Inst - ( IAL ( Unary BNot ) ) + ( IAL + ( SAL ( Unary BNot ) ) + ) , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Ref 5 , Fetch , Exec , Inst - ( IAL ( Binary Mul ) ) + ( IAL + ( SAL ( Binary Mul ) ) + ) ] , Cond ] @@ -41,20 +57,30 @@ , Flush , Inst ( IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) ] \ No newline at end of file diff --git a/.output/golden/f/il/strlen/inline/primeNumber.il b/.output/golden/f/il/strlen/inline/primeNumber.il index 6dbef494d..683c8a5ad 100644 --- a/.output/golden/f/il/strlen/inline/primeNumber.il +++ b/.output/golden/f/il/strlen/inline/primeNumber.il @@ -1,110 +1,165 @@ [ Comment " writes all prime numbers between 0 and 100 " , Inst ( IAL - ( Cons 99 ) + ( SAL + ( Cons 99 ) + ) ) , Inst ( IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) ) , Lambda [ Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) ] , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) , Inst - ( IAL ( Binary Div ) ) + ( IAL + ( SAL ( Binary Div ) ) + ) , Inst - ( IAL ( Binary Mul ) ) + ( IAL + ( SAL ( Binary Mul ) ) + ) , Inst - ( IAL ( Binary LEQ ) ) + ( IAL + ( SAL ( Binary LEQ ) ) + ) , Lambda [ Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Lambda - [ Inst ( IAL Discard ) + [ Inst + ( IAL ( SAL Discard ) ) , Inst ( IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) ) , Inst - ( IAL ( Binary Sub ) ) + ( IAL + ( SAL ( Binary Sub ) ) + ) , Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL - ( SStatic 2 Move ) + ( SAL + ( SStatic 2 Move ) + ) ) ] , Cond , Inst ( IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) ) , Lambda [ Inst ( IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) ) , Inst ( IAL ( SIO OutputDec ) ) , Inst ( IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) ) , Inst ( IAL ( SIO OutputChar ) ) diff --git a/.output/golden/sq/eval/logged/esolangs/helloWorld.logged b/.output/golden/sq/eval/logged/esolangs/helloWorld.logged index 114f1076a..0f82a28b4 100644 --- a/.output/golden/sq/eval/logged/esolangs/helloWorld.logged +++ b/.output/golden/sq/eval/logged/esolangs/helloWorld.logged @@ -1,6 +1,6 @@ dump: Automaton - { unitIU = -1 - , unitRAM = + { memoryIC = -1 + , memoryRAM = [ 12 , 12 , 3 diff --git a/.output/golden/sq/eval/logged/hello.logged b/.output/golden/sq/eval/logged/hello.logged index 83ccd4255..c8c848323 100644 --- a/.output/golden/sq/eval/logged/hello.logged +++ b/.output/golden/sq/eval/logged/hello.logged @@ -1,6 +1,6 @@ dump: Automaton - { unitIU = -1 - , unitRAM = + { memoryIC = -1 + , memoryRAM = [ 15 , 31 , -1 diff --git a/.output/golden/sq/eval/logged/longHello.logged b/.output/golden/sq/eval/logged/longHello.logged index 83ccd4255..c8c848323 100644 --- a/.output/golden/sq/eval/logged/longHello.logged +++ b/.output/golden/sq/eval/logged/longHello.logged @@ -1,6 +1,6 @@ dump: Automaton - { unitIU = -1 - , unitRAM = + { memoryIC = -1 + , memoryRAM = [ 15 , 31 , -1 diff --git a/.output/golden/sq/eval/logged/mazonka/factorial.logged b/.output/golden/sq/eval/logged/mazonka/factorial.logged index 58e8300bd..778c154fa 100644 --- a/.output/golden/sq/eval/logged/mazonka/factorial.logged +++ b/.output/golden/sq/eval/logged/mazonka/factorial.logged @@ -1,6 +1,6 @@ dump: Automaton - { unitIU = -1 - , unitRAM = + { memoryIC = -1 + , memoryRAM = [ 0 , 0 , 8807 diff --git a/.output/golden/sq/eval/logged/mazonka/helloWorld.logged b/.output/golden/sq/eval/logged/mazonka/helloWorld.logged index 114f1076a..0f82a28b4 100644 --- a/.output/golden/sq/eval/logged/mazonka/helloWorld.logged +++ b/.output/golden/sq/eval/logged/mazonka/helloWorld.logged @@ -1,6 +1,6 @@ dump: Automaton - { unitIU = -1 - , unitRAM = + { memoryIC = -1 + , memoryRAM = [ 12 , 12 , 3 diff --git a/.output/golden/sq/eval/logged/mazonka/hi.logged b/.output/golden/sq/eval/logged/mazonka/hi.logged index 5421c264b..72d87899c 100644 --- a/.output/golden/sq/eval/logged/mazonka/hi.logged +++ b/.output/golden/sq/eval/logged/mazonka/hi.logged @@ -1,6 +1,6 @@ dump: Automaton - { unitIU = -1 - , unitRAM = + { memoryIC = -1 + , memoryRAM = [ 0 , -1 , 3 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 df4cf4004..ef7f86290 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 @@ -1,250 +1,479 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , ICF ( SMark "01001100010011110100111101010000" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL ( SIO OutputDec ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( CStatic "011100000111001001101001011011100111010001110011" Call ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL ( SIO OutputDec ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( CStatic "0111000001110010011010010110111001110100011100110110110001101110" Call ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 112 ) + ( SAL + ( Cons 112 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 107 ) + ( SAL + ( Cons 107 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 84 ) + ( SAL + ( Cons 84 ) + ) , ICF ( CStatic "0111000001110010011010010110111001110100011100110110110001101110" Call ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( SStatic 0 Copy ) + ) , IAL ( SIO OutputDec ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( CStatic "0111000001110010011010010110111001110100011100110110110001101110" Call ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111000001110010011010010110111001110100011100110110110001101110" Call ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "010011000100111101001111010100000011101000110001" ( Branch EZ ) ) , ICF @@ -255,7 +484,9 @@ dump: Automaton , ICF ( SMark "011100000111001001101001011011100111010001110011" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) @@ -263,20 +494,22 @@ dump: Automaton ( CStatic "011100000111001001101001011011100111010001110011" Jump ) , ICF ( SMark "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "0111000001110010011010010110111001110100011100110110110001101110" ) , ICF ( CStatic "011100000111001001101001011011100111010001110011" Call ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , ICF Return ] , programCounter = 128 , returnStack = IS [] } - , unitStack = fromList [ 0 ] - , unitRAM = [] + , memoryStack = fromList [ 0 ] + , memoryRAM = [] } diff --git a/.output/golden/ws/eval/logged/stn/asciiOff/from-wsa/hello.logged b/.output/golden/ws/eval/logged/stn/asciiOff/from-wsa/hello.logged index b1a229845..ee3cebcd4 100644 --- a/.output/golden/ws/eval/logged/stn/asciiOff/from-wsa/hello.logged +++ b/.output/golden/ws/eval/logged/stn/asciiOff/from-wsa/hello.logged @@ -1,20 +1,34 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) @@ -23,19 +37,33 @@ dump: Automaton , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) @@ -48,6 +76,6 @@ dump: Automaton , programCounter = 29 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } 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 64f6d9bac..b4b748880 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 @@ -1,43 +1,75 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ICF ( CStatic "011100000111001001101001011011100111010001110011" Call ) , End , ICF ( SMark "011100000111001001101001011011100111010001110011" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) @@ -45,20 +77,22 @@ dump: Automaton ( CStatic "011100000111001001101001011011100111010001110011" Jump ) , ICF ( SMark "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "0111000001110010011010010110111001110100011100110110110001101110" ) , ICF ( CStatic "011100000111001001101001011011100111010001110011" Call ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , ICF Return ] , programCounter = 17 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } 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 d109e75e9..9608f3d43 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 @@ -1,41 +1,71 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ICF ( CStatic "0111000001110010011010010110111001110100011100110110110001101110" Call ) , End , ICF ( SMark "011100000111001001101001011011100111010001110011" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) @@ -43,20 +73,22 @@ dump: Automaton ( CStatic "011100000111001001101001011011100111010001110011" Jump ) , ICF ( SMark "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "0111000001110010011010010110111001110100011100110110110001101110" ) , ICF ( CStatic "011100000111001001101001011011100111010001110011" Call ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , ICF Return ] , programCounter = 16 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } 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 63d06c01d..4039aab96 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 @@ -1,195 +1,325 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( SMark "0111001101110100" ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 93 ) + ( SAL + ( Cons 93 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL - ( Cons 49 ) + ( SAL + ( Cons 49 ) + ) , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , IAL - ( Cons 50 ) + ( SAL + ( Cons 50 ) + ) , IAL - ( Cons 91 ) + ( SAL + ( Cons 91 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 112 ) + ( SAL + ( Cons 112 ) + ) , ICF ( CStatic "0111000001110010011010010110111001110100011100110110110001101110" Call ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( SMark "011001100101111101110011011101000110000101110010011101000101111100110001" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 100 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 100 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110001" ( Branch EZ ) ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 100 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , ILS Store , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "011001100101111101110011011101000110000101110010011101000101111100110001" Jump ) , ICF ( SMark "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110001" ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , ICF ( SMark "011001100101111101110011011101000110000101110010011101000101111100110010" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 11 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 11 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110010" ( Branch EZ ) ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , ICF ( SMark "011001100101111101110011011101000110000101110010011101000101111100110011" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 100 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110011" ( Branch EZ ) ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , ILS Load , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , ILS Load - , IAL ( Binary Mul ) , IAL - ( Cons 100 ) - , IAL ( Binary Add ) + ( SAL ( Binary Mul ) ) + , IAL + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Add ) ) + , IAL + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "011001100101111101110011011101000110000101110010011101000101111100110011" Jump ) , ICF ( SMark "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110011" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "011001100101111101110011011101000110000101110010011101000101111100110010" Jump ) , ICF ( SMark "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110010" ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , ICF ( SMark "011001100101111101110011011101000110000101110010011101000101111100110100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 100 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 100 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110100" ( Branch EZ ) ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 100 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ILS Load , ICF ( CStatic "011011100110111101100100011100100110000101110111" ( Branch EZ ) ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL ( SIO OutputDec ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( CStatic "011100000111001001101001011011100111010001110011" Call ) , ICF ( SMark "011011100110111101100100011100100110000101110111" ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "011001100101111101110011011101000110000101110010011101000101111100110100" Jump ) , ICF ( SMark "011001100101111101100110011010010110111001101001011100110110100001100101011001000101111100110100" ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111000001110010011010010110111001110100011100110110110001101110" Call ) , End , ICF ( SMark "011100000111001001101001011011100111010001110011" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) @@ -197,22 +327,24 @@ dump: Automaton ( CStatic "011100000111001001101001011011100111010001110011" Jump ) , ICF ( SMark "01110000011100100110100101101110011101000111001101011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "0111000001110010011010010110111001110100011100110110110001101110" ) , ICF ( CStatic "011100000111001001101001011011100111010001110011" Call ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , ICF Return ] , programCounter = 105 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 0 , 99 , 10 diff --git a/.output/golden/ws/eval/logged/stn/asciiOff/from-wsa/true.logged b/.output/golden/ws/eval/logged/stn/asciiOff/from-wsa/true.logged index 33aac2e2e..357a0bbab 100644 --- a/.output/golden/ws/eval/logged/stn/asciiOff/from-wsa/true.logged +++ b/.output/golden/ws/eval/logged/stn/asciiOff/from-wsa/true.logged @@ -1,9 +1,9 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ End ] , programCounter = 1 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } 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 2a88a24b9..2d817ef86 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" @@ -1,338 +1,590 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , ILS Store , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 25 ) + ( SAL + ( Cons 25 ) + ) , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , ILS Store , IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) , IAL - ( Cons 49 ) + ( SAL + ( Cons 49 ) + ) , ILS Store , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 28 ) + ( SAL + ( Cons 28 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 31 ) + ( SAL + ( Cons 31 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Store , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , ILS Store , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 34 ) + ( SAL + ( Cons 34 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , ILS Store , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 36 ) + ( SAL + ( Cons 36 ) + ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , ILS Store , IAL - ( Cons 37 ) + ( SAL + ( Cons 37 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , IAL - ( Cons 78 ) + ( SAL + ( Cons 78 ) + ) , ILS Store , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 47 ) + ( SAL + ( Cons 47 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 49 ) + ( SAL + ( Cons 49 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , IAL - ( Cons 84 ) + ( SAL + ( Cons 84 ) + ) , ILS Store , IAL - ( Cons 61 ) + ( SAL + ( Cons 61 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 62 ) + ( SAL + ( Cons 62 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 63 ) + ( SAL + ( Cons 63 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 64 ) + ( SAL + ( Cons 64 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 65 ) + ( SAL + ( Cons 65 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 66 ) + ( SAL + ( Cons 66 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , ILS Store , IAL - ( Cons 67 ) + ( SAL + ( Cons 67 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 68 ) + ( SAL + ( Cons 68 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , ICF ( CStatic "01101110011001010111011101101100011010010110111001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF ( SMark "01101100011011110110111101110000" ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons - ( -1 ) + ( SAL + ( Cons + ( -1 ) + ) ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "01110000011100100110111101100111011001010110111001100100" ( Branch EZ ) ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load - , IAL ( Binary Add ) , IAL - ( Cons 100 ) + ( SAL ( Binary Add ) ) , IAL - ( SStatic 1 Move ) + ( SAL + ( Cons 100 ) + ) + , IAL + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , ICF ( CStatic "01101100011011110110111101110000" Jump ) , ICF ( SMark "01110000011100100110111101100111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL ( SIO OutputDec ) , ICF @@ -340,65 +592,94 @@ dump: Automaton , End , ICF ( SMark "011000010110010001100100" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "0111011101110010011010010111010001100101" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "011101110111001001101001011101000110010101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "0111011101110010011010010111010001100101" Jump ) , ICF ( SMark "011101110111001001101001011101000110010101011111011001010110111001100100" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "01110010011001010110000101100100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0111001001100101011000010110010001011111011001010110111001100100" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "01110010011001010110000101100100" Jump ) , ICF ( SMark "0111001001100101011000010110010001011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "01101110011001010111011101101100011010010110111001100101" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -406,8 +687,8 @@ dump: Automaton , programCounter = 201 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 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 2648d45dd..b541f5f97 100644 --- a/.output/golden/ws/eval/logged/stn/asciiOff/original/count.logged +++ b/.output/golden/ws/eval/logged/stn/asciiOff/original/count.logged @@ -1,93 +1,136 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , ICF ( SMark "01000011" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL ( SIO OutputDec ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 11 ) - , IAL ( Binary Sub ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 11 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "01000101" ( Branch EZ ) ) , ICF ( CStatic "01000011" Jump ) , ICF ( SMark "01000101" ) - , IAL Discard + , IAL ( SAL Discard ) , End , ICF ( SMark "011000010110010001100100" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "0111011101110010011010010111010001100101" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "011101110111001001101001011101000110010101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "0111011101110010011010010111010001100101" Jump ) , ICF ( SMark "011101110111001001101001011101000110010101011111011001010110111001100100" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "01110010011001010110000101100100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0111001001100101011000010110010001011111011001010110111001100100" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "01110010011001010110000101100100" Jump ) , ICF ( SMark "0111001001100101011000010110010001011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "01101110011001010111011101101100011010010110111001100101" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -95,6 +138,6 @@ dump: Automaton , programCounter = 16 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } 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 d26e5bff4..84c88ff70 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" @@ -1,134 +1,232 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 61 ) + ( SAL + ( Cons 61 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , ICF ( CStatic "01100110011000010110001101110100" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL ( SIO OutputDec ) , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL ( SIO OutputDec ) @@ -138,88 +236,125 @@ dump: Automaton , ICF ( SMark "01100110011000010110001101110100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0110011001100001011000110111010001100010011000010111001101100101" ( Branch EZ ) ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "01100110011000010110001101110100" Call ) - , IAL ( Binary Mul ) + , IAL + ( SAL ( Binary Mul ) ) , ICF Return , ICF ( SMark "0110011001100001011000110111010001100010011000010111001101100101" ) - , IAL - ( Cons 1 ) - , IAL Discard , ICF Return , ICF ( SMark "011000010110010001100100" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "0111011101110010011010010111010001100101" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "011101110111001001101001011101000110010101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "0111011101110010011010010111010001100101" Jump ) , ICF ( SMark "011101110111001001101001011101000110010101011111011001010110111001100100" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "01110010011001010110000101100100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0111001001100101011000010110010001011111011001010110111001100100" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "01110010011001010110000101100100" Jump ) , ICF ( SMark "0111001001100101011000010110010001011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "01101110011001010111011101101100011010010110111001100101" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -227,8 +362,8 @@ dump: Automaton , programCounter = 81 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 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 f13a9a79d..454637fed 100644 --- a/.output/golden/ws/eval/logged/stn/asciiOff/original/hWorld.logged +++ b/.output/golden/ws/eval/logged/stn/asciiOff/original/hWorld.logged @@ -1,128 +1,226 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , IAL - ( Cons 112 ) + ( SAL + ( Cons 112 ) + ) , ILS Store , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 99 ) + ( SAL + ( Cons 99 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , ICF @@ -130,65 +228,94 @@ dump: Automaton , End , ICF ( SMark "011000010110010001100100" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "0111011101110010011010010111010001100101" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "011101110111001001101001011101000110010101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "0111011101110010011010010111010001100101" Jump ) , ICF ( SMark "011101110111001001101001011101000110010101011111011001010110111001100100" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "01110010011001010110000101100100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0111001001100101011000010110010001011111011001010110111001100100" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "01110010011001010110000101100100" Jump ) , ICF ( SMark "0111001001100101011000010110010001011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "01101110011001010111011101101100011010010110111001100101" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -196,8 +323,8 @@ dump: Automaton , programCounter = 76 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 72 , 101 , 108 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 a0eda82fa..e94358cdc 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" @@ -1,338 +1,561 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 62 ) + ( SAL + ( Cons 62 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , ICF ( CStatic "0110100001100001011011100110111101101001" Call ) , End , ICF ( SMark "0110100001100001011011100110111101101001" ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , ICF ( CStatic "0110010101101110011001000110100001100001011011100110111101101001" ( Branch EZ ) ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 101 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , ICF ( CStatic "0110100001100001011011100110111101101001" Call ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL ( SIO OutputDec ) , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL ( SIO OutputDec ) , ICF ( CStatic "01101110011001010111011101101100011010010110111001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , ICF ( CStatic "0110100001100001011011100110111101101001" Call ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , ICF ( SMark "0110010101101110011001000110100001100001011011100110111101101001" ) , ICF Return , ICF ( SMark "011000010110010001100100" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "0111011101110010011010010111010001100101" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "011101110111001001101001011101000110010101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "0111011101110010011010010111010001100101" Jump ) , ICF ( SMark "011101110111001001101001011101000110010101011111011001010110111001100100" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "01110010011001010110000101100100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0111001001100101011000010110010001011111011001010110111001100100" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "01110010011001010110000101100100" Jump ) , ICF ( SMark "0111001001100101011000010110010001011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "01101110011001010111011101101100011010010110111001100101" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -340,8 +563,8 @@ dump: Automaton , programCounter = 77 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 diff --git a/.output/golden/ws/eval/logged/stn/asciiOff/original/helloWorld.logged b/.output/golden/ws/eval/logged/stn/asciiOff/original/helloWorld.logged index 6fd076135..4705ee1a1 100644 --- a/.output/golden/ws/eval/logged/stn/asciiOff/original/helloWorld.logged +++ b/.output/golden/ws/eval/logged/stn/asciiOff/original/helloWorld.logged @@ -1,47 +1,71 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL ( SIO OutputChar ) , End ] , programCounter = 25 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } 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 1e4156de1..bc816ab53 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" @@ -1,110 +1,190 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , ICF ( CStatic "01101100011011110110001101110100011001010111001101110100" Call ) @@ -113,74 +193,110 @@ dump: Automaton , ICF ( SMark "01101100011011110110001101110100011001010111001101110100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 2 Copy ) - , IAL ( Binary Add ) + ( SAL + ( SStatic 2 Copy ) + ) , IAL - ( SStatic 2 Slide ) + ( SAL ( Binary Add ) ) + , IAL + ( SAL + ( SStatic 2 Slide ) + ) , ICF Return , ICF ( SMark "011000010110010001100100" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "0111011101110010011010010111010001100101" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "011101110111001001101001011101000110010101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "0111011101110010011010010111010001100101" Jump ) , ICF ( SMark "011101110111001001101001011101000110010101011111011001010110111001100100" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "01110010011001010110000101100100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0111001001100101011000010110010001011111011001010110111001100100" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "01110010011001010110000101100100" Jump ) , ICF ( SMark "0111001001100101011000010110010001011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "01101110011001010111011101101100011010010110111001100101" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -188,8 +304,8 @@ dump: Automaton , programCounter = 66 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 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 a8f5b0fcd..8d78eaf37 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" @@ -1,180 +1,316 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 80 ) + ( SAL + ( Cons 80 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 121 ) + ( SAL + ( Cons 121 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ILS Store , IAL - ( Cons 31 ) + ( SAL + ( Cons 31 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 34 ) + ( SAL + ( Cons 34 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 36 ) + ( SAL + ( Cons 36 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ICF ( CStatic "01110010011001010110000101100100" Call ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , ICF @@ -182,65 +318,94 @@ dump: Automaton , End , ICF ( SMark "011000010110010001100100" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "0111011101110010011010010111010001100101" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "011101110111001001101001011101000110010101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "0111011101110010011010010111010001100101" Jump ) , ICF ( SMark "011101110111001001101001011101000110010101011111011001010110111001100100" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "01110010011001010110000101100100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0111001001100101011000010110010001011111011001010110111001100100" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "01110010011001010110000101100100" Jump ) , ICF ( SMark "0111001001100101011000010110010001011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "01101110011001010111011101101100011010010110111001100101" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -248,8 +413,8 @@ dump: Automaton , programCounter = 106 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 80 , 108 , 101 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 5d4bbbff1..a2e0c339d 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" @@ -1,10 +1,14 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( Cons 0 ) + ) , ILS ( MIO InputDec ) , ILS Load , ICF @@ -12,20 +16,24 @@ dump: Automaton , ICF ( SMark "1" ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL ( SIO OutputDec ) , ICF ( CStatic "1" Jump ) , ICF ( SMark "0" ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL ( SIO OutputDec ) , End ] , programCounter = 13 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [ 0 ] + , memoryStack = fromList [] + , memoryRAM = [ 0 ] } 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 c4fbd6456..40c69b9b1 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 @@ -1,250 +1,479 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , ICF ( SMark "LOOP" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL ( SIO OutputDec ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( CStatic "prints" Call ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL ( SIO OutputDec ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( CStatic "printsln" Call ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 112 ) + ( SAL + ( Cons 112 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 107 ) + ( SAL + ( Cons 107 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 84 ) + ( SAL + ( Cons 84 ) + ) , ICF ( CStatic "printsln" Call ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( SStatic 0 Copy ) + ) , IAL ( SIO OutputDec ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( CStatic "printsln" Call ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "printsln" Call ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "LOOP:1" ( Branch EZ ) ) , ICF @@ -255,7 +484,9 @@ dump: Automaton , ICF ( SMark "prints" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "prints_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) @@ -263,20 +494,22 @@ dump: Automaton ( CStatic "prints" Jump ) , ICF ( SMark "prints_end" ) - , IAL Discard + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "printsln" ) , ICF ( CStatic "prints" Call ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , ICF Return ] , programCounter = 128 , returnStack = IS [] } - , unitStack = fromList [ 0 ] - , unitRAM = [] + , memoryStack = fromList [ 0 ] + , memoryRAM = [] } diff --git a/.output/golden/ws/eval/logged/stn/asciiOn/from-wsa/hello.logged b/.output/golden/ws/eval/logged/stn/asciiOn/from-wsa/hello.logged index b1a229845..ee3cebcd4 100644 --- a/.output/golden/ws/eval/logged/stn/asciiOn/from-wsa/hello.logged +++ b/.output/golden/ws/eval/logged/stn/asciiOn/from-wsa/hello.logged @@ -1,20 +1,34 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) @@ -23,19 +37,33 @@ dump: Automaton , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) @@ -48,6 +76,6 @@ dump: Automaton , programCounter = 29 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } 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 b2f696248..5f5810628 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 @@ -1,43 +1,75 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ICF ( CStatic "prints" Call ) , End , ICF ( SMark "prints" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "prints_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) @@ -45,20 +77,22 @@ dump: Automaton ( CStatic "prints" Jump ) , ICF ( SMark "prints_end" ) - , IAL Discard + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "printsln" ) , ICF ( CStatic "prints" Call ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , ICF Return ] , programCounter = 17 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } 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 3ed1f06bb..130c40d79 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 @@ -1,41 +1,71 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ICF ( CStatic "printsln" Call ) , End , ICF ( SMark "prints" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "prints_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) @@ -43,20 +73,22 @@ dump: Automaton ( CStatic "prints" Jump ) , ICF ( SMark "prints_end" ) - , IAL Discard + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "printsln" ) , ICF ( CStatic "prints" Call ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , ICF Return ] , programCounter = 16 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } 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 3859584a0..e4cb4575d 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 @@ -1,195 +1,325 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ ICF ( SMark "st" ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 93 ) + ( SAL + ( Cons 93 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL - ( Cons 49 ) + ( SAL + ( Cons 49 ) + ) , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , IAL - ( Cons 50 ) + ( SAL + ( Cons 50 ) + ) , IAL - ( Cons 91 ) + ( SAL + ( Cons 91 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL - ( Cons 112 ) + ( SAL + ( Cons 112 ) + ) , ICF ( CStatic "printsln" Call ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( SMark "f_start_1" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 100 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 100 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "f_finished_1" ( Branch EZ ) ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 100 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , ILS Store , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "f_start_1" Jump ) , ICF ( SMark "f_finished_1" ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , ICF ( SMark "f_start_2" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 11 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 11 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "f_finished_2" ( Branch EZ ) ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , ICF ( SMark "f_start_3" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 100 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "f_finished_3" ( Branch EZ ) ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , ILS Load , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , ILS Load - , IAL ( Binary Mul ) , IAL - ( Cons 100 ) - , IAL ( Binary Add ) + ( SAL ( Binary Mul ) ) + , IAL + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 0 ) + ( SAL ( Binary Add ) ) + , IAL + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "f_start_3" Jump ) , ICF ( SMark "f_finished_3" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "f_start_2" Jump ) , ICF ( SMark "f_finished_2" ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , ICF ( SMark "f_start_4" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 100 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 100 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "f_finished_4" ( Branch EZ ) ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 100 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ILS Load , ICF ( CStatic "nodraw" ( Branch EZ ) ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL ( SIO OutputDec ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ICF ( CStatic "prints" Call ) , ICF ( SMark "nodraw" ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "f_start_4" Jump ) , ICF ( SMark "f_finished_4" ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "printsln" Call ) , End , ICF ( SMark "prints" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "prints_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) @@ -197,22 +327,24 @@ dump: Automaton ( CStatic "prints" Jump ) , ICF ( SMark "prints_end" ) - , IAL Discard + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "printsln" ) , ICF ( CStatic "prints" Call ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , ICF Return ] , programCounter = 105 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 0 , 99 , 10 diff --git a/.output/golden/ws/eval/logged/stn/asciiOn/from-wsa/true.logged b/.output/golden/ws/eval/logged/stn/asciiOn/from-wsa/true.logged index 33aac2e2e..357a0bbab 100644 --- a/.output/golden/ws/eval/logged/stn/asciiOn/from-wsa/true.logged +++ b/.output/golden/ws/eval/logged/stn/asciiOn/from-wsa/true.logged @@ -1,9 +1,9 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ End ] , programCounter = 1 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } 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 39c7cb80a..dbeed2d63 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" @@ -1,338 +1,590 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , ILS Store , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 25 ) + ( SAL + ( Cons 25 ) + ) , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , ILS Store , IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) , IAL - ( Cons 49 ) + ( SAL + ( Cons 49 ) + ) , ILS Store , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 28 ) + ( SAL + ( Cons 28 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 31 ) + ( SAL + ( Cons 31 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Store , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , ILS Store , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 34 ) + ( SAL + ( Cons 34 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , ILS Store , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 36 ) + ( SAL + ( Cons 36 ) + ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , ILS Store , IAL - ( Cons 37 ) + ( SAL + ( Cons 37 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , IAL - ( Cons 78 ) + ( SAL + ( Cons 78 ) + ) , ILS Store , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 47 ) + ( SAL + ( Cons 47 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 49 ) + ( SAL + ( Cons 49 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , IAL - ( Cons 84 ) + ( SAL + ( Cons 84 ) + ) , ILS Store , IAL - ( Cons 61 ) + ( SAL + ( Cons 61 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 62 ) + ( SAL + ( Cons 62 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 63 ) + ( SAL + ( Cons 63 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 64 ) + ( SAL + ( Cons 64 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 65 ) + ( SAL + ( Cons 65 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 66 ) + ( SAL + ( Cons 66 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , ILS Store , IAL - ( Cons 67 ) + ( SAL + ( Cons 67 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 68 ) + ( SAL + ( Cons 68 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "write" Call ) , ICF ( CStatic "newline" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF ( SMark "loop" ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons - ( -1 ) + ( SAL + ( Cons + ( -1 ) + ) ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "progend" ( Branch EZ ) ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load - , IAL ( Binary Add ) , IAL - ( Cons 100 ) + ( SAL ( Binary Add ) ) , IAL - ( SStatic 1 Move ) + ( SAL + ( Cons 100 ) + ) + , IAL + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , ICF ( CStatic "loop" Jump ) , ICF ( SMark "progend" ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL ( SIO OutputDec ) , ICF @@ -340,65 +592,94 @@ dump: Automaton , End , ICF ( SMark "add" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "write" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "write_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "write" Jump ) , ICF ( SMark "write_end" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "read" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "read_end" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "read" Jump ) , ICF ( SMark "read_end" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "newline" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -406,8 +687,8 @@ dump: Automaton , programCounter = 201 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 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 0685bfc8f..54d428a75 100644 --- a/.output/golden/ws/eval/logged/stn/asciiOn/original/count.logged +++ b/.output/golden/ws/eval/logged/stn/asciiOn/original/count.logged @@ -1,93 +1,136 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , ICF ( SMark "C" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL ( SIO OutputDec ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 11 ) - , IAL ( Binary Sub ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 11 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "E" ( Branch EZ ) ) , ICF ( CStatic "C" Jump ) , ICF ( SMark "E" ) - , IAL Discard + , IAL ( SAL Discard ) , End , ICF ( SMark "add" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "write" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "write_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "write" Jump ) , ICF ( SMark "write_end" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "read" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "read_end" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "read" Jump ) , ICF ( SMark "read_end" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "newline" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -95,6 +138,6 @@ dump: Automaton , programCounter = 16 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } 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 757a1673e..67a7b98cf 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" @@ -1,134 +1,232 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 61 ) + ( SAL + ( Cons 61 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , ICF ( CStatic "fact" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL ( SIO OutputDec ) , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , ICF ( CStatic "write" Call ) , IAL ( SIO OutputDec ) @@ -138,88 +236,125 @@ dump: Automaton , ICF ( SMark "fact" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "factbase" ( Branch EZ ) ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "fact" Call ) - , IAL ( Binary Mul ) + , IAL + ( SAL ( Binary Mul ) ) , ICF Return , ICF ( SMark "factbase" ) - , IAL - ( Cons 1 ) - , IAL Discard , ICF Return , ICF ( SMark "add" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "write" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "write_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "write" Jump ) , ICF ( SMark "write_end" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "read" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "read_end" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "read" Jump ) , ICF ( SMark "read_end" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "newline" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -227,8 +362,8 @@ dump: Automaton , programCounter = 81 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 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 c3ccb3ce4..6299446f2 100644 --- a/.output/golden/ws/eval/logged/stn/asciiOn/original/hWorld.logged +++ b/.output/golden/ws/eval/logged/stn/asciiOn/original/hWorld.logged @@ -1,128 +1,226 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , IAL - ( Cons 112 ) + ( SAL + ( Cons 112 ) + ) , ILS Store , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 99 ) + ( SAL + ( Cons 99 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "write" Call ) , ICF @@ -130,65 +228,94 @@ dump: Automaton , End , ICF ( SMark "add" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "write" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "write_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "write" Jump ) , ICF ( SMark "write_end" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "read" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "read_end" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "read" Jump ) , ICF ( SMark "read_end" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "newline" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -196,8 +323,8 @@ dump: Automaton , programCounter = 76 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 72 , 101 , 108 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 a0eb35390..ff4778379 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" @@ -1,338 +1,561 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 62 ) + ( SAL + ( Cons 62 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , ICF ( CStatic "hanoi" Call ) , End , ICF ( SMark "hanoi" ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , ICF ( CStatic "endhanoi" ( Branch EZ ) ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 101 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , ICF ( CStatic "hanoi" Call ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL ( SIO OutputDec ) , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL ( SIO OutputDec ) , ICF ( CStatic "newline" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , ICF ( CStatic "hanoi" Call ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , ICF ( SMark "endhanoi" ) , ICF Return , ICF ( SMark "add" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "write" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "write_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "write" Jump ) , ICF ( SMark "write_end" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "read" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "read_end" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "read" Jump ) , ICF ( SMark "read_end" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "newline" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -340,8 +563,8 @@ dump: Automaton , programCounter = 77 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 diff --git a/.output/golden/ws/eval/logged/stn/asciiOn/original/helloWorld.logged b/.output/golden/ws/eval/logged/stn/asciiOn/original/helloWorld.logged index 6fd076135..4705ee1a1 100644 --- a/.output/golden/ws/eval/logged/stn/asciiOn/original/helloWorld.logged +++ b/.output/golden/ws/eval/logged/stn/asciiOn/original/helloWorld.logged @@ -1,47 +1,71 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL ( SIO OutputChar ) , End ] , programCounter = 25 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } 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 693b5ad2b..0a6381434 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" @@ -1,110 +1,190 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , ICF ( CStatic "loctest" Call ) @@ -113,74 +193,110 @@ dump: Automaton , ICF ( SMark "loctest" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 2 Copy ) - , IAL ( Binary Add ) + ( SAL + ( SStatic 2 Copy ) + ) , IAL - ( SStatic 2 Slide ) + ( SAL ( Binary Add ) ) + , IAL + ( SAL + ( SStatic 2 Slide ) + ) , ICF Return , ICF ( SMark "add" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "write" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "write_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "write" Jump ) , ICF ( SMark "write_end" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "read" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "read_end" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "read" Jump ) , ICF ( SMark "read_end" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "newline" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -188,8 +304,8 @@ dump: Automaton , programCounter = 66 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 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 8285d866a..870c9798c 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" @@ -1,180 +1,316 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 80 ) + ( SAL + ( Cons 80 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 121 ) + ( SAL + ( Cons 121 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ILS Store , IAL - ( Cons 31 ) + ( SAL + ( Cons 31 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 34 ) + ( SAL + ( Cons 34 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 36 ) + ( SAL + ( Cons 36 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ICF ( CStatic "read" Call ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ICF ( CStatic "write" Call ) , ICF @@ -182,65 +318,94 @@ dump: Automaton , End , ICF ( SMark "add" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "write" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "write_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "write" Jump ) , ICF ( SMark "write_end" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "read" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "read_end" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "read" Jump ) , ICF ( SMark "read_end" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "newline" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -248,8 +413,8 @@ dump: Automaton , programCounter = 106 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 80 , 108 , 101 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 8ff259ecc..4f3eda6a5 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" @@ -1,10 +1,14 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( Cons 0 ) + ) , ILS ( MIO InputDec ) , ILS Load , ICF @@ -12,20 +16,24 @@ dump: Automaton , ICF ( SMark "\x1" ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL ( SIO OutputDec ) , ICF ( CStatic "\x1" Jump ) , ICF ( SMark "\x0" ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL ( SIO OutputDec ) , End ] , programCounter = 13 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [ 0 ] + , memoryStack = fromList [] + , memoryRAM = [ 0 ] } 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 2a88a24b9..2d817ef86 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" @@ -1,338 +1,590 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , ILS Store , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 25 ) + ( SAL + ( Cons 25 ) + ) , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , ILS Store , IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) , IAL - ( Cons 49 ) + ( SAL + ( Cons 49 ) + ) , ILS Store , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 28 ) + ( SAL + ( Cons 28 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 31 ) + ( SAL + ( Cons 31 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Store , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , ILS Store , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 34 ) + ( SAL + ( Cons 34 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , ILS Store , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 36 ) + ( SAL + ( Cons 36 ) + ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , ILS Store , IAL - ( Cons 37 ) + ( SAL + ( Cons 37 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , IAL - ( Cons 78 ) + ( SAL + ( Cons 78 ) + ) , ILS Store , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 47 ) + ( SAL + ( Cons 47 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 49 ) + ( SAL + ( Cons 49 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , IAL - ( Cons 84 ) + ( SAL + ( Cons 84 ) + ) , ILS Store , IAL - ( Cons 61 ) + ( SAL + ( Cons 61 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 62 ) + ( SAL + ( Cons 62 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 63 ) + ( SAL + ( Cons 63 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 64 ) + ( SAL + ( Cons 64 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 65 ) + ( SAL + ( Cons 65 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 66 ) + ( SAL + ( Cons 66 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , ILS Store , IAL - ( Cons 67 ) + ( SAL + ( Cons 67 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 68 ) + ( SAL + ( Cons 68 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , ICF ( CStatic "01101110011001010111011101101100011010010110111001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF ( SMark "01101100011011110110111101110000" ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons - ( -1 ) + ( SAL + ( Cons + ( -1 ) + ) ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "01110000011100100110111101100111011001010110111001100100" ( Branch EZ ) ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load - , IAL ( Binary Add ) , IAL - ( Cons 100 ) + ( SAL ( Binary Add ) ) , IAL - ( SStatic 1 Move ) + ( SAL + ( Cons 100 ) + ) + , IAL + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , ICF ( CStatic "01101100011011110110111101110000" Jump ) , ICF ( SMark "01110000011100100110111101100111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL ( SIO OutputDec ) , ICF @@ -340,65 +592,94 @@ dump: Automaton , End , ICF ( SMark "011000010110010001100100" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "0111011101110010011010010111010001100101" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "011101110111001001101001011101000110010101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "0111011101110010011010010111010001100101" Jump ) , ICF ( SMark "011101110111001001101001011101000110010101011111011001010110111001100100" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "01110010011001010110000101100100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0111001001100101011000010110010001011111011001010110111001100100" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "01110010011001010110000101100100" Jump ) , ICF ( SMark "0111001001100101011000010110010001011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "01101110011001010111011101101100011010010110111001100101" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -406,8 +687,8 @@ dump: Automaton , programCounter = 201 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 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 2648d45dd..b541f5f97 100644 --- a/.output/golden/ws/eval/logged/ws/asciiOff/original/count.logged +++ b/.output/golden/ws/eval/logged/ws/asciiOff/original/count.logged @@ -1,93 +1,136 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , ICF ( SMark "01000011" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL ( SIO OutputDec ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 11 ) - , IAL ( Binary Sub ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 11 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "01000101" ( Branch EZ ) ) , ICF ( CStatic "01000011" Jump ) , ICF ( SMark "01000101" ) - , IAL Discard + , IAL ( SAL Discard ) , End , ICF ( SMark "011000010110010001100100" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "0111011101110010011010010111010001100101" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "011101110111001001101001011101000110010101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "0111011101110010011010010111010001100101" Jump ) , ICF ( SMark "011101110111001001101001011101000110010101011111011001010110111001100100" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "01110010011001010110000101100100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0111001001100101011000010110010001011111011001010110111001100100" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "01110010011001010110000101100100" Jump ) , ICF ( SMark "0111001001100101011000010110010001011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "01101110011001010111011101101100011010010110111001100101" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -95,6 +138,6 @@ dump: Automaton , programCounter = 16 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } 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 d26e5bff4..84c88ff70 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" @@ -1,134 +1,232 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 61 ) + ( SAL + ( Cons 61 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , ICF ( CStatic "01100110011000010110001101110100" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL ( SIO OutputDec ) , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL ( SIO OutputDec ) @@ -138,88 +236,125 @@ dump: Automaton , ICF ( SMark "01100110011000010110001101110100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0110011001100001011000110111010001100010011000010111001101100101" ( Branch EZ ) ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "01100110011000010110001101110100" Call ) - , IAL ( Binary Mul ) + , IAL + ( SAL ( Binary Mul ) ) , ICF Return , ICF ( SMark "0110011001100001011000110111010001100010011000010111001101100101" ) - , IAL - ( Cons 1 ) - , IAL Discard , ICF Return , ICF ( SMark "011000010110010001100100" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "0111011101110010011010010111010001100101" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "011101110111001001101001011101000110010101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "0111011101110010011010010111010001100101" Jump ) , ICF ( SMark "011101110111001001101001011101000110010101011111011001010110111001100100" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "01110010011001010110000101100100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0111001001100101011000010110010001011111011001010110111001100100" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "01110010011001010110000101100100" Jump ) , ICF ( SMark "0111001001100101011000010110010001011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "01101110011001010111011101101100011010010110111001100101" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -227,8 +362,8 @@ dump: Automaton , programCounter = 81 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 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 a0eda82fa..e94358cdc 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" @@ -1,338 +1,561 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 62 ) + ( SAL + ( Cons 62 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , ICF ( CStatic "0110100001100001011011100110111101101001" Call ) , End , ICF ( SMark "0110100001100001011011100110111101101001" ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , ICF ( CStatic "0110010101101110011001000110100001100001011011100110111101101001" ( Branch EZ ) ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 101 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , ICF ( CStatic "0110100001100001011011100110111101101001" Call ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL ( SIO OutputDec ) , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL ( SIO OutputDec ) , ICF ( CStatic "01101110011001010111011101101100011010010110111001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , ICF ( CStatic "0110100001100001011011100110111101101001" Call ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , ICF ( SMark "0110010101101110011001000110100001100001011011100110111101101001" ) , ICF Return , ICF ( SMark "011000010110010001100100" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "0111011101110010011010010111010001100101" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "011101110111001001101001011101000110010101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "0111011101110010011010010111010001100101" Jump ) , ICF ( SMark "011101110111001001101001011101000110010101011111011001010110111001100100" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "01110010011001010110000101100100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0111001001100101011000010110010001011111011001010110111001100100" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "01110010011001010110000101100100" Jump ) , ICF ( SMark "0111001001100101011000010110010001011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "01101110011001010111011101101100011010010110111001100101" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -340,8 +563,8 @@ dump: Automaton , programCounter = 77 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 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 f13a9a79d..454637fed 100644 --- a/.output/golden/ws/eval/logged/ws/asciiOff/original/hworld.logged +++ b/.output/golden/ws/eval/logged/ws/asciiOff/original/hworld.logged @@ -1,128 +1,226 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , IAL - ( Cons 112 ) + ( SAL + ( Cons 112 ) + ) , ILS Store , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 99 ) + ( SAL + ( Cons 99 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , ICF @@ -130,65 +228,94 @@ dump: Automaton , End , ICF ( SMark "011000010110010001100100" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "0111011101110010011010010111010001100101" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "011101110111001001101001011101000110010101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "0111011101110010011010010111010001100101" Jump ) , ICF ( SMark "011101110111001001101001011101000110010101011111011001010110111001100100" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "01110010011001010110000101100100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0111001001100101011000010110010001011111011001010110111001100100" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "01110010011001010110000101100100" Jump ) , ICF ( SMark "0111001001100101011000010110010001011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "01101110011001010111011101101100011010010110111001100101" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -196,8 +323,8 @@ dump: Automaton , programCounter = 76 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 72 , 101 , 108 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 1e4156de1..bc816ab53 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" @@ -1,110 +1,190 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , ICF ( CStatic "01101100011011110110001101110100011001010111001101110100" Call ) @@ -113,74 +193,110 @@ dump: Automaton , ICF ( SMark "01101100011011110110001101110100011001010111001101110100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 2 Copy ) - , IAL ( Binary Add ) + ( SAL + ( SStatic 2 Copy ) + ) , IAL - ( SStatic 2 Slide ) + ( SAL ( Binary Add ) ) + , IAL + ( SAL + ( SStatic 2 Slide ) + ) , ICF Return , ICF ( SMark "011000010110010001100100" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "0111011101110010011010010111010001100101" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "011101110111001001101001011101000110010101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "0111011101110010011010010111010001100101" Jump ) , ICF ( SMark "011101110111001001101001011101000110010101011111011001010110111001100100" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "01110010011001010110000101100100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0111001001100101011000010110010001011111011001010110111001100100" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "01110010011001010110000101100100" Jump ) , ICF ( SMark "0111001001100101011000010110010001011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "01101110011001010111011101101100011010010110111001100101" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -188,8 +304,8 @@ dump: Automaton , programCounter = 66 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 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 a8f5b0fcd..8d78eaf37 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" @@ -1,180 +1,316 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 80 ) + ( SAL + ( Cons 80 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 121 ) + ( SAL + ( Cons 121 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ILS Store , IAL - ( Cons 31 ) + ( SAL + ( Cons 31 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 34 ) + ( SAL + ( Cons 34 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 36 ) + ( SAL + ( Cons 36 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ICF ( CStatic "01110010011001010110000101100100" Call ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ICF ( CStatic "0111011101110010011010010111010001100101" Call ) , ICF @@ -182,65 +318,94 @@ dump: Automaton , End , ICF ( SMark "011000010110010001100100" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "0111011101110010011010010111010001100101" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "011101110111001001101001011101000110010101011111011001010110111001100100" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "0111011101110010011010010111010001100101" Jump ) , ICF ( SMark "011101110111001001101001011101000110010101011111011001010110111001100100" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "01110010011001010110000101100100" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "0111001001100101011000010110010001011111011001010110111001100100" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "01110010011001010110000101100100" Jump ) , ICF ( SMark "0111001001100101011000010110010001011111011001010110111001100100" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "01101110011001010111011101101100011010010110111001100101" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -248,8 +413,8 @@ dump: Automaton , programCounter = 106 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 80 , 108 , 101 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 39c7cb80a..dbeed2d63 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" @@ -1,338 +1,590 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , ILS Store , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 25 ) + ( SAL + ( Cons 25 ) + ) , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , ILS Store , IAL - ( Cons 26 ) + ( SAL + ( Cons 26 ) + ) , IAL - ( Cons 49 ) + ( SAL + ( Cons 49 ) + ) , ILS Store , IAL - ( Cons 27 ) + ( SAL + ( Cons 27 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 28 ) + ( SAL + ( Cons 28 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 29 ) + ( SAL + ( Cons 29 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 31 ) + ( SAL + ( Cons 31 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Store , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , ILS Store , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 34 ) + ( SAL + ( Cons 34 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , ILS Store , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 36 ) + ( SAL + ( Cons 36 ) + ) , IAL - ( Cons 104 ) + ( SAL + ( Cons 104 ) + ) , ILS Store , IAL - ( Cons 37 ) + ( SAL + ( Cons 37 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , IAL - ( Cons 78 ) + ( SAL + ( Cons 78 ) + ) , ILS Store , IAL - ( Cons 43 ) + ( SAL + ( Cons 43 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 46 ) + ( SAL + ( Cons 46 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 47 ) + ( SAL + ( Cons 47 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 48 ) + ( SAL + ( Cons 48 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 49 ) + ( SAL + ( Cons 49 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , IAL - ( Cons 84 ) + ( SAL + ( Cons 84 ) + ) , ILS Store , IAL - ( Cons 61 ) + ( SAL + ( Cons 61 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 62 ) + ( SAL + ( Cons 62 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 63 ) + ( SAL + ( Cons 63 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 64 ) + ( SAL + ( Cons 64 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 65 ) + ( SAL + ( Cons 65 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 66 ) + ( SAL + ( Cons 66 ) + ) , IAL - ( Cons 105 ) + ( SAL + ( Cons 105 ) + ) , ILS Store , IAL - ( Cons 67 ) + ( SAL + ( Cons 67 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 68 ) + ( SAL + ( Cons 68 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "write" Call ) , ICF ( CStatic "newline" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF ( SMark "loop" ) , IAL - ( Cons 42 ) + ( SAL + ( Cons 42 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons - ( -1 ) + ( SAL + ( Cons + ( -1 ) + ) ) - , IAL ( Binary Sub ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "progend" ( Branch EZ ) ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load - , IAL ( Binary Add ) , IAL - ( Cons 100 ) + ( SAL ( Binary Add ) ) , IAL - ( SStatic 1 Move ) + ( SAL + ( Cons 100 ) + ) + , IAL + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , ICF ( CStatic "loop" Jump ) , ICF ( SMark "progend" ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 60 ) + ( SAL + ( Cons 60 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL ( SIO OutputDec ) , ICF @@ -340,65 +592,94 @@ dump: Automaton , End , ICF ( SMark "add" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "write" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "write_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "write" Jump ) , ICF ( SMark "write_end" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "read" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "read_end" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "read" Jump ) , ICF ( SMark "read_end" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "newline" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -406,8 +687,8 @@ dump: Automaton , programCounter = 201 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 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 0685bfc8f..54d428a75 100644 --- a/.output/golden/ws/eval/logged/ws/asciiOn/original/count.logged +++ b/.output/golden/ws/eval/logged/ws/asciiOn/original/count.logged @@ -1,93 +1,136 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , ICF ( SMark "C" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL ( SIO OutputDec ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 11 ) - , IAL ( Binary Sub ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 11 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "E" ( Branch EZ ) ) , ICF ( CStatic "C" Jump ) , ICF ( SMark "E" ) - , IAL Discard + , IAL ( SAL Discard ) , End , ICF ( SMark "add" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "write" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "write_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "write" Jump ) , ICF ( SMark "write_end" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "read" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "read_end" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "read" Jump ) , ICF ( SMark "read_end" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "newline" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -95,6 +138,6 @@ dump: Automaton , programCounter = 16 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = [] + , memoryStack = fromList [] + , memoryRAM = [] } 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 757a1673e..67a7b98cf 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" @@ -1,134 +1,232 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 61 ) + ( SAL + ( Cons 61 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , ICF ( CStatic "fact" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL ( SIO OutputDec ) , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , ICF ( CStatic "write" Call ) , IAL ( SIO OutputDec ) @@ -138,88 +236,125 @@ dump: Automaton , ICF ( SMark "fact" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "factbase" ( Branch EZ ) ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "fact" Call ) - , IAL ( Binary Mul ) + , IAL + ( SAL ( Binary Mul ) ) , ICF Return , ICF ( SMark "factbase" ) - , IAL - ( Cons 1 ) - , IAL Discard , ICF Return , ICF ( SMark "add" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "write" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "write_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "write" Jump ) , ICF ( SMark "write_end" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "read" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "read_end" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "read" Jump ) , ICF ( SMark "read_end" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "newline" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -227,8 +362,8 @@ dump: Automaton , programCounter = 81 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 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 a0eb35390..ff4778379 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" @@ -1,338 +1,561 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 45 ) + ( SAL + ( Cons 45 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 62 ) + ( SAL + ( Cons 62 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , ICF ( CStatic "hanoi" Call ) , End , ICF ( SMark "hanoi" ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , ICF ( CStatic "endhanoi" ( Branch EZ ) ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 101 ) + ( SAL ( Binary Sub ) ) + , IAL + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , ICF ( CStatic "hanoi" Call ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL ( SIO OutputDec ) , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL ( SIO OutputDec ) , ICF ( CStatic "newline" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 1 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , ILS Load , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , ICF ( CStatic "hanoi" Call ) , IAL - ( Cons 103 ) + ( SAL + ( Cons 103 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , IAL - ( SStatic 1 Move ) + ( SAL + ( SStatic 1 Move ) + ) , ILS Store , ICF ( SMark "endhanoi" ) , ICF Return , ICF ( SMark "add" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "write" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "write_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "write" Jump ) , ICF ( SMark "write_end" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "read" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "read_end" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "read" Jump ) , ICF ( SMark "read_end" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "newline" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -340,8 +563,8 @@ dump: Automaton , programCounter = 77 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 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 c3ccb3ce4..6299446f2 100644 --- a/.output/golden/ws/eval/logged/ws/asciiOn/original/hworld.logged +++ b/.output/golden/ws/eval/logged/ws/asciiOn/original/hworld.logged @@ -1,128 +1,226 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 44 ) + ( SAL + ( Cons 44 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 119 ) + ( SAL + ( Cons 119 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 102 ) + ( SAL + ( Cons 102 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , IAL - ( Cons 112 ) + ( SAL + ( Cons 112 ) + ) , ILS Store , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 99 ) + ( SAL + ( Cons 99 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "write" Call ) , ICF @@ -130,65 +228,94 @@ dump: Automaton , End , ICF ( SMark "add" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "write" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "write_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "write" Jump ) , ICF ( SMark "write_end" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "read" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "read_end" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "read" Jump ) , ICF ( SMark "read_end" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "newline" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -196,8 +323,8 @@ dump: Automaton , programCounter = 76 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 72 , 101 , 108 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 693b5ad2b..0a6381434 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" @@ -1,110 +1,190 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 69 ) + ( SAL + ( Cons 69 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 98 ) + ( SAL + ( Cons 98 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS ( MIO InputDec ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ILS Load , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Load , ICF ( CStatic "loctest" Call ) @@ -113,74 +193,110 @@ dump: Automaton , ICF ( SMark "loctest" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 2 Copy ) - , IAL ( Binary Add ) + ( SAL + ( SStatic 2 Copy ) + ) , IAL - ( SStatic 2 Slide ) + ( SAL ( Binary Add ) ) + , IAL + ( SAL + ( SStatic 2 Slide ) + ) , ICF Return , ICF ( SMark "add" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "write" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "write_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "write" Jump ) , ICF ( SMark "write_end" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "read" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL + ( Cons 10 ) + ) + , IAL + ( SAL ( Binary Sub ) ) , ICF ( CStatic "read_end" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , ICF ( CStatic "read" Jump ) , ICF ( SMark "read_end" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "newline" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -188,8 +304,8 @@ dump: Automaton , programCounter = 66 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 69 , 110 , 116 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 8285d866a..870c9798c 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" @@ -1,180 +1,316 @@ -dump: Automaton - { unitCU = CU +dump: Memory + { memoryCM = CM { program = [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( Cons 80 ) + ( SAL + ( Cons 80 ) + ) , ILS Store , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 2 ) + ( SAL + ( Cons 2 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 3 ) + ( SAL + ( Cons 3 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 4 ) + ( SAL + ( Cons 4 ) + ) , IAL - ( Cons 115 ) + ( SAL + ( Cons 115 ) + ) , ILS Store , IAL - ( Cons 5 ) + ( SAL + ( Cons 5 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 6 ) + ( SAL + ( Cons 6 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 7 ) + ( SAL + ( Cons 7 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 8 ) + ( SAL + ( Cons 8 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 9 ) + ( SAL + ( Cons 9 ) + ) , IAL - ( Cons 116 ) + ( SAL + ( Cons 116 ) + ) , ILS Store , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 11 ) + ( SAL + ( Cons 11 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 12 ) + ( SAL + ( Cons 12 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL - ( Cons 121 ) + ( SAL + ( Cons 121 ) + ) , ILS Store , IAL - ( Cons 14 ) + ( SAL + ( Cons 14 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 15 ) + ( SAL + ( Cons 15 ) + ) , IAL - ( Cons 117 ) + ( SAL + ( Cons 117 ) + ) , ILS Store , IAL - ( Cons 16 ) + ( SAL + ( Cons 16 ) + ) , IAL - ( Cons 114 ) + ( SAL + ( Cons 114 ) + ) , ILS Store , IAL - ( Cons 17 ) + ( SAL + ( Cons 17 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 18 ) + ( SAL + ( Cons 18 ) + ) , IAL - ( Cons 110 ) + ( SAL + ( Cons 110 ) + ) , ILS Store , IAL - ( Cons 19 ) + ( SAL + ( Cons 19 ) + ) , IAL - ( Cons 97 ) + ( SAL + ( Cons 97 ) + ) , ILS Store , IAL - ( Cons 20 ) + ( SAL + ( Cons 20 ) + ) , IAL - ( Cons 109 ) + ( SAL + ( Cons 109 ) + ) , ILS Store , IAL - ( Cons 21 ) + ( SAL + ( Cons 21 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 22 ) + ( SAL + ( Cons 22 ) + ) , IAL - ( Cons 58 ) + ( SAL + ( Cons 58 ) + ) , ILS Store , IAL - ( Cons 23 ) + ( SAL + ( Cons 23 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 24 ) + ( SAL + ( Cons 24 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , IAL - ( Cons 72 ) + ( SAL + ( Cons 72 ) + ) , ILS Store , IAL - ( Cons 31 ) + ( SAL + ( Cons 31 ) + ) , IAL - ( Cons 101 ) + ( SAL + ( Cons 101 ) + ) , ILS Store , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 33 ) + ( SAL + ( Cons 33 ) + ) , IAL - ( Cons 108 ) + ( SAL + ( Cons 108 ) + ) , ILS Store , IAL - ( Cons 34 ) + ( SAL + ( Cons 34 ) + ) , IAL - ( Cons 111 ) + ( SAL + ( Cons 111 ) + ) , ILS Store , IAL - ( Cons 35 ) + ( SAL + ( Cons 35 ) + ) , IAL - ( Cons 32 ) + ( SAL + ( Cons 32 ) + ) , ILS Store , IAL - ( Cons 36 ) + ( SAL + ( Cons 36 ) + ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ICF ( CStatic "read" Call ) , IAL - ( Cons 30 ) + ( SAL + ( Cons 30 ) + ) , ICF ( CStatic "write" Call ) , IAL - ( Cons 100 ) + ( SAL + ( Cons 100 ) + ) , ICF ( CStatic "write" Call ) , ICF @@ -182,65 +318,94 @@ dump: Automaton , End , ICF ( SMark "add" ) - , IAL ( Binary Add ) + , IAL + ( SAL ( Binary Add ) ) , ICF Return , ICF ( SMark "write" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ICF ( CStatic "write_end" ( Branch EZ ) ) , IAL ( SIO OutputChar ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "write" Jump ) , ICF ( SMark "write_end" ) - , IAL Discard - , IAL Discard + , IAL ( SAL Discard ) + , IAL ( SAL Discard ) , ICF Return , ICF ( SMark "read" ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) , ILS ( MIO InputChar ) , ILS Load , IAL - ( SStatic 0 Copy ) + ( SAL + ( SStatic 0 Copy ) + ) + , IAL + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 10 ) - , IAL ( Binary Sub ) + ( SAL ( Binary Sub ) ) , ICF ( CStatic "read_end" ( Branch EZ ) ) - , IAL Discard + , IAL ( SAL Discard ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL + ( Cons 1 ) + ) + , IAL + ( SAL ( Binary Add ) ) , ICF ( CStatic "read" Jump ) , ICF ( SMark "read_end" ) - , IAL Discard + , IAL ( SAL Discard ) + , IAL + ( SAL + ( Cons 1 ) + ) , IAL - ( Cons 1 ) - , IAL ( Binary Add ) + ( SAL ( Binary Add ) ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , ILS Store , ICF Return , ICF ( SMark "newline" ) , IAL - ( Cons 10 ) + ( SAL + ( Cons 10 ) + ) , IAL - ( Cons 13 ) + ( SAL + ( Cons 13 ) + ) , IAL ( SIO OutputChar ) , IAL ( SIO OutputChar ) , ICF Return @@ -248,8 +413,8 @@ dump: Automaton , programCounter = 106 , returnStack = IS [] } - , unitStack = fromList [] - , unitRAM = + , memoryStack = fromList [] + , memoryRAM = [ 80 , 108 , 101 diff --git a/.output/golden/ws/il/from-wsa/bottles.il b/.output/golden/ws/il/from-wsa/bottles.il deleted file mode 100644 index b1a6fc84c..000000000 --- a/.output/golden/ws/il/from-wsa/bottles.il +++ /dev/null @@ -1,273 +0,0 @@ -[ IAL - ( Cons 3 ) -, ICF - ( SMark "LOOP" ) -, IAL - ( SStatic 0 Copy ) -, IAL ( SIO OutputDec ) -, IAL - ( Cons 0 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 44 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 97 ) -, IAL - ( Cons 119 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 104 ) -, IAL - ( Cons 116 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 110 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 114 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 98 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 102 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 115 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 116 ) -, IAL - ( Cons 116 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 98 ) -, IAL - ( Cons 32 ) -, ICF - ( CStatic "prints" Call ) -, IAL - ( SStatic 0 Copy ) -, IAL ( SIO OutputDec ) -, IAL - ( Cons 0 ) -, IAL - ( Cons 114 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 98 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 102 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 115 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 116 ) -, IAL - ( Cons 116 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 98 ) -, IAL - ( Cons 32 ) -, ICF - ( CStatic "printsln" Call ) -, IAL - ( Cons 0 ) -, IAL - ( Cons 100 ) -, IAL - ( Cons 110 ) -, IAL - ( Cons 117 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 114 ) -, IAL - ( Cons 97 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 116 ) -, IAL - ( Cons 105 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 115 ) -, IAL - ( Cons 115 ) -, IAL - ( Cons 97 ) -, IAL - ( Cons 112 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 44 ) -, IAL - ( Cons 110 ) -, IAL - ( Cons 119 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 100 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 110 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 107 ) -, IAL - ( Cons 97 ) -, IAL - ( Cons 84 ) -, ICF - ( CStatic "printsln" Call ) -, IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL - ( SStatic 0 Copy ) -, IAL ( SIO OutputDec ) -, IAL - ( Cons 0 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 97 ) -, IAL - ( Cons 119 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 104 ) -, IAL - ( Cons 116 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 110 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 114 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 98 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 102 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 115 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 116 ) -, IAL - ( Cons 116 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 98 ) -, IAL - ( Cons 32 ) -, ICF - ( CStatic "printsln" Call ) -, IAL - ( Cons 0 ) -, ICF - ( CStatic "printsln" Call ) -, IAL - ( SStatic 0 Copy ) -, ICF - ( CStatic "LOOP:1" ( Branch EZ ) ) -, ICF - ( CStatic "LOOP" Jump ) -, ICF - ( SMark "LOOP:1" ) -, End -, ICF - ( SMark "prints" ) -, IAL - ( SStatic 0 Copy ) -, ICF - ( CStatic "prints_end" ( Branch EZ ) ) -, IAL ( SIO OutputChar ) -, ICF - ( CStatic "prints" Jump ) -, ICF - ( SMark "prints_end" ) -, IAL Discard -, ICF Return -, ICF - ( SMark "printsln" ) -, ICF - ( CStatic "prints" Call ) -, IAL - ( Cons 10 ) -, IAL ( SIO OutputChar ) -, ICF Return -] \ No newline at end of file diff --git a/.output/golden/ws/il/from-wsa/hello.il b/.output/golden/ws/il/from-wsa/hello.il deleted file mode 100644 index 04d60e047..000000000 --- a/.output/golden/ws/il/from-wsa/hello.il +++ /dev/null @@ -1,44 +0,0 @@ -[ IAL - ( Cons 32 ) -, IAL - ( Cons 44 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 72 ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 10 ) -, IAL - ( Cons 33 ) -, IAL - ( Cons 100 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 114 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 119 ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, End -] \ No newline at end of file diff --git a/.output/golden/ws/il/from-wsa/hello2.il b/.output/golden/ws/il/from-wsa/hello2.il deleted file mode 100644 index ff5f4e456..000000000 --- a/.output/golden/ws/il/from-wsa/hello2.il +++ /dev/null @@ -1,55 +0,0 @@ -[ IAL - ( Cons 0 ) -, IAL - ( Cons 10 ) -, IAL - ( Cons 33 ) -, IAL - ( Cons 100 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 114 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 119 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 44 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 72 ) -, ICF - ( CStatic "prints" Call ) -, End -, ICF - ( SMark "prints" ) -, IAL - ( SStatic 0 Copy ) -, ICF - ( CStatic "prints_end" ( Branch EZ ) ) -, IAL ( SIO OutputChar ) -, ICF - ( CStatic "prints" Jump ) -, ICF - ( SMark "prints_end" ) -, IAL Discard -, ICF Return -, ICF - ( SMark "printsln" ) -, ICF - ( CStatic "prints" Call ) -, IAL - ( Cons 10 ) -, IAL ( SIO OutputChar ) -, ICF Return -] \ No newline at end of file diff --git a/.output/golden/ws/il/from-wsa/hello4.il b/.output/golden/ws/il/from-wsa/hello4.il deleted file mode 100644 index 14f6e7be7..000000000 --- a/.output/golden/ws/il/from-wsa/hello4.il +++ /dev/null @@ -1,53 +0,0 @@ -[ IAL - ( Cons 0 ) -, IAL - ( Cons 33 ) -, IAL - ( Cons 100 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 114 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 119 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 44 ) -, IAL - ( Cons 111 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 108 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 72 ) -, ICF - ( CStatic "printsln" Call ) -, End -, ICF - ( SMark "prints" ) -, IAL - ( SStatic 0 Copy ) -, ICF - ( CStatic "prints_end" ( Branch EZ ) ) -, IAL ( SIO OutputChar ) -, ICF - ( CStatic "prints" Jump ) -, ICF - ( SMark "prints_end" ) -, IAL Discard -, ICF Return -, ICF - ( SMark "printsln" ) -, ICF - ( CStatic "prints" Call ) -, IAL - ( Cons 10 ) -, IAL ( SIO OutputChar ) -, ICF Return -] \ No newline at end of file diff --git a/.output/golden/ws/il/from-wsa/prim.il b/.output/golden/ws/il/from-wsa/prim.il deleted file mode 100644 index 7a157cfac..000000000 --- a/.output/golden/ws/il/from-wsa/prim.il +++ /dev/null @@ -1,207 +0,0 @@ -[ ICF - ( SMark "st" ) -, IAL - ( Cons 0 ) -, IAL - ( Cons 93 ) -, IAL - ( Cons 48 ) -, IAL - ( Cons 48 ) -, IAL - ( Cons 49 ) -, IAL - ( Cons 45 ) -, IAL - ( Cons 50 ) -, IAL - ( Cons 91 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 115 ) -, IAL - ( Cons 114 ) -, IAL - ( Cons 101 ) -, IAL - ( Cons 98 ) -, IAL - ( Cons 109 ) -, IAL - ( Cons 117 ) -, IAL - ( Cons 110 ) -, IAL - ( Cons 32 ) -, IAL - ( Cons 109 ) -, IAL - ( Cons 105 ) -, IAL - ( Cons 114 ) -, IAL - ( Cons 112 ) -, ICF - ( CStatic "printsln" Call ) -, IAL - ( Cons 0 ) -, ICF - ( SMark "f_start_1" ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 100 ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "f_finished_1" ( Branch EZ ) ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 100 ) -, IAL ( Binary Add ) -, IAL - ( Cons 1 ) -, ILS Store -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "f_start_1" Jump ) -, ICF - ( SMark "f_finished_1" ) -, IAL Discard -, IAL - ( Cons 2 ) -, ICF - ( SMark "f_start_2" ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 11 ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "f_finished_2" ( Branch EZ ) ) -, IAL - ( Cons 2 ) -, ICF - ( SMark "f_start_3" ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 100 ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "f_finished_3" ( Branch EZ ) ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 1 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, IAL - ( SStatic 1 Move ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 2 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, IAL - ( SStatic 1 Move ) -, IAL - ( Cons 1 ) -, ILS Load -, IAL - ( Cons 2 ) -, ILS Load -, IAL ( Binary Mul ) -, IAL - ( Cons 100 ) -, IAL ( Binary Add ) -, IAL - ( Cons 0 ) -, ILS Store -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "f_start_3" Jump ) -, ICF - ( SMark "f_finished_3" ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "f_start_2" Jump ) -, ICF - ( SMark "f_finished_2" ) -, IAL Discard -, IAL - ( Cons 2 ) -, ICF - ( SMark "f_start_4" ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 100 ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "f_finished_4" ( Branch EZ ) ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 100 ) -, IAL ( Binary Add ) -, ILS Load -, ICF - ( CStatic "nodraw" ( Branch EZ ) ) -, IAL - ( SStatic 0 Copy ) -, IAL ( SIO OutputDec ) -, IAL - ( Cons 0 ) -, IAL - ( Cons 32 ) -, ICF - ( CStatic "prints" Call ) -, ICF - ( SMark "nodraw" ) -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "f_start_4" Jump ) -, ICF - ( SMark "f_finished_4" ) -, IAL Discard -, IAL - ( Cons 0 ) -, ICF - ( CStatic "printsln" Call ) -, End -, ICF - ( SMark "prints" ) -, IAL - ( SStatic 0 Copy ) -, ICF - ( CStatic "prints_end" ( Branch EZ ) ) -, IAL ( SIO OutputChar ) -, ICF - ( CStatic "prints" Jump ) -, ICF - ( SMark "prints_end" ) -, IAL Discard -, ICF Return -, ICF - ( SMark "printsln" ) -, ICF - ( CStatic "prints" Call ) -, IAL - ( Cons 10 ) -, IAL ( SIO OutputChar ) -, ICF Return -] \ No newline at end of file diff --git a/.output/golden/ws/il/optimized/from-wsa/bottles.il b/.output/golden/ws/il/optimized/from-wsa/bottles.il new file mode 100644 index 000000000..ba9a55c97 --- /dev/null +++ b/.output/golden/ws/il/optimized/from-wsa/bottles.il @@ -0,0 +1,506 @@ +[ IAL + ( SAL + ( Cons 3 ) + ) +, ICF + ( SMark "LOOP" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL ( SIO OutputDec ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 104 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 102 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ICF + ( CStatic "prints" Call ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL ( SIO OutputDec ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 102 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ICF + ( CStatic "printsln" Call ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 105 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 112 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 107 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 84 ) + ) +, ICF + ( CStatic "printsln" Call ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL ( SIO OutputDec ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 104 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 102 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ICF + ( CStatic "printsln" Call ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "printsln" Call ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "LOOP:1" ( Branch EZ ) ) +, ICF + ( CStatic "LOOP" Jump ) +, ICF + ( SMark "LOOP:1" ) +, End +, ICF + ( SMark "prints" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "prints_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, ICF + ( CStatic "prints" Jump ) +, ICF + ( SMark "prints_end" ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "printsln" ) +, ICF + ( CStatic "prints" Call ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/golden/ws/il/optimized/from-wsa/hello.il b/.output/golden/ws/il/optimized/from-wsa/hello.il new file mode 100644 index 000000000..3899be8eb --- /dev/null +++ b/.output/golden/ws/il/optimized/from-wsa/hello.il @@ -0,0 +1,72 @@ +[ IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, End +] \ No newline at end of file diff --git a/.output/golden/ws/il/optimized/from-wsa/hello2.il b/.output/golden/ws/il/optimized/from-wsa/hello2.il new file mode 100644 index 000000000..88f1d1ddf --- /dev/null +++ b/.output/golden/ws/il/optimized/from-wsa/hello2.il @@ -0,0 +1,89 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, ICF + ( CStatic "prints" Call ) +, End +, ICF + ( SMark "prints" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "prints_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, ICF + ( CStatic "prints" Jump ) +, ICF + ( SMark "prints_end" ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "printsln" ) +, ICF + ( CStatic "prints" Call ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/golden/ws/il/optimized/from-wsa/hello4.il b/.output/golden/ws/il/optimized/from-wsa/hello4.il new file mode 100644 index 000000000..bd7b32f75 --- /dev/null +++ b/.output/golden/ws/il/optimized/from-wsa/hello4.il @@ -0,0 +1,85 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, ICF + ( CStatic "printsln" Call ) +, End +, ICF + ( SMark "prints" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "prints_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, ICF + ( CStatic "prints" Jump ) +, ICF + ( SMark "prints_end" ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "printsln" ) +, ICF + ( CStatic "prints" Call ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/golden/ws/il/optimized/from-wsa/prim.il b/.output/golden/ws/il/optimized/from-wsa/prim.il new file mode 100644 index 000000000..3caf1a7c7 --- /dev/null +++ b/.output/golden/ws/il/optimized/from-wsa/prim.il @@ -0,0 +1,339 @@ +[ ICF + ( SMark "st" ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 93 ) + ) +, IAL + ( SAL + ( Cons 48 ) + ) +, IAL + ( SAL + ( Cons 48 ) + ) +, IAL + ( SAL + ( Cons 49 ) + ) +, IAL + ( SAL + ( Cons 45 ) + ) +, IAL + ( SAL + ( Cons 50 ) + ) +, IAL + ( SAL + ( Cons 91 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, IAL + ( SAL + ( Cons 105 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 112 ) + ) +, ICF + ( CStatic "printsln" Call ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( SMark "f_start_1" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "f_finished_1" ( Branch EZ ) ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "f_start_1" Jump ) +, ICF + ( SMark "f_finished_1" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 2 ) + ) +, ICF + ( SMark "f_start_2" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "f_finished_2" ( Branch EZ ) ) +, IAL + ( SAL + ( Cons 2 ) + ) +, ICF + ( SMark "f_start_3" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "f_finished_3" ( Branch EZ ) ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 2 ) + ) +, ILS Load +, IAL + ( SAL ( Binary Mul ) ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "f_start_3" Jump ) +, ICF + ( SMark "f_finished_3" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "f_start_2" Jump ) +, ICF + ( SMark "f_finished_2" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 2 ) + ) +, ICF + ( SMark "f_start_4" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "f_finished_4" ( Branch EZ ) ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ILS Load +, ICF + ( CStatic "nodraw" ( Branch EZ ) ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL ( SIO OutputDec ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ICF + ( CStatic "prints" Call ) +, ICF + ( SMark "nodraw" ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "f_start_4" Jump ) +, ICF + ( SMark "f_finished_4" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "printsln" Call ) +, End +, ICF + ( SMark "prints" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "prints_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, ICF + ( CStatic "prints" Jump ) +, ICF + ( SMark "prints_end" ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "printsln" ) +, ICF + ( CStatic "prints" Call ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/golden/ws/il/optimized/from-wsa/true.il b/.output/golden/ws/il/optimized/from-wsa/true.il new file mode 100644 index 000000000..7f93ef7d9 --- /dev/null +++ b/.output/golden/ws/il/optimized/from-wsa/true.il @@ -0,0 +1 @@ +[ End ] \ No newline at end of file diff --git a/.output/golden/ws/il/optimized/original/calc.il b/.output/golden/ws/il/optimized/original/calc.il new file mode 100644 index 000000000..aee7a6970 --- /dev/null +++ b/.output/golden/ws/il/optimized/original/calc.il @@ -0,0 +1,683 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 69 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 5 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 6 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 7 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 8 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 9 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 14 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 15 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 16 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 17 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 18 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 19 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 20 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 21 ) + ) +, IAL + ( SAL + ( Cons 104 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 22 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 23 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 24 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 25 ) + ) +, IAL + ( SAL + ( Cons 45 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 26 ) + ) +, IAL + ( SAL + ( Cons 49 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 27 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 28 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 29 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 30 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 31 ) + ) +, IAL + ( SAL + ( Cons 102 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 105 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 34 ) + ) +, IAL + ( SAL + ( Cons 105 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 35 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 36 ) + ) +, IAL + ( SAL + ( Cons 104 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 37 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 42 ) + ) +, IAL + ( SAL + ( Cons 78 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 43 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 45 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 46 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 47 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 48 ) + ) +, IAL + ( SAL + ( Cons 58 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 49 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 60 ) + ) +, IAL + ( SAL + ( Cons 84 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 61 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 62 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 63 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 64 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 65 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 66 ) + ) +, IAL + ( SAL + ( Cons 105 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 67 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 68 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 69 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "write" Call ) +, ICF + ( CStatic "newline" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF + ( SMark "loop" ) +, IAL + ( SAL + ( Cons 42 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS ( MIO InputDec ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons + ( -1 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "progend" ( Branch EZ ) ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, ICF + ( CStatic "loop" Jump ) +, ICF + ( SMark "progend" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 60 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL ( SIO OutputDec ) +, ICF + ( CStatic "newline" Call ) +, End +, ICF + ( SMark "add" ) +, IAL + ( SAL ( Binary Add ) ) +, ICF Return +, ICF + ( SMark "write" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "write_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "write" Jump ) +, ICF + ( SMark "write_end" ) +, IAL ( SAL Discard ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "read" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputChar ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "read_end" ( Branch EZ ) ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "read" Jump ) +, ICF + ( SMark "read_end" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF Return +, ICF + ( SMark "newline" ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/golden/ws/il/optimized/original/count.il b/.output/golden/ws/il/optimized/original/count.il new file mode 100644 index 000000000..18a05cd56 --- /dev/null +++ b/.output/golden/ws/il/optimized/original/count.il @@ -0,0 +1,134 @@ +[ IAL + ( SAL + ( Cons 1 ) + ) +, ICF + ( SMark "C" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL ( SIO OutputDec ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "E" ( Branch EZ ) ) +, ICF + ( CStatic "C" Jump ) +, ICF + ( SMark "E" ) +, IAL ( SAL Discard ) +, End +, ICF + ( SMark "add" ) +, IAL + ( SAL ( Binary Add ) ) +, ICF Return +, ICF + ( SMark "write" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "write_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "write" Jump ) +, ICF + ( SMark "write_end" ) +, IAL ( SAL Discard ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "read" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputChar ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "read_end" ( Branch EZ ) ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "read" Jump ) +, ICF + ( SMark "read_end" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF Return +, ICF + ( SMark "newline" ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/golden/ws/il/optimized/original/fact.il b/.output/golden/ws/il/optimized/original/fact.il new file mode 100644 index 000000000..c8ff04c51 --- /dev/null +++ b/.output/golden/ws/il/optimized/original/fact.il @@ -0,0 +1,358 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 69 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 5 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 6 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 7 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 8 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 9 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 14 ) + ) +, IAL + ( SAL + ( Cons 58 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 15 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 16 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 20 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 21 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 22 ) + ) +, IAL + ( SAL + ( Cons 61 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 23 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 24 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS ( MIO InputDec ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, ICF + ( CStatic "fact" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL ( SIO OutputDec ) +, IAL + ( SAL + ( Cons 20 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL ( SIO OutputDec ) +, ICF + ( CStatic "newline" Call ) +, End +, ICF + ( SMark "fact" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "factbase" ( Branch EZ ) ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "fact" Call ) +, IAL + ( SAL ( Binary Mul ) ) +, ICF Return +, ICF + ( SMark "factbase" ) +, ICF Return +, ICF + ( SMark "add" ) +, IAL + ( SAL ( Binary Add ) ) +, ICF Return +, ICF + ( SMark "write" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "write_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "write" Jump ) +, ICF + ( SMark "write_end" ) +, IAL ( SAL Discard ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "read" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputChar ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "read_end" ( Branch EZ ) ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "read" Jump ) +, ICF + ( SMark "read_end" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF Return +, ICF + ( SMark "newline" ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/golden/ws/il/optimized/original/hWorld.il b/.output/golden/ws/il/optimized/original/hWorld.il new file mode 100644 index 000000000..f86f1e306 --- /dev/null +++ b/.output/golden/ws/il/optimized/original/hWorld.il @@ -0,0 +1,319 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 5 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 6 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 7 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 8 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 9 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 14 ) + ) +, IAL + ( SAL + ( Cons 102 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 15 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 16 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 17 ) + ) +, IAL + ( SAL + ( Cons 112 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 18 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 19 ) + ) +, IAL + ( SAL + ( Cons 99 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 20 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 21 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 22 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 23 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "write" Call ) +, ICF + ( CStatic "newline" Call ) +, End +, ICF + ( SMark "add" ) +, IAL + ( SAL ( Binary Add ) ) +, ICF Return +, ICF + ( SMark "write" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "write_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "write" Jump ) +, ICF + ( SMark "write_end" ) +, IAL ( SAL Discard ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "read" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputChar ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "read_end" ( Branch EZ ) ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "read" Jump ) +, ICF + ( SMark "read_end" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF Return +, ICF + ( SMark "newline" ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/golden/ws/il/optimized/original/hanoi.il b/.output/golden/ws/il/optimized/original/hanoi.il new file mode 100644 index 000000000..dd0ea6ac0 --- /dev/null +++ b/.output/golden/ws/il/optimized/original/hanoi.il @@ -0,0 +1,559 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 69 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 5 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 6 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 7 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 8 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 9 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 14 ) + ) +, IAL + ( SAL + ( Cons 58 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 15 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 16 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 20 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 21 ) + ) +, IAL + ( SAL + ( Cons 45 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 22 ) + ) +, IAL + ( SAL + ( Cons 62 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 23 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 24 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS ( MIO InputDec ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, ICF + ( CStatic "hanoi" Call ) +, End +, ICF + ( SMark "hanoi" ) +, IAL + ( SAL + ( Cons 103 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 102 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, ICF + ( CStatic "endhanoi" ( Branch EZ ) ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 102 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 103 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 103 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 102 ) + ) +, ILS Load +, ICF + ( CStatic "hanoi" Call ) +, IAL + ( SAL + ( Cons 103 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 102 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Load +, IAL ( SIO OutputDec ) +, IAL + ( SAL + ( Cons 20 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 102 ) + ) +, ILS Load +, IAL ( SIO OutputDec ) +, ICF + ( CStatic "newline" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 102 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 103 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 103 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 102 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Load +, ICF + ( CStatic "hanoi" Call ) +, IAL + ( SAL + ( Cons 103 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 102 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, ICF + ( SMark "endhanoi" ) +, ICF Return +, ICF + ( SMark "add" ) +, IAL + ( SAL ( Binary Add ) ) +, ICF Return +, ICF + ( SMark "write" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "write_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "write" Jump ) +, ICF + ( SMark "write_end" ) +, IAL ( SAL Discard ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "read" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputChar ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "read_end" ( Branch EZ ) ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "read" Jump ) +, ICF + ( SMark "read_end" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF Return +, ICF + ( SMark "newline" ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/golden/ws/il/optimized/original/helloWorld.il b/.output/golden/ws/il/optimized/original/helloWorld.il new file mode 100644 index 000000000..f5831b140 --- /dev/null +++ b/.output/golden/ws/il/optimized/original/helloWorld.il @@ -0,0 +1,62 @@ +[ IAL + ( SAL + ( Cons 72 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL ( SIO OutputChar ) +, End +] \ No newline at end of file diff --git a/.output/golden/ws/il/optimized/original/locTest.il b/.output/golden/ws/il/optimized/original/locTest.il new file mode 100644 index 000000000..4ae21f6fd --- /dev/null +++ b/.output/golden/ws/il/optimized/original/locTest.il @@ -0,0 +1,300 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 69 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 5 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 6 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 7 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 8 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 9 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 14 ) + ) +, IAL + ( SAL + ( Cons 58 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 15 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 16 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS ( MIO InputDec ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS ( MIO InputDec ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Load +, ICF + ( CStatic "loctest" Call ) +, IAL ( SIO OutputDec ) +, End +, ICF + ( SMark "loctest" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 2 Copy ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( SStatic 2 Slide ) + ) +, ICF Return +, ICF + ( SMark "add" ) +, IAL + ( SAL ( Binary Add ) ) +, ICF Return +, ICF + ( SMark "write" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "write_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "write" Jump ) +, ICF + ( SMark "write_end" ) +, IAL ( SAL Discard ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "read" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputChar ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "read_end" ( Branch EZ ) ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "read" Jump ) +, ICF + ( SMark "read_end" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF Return +, ICF + ( SMark "newline" ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/golden/ws/il/optimized/original/name.il b/.output/golden/ws/il/optimized/original/name.il new file mode 100644 index 000000000..369744f01 --- /dev/null +++ b/.output/golden/ws/il/optimized/original/name.il @@ -0,0 +1,409 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 80 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 5 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 6 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 7 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 8 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 9 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 121 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 14 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 15 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 16 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 17 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 18 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 19 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 20 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 21 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 22 ) + ) +, IAL + ( SAL + ( Cons 58 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 23 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 24 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 30 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 31 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 34 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 35 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 36 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ICF + ( CStatic "read" Call ) +, IAL + ( SAL + ( Cons 30 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ICF + ( CStatic "write" Call ) +, ICF + ( CStatic "newline" Call ) +, End +, ICF + ( SMark "add" ) +, IAL + ( SAL ( Binary Add ) ) +, ICF Return +, ICF + ( SMark "write" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "write_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "write" Jump ) +, ICF + ( SMark "write_end" ) +, IAL ( SAL Discard ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "read" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputChar ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "read_end" ( Branch EZ ) ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "read" Jump ) +, ICF + ( SMark "read_end" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF Return +, ICF + ( SMark "newline" ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/golden/ws/il/original/truthMachine.il b/.output/golden/ws/il/optimized/original/truthMachine.il similarity index 63% rename from .output/golden/ws/il/original/truthMachine.il rename to .output/golden/ws/il/optimized/original/truthMachine.il index c1548a866..e8ceda6e0 100644 --- a/.output/golden/ws/il/original/truthMachine.il +++ b/.output/golden/ws/il/optimized/original/truthMachine.il @@ -1,7 +1,11 @@ [ IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL - ( SStatic 0 Copy ) + ( SAL + ( Cons 0 ) + ) , ILS ( MIO InputDec ) , ILS Load , ICF @@ -9,14 +13,18 @@ , ICF ( SMark "\x1" ) , IAL - ( Cons 1 ) + ( SAL + ( Cons 1 ) + ) , IAL ( SIO OutputDec ) , ICF ( CStatic "\x1" Jump ) , ICF ( SMark "\x0" ) , IAL - ( Cons 0 ) + ( SAL + ( Cons 0 ) + ) , IAL ( SIO OutputDec ) , End ] \ No newline at end of file diff --git a/.output/golden/ws/il/original/calc.il b/.output/golden/ws/il/original/calc.il deleted file mode 100644 index d31461392..000000000 --- a/.output/golden/ws/il/original/calc.il +++ /dev/null @@ -1,402 +0,0 @@ -[ IAL - ( Cons 0 ) -, IAL - ( Cons 69 ) -, ILS Store -, IAL - ( Cons 1 ) -, IAL - ( Cons 110 ) -, ILS Store -, IAL - ( Cons 2 ) -, IAL - ( Cons 116 ) -, ILS Store -, IAL - ( Cons 3 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 4 ) -, IAL - ( Cons 114 ) -, ILS Store -, IAL - ( Cons 5 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 6 ) -, IAL - ( Cons 115 ) -, ILS Store -, IAL - ( Cons 7 ) -, IAL - ( Cons 111 ) -, ILS Store -, IAL - ( Cons 8 ) -, IAL - ( Cons 109 ) -, ILS Store -, IAL - ( Cons 9 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 10 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 11 ) -, IAL - ( Cons 110 ) -, ILS Store -, IAL - ( Cons 12 ) -, IAL - ( Cons 117 ) -, ILS Store -, IAL - ( Cons 13 ) -, IAL - ( Cons 109 ) -, ILS Store -, IAL - ( Cons 14 ) -, IAL - ( Cons 98 ) -, ILS Store -, IAL - ( Cons 15 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 16 ) -, IAL - ( Cons 114 ) -, ILS Store -, IAL - ( Cons 17 ) -, IAL - ( Cons 115 ) -, ILS Store -, IAL - ( Cons 18 ) -, IAL - ( Cons 44 ) -, ILS Store -, IAL - ( Cons 19 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 20 ) -, IAL - ( Cons 116 ) -, ILS Store -, IAL - ( Cons 21 ) -, IAL - ( Cons 104 ) -, ILS Store -, IAL - ( Cons 22 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 23 ) -, IAL - ( Cons 110 ) -, ILS Store -, IAL - ( Cons 24 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 25 ) -, IAL - ( Cons 45 ) -, ILS Store -, IAL - ( Cons 26 ) -, IAL - ( Cons 49 ) -, ILS Store -, IAL - ( Cons 27 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 28 ) -, IAL - ( Cons 116 ) -, ILS Store -, IAL - ( Cons 29 ) -, IAL - ( Cons 111 ) -, ILS Store -, IAL - ( Cons 30 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 31 ) -, IAL - ( Cons 102 ) -, ILS Store -, IAL - ( Cons 32 ) -, IAL - ( Cons 105 ) -, ILS Store -, IAL - ( Cons 33 ) -, IAL - ( Cons 110 ) -, ILS Store -, IAL - ( Cons 34 ) -, IAL - ( Cons 105 ) -, ILS Store -, IAL - ( Cons 35 ) -, IAL - ( Cons 115 ) -, ILS Store -, IAL - ( Cons 36 ) -, IAL - ( Cons 104 ) -, ILS Store -, IAL - ( Cons 37 ) -, IAL - ( Cons 0 ) -, ILS Store -, IAL - ( Cons 42 ) -, IAL - ( Cons 78 ) -, ILS Store -, IAL - ( Cons 43 ) -, IAL - ( Cons 117 ) -, ILS Store -, IAL - ( Cons 44 ) -, IAL - ( Cons 109 ) -, ILS Store -, IAL - ( Cons 45 ) -, IAL - ( Cons 98 ) -, ILS Store -, IAL - ( Cons 46 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 47 ) -, IAL - ( Cons 114 ) -, ILS Store -, IAL - ( Cons 48 ) -, IAL - ( Cons 58 ) -, ILS Store -, IAL - ( Cons 49 ) -, IAL - ( Cons 0 ) -, ILS Store -, IAL - ( Cons 60 ) -, IAL - ( Cons 84 ) -, ILS Store -, IAL - ( Cons 61 ) -, IAL - ( Cons 111 ) -, ILS Store -, IAL - ( Cons 62 ) -, IAL - ( Cons 116 ) -, ILS Store -, IAL - ( Cons 63 ) -, IAL - ( Cons 97 ) -, ILS Store -, IAL - ( Cons 64 ) -, IAL - ( Cons 108 ) -, ILS Store -, IAL - ( Cons 65 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 66 ) -, IAL - ( Cons 105 ) -, ILS Store -, IAL - ( Cons 67 ) -, IAL - ( Cons 115 ) -, ILS Store -, IAL - ( Cons 68 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 69 ) -, IAL - ( Cons 0 ) -, ILS Store -, IAL - ( Cons 0 ) -, ICF - ( CStatic "write" Call ) -, ICF - ( CStatic "newline" Call ) -, IAL - ( Cons 100 ) -, IAL - ( Cons 0 ) -, ILS Store -, ICF - ( SMark "loop" ) -, IAL - ( Cons 42 ) -, ICF - ( CStatic "write" Call ) -, IAL - ( Cons 101 ) -, ILS ( MIO InputDec ) -, IAL - ( Cons 101 ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons - ( -1 ) - ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "progend" ( Branch EZ ) ) -, IAL - ( Cons 100 ) -, ILS Load -, IAL ( Binary Add ) -, IAL - ( Cons 100 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, ICF - ( CStatic "loop" Jump ) -, ICF - ( SMark "progend" ) -, IAL Discard -, IAL - ( Cons 60 ) -, ICF - ( CStatic "write" Call ) -, IAL - ( Cons 100 ) -, ILS Load -, IAL ( SIO OutputDec ) -, ICF - ( CStatic "newline" Call ) -, End -, ICF - ( SMark "add" ) -, IAL ( Binary Add ) -, ICF Return -, ICF - ( SMark "write" ) -, IAL - ( SStatic 0 Copy ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, ICF - ( CStatic "write_end" ( Branch EZ ) ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "write" Jump ) -, ICF - ( SMark "write_end" ) -, IAL Discard -, IAL Discard -, ICF Return -, ICF - ( SMark "read" ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( SStatic 0 Copy ) -, ILS ( MIO InputChar ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 10 ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "read_end" ( Branch EZ ) ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "read" Jump ) -, ICF - ( SMark "read_end" ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, IAL - ( Cons 0 ) -, ILS Store -, ICF Return -, ICF - ( SMark "newline" ) -, IAL - ( Cons 10 ) -, IAL - ( Cons 13 ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, ICF Return -] \ No newline at end of file diff --git a/.output/golden/ws/il/original/count.il b/.output/golden/ws/il/original/count.il deleted file mode 100644 index d2cf384d3..000000000 --- a/.output/golden/ws/il/original/count.il +++ /dev/null @@ -1,91 +0,0 @@ -[ IAL - ( Cons 1 ) -, ICF - ( SMark "C" ) -, IAL - ( SStatic 0 Copy ) -, IAL ( SIO OutputDec ) -, IAL - ( Cons 10 ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 11 ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "E" ( Branch EZ ) ) -, ICF - ( CStatic "C" Jump ) -, ICF - ( SMark "E" ) -, IAL Discard -, End -, ICF - ( SMark "add" ) -, IAL ( Binary Add ) -, ICF Return -, ICF - ( SMark "write" ) -, IAL - ( SStatic 0 Copy ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, ICF - ( CStatic "write_end" ( Branch EZ ) ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "write" Jump ) -, ICF - ( SMark "write_end" ) -, IAL Discard -, IAL Discard -, ICF Return -, ICF - ( SMark "read" ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( SStatic 0 Copy ) -, ILS ( MIO InputChar ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 10 ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "read_end" ( Branch EZ ) ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "read" Jump ) -, ICF - ( SMark "read_end" ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, IAL - ( Cons 0 ) -, ILS Store -, ICF Return -, ICF - ( SMark "newline" ) -, IAL - ( Cons 10 ) -, IAL - ( Cons 13 ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, ICF Return -] \ No newline at end of file diff --git a/.output/golden/ws/il/original/fact.il b/.output/golden/ws/il/original/fact.il deleted file mode 100644 index 1d20af1f1..000000000 --- a/.output/golden/ws/il/original/fact.il +++ /dev/null @@ -1,223 +0,0 @@ -[ IAL - ( Cons 0 ) -, IAL - ( Cons 69 ) -, ILS Store -, IAL - ( Cons 1 ) -, IAL - ( Cons 110 ) -, ILS Store -, IAL - ( Cons 2 ) -, IAL - ( Cons 116 ) -, ILS Store -, IAL - ( Cons 3 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 4 ) -, IAL - ( Cons 114 ) -, ILS Store -, IAL - ( Cons 5 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 6 ) -, IAL - ( Cons 97 ) -, ILS Store -, IAL - ( Cons 7 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 8 ) -, IAL - ( Cons 110 ) -, ILS Store -, IAL - ( Cons 9 ) -, IAL - ( Cons 117 ) -, ILS Store -, IAL - ( Cons 10 ) -, IAL - ( Cons 109 ) -, ILS Store -, IAL - ( Cons 11 ) -, IAL - ( Cons 98 ) -, ILS Store -, IAL - ( Cons 12 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 13 ) -, IAL - ( Cons 114 ) -, ILS Store -, IAL - ( Cons 14 ) -, IAL - ( Cons 58 ) -, ILS Store -, IAL - ( Cons 15 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 16 ) -, IAL - ( Cons 0 ) -, ILS Store -, IAL - ( Cons 20 ) -, IAL - ( Cons 33 ) -, ILS Store -, IAL - ( Cons 21 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 22 ) -, IAL - ( Cons 61 ) -, ILS Store -, IAL - ( Cons 23 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 24 ) -, IAL - ( Cons 0 ) -, ILS Store -, IAL - ( Cons 0 ) -, ICF - ( CStatic "write" Call ) -, IAL - ( Cons 100 ) -, ILS ( MIO InputDec ) -, IAL - ( Cons 100 ) -, ILS Load -, ICF - ( CStatic "fact" Call ) -, IAL - ( Cons 100 ) -, ILS Load -, IAL ( SIO OutputDec ) -, IAL - ( Cons 20 ) -, ICF - ( CStatic "write" Call ) -, IAL ( SIO OutputDec ) -, ICF - ( CStatic "newline" Call ) -, End -, ICF - ( SMark "fact" ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "factbase" ( Branch EZ ) ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "fact" Call ) -, IAL ( Binary Mul ) -, ICF Return -, ICF - ( SMark "factbase" ) -, IAL - ( Cons 1 ) -, IAL Discard -, ICF Return -, ICF - ( SMark "add" ) -, IAL ( Binary Add ) -, ICF Return -, ICF - ( SMark "write" ) -, IAL - ( SStatic 0 Copy ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, ICF - ( CStatic "write_end" ( Branch EZ ) ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "write" Jump ) -, ICF - ( SMark "write_end" ) -, IAL Discard -, IAL Discard -, ICF Return -, ICF - ( SMark "read" ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( SStatic 0 Copy ) -, ILS ( MIO InputChar ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 10 ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "read_end" ( Branch EZ ) ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "read" Jump ) -, ICF - ( SMark "read_end" ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, IAL - ( Cons 0 ) -, ILS Store -, ICF Return -, ICF - ( SMark "newline" ) -, IAL - ( Cons 10 ) -, IAL - ( Cons 13 ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, ICF Return -] \ No newline at end of file diff --git a/.output/golden/ws/il/original/hWorld.il b/.output/golden/ws/il/original/hWorld.il deleted file mode 100644 index dacec7e80..000000000 --- a/.output/golden/ws/il/original/hWorld.il +++ /dev/null @@ -1,192 +0,0 @@ -[ IAL - ( Cons 0 ) -, IAL - ( Cons 72 ) -, ILS Store -, IAL - ( Cons 1 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 2 ) -, IAL - ( Cons 108 ) -, ILS Store -, IAL - ( Cons 3 ) -, IAL - ( Cons 108 ) -, ILS Store -, IAL - ( Cons 4 ) -, IAL - ( Cons 111 ) -, ILS Store -, IAL - ( Cons 5 ) -, IAL - ( Cons 44 ) -, ILS Store -, IAL - ( Cons 6 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 7 ) -, IAL - ( Cons 119 ) -, ILS Store -, IAL - ( Cons 8 ) -, IAL - ( Cons 111 ) -, ILS Store -, IAL - ( Cons 9 ) -, IAL - ( Cons 114 ) -, ILS Store -, IAL - ( Cons 10 ) -, IAL - ( Cons 108 ) -, ILS Store -, IAL - ( Cons 11 ) -, IAL - ( Cons 100 ) -, ILS Store -, IAL - ( Cons 12 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 13 ) -, IAL - ( Cons 111 ) -, ILS Store -, IAL - ( Cons 14 ) -, IAL - ( Cons 102 ) -, ILS Store -, IAL - ( Cons 15 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 16 ) -, IAL - ( Cons 115 ) -, ILS Store -, IAL - ( Cons 17 ) -, IAL - ( Cons 112 ) -, ILS Store -, IAL - ( Cons 18 ) -, IAL - ( Cons 97 ) -, ILS Store -, IAL - ( Cons 19 ) -, IAL - ( Cons 99 ) -, ILS Store -, IAL - ( Cons 20 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 21 ) -, IAL - ( Cons 115 ) -, ILS Store -, IAL - ( Cons 22 ) -, IAL - ( Cons 33 ) -, ILS Store -, IAL - ( Cons 23 ) -, IAL - ( Cons 0 ) -, ILS Store -, IAL - ( Cons 0 ) -, ICF - ( CStatic "write" Call ) -, ICF - ( CStatic "newline" Call ) -, End -, ICF - ( SMark "add" ) -, IAL ( Binary Add ) -, ICF Return -, ICF - ( SMark "write" ) -, IAL - ( SStatic 0 Copy ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, ICF - ( CStatic "write_end" ( Branch EZ ) ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "write" Jump ) -, ICF - ( SMark "write_end" ) -, IAL Discard -, IAL Discard -, ICF Return -, ICF - ( SMark "read" ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( SStatic 0 Copy ) -, ILS ( MIO InputChar ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 10 ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "read_end" ( Branch EZ ) ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "read" Jump ) -, ICF - ( SMark "read_end" ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, IAL - ( Cons 0 ) -, ILS Store -, ICF Return -, ICF - ( SMark "newline" ) -, IAL - ( Cons 10 ) -, IAL - ( Cons 13 ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, ICF Return -] \ No newline at end of file diff --git a/.output/golden/ws/il/original/hanoi.il b/.output/golden/ws/il/original/hanoi.il deleted file mode 100644 index 756055f14..000000000 --- a/.output/golden/ws/il/original/hanoi.il +++ /dev/null @@ -1,336 +0,0 @@ -[ IAL - ( Cons 0 ) -, IAL - ( Cons 69 ) -, ILS Store -, IAL - ( Cons 1 ) -, IAL - ( Cons 110 ) -, ILS Store -, IAL - ( Cons 2 ) -, IAL - ( Cons 116 ) -, ILS Store -, IAL - ( Cons 3 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 4 ) -, IAL - ( Cons 114 ) -, ILS Store -, IAL - ( Cons 5 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 6 ) -, IAL - ( Cons 97 ) -, ILS Store -, IAL - ( Cons 7 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 8 ) -, IAL - ( Cons 110 ) -, ILS Store -, IAL - ( Cons 9 ) -, IAL - ( Cons 117 ) -, ILS Store -, IAL - ( Cons 10 ) -, IAL - ( Cons 109 ) -, ILS Store -, IAL - ( Cons 11 ) -, IAL - ( Cons 98 ) -, ILS Store -, IAL - ( Cons 12 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 13 ) -, IAL - ( Cons 114 ) -, ILS Store -, IAL - ( Cons 14 ) -, IAL - ( Cons 58 ) -, ILS Store -, IAL - ( Cons 15 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 16 ) -, IAL - ( Cons 0 ) -, ILS Store -, IAL - ( Cons 20 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 21 ) -, IAL - ( Cons 45 ) -, ILS Store -, IAL - ( Cons 22 ) -, IAL - ( Cons 62 ) -, ILS Store -, IAL - ( Cons 23 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 24 ) -, IAL - ( Cons 0 ) -, ILS Store -, IAL - ( Cons 0 ) -, ICF - ( CStatic "write" Call ) -, IAL - ( Cons 100 ) -, ILS ( MIO InputDec ) -, IAL - ( Cons 100 ) -, ILS Load -, IAL - ( Cons 1 ) -, IAL - ( Cons 3 ) -, IAL - ( Cons 2 ) -, ICF - ( CStatic "hanoi" Call ) -, End -, ICF - ( SMark "hanoi" ) -, IAL - ( Cons 103 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, IAL - ( Cons 102 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, IAL - ( Cons 101 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, IAL - ( Cons 100 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, IAL - ( Cons 100 ) -, ILS Load -, ICF - ( CStatic "endhanoi" ( Branch EZ ) ) -, IAL - ( Cons 100 ) -, ILS Load -, IAL - ( Cons 101 ) -, ILS Load -, IAL - ( Cons 102 ) -, ILS Load -, IAL - ( Cons 103 ) -, ILS Load -, IAL - ( Cons 100 ) -, ILS Load -, IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL - ( Cons 101 ) -, ILS Load -, IAL - ( Cons 103 ) -, ILS Load -, IAL - ( Cons 102 ) -, ILS Load -, ICF - ( CStatic "hanoi" Call ) -, IAL - ( Cons 103 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, IAL - ( Cons 102 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, IAL - ( Cons 101 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, IAL - ( Cons 100 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, IAL - ( Cons 101 ) -, ILS Load -, IAL ( SIO OutputDec ) -, IAL - ( Cons 20 ) -, ICF - ( CStatic "write" Call ) -, IAL - ( Cons 102 ) -, ILS Load -, IAL ( SIO OutputDec ) -, ICF - ( CStatic "newline" Call ) -, IAL - ( Cons 100 ) -, ILS Load -, IAL - ( Cons 101 ) -, ILS Load -, IAL - ( Cons 102 ) -, ILS Load -, IAL - ( Cons 103 ) -, ILS Load -, IAL - ( Cons 100 ) -, ILS Load -, IAL - ( Cons 1 ) -, IAL ( Binary Sub ) -, IAL - ( Cons 103 ) -, ILS Load -, IAL - ( Cons 102 ) -, ILS Load -, IAL - ( Cons 101 ) -, ILS Load -, ICF - ( CStatic "hanoi" Call ) -, IAL - ( Cons 103 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, IAL - ( Cons 102 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, IAL - ( Cons 101 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, IAL - ( Cons 100 ) -, IAL - ( SStatic 1 Move ) -, ILS Store -, ICF - ( SMark "endhanoi" ) -, ICF Return -, ICF - ( SMark "add" ) -, IAL ( Binary Add ) -, ICF Return -, ICF - ( SMark "write" ) -, IAL - ( SStatic 0 Copy ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, ICF - ( CStatic "write_end" ( Branch EZ ) ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "write" Jump ) -, ICF - ( SMark "write_end" ) -, IAL Discard -, IAL Discard -, ICF Return -, ICF - ( SMark "read" ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( SStatic 0 Copy ) -, ILS ( MIO InputChar ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 10 ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "read_end" ( Branch EZ ) ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "read" Jump ) -, ICF - ( SMark "read_end" ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, IAL - ( Cons 0 ) -, ILS Store -, ICF Return -, ICF - ( SMark "newline" ) -, IAL - ( Cons 10 ) -, IAL - ( Cons 13 ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, ICF Return -] \ No newline at end of file diff --git a/.output/golden/ws/il/original/helloWorld.il b/.output/golden/ws/il/original/helloWorld.il deleted file mode 100644 index 70eeb2247..000000000 --- a/.output/golden/ws/il/original/helloWorld.il +++ /dev/null @@ -1,38 +0,0 @@ -[ IAL - ( Cons 72 ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 101 ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 108 ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 108 ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 111 ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 44 ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 32 ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 119 ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 111 ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 114 ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 108 ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 100 ) -, IAL ( SIO OutputChar ) -, End -] \ No newline at end of file diff --git a/.output/golden/ws/il/original/locTest.il b/.output/golden/ws/il/original/locTest.il deleted file mode 100644 index 6db51c33d..000000000 --- a/.output/golden/ws/il/original/locTest.il +++ /dev/null @@ -1,184 +0,0 @@ -[ IAL - ( Cons 0 ) -, IAL - ( Cons 69 ) -, ILS Store -, IAL - ( Cons 1 ) -, IAL - ( Cons 110 ) -, ILS Store -, IAL - ( Cons 2 ) -, IAL - ( Cons 116 ) -, ILS Store -, IAL - ( Cons 3 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 4 ) -, IAL - ( Cons 114 ) -, ILS Store -, IAL - ( Cons 5 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 6 ) -, IAL - ( Cons 97 ) -, ILS Store -, IAL - ( Cons 7 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 8 ) -, IAL - ( Cons 110 ) -, ILS Store -, IAL - ( Cons 9 ) -, IAL - ( Cons 117 ) -, ILS Store -, IAL - ( Cons 10 ) -, IAL - ( Cons 109 ) -, ILS Store -, IAL - ( Cons 11 ) -, IAL - ( Cons 98 ) -, ILS Store -, IAL - ( Cons 12 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 13 ) -, IAL - ( Cons 114 ) -, ILS Store -, IAL - ( Cons 14 ) -, IAL - ( Cons 58 ) -, ILS Store -, IAL - ( Cons 15 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 16 ) -, IAL - ( Cons 0 ) -, ILS Store -, IAL - ( Cons 0 ) -, ICF - ( CStatic "write" Call ) -, IAL - ( Cons 100 ) -, ILS ( MIO InputDec ) -, IAL - ( Cons 0 ) -, ICF - ( CStatic "write" Call ) -, IAL - ( Cons 101 ) -, ILS ( MIO InputDec ) -, IAL - ( Cons 100 ) -, ILS Load -, IAL - ( Cons 101 ) -, ILS Load -, ICF - ( CStatic "loctest" Call ) -, IAL ( SIO OutputDec ) -, End -, ICF - ( SMark "loctest" ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( SStatic 2 Copy ) -, IAL ( Binary Add ) -, IAL - ( SStatic 2 Slide ) -, ICF Return -, ICF - ( SMark "add" ) -, IAL ( Binary Add ) -, ICF Return -, ICF - ( SMark "write" ) -, IAL - ( SStatic 0 Copy ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, ICF - ( CStatic "write_end" ( Branch EZ ) ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "write" Jump ) -, ICF - ( SMark "write_end" ) -, IAL Discard -, IAL Discard -, ICF Return -, ICF - ( SMark "read" ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( SStatic 0 Copy ) -, ILS ( MIO InputChar ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 10 ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "read_end" ( Branch EZ ) ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "read" Jump ) -, ICF - ( SMark "read_end" ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, IAL - ( Cons 0 ) -, ILS Store -, ICF Return -, ICF - ( SMark "newline" ) -, IAL - ( Cons 10 ) -, IAL - ( Cons 13 ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, ICF Return -] \ No newline at end of file diff --git a/.output/golden/ws/il/original/name.il b/.output/golden/ws/il/original/name.il deleted file mode 100644 index 2d6b723ec..000000000 --- a/.output/golden/ws/il/original/name.il +++ /dev/null @@ -1,244 +0,0 @@ -[ IAL - ( Cons 0 ) -, IAL - ( Cons 80 ) -, ILS Store -, IAL - ( Cons 1 ) -, IAL - ( Cons 108 ) -, ILS Store -, IAL - ( Cons 2 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 3 ) -, IAL - ( Cons 97 ) -, ILS Store -, IAL - ( Cons 4 ) -, IAL - ( Cons 115 ) -, ILS Store -, IAL - ( Cons 5 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 6 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 7 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 8 ) -, IAL - ( Cons 110 ) -, ILS Store -, IAL - ( Cons 9 ) -, IAL - ( Cons 116 ) -, ILS Store -, IAL - ( Cons 10 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 11 ) -, IAL - ( Cons 114 ) -, ILS Store -, IAL - ( Cons 12 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 13 ) -, IAL - ( Cons 121 ) -, ILS Store -, IAL - ( Cons 14 ) -, IAL - ( Cons 111 ) -, ILS Store -, IAL - ( Cons 15 ) -, IAL - ( Cons 117 ) -, ILS Store -, IAL - ( Cons 16 ) -, IAL - ( Cons 114 ) -, ILS Store -, IAL - ( Cons 17 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 18 ) -, IAL - ( Cons 110 ) -, ILS Store -, IAL - ( Cons 19 ) -, IAL - ( Cons 97 ) -, ILS Store -, IAL - ( Cons 20 ) -, IAL - ( Cons 109 ) -, ILS Store -, IAL - ( Cons 21 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 22 ) -, IAL - ( Cons 58 ) -, ILS Store -, IAL - ( Cons 23 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 24 ) -, IAL - ( Cons 0 ) -, ILS Store -, IAL - ( Cons 30 ) -, IAL - ( Cons 72 ) -, ILS Store -, IAL - ( Cons 31 ) -, IAL - ( Cons 101 ) -, ILS Store -, IAL - ( Cons 32 ) -, IAL - ( Cons 108 ) -, ILS Store -, IAL - ( Cons 33 ) -, IAL - ( Cons 108 ) -, ILS Store -, IAL - ( Cons 34 ) -, IAL - ( Cons 111 ) -, ILS Store -, IAL - ( Cons 35 ) -, IAL - ( Cons 32 ) -, ILS Store -, IAL - ( Cons 36 ) -, IAL - ( Cons 0 ) -, ILS Store -, IAL - ( Cons 0 ) -, ICF - ( CStatic "write" Call ) -, IAL - ( Cons 100 ) -, ICF - ( CStatic "read" Call ) -, IAL - ( Cons 30 ) -, ICF - ( CStatic "write" Call ) -, IAL - ( Cons 100 ) -, ICF - ( CStatic "write" Call ) -, ICF - ( CStatic "newline" Call ) -, End -, ICF - ( SMark "add" ) -, IAL ( Binary Add ) -, ICF Return -, ICF - ( SMark "write" ) -, IAL - ( SStatic 0 Copy ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, ICF - ( CStatic "write_end" ( Branch EZ ) ) -, IAL ( SIO OutputChar ) -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "write" Jump ) -, ICF - ( SMark "write_end" ) -, IAL Discard -, IAL Discard -, ICF Return -, ICF - ( SMark "read" ) -, IAL - ( SStatic 0 Copy ) -, IAL - ( SStatic 0 Copy ) -, ILS ( MIO InputChar ) -, ILS Load -, IAL - ( SStatic 0 Copy ) -, IAL - ( Cons 10 ) -, IAL ( Binary Sub ) -, ICF - ( CStatic "read_end" ( Branch EZ ) ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, ICF - ( CStatic "read" Jump ) -, ICF - ( SMark "read_end" ) -, IAL Discard -, IAL - ( Cons 1 ) -, IAL ( Binary Add ) -, IAL - ( Cons 0 ) -, ILS Store -, ICF Return -, ICF - ( SMark "newline" ) -, IAL - ( Cons 10 ) -, IAL - ( Cons 13 ) -, IAL ( SIO OutputChar ) -, IAL ( SIO OutputChar ) -, ICF Return -] \ No newline at end of file diff --git a/.output/golden/ws/il/parsed/from-wsa/bottles.il b/.output/golden/ws/il/parsed/from-wsa/bottles.il new file mode 100644 index 000000000..ba9a55c97 --- /dev/null +++ b/.output/golden/ws/il/parsed/from-wsa/bottles.il @@ -0,0 +1,506 @@ +[ IAL + ( SAL + ( Cons 3 ) + ) +, ICF + ( SMark "LOOP" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL ( SIO OutputDec ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 104 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 102 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ICF + ( CStatic "prints" Call ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL ( SIO OutputDec ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 102 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ICF + ( CStatic "printsln" Call ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 105 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 112 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 107 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 84 ) + ) +, ICF + ( CStatic "printsln" Call ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL ( SIO OutputDec ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 104 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 102 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ICF + ( CStatic "printsln" Call ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "printsln" Call ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "LOOP:1" ( Branch EZ ) ) +, ICF + ( CStatic "LOOP" Jump ) +, ICF + ( SMark "LOOP:1" ) +, End +, ICF + ( SMark "prints" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "prints_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, ICF + ( CStatic "prints" Jump ) +, ICF + ( SMark "prints_end" ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "printsln" ) +, ICF + ( CStatic "prints" Call ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/golden/ws/il/parsed/from-wsa/hello.il b/.output/golden/ws/il/parsed/from-wsa/hello.il new file mode 100644 index 000000000..3899be8eb --- /dev/null +++ b/.output/golden/ws/il/parsed/from-wsa/hello.il @@ -0,0 +1,72 @@ +[ IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, End +] \ No newline at end of file diff --git a/.output/golden/ws/il/parsed/from-wsa/hello2.il b/.output/golden/ws/il/parsed/from-wsa/hello2.il new file mode 100644 index 000000000..88f1d1ddf --- /dev/null +++ b/.output/golden/ws/il/parsed/from-wsa/hello2.il @@ -0,0 +1,89 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, ICF + ( CStatic "prints" Call ) +, End +, ICF + ( SMark "prints" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "prints_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, ICF + ( CStatic "prints" Jump ) +, ICF + ( SMark "prints_end" ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "printsln" ) +, ICF + ( CStatic "prints" Call ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/golden/ws/il/parsed/from-wsa/hello4.il b/.output/golden/ws/il/parsed/from-wsa/hello4.il new file mode 100644 index 000000000..bd7b32f75 --- /dev/null +++ b/.output/golden/ws/il/parsed/from-wsa/hello4.il @@ -0,0 +1,85 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, ICF + ( CStatic "printsln" Call ) +, End +, ICF + ( SMark "prints" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "prints_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, ICF + ( CStatic "prints" Jump ) +, ICF + ( SMark "prints_end" ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "printsln" ) +, ICF + ( CStatic "prints" Call ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/golden/ws/il/parsed/from-wsa/prim.il b/.output/golden/ws/il/parsed/from-wsa/prim.il new file mode 100644 index 000000000..3caf1a7c7 --- /dev/null +++ b/.output/golden/ws/il/parsed/from-wsa/prim.il @@ -0,0 +1,339 @@ +[ ICF + ( SMark "st" ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 93 ) + ) +, IAL + ( SAL + ( Cons 48 ) + ) +, IAL + ( SAL + ( Cons 48 ) + ) +, IAL + ( SAL + ( Cons 49 ) + ) +, IAL + ( SAL + ( Cons 45 ) + ) +, IAL + ( SAL + ( Cons 50 ) + ) +, IAL + ( SAL + ( Cons 91 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, IAL + ( SAL + ( Cons 105 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL + ( SAL + ( Cons 112 ) + ) +, ICF + ( CStatic "printsln" Call ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( SMark "f_start_1" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "f_finished_1" ( Branch EZ ) ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 1 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "f_start_1" Jump ) +, ICF + ( SMark "f_finished_1" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 2 ) + ) +, ICF + ( SMark "f_start_2" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "f_finished_2" ( Branch EZ ) ) +, IAL + ( SAL + ( Cons 2 ) + ) +, ICF + ( SMark "f_start_3" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "f_finished_3" ( Branch EZ ) ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 2 ) + ) +, ILS Load +, IAL + ( SAL ( Binary Mul ) ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "f_start_3" Jump ) +, ICF + ( SMark "f_finished_3" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "f_start_2" Jump ) +, ICF + ( SMark "f_finished_2" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 2 ) + ) +, ICF + ( SMark "f_start_4" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "f_finished_4" ( Branch EZ ) ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ILS Load +, ICF + ( CStatic "nodraw" ( Branch EZ ) ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL ( SIO OutputDec ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ICF + ( CStatic "prints" Call ) +, ICF + ( SMark "nodraw" ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "f_start_4" Jump ) +, ICF + ( SMark "f_finished_4" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "printsln" Call ) +, End +, ICF + ( SMark "prints" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "prints_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, ICF + ( CStatic "prints" Jump ) +, ICF + ( SMark "prints_end" ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "printsln" ) +, ICF + ( CStatic "prints" Call ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/golden/ws/il/parsed/from-wsa/true.il b/.output/golden/ws/il/parsed/from-wsa/true.il new file mode 100644 index 000000000..7f93ef7d9 --- /dev/null +++ b/.output/golden/ws/il/parsed/from-wsa/true.il @@ -0,0 +1 @@ +[ End ] \ No newline at end of file diff --git a/.output/golden/ws/il/parsed/original/calc.il b/.output/golden/ws/il/parsed/original/calc.il new file mode 100644 index 000000000..aee7a6970 --- /dev/null +++ b/.output/golden/ws/il/parsed/original/calc.il @@ -0,0 +1,683 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 69 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 5 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 6 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 7 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 8 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 9 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 14 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 15 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 16 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 17 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 18 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 19 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 20 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 21 ) + ) +, IAL + ( SAL + ( Cons 104 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 22 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 23 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 24 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 25 ) + ) +, IAL + ( SAL + ( Cons 45 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 26 ) + ) +, IAL + ( SAL + ( Cons 49 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 27 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 28 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 29 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 30 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 31 ) + ) +, IAL + ( SAL + ( Cons 102 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 105 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 34 ) + ) +, IAL + ( SAL + ( Cons 105 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 35 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 36 ) + ) +, IAL + ( SAL + ( Cons 104 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 37 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 42 ) + ) +, IAL + ( SAL + ( Cons 78 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 43 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 45 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 46 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 47 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 48 ) + ) +, IAL + ( SAL + ( Cons 58 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 49 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 60 ) + ) +, IAL + ( SAL + ( Cons 84 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 61 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 62 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 63 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 64 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 65 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 66 ) + ) +, IAL + ( SAL + ( Cons 105 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 67 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 68 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 69 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "write" Call ) +, ICF + ( CStatic "newline" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF + ( SMark "loop" ) +, IAL + ( SAL + ( Cons 42 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS ( MIO InputDec ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons + ( -1 ) + ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "progend" ( Branch EZ ) ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, ICF + ( CStatic "loop" Jump ) +, ICF + ( SMark "progend" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 60 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL ( SIO OutputDec ) +, ICF + ( CStatic "newline" Call ) +, End +, ICF + ( SMark "add" ) +, IAL + ( SAL ( Binary Add ) ) +, ICF Return +, ICF + ( SMark "write" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "write_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "write" Jump ) +, ICF + ( SMark "write_end" ) +, IAL ( SAL Discard ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "read" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputChar ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "read_end" ( Branch EZ ) ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "read" Jump ) +, ICF + ( SMark "read_end" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF Return +, ICF + ( SMark "newline" ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/golden/ws/il/parsed/original/count.il b/.output/golden/ws/il/parsed/original/count.il new file mode 100644 index 000000000..18a05cd56 --- /dev/null +++ b/.output/golden/ws/il/parsed/original/count.il @@ -0,0 +1,134 @@ +[ IAL + ( SAL + ( Cons 1 ) + ) +, ICF + ( SMark "C" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL ( SIO OutputDec ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "E" ( Branch EZ ) ) +, ICF + ( CStatic "C" Jump ) +, ICF + ( SMark "E" ) +, IAL ( SAL Discard ) +, End +, ICF + ( SMark "add" ) +, IAL + ( SAL ( Binary Add ) ) +, ICF Return +, ICF + ( SMark "write" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "write_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "write" Jump ) +, ICF + ( SMark "write_end" ) +, IAL ( SAL Discard ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "read" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputChar ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "read_end" ( Branch EZ ) ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "read" Jump ) +, ICF + ( SMark "read_end" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF Return +, ICF + ( SMark "newline" ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/golden/ws/il/parsed/original/fact.il b/.output/golden/ws/il/parsed/original/fact.il new file mode 100644 index 000000000..dc5f9ed89 --- /dev/null +++ b/.output/golden/ws/il/parsed/original/fact.il @@ -0,0 +1,363 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 69 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 5 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 6 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 7 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 8 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 9 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 14 ) + ) +, IAL + ( SAL + ( Cons 58 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 15 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 16 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 20 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 21 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 22 ) + ) +, IAL + ( SAL + ( Cons 61 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 23 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 24 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS ( MIO InputDec ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, ICF + ( CStatic "fact" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL ( SIO OutputDec ) +, IAL + ( SAL + ( Cons 20 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL ( SIO OutputDec ) +, ICF + ( CStatic "newline" Call ) +, End +, ICF + ( SMark "fact" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "factbase" ( Branch EZ ) ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "fact" Call ) +, IAL + ( SAL ( Binary Mul ) ) +, ICF Return +, ICF + ( SMark "factbase" ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "add" ) +, IAL + ( SAL ( Binary Add ) ) +, ICF Return +, ICF + ( SMark "write" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "write_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "write" Jump ) +, ICF + ( SMark "write_end" ) +, IAL ( SAL Discard ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "read" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputChar ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "read_end" ( Branch EZ ) ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "read" Jump ) +, ICF + ( SMark "read_end" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF Return +, ICF + ( SMark "newline" ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/golden/ws/il/parsed/original/hWorld.il b/.output/golden/ws/il/parsed/original/hWorld.il new file mode 100644 index 000000000..f86f1e306 --- /dev/null +++ b/.output/golden/ws/il/parsed/original/hWorld.il @@ -0,0 +1,319 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 5 ) + ) +, IAL + ( SAL + ( Cons 44 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 6 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 7 ) + ) +, IAL + ( SAL + ( Cons 119 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 8 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 9 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 14 ) + ) +, IAL + ( SAL + ( Cons 102 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 15 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 16 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 17 ) + ) +, IAL + ( SAL + ( Cons 112 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 18 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 19 ) + ) +, IAL + ( SAL + ( Cons 99 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 20 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 21 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 22 ) + ) +, IAL + ( SAL + ( Cons 33 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 23 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "write" Call ) +, ICF + ( CStatic "newline" Call ) +, End +, ICF + ( SMark "add" ) +, IAL + ( SAL ( Binary Add ) ) +, ICF Return +, ICF + ( SMark "write" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "write_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "write" Jump ) +, ICF + ( SMark "write_end" ) +, IAL ( SAL Discard ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "read" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputChar ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "read_end" ( Branch EZ ) ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "read" Jump ) +, ICF + ( SMark "read_end" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF Return +, ICF + ( SMark "newline" ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/golden/ws/il/parsed/original/hanoi.il b/.output/golden/ws/il/parsed/original/hanoi.il new file mode 100644 index 000000000..dd0ea6ac0 --- /dev/null +++ b/.output/golden/ws/il/parsed/original/hanoi.il @@ -0,0 +1,559 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 69 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 5 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 6 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 7 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 8 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 9 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 14 ) + ) +, IAL + ( SAL + ( Cons 58 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 15 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 16 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 20 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 21 ) + ) +, IAL + ( SAL + ( Cons 45 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 22 ) + ) +, IAL + ( SAL + ( Cons 62 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 23 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 24 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS ( MIO InputDec ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 2 ) + ) +, ICF + ( CStatic "hanoi" Call ) +, End +, ICF + ( SMark "hanoi" ) +, IAL + ( SAL + ( Cons 103 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 102 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, ICF + ( CStatic "endhanoi" ( Branch EZ ) ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 102 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 103 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 103 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 102 ) + ) +, ILS Load +, ICF + ( CStatic "hanoi" Call ) +, IAL + ( SAL + ( Cons 103 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 102 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Load +, IAL ( SIO OutputDec ) +, IAL + ( SAL + ( Cons 20 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 102 ) + ) +, ILS Load +, IAL ( SIO OutputDec ) +, ICF + ( CStatic "newline" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 102 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 103 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, IAL + ( SAL + ( Cons 103 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 102 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Load +, ICF + ( CStatic "hanoi" Call ) +, IAL + ( SAL + ( Cons 103 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 102 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL + ( SAL + ( SStatic 1 Move ) + ) +, ILS Store +, ICF + ( SMark "endhanoi" ) +, ICF Return +, ICF + ( SMark "add" ) +, IAL + ( SAL ( Binary Add ) ) +, ICF Return +, ICF + ( SMark "write" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "write_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "write" Jump ) +, ICF + ( SMark "write_end" ) +, IAL ( SAL Discard ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "read" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputChar ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "read_end" ( Branch EZ ) ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "read" Jump ) +, ICF + ( SMark "read_end" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF Return +, ICF + ( SMark "newline" ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/golden/ws/il/parsed/original/helloWorld.il b/.output/golden/ws/il/parsed/original/helloWorld.il new file mode 100644 index 000000000..f5831b140 --- /dev/null +++ b/.output/golden/ws/il/parsed/original/helloWorld.il @@ -0,0 +1,62 @@ +[ IAL + ( SAL + ( Cons 72 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 101 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 44 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 119 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 111 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 114 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 108 ) + ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 100 ) + ) +, IAL ( SIO OutputChar ) +, End +] \ No newline at end of file diff --git a/.output/golden/ws/il/parsed/original/locTest.il b/.output/golden/ws/il/parsed/original/locTest.il new file mode 100644 index 000000000..4ae21f6fd --- /dev/null +++ b/.output/golden/ws/il/parsed/original/locTest.il @@ -0,0 +1,300 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 69 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 5 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 6 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 7 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 8 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 9 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL + ( Cons 98 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 14 ) + ) +, IAL + ( SAL + ( Cons 58 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 15 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 16 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS ( MIO InputDec ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS ( MIO InputDec ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ILS Load +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Load +, ICF + ( CStatic "loctest" Call ) +, IAL ( SIO OutputDec ) +, End +, ICF + ( SMark "loctest" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 2 Copy ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( SStatic 2 Slide ) + ) +, ICF Return +, ICF + ( SMark "add" ) +, IAL + ( SAL ( Binary Add ) ) +, ICF Return +, ICF + ( SMark "write" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "write_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "write" Jump ) +, ICF + ( SMark "write_end" ) +, IAL ( SAL Discard ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "read" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputChar ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "read_end" ( Branch EZ ) ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "read" Jump ) +, ICF + ( SMark "read_end" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF Return +, ICF + ( SMark "newline" ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/golden/ws/il/parsed/original/name.il b/.output/golden/ws/il/parsed/original/name.il new file mode 100644 index 000000000..369744f01 --- /dev/null +++ b/.output/golden/ws/il/parsed/original/name.il @@ -0,0 +1,409 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( Cons 80 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 2 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 3 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 4 ) + ) +, IAL + ( SAL + ( Cons 115 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 5 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 6 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 7 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 8 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 9 ) + ) +, IAL + ( SAL + ( Cons 116 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 11 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 12 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL + ( SAL + ( Cons 121 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 14 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 15 ) + ) +, IAL + ( SAL + ( Cons 117 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 16 ) + ) +, IAL + ( SAL + ( Cons 114 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 17 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 18 ) + ) +, IAL + ( SAL + ( Cons 110 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 19 ) + ) +, IAL + ( SAL + ( Cons 97 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 20 ) + ) +, IAL + ( SAL + ( Cons 109 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 21 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 22 ) + ) +, IAL + ( SAL + ( Cons 58 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 23 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 24 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 30 ) + ) +, IAL + ( SAL + ( Cons 72 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 31 ) + ) +, IAL + ( SAL + ( Cons 101 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 32 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 33 ) + ) +, IAL + ( SAL + ( Cons 108 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 34 ) + ) +, IAL + ( SAL + ( Cons 111 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 35 ) + ) +, IAL + ( SAL + ( Cons 32 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 36 ) + ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, IAL + ( SAL + ( Cons 0 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ICF + ( CStatic "read" Call ) +, IAL + ( SAL + ( Cons 30 ) + ) +, ICF + ( CStatic "write" Call ) +, IAL + ( SAL + ( Cons 100 ) + ) +, ICF + ( CStatic "write" Call ) +, ICF + ( CStatic "newline" Call ) +, End +, ICF + ( SMark "add" ) +, IAL + ( SAL ( Binary Add ) ) +, ICF Return +, ICF + ( SMark "write" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ICF + ( CStatic "write_end" ( Branch EZ ) ) +, IAL ( SIO OutputChar ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "write" Jump ) +, ICF + ( SMark "write_end" ) +, IAL ( SAL Discard ) +, IAL ( SAL Discard ) +, ICF Return +, ICF + ( SMark "read" ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputChar ) +, ILS Load +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL ( Binary Sub ) ) +, ICF + ( CStatic "read_end" ( Branch EZ ) ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, ICF + ( CStatic "read" Jump ) +, ICF + ( SMark "read_end" ) +, IAL ( SAL Discard ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL + ( SAL ( Binary Add ) ) +, IAL + ( SAL + ( Cons 0 ) + ) +, ILS Store +, ICF Return +, ICF + ( SMark "newline" ) +, IAL + ( SAL + ( Cons 10 ) + ) +, IAL + ( SAL + ( Cons 13 ) + ) +, IAL ( SIO OutputChar ) +, IAL ( SIO OutputChar ) +, ICF Return +] \ No newline at end of file diff --git a/.output/golden/ws/il/parsed/original/truthMachine.il b/.output/golden/ws/il/parsed/original/truthMachine.il new file mode 100644 index 000000000..236fff896 --- /dev/null +++ b/.output/golden/ws/il/parsed/original/truthMachine.il @@ -0,0 +1,30 @@ +[ IAL + ( SAL + ( Cons 0 ) + ) +, IAL + ( SAL + ( SStatic 0 Copy ) + ) +, ILS ( MIO InputDec ) +, ILS Load +, ICF + ( CStatic "\x0" ( Branch EZ ) ) +, ICF + ( SMark "\x1" ) +, IAL + ( SAL + ( Cons 1 ) + ) +, IAL ( SIO OutputDec ) +, ICF + ( CStatic "\x1" Jump ) +, ICF + ( SMark "\x0" ) +, IAL + ( SAL + ( Cons 0 ) + ) +, IAL ( SIO OutputDec ) +, End +] \ No newline at end of file diff --git a/docs/developers/CHANGELOG.md b/docs/developers/CHANGELOG.md index 19b6fb8e9..1944e230f 100644 --- a/docs/developers/CHANGELOG.md +++ b/docs/developers/CHANGELOG.md @@ -1,5 +1,9 @@ # 📅 Revision history for HelMA +## 0.8.4.4 -- 2023-03-14 + +* Add optimizer for Stack Automaton + ## 0.8.4.3 -- 2023-02-13 * Add SimpleParams for ETA diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.Evaluator.hs.html b/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.Evaluator.hs.html deleted file mode 100644 index 76ed3abbe..000000000 --- a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.Evaluator.hs.html +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - -
-never executed always true always false
-
-
-    1 module HelVM.HelMA.Automata.WhiteSpace.Evaluator (
-    2   simpleEval,
-    3   evalParams,
-    4 ) where
-    5 
-    6 import           HelVM.HelMA.Automata.WhiteSpace.Lexer
-    7 import           HelVM.HelMA.Automata.WhiteSpace.Parser
-    8 import           HelVM.HelMA.Automata.WhiteSpace.Token
-    9 
-   10 import           HelVM.HelMA.Automaton.Symbol
-   11 
-   12 import           HelVM.HelMA.Automaton.API.EvalParams
-   13 import           HelVM.HelMA.Automaton.API.IOTypes
-   14 
-   15 import           HelVM.HelMA.Automaton.Automaton
-   16 
-   17 import           HelVM.HelMA.Automaton.IO.AutomatonIO
-   18 import           HelVM.HelMA.Automaton.IO.BusinessIO
-   19 
-   20 import           HelVM.HelMA.Automaton.Instruction
-   21 
-   22 import           HelVM.HelMA.Automaton.Types.FormatType
-   23 import           HelVM.HelMA.Automaton.Types.RAMType
-   24 import           HelVM.HelMA.Automaton.Types.StackType
-   25 import           HelVM.HelMA.Automaton.Types.TokenType
-   26 
-   27 import           HelVM.HelMA.Automaton.API.AutoParams
-   28 
-   29 import           HelVM.HelIO.Control.Safe
-   30 
-   31 import           Prelude                                      hiding (swap)
-   32 
-   33 import qualified HelVM.HelMA.Automata.WhiteSpace.SimpleParams as S
-   34 
-   35 import qualified HelVM.HelIO.Collections.MapList              as MapList
-   36 import qualified HelVM.HelIO.Collections.SList                as SList
-   37 
-   38 import qualified Data.Sequence                                as Seq
-   39 
-   40 simpleEval :: BIO m => S.SimpleParams -> m ()
-   41 simpleEval p = eval (S.tokenType p) (S.source p) (S.formatType p) (S.stackType p) (S.ramType p) (S.autoParams p)
-   42 
-   43 ----
-   44 
-   45 evalParams :: BIO m => TokenType -> EvalParams -> m ()
-   46 evalParams tokenType p = eval tokenType (source p) (formatType p) (stackAutoOptions p) (ramAutoOptions p) (autoParams p)
-   47 
-   48 eval :: BIO m => TokenType -> Source -> FormatType -> StackType -> RAMType -> AutoParams -> m ()
-   49 eval tokenType source = evalTL $ tokenize tokenType source
-   50 
-   51 evalTL :: BIO m => TokenList -> FormatType -> StackType -> RAMType -> AutoParams -> m ()
-   52 evalTL tl ascii st rt p = evalTL' =<< liftSafe (parseFromTL ascii tl) where evalTL' il = evalIL il st rt p
-   53 
-   54 evalIL :: BIO m => InstructionList -> StackType -> RAMType -> AutoParams -> m ()
-   55 evalIL il s ListRAMType    = evalIL' il s []
-   56 evalIL il s SeqRAMType     = evalIL' il s Seq.empty
-   57 evalIL il s SListRAMType   = evalIL' il s SList.sListEmpty
-   58 evalIL il s MapListRAMType = evalIL' il s MapList.mapListEmpty
-   59 
-   60 evalIL' :: (RAutomatonIO Symbol r m) => InstructionList -> StackType -> r -> AutoParams -> m ()
-   61 evalIL' il ListStackType  = evalIL'' il []
-   62 evalIL' il SeqStackType   = evalIL'' il Seq.empty
-   63 evalIL' il SListStackType = evalIL'' il SList.sListEmpty
-   64 
-   65 evalIL'' :: (SRAutomatonIO Symbol s r m) => InstructionList -> s -> r -> AutoParams -> m ()
-   66 evalIL'' il s r p = runAndDumpLogs p (newAutomaton il s r)
-
-
- - diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.API.EvalParams.hs.html b/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.API.EvalParams.hs.html deleted file mode 100644 index f4b5e13c4..000000000 --- a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.API.EvalParams.hs.html +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - -
-never executed always true always false
-
-
-    1 module HelVM.HelMA.Automaton.API.EvalParams where
-    2 
-    3 import           HelVM.HelMA.Automaton.API.AutoOptions
-    4 import           HelVM.HelMA.Automaton.API.AutoParams
-    5 import           HelVM.HelMA.Automaton.API.IOTypes
-    6 
-    7 import           HelVM.HelMA.Automaton.Types.CellType
-    8 import           HelVM.HelMA.Automaton.Types.DumpType
-    9 import           HelVM.HelMA.Automaton.Types.FormatType
-   10 import           HelVM.HelMA.Automaton.Types.IntCellType
-   11 import           HelVM.HelMA.Automaton.Types.RAMType
-   12 import           HelVM.HelMA.Automaton.Types.StackType
-   13 
-   14 -- | Accessors
-   15 ramAutoOptions :: EvalParams -> RAMType
-   16 ramAutoOptions = ram . typeOptions
-   17 
-   18 stackAutoOptions :: EvalParams -> StackType
-   19 stackAutoOptions = stack . typeOptions
-   20 
-   21 cellAutoOptions :: EvalParams -> CellType
-   22 cellAutoOptions = cell . typeOptions
-   23 
-   24 intCellAutoOptions :: EvalParams -> IntCellType
-   25 intCellAutoOptions = intCell . typeOptions
-   26 
-   27 dumpAutoOptions :: EvalParams -> DumpType
-   28 dumpAutoOptions = dumpType . autoParams
-   29 
-   30 -- | Type
-   31 data EvalParams = EvalParams
-   32   { formatType  :: !FormatType
-   33   , source      :: !Source
-   34   , typeOptions :: !AutoOptions
-   35   , autoParams  :: !AutoParams
-   36   }
-
-
- - diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Automaton.hs.html b/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Automaton.hs.html deleted file mode 100644 index 92ae8eeee..000000000 --- a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Automaton.hs.html +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - -
-never executed always true always false
-
-
-    1 module HelVM.HelMA.Automaton.Automaton (
-    2   runAndDumpLogs,
-    3   run,
-    4   flippedNewAutomaton,
-    5   newAutomaton,
-    6   Automaton,
-    7 ) where
-    8 
-    9 import           HelVM.HelMA.Automaton.API.AutoParams
-   10 
-   11 import           HelVM.HelMA.Automaton.Loop                      as Loop
-   12 import           HelVM.HelMA.Automaton.Symbol
-   13 
-   14 import           HelVM.HelMA.Automaton.IO.AutomatonIO
-   15 
-   16 import           HelVM.HelMA.Automaton.Instruction
-   17 import           HelVM.HelMA.Automaton.Instruction.CFInstruction
-   18 
-   19 import           HelVM.HelMA.Automaton.Types.DumpType
-   20 
-   21 import           HelVM.HelMA.Automaton.Units.ALU                 as Stack
-   22 import           HelVM.HelMA.Automaton.Units.CPU                 as CPU
-   23 import           HelVM.HelMA.Automaton.Units.LSU                 as LSU
-   24 
-   25 import           HelVM.HelIO.Containers.LLIndexSafe
-   26 
-   27 import           Control.Applicative.Tools
-   28 import           Control.Monad.Extra
-   29 import           Control.Type.Operator
-   30 
-   31 import           Data.Vector                                     as Vector
-   32 
-   33 import           Prelude                                         hiding (swap)
-   34 
-   35 runAndDumpLogs :: (SRAutomatonIO Symbol s r m) => AutoParams -> Automaton s r ->  m ()
-   36 runAndDumpLogs p = logDump (dumpType p) <=< run (compile p) (limit p)
-   37 
-   38 run :: (SRAutomatonIO Symbol s r m) => Bool -> LimitMaybe -> F s r m
-   39 run False = runI
-   40 run True  = runA
-   41 
-   42 ----
-   43 
-   44 runA :: (SRAutomatonIO Symbol s r m) => LimitMaybe -> F s r m
-   45 runA l a = loopMWithLimit (nextStateA $ compileA a) l  a
-   46 
-   47 compileA :: (SRAutomatonIO Symbol s r m) => Automaton s r -> Vector (SF s r m)
-   48 compileA = runInstruction <.> unitProgram
-   49 
-   50 nextStateA :: (SRAutomatonIO Symbol s r m) => Vector (SF s r m) -> SF s r m
-   51 nextStateA fv a = flip id (incrementIC a) =<< indexSafe fv (unitProgramCounter a)
-   52 
-   53 ----
-   54 
-   55 runI :: (SRAutomatonIO Symbol s r m) => LimitMaybe -> F s r m
-   56 runI = loopMWithLimit nextStateI
-   57 
-   58 nextStateI :: (SRAutomatonIO Symbol s r m) => SF s r m
-   59 nextStateI a = nextStateForInstruction =<< currentInstruction (unitCU a) where
-   60   nextStateForInstruction i = runInstruction i $ incrementIC a
-   61 
-   62 ----
-   63 
-   64 runInstruction :: (SRAutomatonIO Symbol s r m) => Instruction -> SF s r m
-   65 runInstruction (IAL      i) a = Loop.continue . updateStack   a <$> runALI i (unitStack a)
-   66 runInstruction (ILS      i) a = Loop.continue . updateFromLSU a <$> runSLI i (toLSU a)
-   67 runInstruction (ICF      i) a = Loop.continue . updateFromCPU a <$> runCFI i (toCPU a)
-   68 runInstruction  Transfer    a = transfer a
-   69 runInstruction  End         a = end a
-   70 
-   71 transfer :: (SRAutomatonIO Symbol s r m) => SF s r m
-   72 transfer = transferBranch <=< pop2ForStack
-   73 
-   74 transferBranch :: (SRAutomatonIO Symbol s r m) => (Symbol, Symbol, Automaton s r) -> m $ AutomatonSame s r
-   75 transferBranch (_ , 0 , u) = pure $ Loop.continue u
-   76 transferBranch (0 , _ , u) = end u
-   77 transferBranch (a , _ , u) = Loop.continue . updateFromCPU u <$> runCFI dJumpI (toCPU $ push1ForStack a u)
-   78 
-   79 pop2ForStack :: (SRAutomatonIO Symbol s r m) => Automaton s r -> m (Symbol , Symbol , Automaton s r)
-   80 pop2ForStack a = build <$> pop2 (unitStack a) where
-   81   build (s1 , s2 , s') = (s1 , s2 , updateStack a s')
-   82 
-   83 push1ForStack :: Stack s Symbol => Symbol -> Automaton s r -> Automaton s r
-   84 push1ForStack e a = a { unitStack = push1 e (unitStack a) }
-   85 
-   86 end :: (SRAutomatonIO Symbol s r m) => SF s r m
-   87 end = pure . Loop.break
-   88 
-   89 -- | Constructors
-   90 
-   91 flippedNewAutomaton :: (s , r) -> InstructionList -> Automaton s r
-   92 flippedNewAutomaton = flip (uncurry . newAutomaton)
-   93 
-   94 newAutomaton :: InstructionList -> s -> r -> Automaton s r
-   95 newAutomaton il = Automaton (newCU il)
-   96 
-   97 -- | Updaters
-   98 
-   99 incrementIC :: Automaton s r -> Automaton s r
-  100 incrementIC a = a { unitCU = incrementPC $ unitCU a}
-  101 
-  102 updateStack :: Automaton s r -> s -> Automaton s r
-  103 updateStack a s = a {unitStack = s}
-  104 
-  105 updateFromCPU :: Automaton s r -> CentralProcessingUnit s -> Automaton s r
-  106 updateFromCPU a cpu = a { unitCU = controlUnit cpu, unitStack = alu cpu}
-  107 
-  108 updateFromLSU :: Automaton s r -> LoadStoreUnit s r -> Automaton s r
-  109 updateFromLSU a lsu = a {unitStack = stack lsu , unitRAM = ram lsu}
-  110 
-  111 -- | Accessors
-  112 
-  113 unitProgram :: Automaton s r -> InstructionVector
-  114 unitProgram = program . unitCU
-  115 
-  116 unitProgramCounter :: Automaton s r -> InstructionCounter
-  117 unitProgramCounter = programCounter . unitCU
-  118 
-  119 toCPU :: Automaton s r -> CentralProcessingUnit s
-  120 toCPU a = CPU { controlUnit = unitCU a , alu = unitStack a }
-  121 
-  122 toLSU :: Automaton s r -> LoadStoreUnit s r
-  123 toLSU a = LSU { stack = unitStack a, ram = unitRAM a }
-  124 
-  125 -- | Types
-  126 
-  127 type SF s r m = Automaton s r -> m $ AutomatonSame s r
-  128 
-  129 type F s r m = Automaton s r -> m $ Automaton s r
-  130 
-  131 type AutomatonSame s r = Same (Automaton s r)
-  132 
-  133 -- | Data types
-  134 data Automaton s r = Automaton
-  135   { unitCU    :: ControlUnit
-  136   , unitStack :: s
-  137   , unitRAM   :: r
-  138   }
-  139   deriving stock (Show)
-
-
- - diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.hs.html b/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.hs.html deleted file mode 100644 index fc324c9a8..000000000 --- a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.hs.html +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - -
-never executed always true always false
-
-
-    1 module HelVM.HelMA.Automaton.Instruction where
-    2 
-    3 import           HelVM.HelMA.Automaton.Instruction.ALInstruction
-    4 import           HelVM.HelMA.Automaton.Instruction.CFInstruction
-    5 import           HelVM.HelMA.Automaton.Instruction.IOInstruction
-    6 import           HelVM.HelMA.Automaton.Instruction.LSInstruction
-    7 
-    8 import           Data.Vector                                     as Vector
-    9 
-   10 -- | Constructors
-   11 
-   12 consI :: Integer -> Instruction
-   13 consI = IAL . Cons
-   14 
-   15 subI , divModI , sInputI , sOutputI ,  halibutI :: Instruction
-   16 subI     = IAL $ Binary Sub
-   17 divModI  = IAL $ Binaries [Mod, Div]
-   18 sInputI  = IAL $ SIO InputChar
-   19 sOutputI = IAL $ SIO OutputChar
-   20 halibutI = IAL Halibut
-   21 
-   22 dMarkI :: Natural -> Instruction
-   23 dMarkI = ICF . DMark
-   24 
-   25 sMarkI :: Natural -> Instruction
-   26 sMarkI = ICF . SMark . show
-   27 
-   28 sJumpI :: Natural -> Instruction
-   29 sJumpI = ICF . flip CStatic Jump . show
-   30 
-   31 -- | Others
-   32 
-   33 isMark :: Instruction -> Bool
-   34 isMark (ICF (DMark _)) = True
-   35 isMark (ICF (SMark _)) = True
-   36 isMark             _   = False
-   37 
-   38 isDMark :: Natural -> Instruction -> Bool
-   39 isDMark n (ICF (DMark n')) = n == n'
-   40 isDMark _               _  = False
-   41 
-   42 isSMark :: Label -> Instruction -> Bool
-   43 isSMark l (ICF (SMark l')) = l == l'
-   44 isSMark _            _     = False
-   45 
-   46 -- | Types
-   47 
-   48 data Instruction =
-   49     IAL !ALInstruction
-   50   | ILS !LSInstruction
-   51   | ICF !CFInstruction
-   52   | End
-   53   | Transfer
-   54   deriving stock (Eq , Read , Show)
-   55 
-   56 type InstructionList   = [Instruction]
-   57 type InstructionVector = Vector Instruction
-
-
- - diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.API.BFType.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.API.BFType.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.API.BFType.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.API.BFType.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Common.Symbol.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Common.Symbol.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Common.Symbol.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Common.Symbol.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Evaluator.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Evaluator.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Evaluator.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Evaluator.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Evaluator.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Evaluator.hs.html similarity index 87% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Evaluator.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Evaluator.hs.html index 2f9fd39fe..6426f60db 100644 --- a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Evaluator.hs.html +++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Evaluator.hs.html @@ -39,13 +39,13 @@ 20 evalSource :: (BIO m , Symbol e) => Source -> FullTape e -> DumpType -> m () 21 evalSource source tape dt = logDump dt =<< flip runList tape =<< parseWithOptimize source 22 - 23 runList :: (BIO m , Symbol e) => FastInstructionList -> FullTape e -> m $ Automaton e - 24 runList il = nextStep (IU il 0) + 23 runList :: (BIO m , Symbol e) => FastInstructionList -> FullTape e -> m $ Memory e + 24 runList il = nextStep (IM il 0) 25 - 26 nextStep :: (BIO m , Symbol e) => InstructionUnit -> FullTape e -> m $ Automaton e - 27 nextStep (IU iv ic) = doInstruction (iv `indexMaybe` ic) (IU iv $ ic + 1) + 26 nextStep :: (BIO m , Symbol e) => InstructionMemory -> FullTape e -> m $ Memory e + 27 nextStep (IM iv ic) = doInstruction (iv `indexMaybe` ic) (IM iv $ ic + 1) 28 - 29 doInstruction :: (BIO m , Symbol e) => Maybe FastInstruction -> InstructionUnit -> FullTape e -> m $ Automaton e + 29 doInstruction :: (BIO m , Symbol e) => Maybe FastInstruction -> InstructionMemory -> FullTape e -> m $ Memory e 30 doInstruction (Just (Move i )) table tape = nextStep table (moveHead i tape) 31 doInstruction (Just (Inc i )) table tape = nextStep table (incSymbol i tape) 32 doInstruction (Just Output ) table tape = doOutputChar table tape @@ -63,32 +63,32 @@ 44 doInstruction (Just (TriClr i1 i2 i3)) table tape = nextStep table (triAndClearSymbol i1 i2 i3 tape) 45 doInstruction Nothing table tape = doEnd table tape 46 - 47 doWhile :: (BIO m , Symbol e) => FastInstructionList -> InstructionUnit -> FullTape e -> m $ Automaton e + 47 doWhile :: (BIO m , Symbol e) => FastInstructionList -> InstructionMemory -> FullTape e -> m $ Memory e 48 doWhile _ table tape@(_ , 0:_) = nextStep table tape 49 doWhile iv table tape = doWhileWithTape =<< runList iv tape where - 50 doWhileWithTape :: (BIO m , Symbol e) => Automaton e -> m $ Automaton e - 51 doWhileWithTape = doWhile iv table . unitTape + 50 doWhileWithTape :: (BIO m , Symbol e) => Memory e -> m $ Memory e + 51 doWhileWithTape = doWhile iv table . memoryTape 52 53 -- | IO instructions - 54 doOutputChar :: (BIO m , Symbol e) => InstructionUnit -> FullTape e -> m $ Automaton e + 54 doOutputChar :: (BIO m , Symbol e) => InstructionMemory -> FullTape e -> m $ Memory e 55 doOutputChar _ (_ , []) = error "Illegal State" 56 doOutputChar table tape@(_ , e:_) = wPutChar (toChar e) *> nextStep table tape 57 - 58 doInputChar :: (BIO m , Symbol e) => InstructionUnit -> FullTape e -> m $ Automaton e + 58 doInputChar :: (BIO m , Symbol e) => InstructionMemory -> FullTape e -> m $ Memory e 59 doInputChar table tape = (nextStep table . flip writeSymbol tape) =<< wGetChar 60 61 -- | Terminate instruction - 62 doEnd :: BIO m => InstructionUnit -> FullTape e -> m $ Automaton e - 63 doEnd iu tape = pure $ Automaton iu tape + 62 doEnd :: BIO m => InstructionMemory -> FullTape e -> m $ Memory e + 63 doEnd iu tape = pure $ Memory iu tape 64 65 -- | Types - 66 data Automaton e = Automaton - 67 { unitUI :: InstructionUnit - 68 , unitTape :: FullTape e + 66 data Memory e = Memory + 67 { memoryIM :: InstructionMemory + 68 , memoryTape :: FullTape e 69 } 70 deriving stock (Eq , Show) 71 - 72 data InstructionUnit = IU !FastInstructionList !InstructionCounter + 72 data InstructionMemory = IM !FastInstructionList !InstructionCounter 73 deriving stock (Eq , Show) 74 75 type InstructionCounter = Int diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Optimizer.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Optimizer.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Optimizer.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Optimizer.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Evaluator.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Evaluator.hs.html similarity index 91% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Evaluator.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Evaluator.hs.html index e439faecb..9da8b9429 100644 --- a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Evaluator.hs.html +++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Evaluator.hs.html @@ -38,7 +38,7 @@ 19 evalSource :: (BIO m , Symbol e) => Source -> FullTape e -> DumpType -> m () 20 evalSource source tape dt = logDump dt =<< doInstruction ([] , tokenize source) tape 21 - 22 doInstruction :: (BIO m , Symbol e) => Table -> FullTape e -> m $ Automaton e + 22 doInstruction :: (BIO m , Symbol e) => Table -> FullTape e -> m $ Memory e 23 doInstruction table@(_ , Simple MoveR : _) tape = doInstruction (nextInst table) (moveHeadRight tape) 24 doInstruction table@(_ , Simple MoveL : _) tape = doInstruction (nextInst table) (moveHeadLeft tape) 25 doInstruction table@(_ , Simple Inc : _) tape = doInstruction (nextInst table) (nextSymbol tape) @@ -49,30 +49,30 @@ 30 doInstruction table@(_ , JmpBack : _) tape = doJmpBack table tape 31 doInstruction table@(_ , [] ) tape = doEnd table tape 32 - 33 doJmpPast :: (BIO m , Symbol e) => Table -> FullTape e -> m $ Automaton e + 33 doJmpPast :: (BIO m , Symbol e) => Table -> FullTape e -> m $ Memory e 34 doJmpPast table tape@(_ , 0 : _) = doInstruction (jumpPast table) tape 35 doJmpPast table tape = doInstruction (nextInst table) tape 36 - 37 doJmpBack :: (BIO m , Symbol e) => Table -> FullTape e -> m $ Automaton e + 37 doJmpBack :: (BIO m , Symbol e) => Table -> FullTape e -> m $ Memory e 38 doJmpBack table tape@(_ , 0 : _) = doInstruction (nextInst table) tape 39 doJmpBack table tape = doInstruction (jumpBack table) tape 40 41 -- | IO instructions - 42 doOutputChar :: (BIO m , Symbol e) => Table -> FullTape e -> m $ Automaton e + 42 doOutputChar :: (BIO m , Symbol e) => Table -> FullTape e -> m $ Memory e 43 doOutputChar _ (_ , []) = error "Illegal State" 44 doOutputChar table tape@(_ , e : _) = wPutChar (toChar e) *> doInstruction (nextInst table) tape 45 - 46 doInputChar :: (BIO m , Symbol e) => Table -> FullTape e -> m $ Automaton e + 46 doInputChar :: (BIO m , Symbol e) => Table -> FullTape e -> m $ Memory e 47 doInputChar table tape = (doInstruction (nextInst table) . flip writeSymbol tape) =<< wGetChar 48 49 -- | Terminate instruction - 50 doEnd :: BIO m => Table -> FullTape e -> m $ Automaton e - 51 doEnd table tape = pure $ Automaton table tape + 50 doEnd :: BIO m => Table -> FullTape e -> m $ Memory e + 51 doEnd table tape = pure $ Memory table tape 52 53 -- | Types - 54 data Automaton e = Automaton - 55 { unitTable :: Table - 56 , unitTape :: FullTape e + 54 data Memory e = Memory + 55 { memoryTable :: Table + 56 , memoryTape :: FullTape e 57 } 58 deriving stock (Eq , Read , Show) diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Evaluator.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Evaluator.hs.html similarity index 85% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Evaluator.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Evaluator.hs.html index 48d8746bf..13fbbae98 100644 --- a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Evaluator.hs.html +++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Evaluator.hs.html @@ -39,13 +39,13 @@ 20 evalSource :: (BIO m , Symbol e) => Source -> FullTape e -> DumpType -> m () 21 evalSource source tape dt = logDump dt =<< flip runVector tape =<< parseAsVector source 22 - 23 runVector :: (BIO m , Symbol e) => TreeInstructionVector -> FullTape e -> m $ Automaton e - 24 runVector iv = nextStep (IU iv 0) + 23 runVector :: (BIO m , Symbol e) => TreeInstructionVector -> FullTape e -> m $ Memory e + 24 runVector iv = nextStep (IM iv 0) 25 - 26 nextStep :: (BIO m , Symbol e) => InstructionUnit -> FullTape e -> m $ Automaton e - 27 nextStep (IU iv ic) = doInstruction (iv `indexMaybe` ic) (IU iv $ ic + 1) + 26 nextStep :: (BIO m , Symbol e) => InstructionMemory -> FullTape e -> m $ Memory e + 27 nextStep (IM iv ic) = doInstruction (iv `indexMaybe` ic) (IM iv $ ic + 1) 28 - 29 doInstruction :: (BIO m , Symbol e) => Maybe TreeInstruction -> InstructionUnit -> FullTape e -> m $ Automaton e + 29 doInstruction :: (BIO m , Symbol e) => Maybe TreeInstruction -> InstructionMemory -> FullTape e -> m $ Memory e 30 doInstruction (Just (Simple MoveR )) table tape = nextStep table (moveHeadRight tape) 31 doInstruction (Just (Simple MoveL )) table tape = nextStep table (moveHeadLeft tape) 32 doInstruction (Just (Simple Inc )) table tape = nextStep table (nextSymbol tape) @@ -55,32 +55,32 @@ 36 doInstruction (Just (While iv )) table tape = doWhile iv table tape 37 doInstruction Nothing table tape = doEnd table tape 38 - 39 doWhile :: (BIO m , Symbol e) => TreeInstructionVector -> InstructionUnit -> FullTape e -> m $ Automaton e + 39 doWhile :: (BIO m , Symbol e) => TreeInstructionVector -> InstructionMemory -> FullTape e -> m $ Memory e 40 doWhile _ table tape@(_ , 0:_) = nextStep table tape 41 doWhile iv table tape = doWhileWithTape =<< runVector iv tape where - 42 doWhileWithTape :: (BIO m , Symbol e) => Automaton e -> m $ Automaton e - 43 doWhileWithTape = doWhile iv table . unitTape + 42 doWhileWithTape :: (BIO m , Symbol e) => Memory e -> m $ Memory e + 43 doWhileWithTape = doWhile iv table . memoryTape 44 45 -- | IO instructions - 46 doOutputChar :: (BIO m , Symbol e) => InstructionUnit -> FullTape e -> m $ Automaton e + 46 doOutputChar :: (BIO m , Symbol e) => InstructionMemory -> FullTape e -> m $ Memory e 47 doOutputChar _ (_ , []) = error "Illegal State" 48 doOutputChar table tape@(_ , e:_) = wPutChar (toChar e) *> nextStep table tape 49 - 50 doInputChar :: (BIO m , Symbol e) => InstructionUnit -> FullTape e -> m $ Automaton e + 50 doInputChar :: (BIO m , Symbol e) => InstructionMemory -> FullTape e -> m $ Memory e 51 doInputChar table tape = (nextStep table . flip writeSymbol tape) =<< wGetChar 52 53 -- | Terminate instruction - 54 doEnd :: BIO m => InstructionUnit -> FullTape e -> m $ Automaton e - 55 doEnd iu tape = pure $ Automaton iu tape + 54 doEnd :: BIO m => InstructionMemory -> FullTape e -> m $ Memory e + 55 doEnd im tape = pure $ Memory im tape 56 57 -- | Types - 58 data Automaton e = Automaton - 59 { unitUI :: InstructionUnit - 60 , unitTape :: FullTape e + 58 data Memory e = Memory + 59 { memoryIM :: InstructionMemory + 60 , memoryTape :: FullTape e 61 } 62 deriving stock (Eq , Show) 63 - 64 data InstructionUnit = IU !TreeInstructionVector !InstructionCounter + 64 data InstructionMemory = IM !TreeInstructionVector !InstructionCounter 65 deriving stock (Eq , Show) 66 67 type InstructionCounter = Int diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Cat.Evaluator.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Cat.Evaluator.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Cat.Evaluator.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Cat.Evaluator.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.API.ETAImplType.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.API.ETAImplType.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.API.ETAImplType.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.API.ETAImplType.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Addressing.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Addressing.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Addressing.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Addressing.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Automaton.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Automaton.hs.html similarity index 72% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Automaton.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Automaton.hs.html index 78f515862..f4db5f44a 100644 --- a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Automaton.hs.html +++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Automaton.hs.html @@ -19,7 +19,7 @@ 
     1 module HelVM.HelMA.Automata.ETA.Automaton (
     2   run,
-    3   newAutomaton,
+    3   newMemory,
     4 ) where
     5 
     6 import           HelVM.HelMA.Automata.ETA.Addressing
@@ -30,7 +30,7 @@
    11 
    12 import           HelVM.HelMA.Automaton.IO.AutomatonIO
    13 
-   14 import           HelVM.HelMA.Automaton.Units.ALU         as Stack
+   14 import           HelVM.HelMA.Automaton.Combiner.ALU      as Stack
    15 
    16 import           Control.Monad.Extra
    17 import           Control.Type.Operator
@@ -40,66 +40,66 @@
    21 
    22 import           Prelude                                 hiding (divMod)
    23 
-   24 run :: (SAutomatonIO e s m) => Maybe Natural -> Automaton s -> m $ Automaton s
+   24 run :: (SAutomatonIO e s m) => Maybe Natural -> Memory s -> m $ Memory s
    25 run = loopMWithLimit nextState
    26 
-   27 nextState :: (SAutomatonIO e s m) => Automaton s -> m $ AutomatonSame s
-   28 nextState (Automaton iu s) = build =<< nextIU iu where build (t , iu') = doInstruction t (Automaton iu' s)
+   27 nextState :: (SAutomatonIO e s m) => Memory s -> m $ MemorySame s
+   28 nextState (Memory iu s) = build =<< nextIM iu where build (t , iu') = doInstruction t (Memory iu' s)
    29 
-   30 doInstruction :: (SAutomatonIO e s m) => Maybe Token -> Automaton s -> m $ AutomatonSame s
+   30 doInstruction :: (SAutomatonIO e s m) => Maybe Token -> Memory s -> m $ MemorySame s
    31 -- | IO instructions
-   32 doInstruction (Just O) u                           = Left . updateStack u <$> doOutputChar2 (unitStack u)
-   33 doInstruction (Just I) u                           = Left . updateStack u <$> doInputChar2 (unitStack u)
+   32 doInstruction (Just O) u                        = Left . updateStack u <$> doOutputChar2 (memoryStack u)
+   33 doInstruction (Just I) u                        = Left . updateStack u <$> doInputChar2 (memoryStack u)
    34 
    35 -- | Stack instructions
-   36 doInstruction (Just N) (Automaton iu s)            = build <$> parseNumber iu where build (symbol , iu') = Left (Automaton iu' (push1 symbol s))
-   37 doInstruction (Just H) u                           = Left . updateStack u <$> halibut (unitStack u)
+   36 doInstruction (Just N) (Memory iu s)            = build <$> parseNumber iu where build (symbol , iu') = Left (Memory iu' (push1 symbol s))
+   37 doInstruction (Just H) u                        = Left . updateStack u <$> halibut (memoryStack u)
    38 
    39 -- | Arithmetic
-   40 doInstruction (Just S) u                           = Left . updateStack u <$> sub (unitStack u)
-   41 doInstruction (Just E) u                           = Left . updateStack u <$> divMod (unitStack u)
+   40 doInstruction (Just S) u                        = Left . updateStack u <$> sub (memoryStack u)
+   41 doInstruction (Just E) u                        = Left . updateStack u <$> divMod (memoryStack u)
    42 
    43 -- | Control
-   44 doInstruction (Just R) u                           = pure $ Left u
-   45 doInstruction (Just A) (Automaton iu@(IU il ic) s) = pure $ Left ((Automaton iu . flipPush1 s . genericNextLabel il) ic)
-   46 doInstruction (Just T) u                           = transfer u
-   47 doInstruction Nothing u                            = end u
+   44 doInstruction (Just R) u                        = pure $ Left u
+   45 doInstruction (Just A) (Memory iu@(IM il ic) s) = pure $ Left ((Memory iu . flipPush1 s . genericNextLabel il) ic)
+   46 doInstruction (Just T) u                        = transfer u
+   47 doInstruction Nothing u                         = end u
    48 
-   49 transfer :: (SAutomatonIO e s m) => Automaton s -> m $ AutomatonSame s
+   49 transfer :: (SAutomatonIO e s m) => Memory s -> m $ MemorySame s
    50 transfer = branch <=< pop2ForStack where
    51   branch (_ , 0 , u) = pure $ Left u
    52   branch (0 , _ , u) = end u
-   53   branch (l , _ , u) = Left . updateAddress u <$> genericFindAddress (unitProgram u) l
+   53   branch (l , _ , u) = Left . updateAddress u <$> genericFindAddress (memoryProgram u) l
    54 
-   55 pop2ForStack :: (SAutomatonIO e s m) => Automaton s -> m (e , e , Automaton s)
-   56 pop2ForStack u = build <$> pop2 (unitStack u) where
+   55 pop2ForStack :: (SAutomatonIO e s m) => Memory s -> m (e , e , Memory s)
+   56 pop2ForStack u = build <$> pop2 (memoryStack u) where
    57   build (s1 , s2 , s') = (s1 , s2 , updateStack u s')
    58 
    59 -- | Terminate instruction
-   60 end :: (SAutomatonIO e s m) => Automaton s -> m $ AutomatonSame s
+   60 end :: (SAutomatonIO e s m) => Memory s -> m $ MemorySame s
    61 end = pure . Right
    62 
-   63 -- | Automaton methods
+   63 -- | Memory methods
    64 
-   65 newAutomaton :: TokenList -> s -> Automaton s
-   66 newAutomaton tl = Automaton (IU (Vector.fromList tl) 0)
+   65 newMemory :: TokenList -> s -> Memory s
+   66 newMemory tl = Memory (IM (Vector.fromList tl) 0)
    67 
-   68 updateStack :: Automaton s -> s -> Automaton s
-   69 updateStack u s =  u {unitStack = s}
+   68 updateStack :: Memory s -> s -> Memory s
+   69 updateStack u s =  u {memoryStack = s}
    70 
-   71 updateAddress :: Automaton s -> InstructionCounter -> Automaton s
-   72 updateAddress u a =  u {unitIU = updatePC (unitIU u) a}
+   71 updateAddress :: Memory s -> InstructionCounter -> Memory s
+   72 updateAddress u a =  u {memoryIM = updatePC (memoryIM u) a}
    73 
-   74 unitProgram :: Automaton s -> TokenVector
-   75 unitProgram = program . unitIU
+   74 memoryProgram :: Memory s -> TokenVector
+   75 memoryProgram = program . memoryIM
    76 
    77 -- | Types
    78 
-   79 type AutomatonSame s = Same (Automaton s)
+   79 type MemorySame s = Same (Memory s)
    80 
-   81 data Automaton s = Automaton
-   82   { unitIU    :: !InstructionUnit
-   83   , unitStack :: s
+   81 data Memory s = Memory
+   82   { memoryIM    :: !InstructionMemory
+   83   , memoryStack :: s
    84   }
    85   deriving stock (Eq , Read , Show)
 
diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Evaluator.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Evaluator.hs.html
similarity index 53%
rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Evaluator.hs.html
rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Evaluator.hs.html
index 75ea9a168..606643d69 100644
--- a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Evaluator.hs.html
+++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Evaluator.hs.html
@@ -22,53 +22,59 @@
     3   evalParams,
     4 ) where
     5 
-    6 import           HelVM.HelMA.Automata.ETA.Automaton
-    7 import           HelVM.HelMA.Automata.ETA.Lexer
-    8 import           HelVM.HelMA.Automata.ETA.Optimizer
-    9 import qualified HelVM.HelMA.Automata.ETA.SimpleParams    as S
-   10 import           HelVM.HelMA.Automata.ETA.Symbol
-   11 import           HelVM.HelMA.Automata.ETA.Token
-   12 
-   13 import           HelVM.HelMA.Automaton.API.AutoParams
-   14 import           HelVM.HelMA.Automaton.API.EvalParams
-   15 import           HelVM.HelMA.Automaton.API.IOTypes
-   16 
-   17 import qualified HelVM.HelMA.Automaton.Automaton          as Automaton
-   18 
-   19 import           HelVM.HelMA.Automaton.IO.AutomatonIO
-   20 import           HelVM.HelMA.Automaton.IO.BusinessIO
+    6 import           HelVM.HelMA.Automata.ETA.API.ETAImplType
+    7 
+    8 import           HelVM.HelMA.Automata.ETA.Automaton
+    9 import           HelVM.HelMA.Automata.ETA.Lexer
+   10 import           HelVM.HelMA.Automata.ETA.Optimizer
+   11 import qualified HelVM.HelMA.Automata.ETA.SimpleParams      as S
+   12 import           HelVM.HelMA.Automata.ETA.Symbol
+   13 import           HelVM.HelMA.Automata.ETA.Token
+   14 
+   15 import           HelVM.HelMA.Automaton.API.AutoOptions
+   16 import qualified HelVM.HelMA.Automaton.API.AutomatonOptions as Automaton
+   17 import           HelVM.HelMA.Automaton.API.EvalParams
+   18 import           HelVM.HelMA.Automaton.API.IOTypes
+   19 
+   20 import qualified HelVM.HelMA.Automaton.Automaton            as Automaton
    21 
-   22 import           HelVM.HelMA.Automaton.Types.DumpType
-   23 import           HelVM.HelMA.Automaton.Types.StackType
+   22 import           HelVM.HelMA.Automaton.IO.AutomatonIO
+   23 import           HelVM.HelMA.Automaton.IO.BusinessIO
    24 
-   25 import           HelVM.HelIO.Collections.SList            as SList
-   26 
+   25 import           HelVM.HelMA.Automaton.Types.DumpType
+   26 import           HelVM.HelMA.Automaton.Types.StackType
    27 
-   28 import           Prelude                                  hiding (divMod)
+   28 import           HelVM.HelIO.Collections.SList              as SList
    29 
-   30 import qualified Data.Sequence                            as Seq
+   30 import qualified Data.Sequence                              as Seq
    31 
-   32 import           HelVM.HelMA.Automata.ETA.API.ETAImplType
+   32 import           Prelude                                    hiding (divMod)
    33 
    34 simpleEval :: BIO m => S.SimpleParams -> m ()
-   35 simpleEval p = evalSource (S.implType p) (S.source p) (S.stackType p) (S.autoParams p)
+   35 simpleEval p = evalSource (S.implType p) (S.source p) (S.stackType p) (S.autoOptions p)
    36 
    37 ----
    38 
    39 evalParams :: BIO m => ETAImplType -> EvalParams -> m ()
-   40 evalParams e p = evalSource e (source p) (stackAutoOptions p) (autoParams p)
+   40 evalParams e p = evalSource e (source p) (stackAutoOptions p) (autoOptions p)
    41 
-   42 evalSource :: (AutomatonIO Symbol m) => ETAImplType -> Source -> StackType -> AutoParams -> m ()
+   42 evalSource :: (AutomatonIO Symbol m) => ETAImplType -> Source -> StackType -> AutoOptions -> m ()
    43 evalSource etaImplType source = evalTL etaImplType (tokenize source)
    44 
-   45 evalTL :: (AutomatonIO Symbol m) => ETAImplType -> TokenList -> StackType -> AutoParams -> m ()
-   46 evalTL c tl ListStackType  = eval c tl []
-   47 evalTL c tl SeqStackType   = eval c tl Seq.empty
-   48 evalTL c tl SListStackType = eval c tl SList.sListEmpty
-   49 
-   50 eval :: (SAutomatonIO Symbol s m) => ETAImplType -> TokenList -> s -> AutoParams -> m ()
-   51 eval Fast     tl s (AutoParams c limit dt) = logDump dt =<< (Automaton.run c limit . Automaton.flippedNewAutomaton (s , [])) =<< optimize tl
-   52 eval Original tl s (AutoParams _ limit dt) = logDump dt =<< run limit (newAutomaton tl s)
+   45 evalTL :: (AutomatonIO Symbol m) => ETAImplType -> TokenList -> StackType -> AutoOptions -> m ()
+   46 evalTL Fast     = fastEval
+   47 evalTL Original = originalEval
+   48 
+   49 fastEval :: (AutomatonIO Symbol m) => TokenList -> StackType -> AutoOptions -> m ()
+   50 fastEval tl s a = flip Automaton.start (Automaton.withDefaultRam s a) =<< optimize tl
+   51 
+   52 originalEval :: (AutomatonIO Symbol m) => TokenList -> StackType -> AutoOptions -> m ()
+   53 originalEval tl ListStackType  = eval tl []
+   54 originalEval tl SeqStackType   = eval tl Seq.empty
+   55 originalEval tl SListStackType = eval tl SList.sListEmpty
+   56 
+   57 eval :: (SAutomatonIO Symbol s m) => TokenList -> s -> AutoOptions -> m ()
+   58 eval tl s (AutoOptions _  _ limit dt) = logDump dt =<< run limit (newMemory tl s)
diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Lexer.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Lexer.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Lexer.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Lexer.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.OperandParsers.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.OperandParsers.hs.html similarity index 71% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.OperandParsers.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.OperandParsers.hs.html index 23a60fcef..9181df955 100644 --- a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.OperandParsers.hs.html +++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.OperandParsers.hs.html @@ -36,41 +36,40 @@ 17 act (acc , (R : tl , tll)) = Left ( acc , (tl , tll)) 18 act (acc , (t : tl , tll)) = Left (t : acc , (tl , tll)) 19 act (acc , ([] , tl : tll)) = Left ( acc , (tl , tll)) - 20 -- act (acc , ([] , [])) = Right $ pure (0, ([] , [])) - 21 act (acc , ([] , [])) = Right $ ( , ([] , [])) <$> makeIntegral7FromList acc - 22 - 23 parseNumberFromTL :: (MonadSafe m , Integral a) => OperandParser m a - 24 parseNumberFromTL a = loop act ([] , a) where - 25 act (acc , E : tl) = Right $ ( , tl) <$> makeIntegral7FromList acc - 26 act (acc , R : tl) = Left ( acc , tl) - 27 act (acc , t : tl) = Left (t : acc , tl) - 28 act (acc , []) = Right (liftError $ show acc) - 29 - 30 parseNumber :: (MonadSafe m , Integral a) => OperandIUParser m a - 31 parseNumber iu = loopM act =<< (([] , ) <$> nextIU iu) where - 32 act (acc , (Nothing , iu')) = Right . ( , iu') <$> makeIntegral7FromList acc - 33 act (acc , (Just E , iu')) = Right . ( , iu') <$> makeIntegral7FromList acc - 34 act (acc , (Just R , iu')) = Left . ( acc , ) <$> nextIU iu' - 35 act (acc , (Just t , iu')) = Left . (t : acc , ) <$> nextIU iu' - 36 - 37 nextIU :: MonadSafe m => OperandIUParser m (Maybe Token) - 38 nextIU iu@(IU il ic) - 39 | ic < Vector.length il = wrap <$> indexSafe il ic - 40 | otherwise = pure (Nothing , iu) - 41 where wrap i = (Just i, IU il (ic+1)) - 42 - 43 updatePC :: InstructionUnit -> InstructionCounter -> InstructionUnit - 44 updatePC iu a = iu { programCounter = a } - 45 - 46 -- | Types - 47 type OperandParser m a = TokenList -> m (a , TokenList) - 48 - 49 data InstructionUnit = IU - 50 { program :: !TokenVector - 51 , programCounter :: !InstructionCounter - 52 } deriving stock (Eq , Read , Show) - 53 - 54 type OperandIUParser m a = InstructionUnit -> m (a , InstructionUnit) + 20 act (acc , ([] , [])) = Right $ ( , ([] , [])) <$> makeIntegral7FromList acc + 21 + 22 parseNumberFromTL :: (MonadSafe m , Integral a) => OperandParser m a + 23 parseNumberFromTL a = loop act ([] , a) where + 24 act (acc , E : tl) = Right $ ( , tl) <$> makeIntegral7FromList acc + 25 act (acc , R : tl) = Left ( acc , tl) + 26 act (acc , t : tl) = Left (t : acc , tl) + 27 act (acc , []) = Right (liftError $ show acc) + 28 + 29 parseNumber :: (MonadSafe m , Integral a) => OperandIMParser m a + 30 parseNumber iu = loopM act =<< (([] , ) <$> nextIM iu) where + 31 act (acc , (Nothing , iu')) = Right . ( , iu') <$> makeIntegral7FromList acc + 32 act (acc , (Just E , iu')) = Right . ( , iu') <$> makeIntegral7FromList acc + 33 act (acc , (Just R , iu')) = Left . ( acc , ) <$> nextIM iu' + 34 act (acc , (Just t , iu')) = Left . (t : acc , ) <$> nextIM iu' + 35 + 36 nextIM :: MonadSafe m => OperandIMParser m (Maybe Token) + 37 nextIM iu@(IM il ic) + 38 | ic < Vector.length il = wrap <$> indexSafe il ic + 39 | otherwise = pure (Nothing , iu) + 40 where wrap i = (Just i, IM il (ic+1)) + 41 + 42 updatePC :: InstructionMemory -> InstructionCounter -> InstructionMemory + 43 updatePC iu a = iu { programCounter = a } + 44 + 45 -- | Types + 46 type OperandParser m a = TokenList -> m (a , TokenList) + 47 + 48 data InstructionMemory = IM + 49 { program :: !TokenVector + 50 , programCounter :: !InstructionCounter + 51 } deriving stock (Eq , Read , Show) + 52 + 53 type OperandIMParser m a = InstructionMemory -> m (a , InstructionMemory) diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Optimizer.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Optimizer.hs.html similarity index 98% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Optimizer.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Optimizer.hs.html index a8030cf17..78a7cbd86 100644 --- a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Optimizer.hs.html +++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Optimizer.hs.html @@ -80,7 +80,7 @@ 61 check True = prependStaticMakr line <.> optimizeLineTail $ line {numberFlag = False} 62 63 prependStaticMakr :: Line -> InstructionList -> InstructionList - 64 prependStaticMakr line il = divModI : sMarkI (currentAddress line) : il + 64 prependStaticMakr line il = divModI : sMarkIN (currentAddress line) : il 65 66 prependDivModSimple :: MonadSafe m => Line -> m InstructionList 67 prependDivModSimple = (divModI : ) <.> optimizeLineTail @@ -94,7 +94,7 @@ 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 , sJumpI $ currentAddress line + fromIntegral offset] + 78 build offset = pure [consI n , sJumpIN $ currentAddress line + fromIntegral offset] 79 80 -- | Accessors 81 diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Parser.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Parser.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Parser.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Parser.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.SimpleParams.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.SimpleParams.hs.html similarity index 89% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.SimpleParams.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.SimpleParams.hs.html index 6965d8c74..868f93a49 100644 --- a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.SimpleParams.hs.html +++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.SimpleParams.hs.html @@ -21,25 +21,25 @@ 2 3 import HelVM.HelMA.Automata.ETA.API.ETAImplType 4 - 5 import HelVM.HelMA.Automaton.API.AutoParams + 5 import HelVM.HelMA.Automaton.API.AutoOptions 6 import HelVM.HelMA.Automaton.API.IOTypes 7 8 import HelVM.HelMA.Automaton.Types.StackType 9 10 simpleParams :: ETAImplType -> StackType -> Bool -> Source -> SimpleParams 11 simpleParams it st c s = SimpleParams - 12 { implType = it + 12 { implType = it 13 , source = s 14 , stackType = st - 15 , autoParams = simpleAutoParams c + 15 , autoOptions = simpleAutoParams c 16 } 17 18 -- | Type 19 data SimpleParams = SimpleParams - 20 { implType :: !ETAImplType - 21 , source :: !Source - 22 , stackType :: !StackType - 23 , autoParams :: !AutoParams + 20 { implType :: !ETAImplType + 21 , source :: !Source + 22 , stackType :: !StackType + 23 , autoOptions :: !AutoOptions 24 } diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Token.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Token.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Token.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Token.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.FALSE.Expression.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.FALSE.Expression.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.FALSE.Expression.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.FALSE.Expression.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.FALSE.Parser.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.FALSE.Parser.hs.html similarity index 76% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.FALSE.Parser.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.FALSE.Parser.hs.html index e6a0c87f3..8f090c328 100644 --- a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.FALSE.Parser.hs.html +++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.FALSE.Parser.hs.html @@ -27,8 +27,8 @@ 8 9 import HelVM.HelMA.Automaton.API.IOTypes 10 import HelVM.HelMA.Automaton.Instruction - 11 import HelVM.HelMA.Automaton.Instruction.ALInstruction - 12 import HelVM.HelMA.Automaton.Instruction.IOInstruction + 11 import HelVM.HelMA.Automaton.Instruction.IOInstruction + 12 import HelVM.HelMA.Automaton.Instruction.SInstruction 13 import HelVM.HelMA.Automaton.ReadPExtra 14 15 import HelVM.HelIO.Control.Safe @@ -61,7 +61,7 @@ 42 writeStringParser = Str <$> stringParser 43 44 constParser :: ReadP Expression - 45 constParser = Inst . IAL . Cons . fromIntegral <$> naturalParser + 45 constParser = Inst . consI . fromIntegral <$> naturalParser 46 47 refParser :: ReadP Expression 48 refParser = refFromChar <$> letterAscii @@ -73,24 +73,24 @@ 54 simpleInstructionChars = "$%\\@`+-*/_&|~<=!?#:;^,.ß" 55 56 charToSimpleInstruction :: Char -> Maybe Expression - 57 charToSimpleInstruction '$' = ial dupI - 58 charToSimpleInstruction '%' = ial Discard - 59 charToSimpleInstruction '\\' = ial swapI - 60 charToSimpleInstruction '@' = ial rotI - 61 charToSimpleInstruction '`' = ial dCopy + 57 charToSimpleInstruction '$' = inst dupI + 58 charToSimpleInstruction '%' = inst discardI + 59 charToSimpleInstruction '\\' = inst swapI + 60 charToSimpleInstruction '@' = inst rotI + 61 charToSimpleInstruction '`' = inst dCopy 62 - 63 charToSimpleInstruction '+' = binary Add - 64 charToSimpleInstruction '-' = binary Sub - 65 charToSimpleInstruction '*' = binary Mul - 66 charToSimpleInstruction '/' = binary Div - 67 charToSimpleInstruction '_' = unary Neg + 63 charToSimpleInstruction '+' = inst addI + 64 charToSimpleInstruction '-' = inst subI + 65 charToSimpleInstruction '*' = inst mulI + 66 charToSimpleInstruction '/' = inst divI + 67 charToSimpleInstruction '_' = inst negI 68 - 69 charToSimpleInstruction '&' = binary BAnd - 70 charToSimpleInstruction '|' = binary BOr - 71 charToSimpleInstruction '~' = unary BNot + 69 charToSimpleInstruction '&' = inst $ binary BAnd + 70 charToSimpleInstruction '|' = inst $ binary BOr + 71 charToSimpleInstruction '~' = inst $ unary BNot 72 - 73 charToSimpleInstruction '<' = binary LGT - 74 charToSimpleInstruction '=' = binary LEQ + 73 charToSimpleInstruction '<' = inst $ binary LGT + 74 charToSimpleInstruction '=' = inst $ binary LEQ 75 76 charToSimpleInstruction '!' = pure Exec 77 charToSimpleInstruction '?' = pure Cond @@ -99,44 +99,35 @@ 80 charToSimpleInstruction ':' = pure Store 81 charToSimpleInstruction ';' = pure Fetch 82 - 83 charToSimpleInstruction '^' = sio InputChar - 84 charToSimpleInstruction ',' = sio OutputChar - 85 charToSimpleInstruction '.' = sio OutputDec + 83 charToSimpleInstruction '^' = inst $ sio InputChar + 84 charToSimpleInstruction ',' = inst $ sio OutputChar + 85 charToSimpleInstruction '.' = inst $ sio OutputDec 86 charToSimpleInstruction 'ß' = pure Flush 87 88 charToSimpleInstruction _ = Nothing 89 - 90 unary :: UnaryInstruction -> Maybe Expression - 91 unary = ial . Unary + 90 inst :: Instruction -> Maybe Expression + 91 inst = pure . Inst 92 - 93 binary :: BinaryInstruction -> Maybe Expression - 94 binary = ial . Binary - 95 - 96 sio :: IOInstruction -> Maybe Expression - 97 sio = ial . SIO - 98 - 99 ial :: ALInstruction -> Maybe Expression - 100 ial = pure . Inst . IAL - 101 - 102 -- | Extra + 93 -- | Extra + 94 + 95 refFromChar :: Char -> Expression + 96 refFromChar c = Ref $ fromIntegral $ ord (toLower c) - ord 'a' + 97 + 98 naturalParser :: ReadP Natural + 99 naturalParser = naturalLiteralParser <|> ordCharLiteralParser + 100 + 101 naturalLiteralParser :: ReadP Natural + 102 naturalLiteralParser = readUnsafe <$> many1 digit 103 - 104 refFromChar :: Char -> Expression - 105 refFromChar c = Ref $ fromIntegral $ ord (toLower c) - ord 'a' + 104 ordCharLiteralParser :: Integral a => ReadP a + 105 ordCharLiteralParser = fromIntegral . ord <$> (skipSpacesAndChar '\'' *> anyChar) 106 - 107 naturalParser :: ReadP Natural - 108 naturalParser = naturalLiteralParser <|> ordCharLiteralParser + 107 stringParser :: ReadP String + 108 stringParser = skipSpacesAndChar '"' *> many (notChar '"') <* char '"' 109 - 110 naturalLiteralParser :: ReadP Natural - 111 naturalLiteralParser = readUnsafe <$> many1 digit - 112 - 113 ordCharLiteralParser :: Integral a => ReadP a - 114 ordCharLiteralParser = fromIntegral . ord <$> (skipSpacesAndChar '\'' *> anyChar) - 115 - 116 stringParser :: ReadP String - 117 stringParser = skipSpacesAndChar '"' *> many (notChar '"') <* char '"' - 118 - 119 skipSpacesAndChar :: Char -> ReadP Char - 120 skipSpacesAndChar c = skipSpaces *> char c + 110 skipSpacesAndChar :: Char -> ReadP Char + 111 skipSpacesAndChar c = skipSpaces *> char c diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Automaton.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Automaton.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Automaton.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Automaton.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Constants.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Constants.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Constants.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Constants.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Evaluator.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Evaluator.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Evaluator.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Evaluator.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.InputEncoder.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.InputEncoder.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.InputEncoder.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.InputEncoder.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Lambda.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Lambda.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Lambda.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Lambda.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Lexer.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Lexer.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Lexer.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Lexer.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Parser.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Parser.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Parser.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Parser.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Reducer.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Reducer.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Reducer.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Reducer.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Rev.Evaluator.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Rev.Evaluator.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Rev.Evaluator.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Rev.Evaluator.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.SubLeq.Automaton.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.SubLeq.Automaton.hs.html similarity index 94% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.SubLeq.Automaton.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.SubLeq.Automaton.hs.html index e1cc1ce8a..6981d5220 100644 --- a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.SubLeq.Automaton.hs.html +++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.SubLeq.Automaton.hs.html @@ -18,7 +18,7 @@ 
     1 module HelVM.HelMA.Automata.SubLeq.Automaton (
-    2   newAutomaton,
+    2   newMemory,
     3   run,
     4 ) where
     5 
@@ -27,7 +27,7 @@
     8 
     9 import           HelVM.HelMA.Automaton.Loop           as Loop
    10 
-   11 import           HelVM.HelMA.Automaton.Units.RAM      as RAM
+   11 import           HelVM.HelMA.Automaton.Combiner.RAM   as RAM
    12 
    13 import           Control.Type.Operator
    14 
@@ -65,16 +65,16 @@
    46 next3Automaton :: Num e => e -> ram -> Automaton e ram
    47 next3Automaton ic = Automaton (ic + 3)
    48 
-   49 newAutomaton :: Num e => ram -> Automaton e ram
-   50 newAutomaton = Automaton 0
+   49 newMemory :: Num e => ram -> Automaton e ram
+   50 newMemory = Automaton 0
    51 
    52 -- | Types
    53 
    54 type AutomatonSame ic ram = Same (Automaton ic ram)
    55 
    56 data Automaton ic ram = Automaton
-   57    { unitIU  :: ic
-   58    , unitRAM :: ram
+   57    { memoryIC  :: ic
+   58    , memoryRAM :: ram
    59    }
    60   deriving stock (Eq , Read , Show)
 
diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.SubLeq.Evaluator.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.SubLeq.Evaluator.hs.html
similarity index 99%
rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.SubLeq.Evaluator.hs.html
rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.SubLeq.Evaluator.hs.html
index 217c21e63..64bac6e26 100644
--- a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.SubLeq.Evaluator.hs.html
+++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.SubLeq.Evaluator.hs.html
@@ -62,7 +62,7 @@
    43 evalIL' MapListRAMType = start . MapList.mapListFromList
    44 
    45 start :: RAutomatonIO e r m => r -> LimitMaybe -> DumpType -> m ()
-   46 start r limit dt = logDump dt =<< run limit (newAutomaton r)
+   46 start r limit dt = logDump dt =<< run limit (newMemory r)
diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.SubLeq.Lexer.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.SubLeq.Lexer.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.SubLeq.Lexer.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.SubLeq.Lexer.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.Evaluator.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.Evaluator.hs.html new file mode 100644 index 000000000..62f072364 --- /dev/null +++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.Evaluator.hs.html @@ -0,0 +1,62 @@ + + + + + + +
+never executed always true always false
+
+
+    1 module HelVM.HelMA.Automata.WhiteSpace.Evaluator (
+    2   simpleEval,
+    3   evalParams,
+    4 ) where
+    5 
+    6 import           HelVM.HelMA.Automata.WhiteSpace.Lexer
+    7 import           HelVM.HelMA.Automata.WhiteSpace.Parser
+    8 import qualified HelVM.HelMA.Automata.WhiteSpace.SimpleParams as S
+    9 import           HelVM.HelMA.Automata.WhiteSpace.Token
+   10 
+   11 import qualified HelVM.HelMA.Automaton.API.AutomatonOptions   as Automaton
+   12 import           HelVM.HelMA.Automaton.API.EvalParams
+   13 import           HelVM.HelMA.Automaton.API.IOTypes
+   14 
+   15 import           HelVM.HelMA.Automaton.Automaton
+   16 
+   17 import           HelVM.HelMA.Automaton.IO.BusinessIO
+   18 
+   19 import           HelVM.HelMA.Automaton.Types.FormatType
+   20 import           HelVM.HelMA.Automaton.Types.TokenType
+   21 
+   22 import           HelVM.HelIO.Control.Safe
+   23 
+   24 import           Prelude                                      hiding (swap)
+   25 
+   26 
+   27 simpleEval :: BIO m => S.SimpleParams -> m ()
+   28 simpleEval p = eval (S.tokenType p) (S.source p) (S.formatType p) $ S.automatonOptions p
+   29 
+   30 ----
+   31 
+   32 evalParams :: BIO m => TokenType -> EvalParams -> m ()
+   33 evalParams tokenType p = eval tokenType (source p) (formatType p) $ automatonOptions p
+   34 
+   35 eval :: BIO m => TokenType -> Source -> FormatType -> Automaton.AutomatonOptions -> m ()
+   36 eval tokenType source = evalTL $ tokenize tokenType source
+   37 
+   38 evalTL :: BIO m => TokenList -> FormatType -> Automaton.AutomatonOptions -> m ()
+   39 evalTL tl ascii ao = flip start ao =<< liftSafe (parseFromTL ascii tl)
+
+
+ + diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.Lexer.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.Lexer.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.Lexer.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.Lexer.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.OperandParsers.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.OperandParsers.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.OperandParsers.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.OperandParsers.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.Parser.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.Parser.hs.html similarity index 58% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.Parser.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.Parser.hs.html index 96ed0ab77..4d5a52672 100644 --- a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.Parser.hs.html +++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.Parser.hs.html @@ -33,87 +33,83 @@ 14 import HelVM.HelMA.Automaton.API.IOTypes 15 16 import HelVM.HelMA.Automaton.Instruction - 17 import HelVM.HelMA.Automaton.Instruction.ALInstruction - 18 import HelVM.HelMA.Automaton.Instruction.CFInstruction - 19 import HelVM.HelMA.Automaton.Instruction.IOInstruction - 20 import HelVM.HelMA.Automaton.Instruction.LSInstruction - 21 - 22 import HelVM.HelMA.Automaton.Types.FormatType - 23 import HelVM.HelMA.Automaton.Types.TokenType - 24 - 25 import HelVM.HelIO.Control.Safe - 26 import HelVM.HelIO.Extra + 17 + 18 import HelVM.HelMA.Automaton.Types.FormatType + 19 import HelVM.HelMA.Automaton.Types.TokenType + 20 + 21 import HelVM.HelIO.Control.Safe + 22 import HelVM.HelIO.Extra + 23 + 24 -- FIXME + 25 flipParseVisible :: FormatType -> Source -> Safe InstructionList + 26 flipParseVisible = flip parseVisible 27 - 28 -- FIXME - 29 flipParseVisible :: FormatType -> Source -> Safe InstructionList - 30 flipParseVisible = flip parseVisible - 31 - 32 flipParseWhite :: FormatType -> Source -> Safe InstructionList - 33 flipParseWhite = flip parseWhite - 34 - 35 parseVisible :: Source -> FormatType -> Safe InstructionList - 36 parseVisible = parse VisibleTokenType - 37 - 38 parseWhite :: Source -> FormatType -> Safe InstructionList - 39 parseWhite = parse WhiteTokenType - 40 - 41 parse :: MonadSafe m => TokenType -> Source -> FormatType -> m InstructionList - 42 parse tokenType = flip parseFromTL . tokenize tokenType - 43 - 44 parseFromTL :: MonadSafe m => FormatType -> TokenList -> m InstructionList - 45 parseFromTL ascii = repeatedlyM (parseInstruction ascii) - 46 - 47 parseInstruction :: MonadSafe m => FormatType -> InstructionParser m - 48 parseInstruction _ (S : tl) = parseInstructionStackManipulation tl - 49 parseInstruction _ (T : S : tl) = parseInstructionArithmetic tl - 50 parseInstruction _ (T : T : tl) = parseInstructionHeadAccess tl - 51 parseInstruction ascii (N : tl) = parseInstructionFlowControl ascii tl - 52 parseInstruction _ (T : N : tl) = parseInstructionIO tl - 53 parseInstruction _ tl = unrecognisedTokensIn "parseInstruction" tl - 54 - 55 parseInstructionStackManipulation :: MonadSafe m => InstructionParser m - 56 parseInstructionStackManipulation (S : tl) = build <$> parseSymbol tl where build (symbol , tl') = (IAL (Cons symbol ) , tl') - 57 parseInstructionStackManipulation (T : S : tl) = build <$> parseIndex tl where build (index , tl') = (IAL (SStatic index Copy ) , tl') - 58 parseInstructionStackManipulation (T : N : tl) = build <$> parseIndex tl where build (index , tl') = (IAL (SStatic index Slide) , tl') - 59 parseInstructionStackManipulation (N : S : tl) = pure (IAL dupI , tl) - 60 parseInstructionStackManipulation (N : T : tl) = pure (IAL swapI , tl) - 61 parseInstructionStackManipulation (N : N : tl) = pure (IAL Discard , tl) - 62 parseInstructionStackManipulation tl = unrecognisedTokensIn "parseInstructionStackManipulation" tl - 63 - 64 parseInstructionArithmetic :: MonadSafe m => InstructionParser m - 65 parseInstructionArithmetic (S : S : tl) = pure (IAL (Binary Add) , tl) - 66 parseInstructionArithmetic (S : T : tl) = pure (IAL (Binary Sub) , tl) - 67 parseInstructionArithmetic (S : N : tl) = pure (IAL (Binary Mul) , tl) - 68 parseInstructionArithmetic (T : S : tl) = pure (IAL (Binary Div) , tl) - 69 parseInstructionArithmetic (T : T : tl) = pure (IAL (Binary Mod) , tl) - 70 parseInstructionArithmetic tl = unrecognisedTokensIn "parseInstructionArithmetic" tl - 71 - 72 parseInstructionHeadAccess :: MonadSafe m => InstructionParser m - 73 parseInstructionHeadAccess (S : tl) = pure (ILS Store , tl) - 74 parseInstructionHeadAccess (T : tl) = pure (ILS Load , tl) - 75 parseInstructionHeadAccess tl = unrecognisedTokensIn "parseInstructionHeadAccess" tl - 76 - 77 parseInstructionFlowControl :: MonadSafe m => FormatType -> InstructionParser m - 78 parseInstructionFlowControl ascii (S : S : tl) = build <$> parseLabel ascii tl where build (label , tl') = (ICF (SMark label ) , tl') - 79 parseInstructionFlowControl ascii (S : T : tl) = build <$> parseLabel ascii tl where build (label , tl') = (ICF (CStatic label Call ) , tl') - 80 parseInstructionFlowControl ascii (S : N : tl) = build <$> parseLabel ascii tl where build (label , tl') = (ICF (CStatic label Jump ) , tl') - 81 parseInstructionFlowControl ascii (T : S : tl) = build <$> parseLabel ascii tl where build (label , tl') = (ICF (CStatic label (Branch EZ )) , tl') - 82 parseInstructionFlowControl ascii (T : T : tl) = build <$> parseLabel ascii tl where build (label , tl') = (ICF (CStatic label (Branch LTZ)) , tl') - 83 parseInstructionFlowControl _ (T : N : tl) = pure (ICF Return , tl) - 84 parseInstructionFlowControl _ (N : N : tl) = pure (End , tl) - 85 parseInstructionFlowControl _ tl = unrecognisedTokensIn "parseInstructionFlowControl" tl - 86 - 87 parseInstructionIO :: MonadSafe m => InstructionParser m - 88 parseInstructionIO (S : S : tl) = pure (IAL (SIO OutputChar) , tl) - 89 parseInstructionIO (S : T : tl) = pure (IAL (SIO OutputDec ) , tl) - 90 parseInstructionIO (T : S : tl) = pure (ILS (MIO InputChar ) , tl) - 91 parseInstructionIO (T : T : tl) = pure (ILS (MIO InputDec ) , tl) - 92 parseInstructionIO tl = unrecognisedTokensIn "parseInstructionIO" tl - 93 - 94 unrecognisedTokensIn :: MonadSafe m => Text -> TokenList -> m a - 95 unrecognisedTokensIn name tl = liftErrorTupleList [("Unrecognised tokens in" , name) , ("Rest tokens" , show tl)] - 96 - 97 type InstructionParser m = ParserFromTokenList m Instruction + 28 flipParseWhite :: FormatType -> Source -> Safe InstructionList + 29 flipParseWhite = flip parseWhite + 30 + 31 parseVisible :: Source -> FormatType -> Safe InstructionList + 32 parseVisible = parse VisibleTokenType + 33 + 34 parseWhite :: Source -> FormatType -> Safe InstructionList + 35 parseWhite = parse WhiteTokenType + 36 + 37 parse :: MonadSafe m => TokenType -> Source -> FormatType -> m InstructionList + 38 parse tokenType = flip parseFromTL . tokenize tokenType + 39 + 40 parseFromTL :: MonadSafe m => FormatType -> TokenList -> m InstructionList + 41 parseFromTL ascii = repeatedlyM (parseInstruction ascii) + 42 + 43 parseInstruction :: MonadSafe m => FormatType -> InstructionParser m + 44 parseInstruction _ (S : tl) = parseInstructionStackManipulation tl + 45 parseInstruction _ (T : S : tl) = parseInstructionArithmetic tl + 46 parseInstruction _ (T : T : tl) = parseInstructionHeadAccess tl + 47 parseInstruction ascii (N : tl) = parseInstructionFlowControl ascii tl + 48 parseInstruction _ (T : N : tl) = parseInstructionIO tl + 49 parseInstruction _ tl = unrecognisedTokensIn "parseInstruction" tl + 50 + 51 parseInstructionStackManipulation :: MonadSafe m => InstructionParser m + 52 parseInstructionStackManipulation (S : tl) = build <$> parseSymbol tl where build (symbol , tl') = (consI symbol , tl') + 53 parseInstructionStackManipulation (T : S : tl) = build <$> parseIndex tl where build (index , tl') = (sCopyI index , tl') + 54 parseInstructionStackManipulation (T : N : tl) = build <$> parseIndex tl where build (index , tl') = (sSlideI index , tl') + 55 parseInstructionStackManipulation (N : S : tl) = pure (dupI , tl) + 56 parseInstructionStackManipulation (N : T : tl) = pure (swapI , tl) + 57 parseInstructionStackManipulation (N : N : tl) = pure (discardI , tl) + 58 parseInstructionStackManipulation tl = unrecognisedTokensIn "parseInstructionStackManipulation" tl + 59 + 60 parseInstructionArithmetic :: MonadSafe m => InstructionParser m + 61 parseInstructionArithmetic (S : S : tl) = pure (addI , tl) + 62 parseInstructionArithmetic (S : T : tl) = pure (subI , tl) + 63 parseInstructionArithmetic (S : N : tl) = pure (mulI , tl) + 64 parseInstructionArithmetic (T : S : tl) = pure (divI , tl) + 65 parseInstructionArithmetic (T : T : tl) = pure (modI , tl) + 66 parseInstructionArithmetic tl = unrecognisedTokensIn "parseInstructionArithmetic" tl + 67 + 68 parseInstructionHeadAccess :: MonadSafe m => InstructionParser m + 69 parseInstructionHeadAccess (S : tl) = pure (storeI , tl) + 70 parseInstructionHeadAccess (T : tl) = pure (loadI , tl) + 71 parseInstructionHeadAccess tl = unrecognisedTokensIn "parseInstructionHeadAccess" tl + 72 + 73 parseInstructionFlowControl :: MonadSafe m => FormatType -> InstructionParser m + 74 parseInstructionFlowControl ascii (S : S : tl) = build <$> parseLabel ascii tl where build (label , tl') = (sMarkI label , tl') + 75 parseInstructionFlowControl ascii (S : T : tl) = build <$> parseLabel ascii tl where build (label , tl') = (sCallI label , tl') + 76 parseInstructionFlowControl ascii (S : N : tl) = build <$> parseLabel ascii tl where build (label , tl') = (sJumpI label , tl') + 77 parseInstructionFlowControl ascii (T : S : tl) = build <$> parseLabel ascii tl where build (label , tl') = (sEZI label , tl') + 78 parseInstructionFlowControl ascii (T : T : tl) = build <$> parseLabel ascii tl where build (label , tl') = (sLTZI label , tl') + 79 parseInstructionFlowControl _ (T : N : tl) = pure (returnI , tl) + 80 parseInstructionFlowControl _ (N : N : tl) = pure (End , tl) + 81 parseInstructionFlowControl _ tl = unrecognisedTokensIn "parseInstructionFlowControl" tl + 82 + 83 parseInstructionIO :: MonadSafe m => InstructionParser m + 84 parseInstructionIO (S : S : tl) = pure (sOutputI , tl) + 85 parseInstructionIO (S : T : tl) = pure (sOutputDecI , tl) + 86 parseInstructionIO (T : S : tl) = pure (mInputI , tl) + 87 parseInstructionIO (T : T : tl) = pure (mInputDecI , tl) + 88 parseInstructionIO tl = unrecognisedTokensIn "parseInstructionIO" tl + 89 + 90 unrecognisedTokensIn :: MonadSafe m => Text -> TokenList -> m a + 91 unrecognisedTokensIn name tl = liftErrorTupleList [("Unrecognised tokens in" , name) , ("Rest tokens" , show tl)] + 92 + 93 type InstructionParser m = ParserFromTokenList m Instruction diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.SimpleParams.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.SimpleParams.hs.html similarity index 73% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.SimpleParams.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.SimpleParams.hs.html index 51f50d49f..f8257845d 100644 --- a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.SimpleParams.hs.html +++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.SimpleParams.hs.html @@ -19,14 +19,14 @@ 
     1 module HelVM.HelMA.Automata.WhiteSpace.SimpleParams where
     2 
-    3 import           HelVM.HelMA.Automaton.API.AutoParams
-    4 import           HelVM.HelMA.Automaton.API.IOTypes
-    5 
-    6 import           HelVM.HelMA.Automaton.Types.FormatType
-    7 import           HelVM.HelMA.Automaton.Types.RAMType
-    8 import           HelVM.HelMA.Automaton.Types.StackType
-    9 import           HelVM.HelMA.Automaton.Types.TokenType
-   10 
+    3 import           HelVM.HelMA.Automaton.API.AutoOptions
+    4 import qualified HelVM.HelMA.Automaton.API.AutomatonOptions as Automaton
+    5 import           HelVM.HelMA.Automaton.API.IOTypes
+    6 
+    7 import           HelVM.HelMA.Automaton.Types.FormatType
+    8 import           HelVM.HelMA.Automaton.Types.RAMType
+    9 import           HelVM.HelMA.Automaton.Types.StackType
+   10 import           HelVM.HelMA.Automaton.Types.TokenType
    11 
    12 -- | Construction for tests
    13 simpleParamsWithDefaultsAndWhiteTokenType :: FormatType -> Source -> SimpleParams
@@ -45,27 +45,28 @@
    26 simpleParamsWithVisibleTokenType :: (StackType, RAMType) -> FormatType -> Source -> SimpleParams
    27 simpleParamsWithVisibleTokenType = simpleParams VisibleTokenType
    28 
-   29 simpleParams :: TokenType -> (StackType, RAMType) -> FormatType -> Source -> SimpleParams
-   30 simpleParams tt (st , rt) al s = SimpleParams
-   31   { tokenType = tt
-   32   , source = s
-   33   , formatType = al
-   34   , stackType = st
-   35   , ramType = rt
-   36   , autoParams = simpleAutoParams False
-   37   }
-   38 
-   39 -- | Type
-   40 data SimpleParams = SimpleParams
-   41   { tokenType  :: !TokenType
-   42   , source     :: !Source
-   43   , formatType :: !FormatType
-   44   , stackType  :: !StackType
-   45   , ramType    :: !RAMType
-   46   , autoParams :: !AutoParams
-   47   }
-   48 
-   49 
+   29 automatonOptions :: SimpleParams -> Automaton.AutomatonOptions
+   30 automatonOptions p = Automaton.AutomatonOptions (stackType p) (ramType p) (autoOptions p)
+   31 
+   32 simpleParams :: TokenType -> (StackType, RAMType) -> FormatType -> Source -> SimpleParams
+   33 simpleParams tt (st , rt) al s = SimpleParams
+   34   { tokenType = tt
+   35   , source = s
+   36   , formatType = al
+   37   , stackType = st
+   38   , ramType = rt
+   39   , autoOptions = simpleAutoParams False
+   40   }
+   41 
+   42 -- | Type
+   43 data SimpleParams = SimpleParams
+   44   { tokenType   :: !TokenType
+   45   , source      :: !Source
+   46   , formatType  :: !FormatType
+   47   , stackType   :: !StackType
+   48   , ramType     :: !RAMType
+   49   , autoOptions :: !AutoOptions
+   50   }
diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.Token.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.Token.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.Token.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.Token.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Zot.Automaton.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Zot.Automaton.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Zot.Automaton.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Zot.Automaton.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Zot.Evaluator.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Zot.Evaluator.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Zot.Evaluator.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Zot.Evaluator.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Zot.Expression.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Zot.Expression.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Zot.Expression.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Zot.Expression.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Zot.Parser.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Zot.Parser.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Zot.Parser.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Zot.Parser.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.AutoOptions.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.AutoOptions.hs.html new file mode 100644 index 000000000..c0d699cb3 --- /dev/null +++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.AutoOptions.hs.html @@ -0,0 +1,46 @@ + + + + + + +
+never executed always true always false
+
+
+    1 module HelVM.HelMA.Automaton.API.AutoOptions where
+    2 
+    3 import           HelVM.HelMA.Automaton.API.OptimizationLevel
+    4 import           HelVM.HelMA.Automaton.Loop
+    5 import           HelVM.HelMA.Automaton.Types.DumpType
+    6 
+    7 verySimpleAutoParams :: AutoOptions
+    8 verySimpleAutoParams = simpleAutoParams False
+    9 
+   10 simpleAutoParams :: Bool -> AutoOptions
+   11 simpleAutoParams c = AutoOptions
+   12   { optLevel     = BasicOptimizations
+   13   , compileFlag  = c
+   14   , limit        = testMaybeLimit
+   15   , dumpType     = Pretty
+   16   }
+   17 
+   18 data AutoOptions = AutoOptions
+   19   { optLevel    :: OptimizationLevel
+   20   , compileFlag :: Bool
+   21   , limit       :: LimitMaybe
+   22   , dumpType    :: DumpType
+   23   }
+
+
+ + diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.API.AutoParams.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.AutoParams.hs.html similarity index 69% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.API.AutoParams.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.AutoParams.hs.html index 4be999ee7..0e9ffd20c 100644 --- a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.API.AutoParams.hs.html +++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.AutoParams.hs.html @@ -17,26 +17,28 @@ never executed always true always false 
-    1 module HelVM.HelMA.Automaton.API.AutoParams where
+    1 module HelVM.HelMA.Automaton.API.AutoOptions where
     2 
     3 import           HelVM.HelMA.Automaton.Loop
     4 import           HelVM.HelMA.Automaton.Types.DumpType
     5 
-    6 verySimpleAutoParams :: AutoParams
+    6 verySimpleAutoParams :: AutoOptions
     7 verySimpleAutoParams = simpleAutoParams False
     8 
-    9 simpleAutoParams :: Bool -> AutoParams
-   10 simpleAutoParams c = AutoParams
-   11   { compile = c
-   12   , limit = testMaybeLimit
-   13   , dumpType = Pretty
-   14   }
-   15 
-   16 data AutoParams = AutoParams
-   17   { compile  :: Bool
-   18   , limit    :: LimitMaybe
-   19   , dumpType :: DumpType
-   20   }
+    9 simpleAutoParams :: Bool -> AutoOptions
+   10 simpleAutoParams c = AutoOptions
+   11   { optimizeFlag = False
+   12   , compileFlag = c
+   13   , limit = testMaybeLimit
+   14   , dumpType = Pretty
+   15   }
+   16 
+   17 data AutoOptions = AutoOptions
+   18   { optimizeFlag :: Bool
+   19   , compileFlag  :: Bool
+   20   , limit        :: LimitMaybe
+   21   , dumpType     :: DumpType
+   22   }
diff --git a/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.AutomatonOptions.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.AutomatonOptions.hs.html new file mode 100644 index 000000000..bee737adb --- /dev/null +++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.AutomatonOptions.hs.html @@ -0,0 +1,45 @@ + + + + + + +
+never executed always true always false
+
+
+    1 module HelVM.HelMA.Automaton.API.AutomatonOptions where
+    2 
+    3 import           HelVM.HelMA.Automaton.API.AutoOptions
+    4 import           HelVM.HelMA.Automaton.API.OptimizationLevel
+    5 import           HelVM.HelMA.Automaton.Types.RAMType
+    6 import           HelVM.HelMA.Automaton.Types.StackType
+    7 
+    8 optLevelAutoOptions :: AutomatonOptions -> OptimizationLevel
+    9 optLevelAutoOptions = optLevel . autoOptions
+   10 
+   11 withDefaultRam :: StackType -> AutoOptions -> AutomatonOptions
+   12 withDefaultRam s ao = AutomatonOptions
+   13   { ramType     = defaultRAMType
+   14   , stackType   = s
+   15   , autoOptions = ao
+   16   }
+   17 
+   18 data AutomatonOptions = AutomatonOptions
+   19   { stackType   :: StackType
+   20   , ramType     :: RAMType
+   21   , autoOptions :: AutoOptions
+   22   }
+
+
+ + diff --git a/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.EvalParams.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.EvalParams.hs.html new file mode 100644 index 000000000..303cf1b4f --- /dev/null +++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.EvalParams.hs.html @@ -0,0 +1,63 @@ + + + + + + +
+never executed always true always false
+
+
+    1 module HelVM.HelMA.Automaton.API.EvalParams where
+    2 
+    3 import           HelVM.HelMA.Automaton.API.AutoOptions
+    4 import qualified HelVM.HelMA.Automaton.API.AutomatonOptions as Automaton
+    5 import           HelVM.HelMA.Automaton.API.IOTypes
+    6 import           HelVM.HelMA.Automaton.API.MemoryOptions
+    7 
+    8 import           HelVM.HelMA.Automaton.Types.CellType
+    9 import           HelVM.HelMA.Automaton.Types.DumpType
+   10 import           HelVM.HelMA.Automaton.Types.FormatType
+   11 import           HelVM.HelMA.Automaton.Types.IntCellType
+   12 import           HelVM.HelMA.Automaton.Types.RAMType
+   13 import           HelVM.HelMA.Automaton.Types.StackType
+   14 
+   15 -- | Accessors
+   16 ramAutoOptions :: EvalParams -> RAMType
+   17 ramAutoOptions = ram . memoryOptions
+   18 
+   19 stackAutoOptions :: EvalParams -> StackType
+   20 stackAutoOptions = stack . memoryOptions
+   21 
+   22 cellAutoOptions :: EvalParams -> CellType
+   23 cellAutoOptions = cell . memoryOptions
+   24 
+   25 intCellAutoOptions :: EvalParams -> IntCellType
+   26 intCellAutoOptions = intCell . memoryOptions
+   27 
+   28 dumpAutoOptions :: EvalParams -> DumpType
+   29 dumpAutoOptions = dumpType . autoOptions
+   30 
+   31 automatonOptions :: EvalParams -> Automaton.AutomatonOptions
+   32 automatonOptions p = Automaton.AutomatonOptions (stackAutoOptions p) (ramAutoOptions p) (autoOptions p)
+   33 
+   34 -- | Type
+   35 data EvalParams = EvalParams
+   36   { formatType    :: !FormatType
+   37   , source        :: !Source
+   38   , memoryOptions :: !MemoryOptions
+   39   , autoOptions   :: !AutoOptions
+   40   }
+
+
+ + diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.API.AutoOptions.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.MemoryOptions.hs.html similarity index 95% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.API.AutoOptions.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.MemoryOptions.hs.html index 039e72235..fee9a0b3e 100644 --- a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.API.AutoOptions.hs.html +++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.MemoryOptions.hs.html @@ -17,7 +17,7 @@ never executed always true always false 
-    1 module HelVM.HelMA.Automaton.API.AutoOptions where
+    1 module HelVM.HelMA.Automaton.API.MemoryOptions where
     2 
     3 import           HelVM.HelMA.Automaton.Types.CellType
     4 import           HelVM.HelMA.Automaton.Types.IntCellType
@@ -25,7 +25,7 @@
     6 import           HelVM.HelMA.Automaton.Types.StackType
     7 
     8 -- | Types
-    9 data AutoOptions = AutoOptions
+    9 data MemoryOptions = MemoryOptions
    10   { ram     :: !RAMType
    11   , stack   :: !StackType
    12   , cell    :: !CellType
diff --git a/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.OptimizationLevel.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.OptimizationLevel.hs.html
new file mode 100644
index 000000000..96e2b9243
--- /dev/null
+++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.OptimizationLevel.hs.html
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+never executed always true always false
+

+
+    1 module HelVM.HelMA.Automaton.API.OptimizationLevel where
+    2 
+    3 import           HelVM.HelIO.SwitchEnum
+    4 
+    5 import           HelVM.HelIO.Containers.LLIndexSafe
+    6 
+    7 -- | Constructors
+    8 
+    9 implementedOptimizationLevels :: [OptimizationLevel]
+   10 implementedOptimizationLevels = [NoOptimizations , BasicOptimizations]
+   11 
+   12 fromBool :: Bool -> OptimizationLevel
+   13 fromBool = enumFromBool
+   14 
+   15 fromNatural :: Natural -> OptimizationLevel
+   16 fromNatural = fromMaybe AllOptimizations . indexMaybe optimizationLevels . fromIntegral
+   17 
+   18 defaultOptimizationLevel :: OptimizationLevel
+   19 defaultOptimizationLevel = defaultEnum
+   20 
+   21 optimizationLevels :: [OptimizationLevel]
+   22 optimizationLevels = generateEnums 4
+   23 
+   24 -- | Types
+   25 
+   26 data OptimizationLevel =
+   27     NoOptimizations
+   28   | BasicOptimizations
+   29   | SomeOptimizations
+   30   | AllOptimizations
+   31   deriving stock (Bounded , Enum , Eq , Read , Show)
+
+

+
+
diff --git a/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Automaton.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Automaton.hs.html
new file mode 100644
index 000000000..4a134865b
--- /dev/null
+++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Automaton.hs.html
@@ -0,0 +1,104 @@
+
+
+
+
+
+
+
+never executed always true always false
+

+
+    1 module HelVM.HelMA.Automaton.Automaton (
+    2   start,
+    3   runAndDumpLogs,
+    4   run,
+    5 ) where
+    6 
+    7 import           HelVM.HelMA.Automaton.API.AutoOptions
+    8 import           HelVM.HelMA.Automaton.API.AutomatonOptions
+    9 
+   10 import           HelVM.HelMA.Automaton.Instruction
+   11 
+   12 import           HelVM.HelMA.Automaton.IO.AutomatonIO
+   13 import           HelVM.HelMA.Automaton.IO.BusinessIO
+   14 
+   15 import           HelVM.HelMA.Automaton.Loop                 as Loop
+   16 import           HelVM.HelMA.Automaton.Optimizer
+   17 import           HelVM.HelMA.Automaton.Symbol
+   18 
+   19 import           HelVM.HelMA.Automaton.Types.DumpType
+   20 import           HelVM.HelMA.Automaton.Types.RAMType
+   21 import           HelVM.HelMA.Automaton.Types.StackType
+   22 
+   23 import           HelVM.HelMA.Automaton.Combiner
+   24 import           HelVM.HelMA.Automaton.Combiner.CPU         as CPU
+   25 
+   26 import           HelVM.HelIO.Containers.LLIndexSafe
+   27 
+   28 import qualified HelVM.HelIO.Collections.MapList            as MapList
+   29 import qualified HelVM.HelIO.Collections.SList              as SList
+   30 
+   31 import           Control.Applicative.Tools
+   32 import           Control.Monad.Extra
+   33 
+   34 import qualified Data.Sequence                              as Seq
+   35 import           Data.Vector                                as Vector
+   36 
+   37 import           Prelude                                    hiding (swap)
+   38 
+   39 start :: BIO m => InstructionList -> AutomatonOptions -> m ()
+   40 start il ao = start' (flip optimize il $ optLevelAutoOptions ao) (stackType ao) (ramType ao) (autoOptions ao)
+   41 
+   42 start' :: BIO m => InstructionList -> StackType -> RAMType -> AutoOptions -> m ()
+   43 start' il s ListRAMType    = start'' il s []
+   44 start' il s SeqRAMType     = start'' il s Seq.empty
+   45 start' il s SListRAMType   = start'' il s SList.sListEmpty
+   46 start' il s MapListRAMType = start'' il s MapList.mapListEmpty
+   47 
+   48 start'' :: (RAutomatonIO Symbol r m) => InstructionList -> StackType -> r -> AutoOptions -> m ()
+   49 start'' il ListStackType  = start''' il []
+   50 start'' il SeqStackType   = start''' il Seq.empty
+   51 start'' il SListStackType = start''' il SList.sListEmpty
+   52 
+   53 start''' :: (SRAutomatonIO Symbol s r m) => InstructionList -> s -> r -> AutoOptions -> m ()
+   54 start''' il s r p = runAndDumpLogs p (newMemory il s r)
+   55 
+   56 runAndDumpLogs :: (SRAutomatonIO Symbol s r m) => AutoOptions -> Memory s r ->  m ()
+   57 runAndDumpLogs p = logDump (dumpType p) <=< run (compileFlag p) (limit p)
+   58 
+   59 run :: (SRAutomatonIO Symbol s r m) => Bool -> LimitMaybe -> F s r m
+   60 run False = runI
+   61 run True  = runA
+   62 
+   63 ----
+   64 
+   65 runA :: (SRAutomatonIO Symbol s r m) => LimitMaybe -> F s r m
+   66 runA l a = loopMWithLimit (nextStateA $ compileA a) l  a
+   67 
+   68 compileA :: (SRAutomatonIO Symbol s r m) => Memory s r -> Vector (SF s r m)
+   69 compileA = runInstruction <.> memoryProgram
+   70 
+   71 nextStateA :: (SRAutomatonIO Symbol s r m) => Vector (SF s r m) -> SF s r m
+   72 nextStateA fv a = flip id (incrementIC a) =<< indexSafe fv (memoryProgramCounter a)
+   73 
+   74 ----
+   75 
+   76 runI :: (SRAutomatonIO Symbol s r m) => LimitMaybe -> F s r m
+   77 runI = loopMWithLimit nextStateI
+   78 
+   79 nextStateI :: (SRAutomatonIO Symbol s r m) => SF s r m
+   80 nextStateI a = nextStateForInstruction =<< currentInstruction (memoryCM a) where
+   81   nextStateForInstruction i = runInstruction i $ incrementIC a
+
+

+
+
diff --git a/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.ALU.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.ALU.hs.html
new file mode 100644
index 000000000..57ef404a8
--- /dev/null
+++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.ALU.hs.html
@@ -0,0 +1,209 @@
+
+
+
+
+
+
+
+never executed always true always false
+

+
+    1 module HelVM.HelMA.Automaton.Combiner.ALU (
+    2   runALI,
+    3   runSAL,
+    4 
+    5   doOutputChar2,
+    6   doInputChar2,
+    7   doInputDec2,
+    8   divMod,
+    9   sub,
+   10   binaryInstruction,
+   11   binaryInstructions,
+   12   halibut,
+   13   move,
+   14   discard,
+   15   slide,
+   16   copy,
+   17   flipPush1,
+   18   charPush1,
+   19   genericPush1,
+   20   pop1,
+   21   pop2,
+   22   push1,
+   23   push2,
+   24   splitAt,
+   25   drop,
+   26   ALU,
+   27   SafeStack,
+   28   Stack,
+   29 ) where
+   30 
+   31 import           HelVM.HelMA.Automaton.Instruction.IOInstruction
+   32 import           HelVM.HelMA.Automaton.Instruction.SInstruction
+   33 
+   34 import           HelVM.HelMA.Automaton.IO.BusinessIO
+   35 
+   36 import           HelVM.HelIO.Control.Safe
+   37 
+   38 import           HelVM.HelIO.Containers.LLIndexSafe
+   39 
+   40 import           HelVM.HelIO.ListLikeExtra
+   41 
+   42 import           Control.Applicative.Tools
+   43 import           Data.ListLike                                   hiding (show)
+   44 import           Prelude                                         hiding (divMod, drop, fromList, length, splitAt, swap)
+   45 
+   46 
+   47 runALI :: ALU m ll element => SInstruction -> ll -> m ll
+   48 runALI (SAL ali) = runSAL ali
+   49 runALI (SIO ioi) = runSIO ioi
+   50 
+   51 runSIO :: ALU m ll element => IOInstruction -> ll -> m ll
+   52 runSIO OutputChar = doOutputChar2
+   53 runSIO OutputDec  = doOutputDec2
+   54 runSIO InputChar  = doInputChar2
+   55 runSIO InputDec   = doInputDec2
+   56 
+   57 --runSALSafe :: IntegralStack ll element => ALInstruction -> ll -> Stack ll
+   58 --runSALSafe = runSAL
+   59 
+   60 runSAL :: SafeStack m ll element => ALInstruction -> ll -> m ll
+   61 runSAL (Cons    i    ) = push  i
+   62 runSAL (Unary     op ) = error $ show op
+   63 runSAL (Binary    op ) = binaryInstruction op
+   64 runSAL (Binaries  ops) = binaryInstructions ops
+   65 runSAL (SDynamic  op ) = dynamicManipulation op
+   66 runSAL (SStatic i op ) = staticManipulation op i
+   67 runSAL  Halibut        = halibut
+   68 runSAL  Pick           = pick
+   69 runSAL  Discard        = discard
+   70 
+   71 -- | Arithmetic instructions
+   72 divMod :: SafeStack m ll element => ll -> m ll
+   73 divMod = binaryInstructions [Mod , Div]
+   74 
+   75 sub :: SafeStack m ll element => ll -> m ll
+   76 sub = binaryInstruction Sub
+   77 
+   78 binaryInstruction :: SafeStack m ll element => BinaryInstruction -> ll -> m ll
+   79 binaryInstruction i = binaryInstructions [i]
+   80 
+   81 binaryInstructions :: SafeStack m ll element => [BinaryInstruction] -> ll -> m ll
+   82 binaryInstructions il = build <.> pop2 where
+   83   build (e , e', l) = pushList (calculateOps e e' il) l
+   84 
+   85 -- | IO instructions
+   86 doOutputChar2 :: ALU m ll element => ll -> m ll
+   87 doOutputChar2 = appendError "ALU.doOutputChar2" . build <=< pop1 where
+   88   build (e , l) = wPutAsChar e $> l
+   89 
+   90 doOutputDec2 :: ALU m ll element => ll -> m ll
+   91 doOutputDec2 = appendError "ALU.doOutputDec2" . build <=< pop1 where
+   92   build (e , l) = wPutAsDec e $> l
+   93 
+   94 doInputChar2 :: ALU m ll element => ll -> m ll
+   95 doInputChar2 l = appendError "ALU.doOutputDec2" $ build <$> wGetCharAs where
+   96   build e = push1 e l
+   97 
+   98 doInputDec2 :: ALU m ll element => ll -> m ll
+   99 doInputDec2 l = build <$> wGetCharAs where
+  100   build e = push1 e l
+  101 
+  102 -- | Manipulation instructions
+  103 dynamicManipulation :: SafeStack m ll element => ManipulationInstruction -> ll -> m ll
+  104 dynamicManipulation op = appendError "ALU.dynamicManipulation" . build <=< unconsSafe where
+  105   build (e , l) = staticManipulation op (fromIntegral e) l
+  106 
+  107 staticManipulation :: SafeStack m ll element => ManipulationInstruction -> Index -> ll -> m ll
+  108 staticManipulation Copy  = copy
+  109 staticManipulation Move  = move
+  110 staticManipulation Slide = slide
+  111 
+  112 -- | Halibut and Pick instructions
+  113 halibut :: SafeStack m ll element => ll -> m ll
+  114 halibut = appendError "ALU.halibut" . build <=< pop1 where
+  115   build (e , l)
+  116     | 0 < i     = move i l
+  117     | otherwise = copy (negate i) l
+  118       where i = fromIntegral e
+  119 
+  120 pick :: SafeStack m ll element => ll -> m ll
+  121 pick = appendError "ALU.pick" . build <=< pop1 where
+  122   build (e , l)
+  123     | 0 <= i    = copy i l
+  124     | otherwise = move (negate i) l
+  125       where i = fromIntegral e
+  126 
+  127 -- | Slide instructions
+  128 slide :: SafeStack m ll element => Index -> ll -> m ll
+  129 slide i = appendError "ALU.pop2" . build <.> pop1 where
+  130   build (e , l) = push1 e $ drop i l
+  131 
+  132 -- | Move instructions
+  133 move :: SafeStack m ll element => Index -> ll -> m ll
+  134 move i l = build $ length l where
+  135   build ll
+  136     | ll <= i = liftErrorWithTupleList "ALU.move index must be less then lenght" [("i" , show i) , ("ll" , show ll)]
+  137     | otherwise = pure $ l1 <> l2 <> l3 where
+  138       (l1 , l3) = splitAt 1 l'
+  139       (l2 , l') = splitAt i l
+  140 
+  141 -- | Copy instructions
+  142 copy :: SafeStack m ll element => Index -> ll -> m ll
+  143 copy i = teeMap flipPush1 (findSafe i)
+  144 
+  145 -- | Pop instructions
+  146 pop1 :: SafeStack m ll element => ll ->  m (element , ll)
+  147 pop1 = appendError "ALU.pop1" . unconsSafe
+  148 
+  149 pop2 :: SafeStack m ll element => ll -> m (element , element , ll)
+  150 pop2 = appendError "ALU.pop2" . uncons2Safe
+  151 
+  152 -- | Push instructions
+  153 push :: SafeStack m ll element => Integer -> ll -> m ll
+  154 push i = pure . genericPush1 i
+  155 
+  156 flipPush1 :: Stack ll element => ll -> element -> ll
+  157 flipPush1 = flip push1
+  158 
+  159 charPush1 :: (Num element , Stack ll element) => Char -> ll -> ll
+  160 charPush1 = genericPush1 . ord
+  161 
+  162 genericPush1 :: (Integral v , Num element , Stack ll element) => v -> ll -> ll
+  163 genericPush1 = push1 . fromIntegral
+  164 
+  165 push1 :: Stack ll element => element -> ll -> ll
+  166 push1 e = pushList [e]
+  167 
+  168 push2 :: Stack ll element => element -> element -> ll -> ll
+  169 push2 e e' = pushList [e , e']
+  170 
+  171 pushList :: Stack ll element => [element] -> ll -> ll
+  172 pushList es l = fromList es <> l
+  173 
+  174 teeMap :: Functor f => (t -> a -> b) -> (t -> f a) -> t -> f b
+  175 teeMap f2 f1 x = f2 x <$> f1 x
+  176 
+  177 -- | Types
+  178 type ALU m ll element = (BIO m , SafeStack m ll element)
+  179 
+  180 type SafeStack m ll element  = (MonadSafe m , IntegralStack ll element)
+  181 
+  182 type IntegralStack ll element = (Stack ll element , Integral element)
+  183 
+  184 type Stack ll element = (Show ll , ListLike ll element , IndexSafe ll element)
+  185 
+  186 type Index = Int
+
+

+
+
diff --git a/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.CPU.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.CPU.hs.html
new file mode 100644
index 000000000..5b5907981
--- /dev/null
+++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.CPU.hs.html
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+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 -> CentralProcessingMemory ll -> m $ CentralProcessingMemory ll
+   17 runCFI (DMark    _          ) = pure
+   18 runCFI (SMark    _          ) = pure
+   19 runCFI  Return                = popAddress
+   20 runCFI (CDynamic   Call     ) = dynamicCall
+   21 runCFI (CDynamic   Jump     ) = dynamicJump
+   22 runCFI (CDynamic  (Branch t)) = dynamicBranch  t
+   23 runCFI (CStatic l  Call     ) = staticCall   l
+   24 runCFI (CStatic l  Jump     ) = staticJump   l
+   25 runCFI (CStatic l (Branch t)) = staticBranch l t
+   26 
+   27 popAddress :: ALU m ll element  => CentralProcessingMemory ll -> m $ CentralProcessingMemory ll
+   28 popAddress (CPM (CM il _ (IS (a : is))) s) = pure $ CPM (CM il a $ IS is) s
+   29 popAddress (CPM (CM il _ (IS      [] )) _) = liftErrorWithTupleList "Empty Return Stack" [("il" , show il)]
+   30 
+   31 dynamicCall :: (ALU m ll element , Show element) => CentralProcessingMemory ll -> m $ CentralProcessingMemory ll
+   32 dynamicCall (CPM (CM il ic (IS is)) s) = appendError "CPM.dynamicCall" $ call1 =<< pop1 s where
+   33   call1 (n , s') = call2 <$> findAddressForDynamicLabel n il where
+   34     call2 a = CPM (CM il a (IS (ic : is))) s'
+   35 
+   36 dynamicJump :: (ALU m ll element , Show element) => CentralProcessingMemory ll -> m $ CentralProcessingMemory ll
+   37 dynamicJump (CPM (CM il _ is) s) = appendError "CPM.dynamicJump" $ jump1 =<< pop1 s where
+   38   jump1 (n, s') = jump2 <$> findAddressForDynamicLabel n il where
+   39     jump2 a = CPM (CM il a is) s'
+   40 
+   41 dynamicBranch :: (ALU m ll element , Show element) => BranchTest -> CentralProcessingMemory ll -> m $ CentralProcessingMemory ll
+   42 dynamicBranch t (CPM (CM il ic is) s) = appendError "CPM.dynamicBranch" $ branch =<< pop2 s where
+   43   branch (n , e , s')
+   44     | isNotJump t e = pure $ CPM (CM il ic is) s'
+   45     | otherwise     = jump <$> findAddressForDynamicLabel n il where
+   46       jump ic' = CPM (CM il ic' is) s'
+   47 
+   48 findAddressForDynamicLabel :: (MonadSafe m , Integral n , Show n) => n -> InstructionVector -> m InstructionAddress
+   49 findAddressForDynamicLabel n il
+   50   | n < 0     = liftError $ show n
+   51   | otherwise = liftMaybeOrErrorTuple ("Undefined label", show n) $ findIndex (isDMark $ fromIntegral n) il
+   52 
+   53 --
+   54 
+   55 staticCall :: ALU m ll element => Label -> CentralProcessingMemory ll -> m $ CentralProcessingMemory ll
+   56 staticCall l (CPM (CM il ic (IS is)) s) = appendError "CPM.staticCall" $ call <$> findAddressForStaticLabel l il where
+   57   call a = CPM (CM il a (IS (ic : is))) s
+   58 
+   59 staticJump :: ALU m ll element => Label -> CentralProcessingMemory ll -> m $ CentralProcessingMemory ll
+   60 staticJump l (CPM (CM il _  is) s) = appendError "CPM.staticJump" $ jump <$> findAddressForStaticLabel l il where
+   61   jump a = CPM (CM il a is) s
+   62 
+   63 staticBranch :: ALU m ll element => Label -> BranchTest -> CentralProcessingMemory ll -> m $ CentralProcessingMemory ll
+   64 staticBranch l t (CPM (CM il ic is) s) = appendError "CPM.staticBranch" $ branch =<< pop1 s where
+   65   branch (e , s')
+   66     | isNotJump t e = pure $ CPM (CM il ic is) s'
+   67     | otherwise     = jump <$> findAddressForStaticLabel l il where
+   68       jump ic' = CPM (CM il ic' is) s'
+   69 
+   70 findAddressForStaticLabel :: MonadSafe m => Label -> InstructionVector -> m InstructionAddress
+   71 findAddressForStaticLabel l = liftMaybeOrErrorTuple ("Undefined label", show l) . findIndex (isSMark l)
+   72 
+   73 -- | ControlMemory methods
+   74 
+   75 newCM :: InstructionList -> ControlMemory
+   76 newCM il = CM (Vector.fromList il) 0 (IS [])
+   77 
+   78 currentInstruction :: MonadSafe m => ControlMemory -> m Instruction
+   79 currentInstruction (CM il ic _) = indexSafe il ic
+   80 
+   81 incrementPC :: ControlMemory -> ControlMemory
+   82 incrementPC cu = cu { programCounter = 1 + programCounter cu }
+   83 
+   84 -- | Types
+   85 data CentralProcessingMemory al = CPM
+   86   { controlMemory :: ControlMemory
+   87   , alm           :: al
+   88   }
+   89   deriving stock (Show)
+   90 
+   91 data ControlMemory = CM
+   92   { program        :: InstructionVector
+   93   , programCounter :: InstructionCounter
+   94   , returnStack    :: InstructionStack
+   95   }
+   96   deriving stock (Show)
+   97 
+   98 newtype InstructionStack = IS [InstructionAddress]
+   99   deriving stock (Show)
+  100 
+  101 type InstructionCounter = InstructionAddress
+  102 
+  103 type InstructionAddress = Int
+
+

+
+
diff --git a/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.LSU.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.LSU.hs.html
new file mode 100644
index 000000000..cb6f64734
--- /dev/null
+++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.LSU.hs.html
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+never executed always true always false
+

+
+    1 module HelVM.HelMA.Automaton.Combiner.LSU where
+    2 
+    3 import           HelVM.HelMA.Automaton.Combiner.ALU
+    4 import qualified HelVM.HelMA.Automaton.Combiner.RAM              as RAM
+    5 
+    6 import           HelVM.HelMA.Automaton.IO.BusinessIO
+    7 
+    8 import           HelVM.HelMA.Automaton.Instruction.IOInstruction
+    9 import           HelVM.HelMA.Automaton.Instruction.LSInstruction
+   10 
+   11 import           HelVM.HelIO.Control.Safe
+   12 
+   13 import           Control.Type.Operator
+   14 
+   15 runSLI :: (LSU m s r element) => LSInstruction -> LoadStoreMemory s r -> m $ LoadStoreMemory s r
+   16 runSLI Load             = load
+   17 runSLI Store            = store
+   18 runSLI (MIO OutputChar) = loadOutputChar
+   19 runSLI (MIO OutputDec)  = loadOutputDec
+   20 runSLI (MIO InputChar)  = storeInputChar
+   21 runSLI (MIO InputDec)   = storeInputDec
+   22 
+   23 load :: LSU m s r element => LoadStoreMemory s r -> m $ LoadStoreMemory s r
+   24 load (LSM s r) = appendError "LSM.load" $ build <$> pop1 s where
+   25   build (address , s') = LSM (push1 (RAM.genericLoad r address) s') r
+   26 
+   27 store :: LSU m s r element => LoadStoreMemory s r -> m $ LoadStoreMemory s r
+   28 store (LSM s r) = appendError "LSM.store" $ build <$> pop2 s where
+   29   build (value , address , s') = LSM s' $ RAM.store address value r
+   30 
+   31 loadOutputChar :: LSU m s r element => LoadStoreMemory s r -> m $ LoadStoreMemory s r
+   32 loadOutputChar (LSM s r) = appendError "LSM.loadOutputChar" $ build =<< pop1 s where
+   33   build (address , s') = LSM s' r <$ wPutAsChar (RAM.genericLoad r address)
+   34 
+   35 loadOutputDec :: LSU m s r element => LoadStoreMemory s r -> m $ LoadStoreMemory s r
+   36 loadOutputDec (LSM s r) = appendError "LSM.loadOutputDec" $ build =<< pop1 s where
+   37   build (address , s') = LSM s' r <$ wPutAsDec (RAM.genericLoad r address)
+   38 
+   39 storeInputChar :: LSU m s r element => LoadStoreMemory s r -> m $ LoadStoreMemory s r
+   40 storeInputChar (LSM s r) = appendError "LSM.storeInputChar" $ build =<< pop1 s where
+   41   build (address , s') = LSM s' . flip (RAM.store address) r <$> wGetCharAs
+   42 
+   43 storeInputDec :: LSU m s r element => LoadStoreMemory s r -> m $ LoadStoreMemory s r
+   44 storeInputDec (LSM s r) = appendError "LSM.storeInputDec" $ build =<< pop1 s where
+   45   build (address , s') = LSM s' . flip (RAM.store address) r <$> wGetDecAs
+   46 
+   47 -- | Types
+   48 type LSU m s r element = (ALU m s element , RAM.RAM r element)
+   49 
+   50 data LoadStoreMemory s r = LSM
+   51   { stack :: s
+   52   , ram   :: r
+   53   }
+
+

+
+
diff --git a/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.RAM.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.RAM.hs.html
new file mode 100644
index 000000000..428fcd692
--- /dev/null
+++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.RAM.hs.html
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+never executed always true always false
+

+
+    1 module HelVM.HelMA.Automaton.Combiner.RAM (
+    2   genericLoad,
+    3   load,
+    4   flippedStoreChar,
+    5   storeChar,
+    6   genericStore,
+    7   store,
+    8   fromList,
+    9   RAM,
+   10 ) where
+   11 
+   12 import           HelVM.HelIO.Containers.LLIndexSafe
+   13 import           HelVM.HelIO.Containers.LLInsertDef
+   14 
+   15 import           Data.Default
+   16 import           Prelude                            hiding (divMod, drop, splitAt, swap)
+   17 
+   18 genericLoad :: (Integral i , RAM ll element) => ll -> i -> element
+   19 genericLoad l = load l . fromIntegral
+   20 
+   21 load :: (RAM ll element) => ll -> Address -> element
+   22 load l i = indexMaybe l i ?: def
+   23 
+   24 flippedStoreChar :: (Num element , Integral address , RAM ll element) => address -> ll -> Char -> ll
+   25 flippedStoreChar a = flip (storeChar a)
+   26 
+   27 storeChar :: (Num element , Integral address , RAM ll element) => address -> Char -> ll -> ll
+   28 storeChar a char = genericStore a $ ord char
+   29 
+   30 genericStore :: (Integral value , Num element , Integral address , RAM ll element) => address -> value -> ll -> ll
+   31 genericStore a v = store a $ fromIntegral v
+   32 
+   33 store :: (Integral a , RAM ll element) => a -> element -> ll -> ll
+   34 store = insertDef . fromIntegral
+   35 
+   36 -- | Types
+   37 type RAM ll element = (Show ll , Default element , II ll element)
+   38 
+   39 type II ll element = (InsertDef ll element , IndexSafe ll element)
+   40 
+   41 type Address = Int
+
+

+
+
diff --git a/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.hs.html
new file mode 100644
index 000000000..bbd8cbcfb
--- /dev/null
+++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.hs.html
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+never executed always true always false
+

+
+    1 module HelVM.HelMA.Automaton.Combiner where
+    2 
+    3 import           HelVM.HelMA.Automaton.IO.AutomatonIO
+    4 
+    5 import           HelVM.HelMA.Automaton.Instruction
+    6 import           HelVM.HelMA.Automaton.Instruction.CFInstruction
+    7 
+    8 import           HelVM.HelMA.Automaton.Loop                      as Loop
+    9 
+   10 import           HelVM.HelMA.Automaton.Symbol
+   11 
+   12 import           HelVM.HelMA.Automaton.Combiner.ALU              as ALU
+   13 import           HelVM.HelMA.Automaton.Combiner.CPU              as CPU
+   14 import           HelVM.HelMA.Automaton.Combiner.LSU              as LSU
+   15 
+   16 import           Control.Monad.Extra
+   17 import           Control.Type.Operator
+   18 
+   19 import           Prelude                                         hiding (swap)
+   20 
+   21 -- | Core of Combiner
+   22 
+   23 runInstruction :: (SRAutomatonIO Symbol s r m) => Instruction -> SF s r m
+   24 runInstruction (IAL      i) a = Loop.continue . updateStack   a <$> runALI i (memoryStack a)
+   25 runInstruction (ILS      i) a = Loop.continue . updateFromLSM a <$> runSLI i (toLSM a)
+   26 runInstruction (ICF      i) a = Loop.continue . updateFromCPM a <$> runCFI i (toCPM a)
+   27 runInstruction  Transfer    a = transfer a
+   28 runInstruction  End         a = end a
+   29 
+   30 transfer :: (SRAutomatonIO Symbol s r m) => SF s r m
+   31 transfer = transferBranch <=< pop2ForStack
+   32 
+   33 transferBranch :: (SRAutomatonIO Symbol s r m) => (Symbol, Symbol, Memory s r) -> m $ MemorySame s r
+   34 transferBranch (_ , 0 , u) = pure $ Loop.continue u
+   35 transferBranch (0 , _ , u) = end u
+   36 transferBranch (a , _ , u) = Loop.continue . updateFromCPM u <$> runCFI dJumpI (toCPM $ push1ForStack a u)
+   37 
+   38 pop2ForStack :: (SRAutomatonIO Symbol s r m) => Memory s r -> m (Symbol , Symbol , Memory s r)
+   39 pop2ForStack a = build <$> pop2 (memoryStack a) where
+   40   build (s1 , s2 , s') = (s1 , s2 , updateStack a s')
+   41 
+   42 push1ForStack :: Stack s Symbol => Symbol -> Memory s r -> Memory s r
+   43 push1ForStack e a = a { memoryStack = push1 e (memoryStack a) }
+   44 
+   45 end :: (SRAutomatonIO Symbol s r m) => SF s r m
+   46 end = pure . Loop.break
+   47 
+   48 -- | Constructors
+   49 
+   50 flippedNewMemory :: (s , r) -> InstructionList -> Memory s r
+   51 flippedNewMemory = flip (uncurry . newMemory)
+   52 
+   53 newMemory :: InstructionList -> s -> r -> Memory s r
+   54 newMemory il = Memory (newCM il)
+   55 
+   56 -- | Updaters
+   57 
+   58 incrementIC :: Memory s r -> Memory s r
+   59 incrementIC m = m { memoryCM = incrementPC $ memoryCM m}
+   60 
+   61 updateStack :: Memory s r -> s -> Memory s r
+   62 updateStack m s = m {memoryStack = s}
+   63 
+   64 updateFromCPM :: Memory s r -> CentralProcessingMemory s -> Memory s r
+   65 updateFromCPM m cpm = m { memoryCM = controlMemory cpm, memoryStack = alm cpm}
+   66 
+   67 updateFromLSM :: Memory s r -> LoadStoreMemory s r -> Memory s r
+   68 updateFromLSM m lsu = m {memoryStack = stack lsu , memoryRAM = ram lsu}
+   69 
+   70 -- | Accessors
+   71 
+   72 memoryProgram :: Memory s r -> InstructionVector
+   73 memoryProgram = program . memoryCM
+   74 
+   75 memoryProgramCounter :: Memory s r -> InstructionCounter
+   76 memoryProgramCounter = programCounter . memoryCM
+   77 
+   78 toCPM :: Memory s r -> CentralProcessingMemory s
+   79 toCPM a = CPM { controlMemory = memoryCM a , alm = memoryStack a }
+   80 
+   81 toLSM :: Memory s r -> LoadStoreMemory s r
+   82 toLSM a = LSM { stack = memoryStack a, ram = memoryRAM a }
+   83 
+   84 -- | Types
+   85 
+   86 type SF s r m = Memory s r -> m $ MemorySame s r
+   87 
+   88 type F s r m = Memory s r -> m $ Memory s r
+   89 
+   90 type MemorySame s r = Same (Memory s r)
+   91 
+   92 -- | Data types
+   93 data Memory s r = Memory
+   94   { memoryCM    :: ControlMemory
+   95   , memoryStack :: s
+   96   , memoryRAM   :: r
+   97   }
+   98   deriving stock (Show)
+
+

+
+
diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.IO.BusinessIO.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.IO.BusinessIO.hs.html
similarity index 100%
rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.IO.BusinessIO.hs.html
rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.IO.BusinessIO.hs.html
diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.IO.FreeIO.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.IO.FreeIO.hs.html
similarity index 100%
rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.IO.FreeIO.hs.html
rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.IO.FreeIO.hs.html
diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.IO.MockIO.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.IO.MockIO.hs.html
similarity index 100%
rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.IO.MockIO.hs.html
rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.IO.MockIO.hs.html
diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.ALInstruction.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.ALInstruction.hs.html
similarity index 51%
rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.ALInstruction.hs.html
rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.ALInstruction.hs.html
index 6b71a72cb..b1ffd519d 100644
--- a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.ALInstruction.hs.html
+++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.ALInstruction.hs.html
@@ -23,77 +23,75 @@
     4 
     5 -- | Constructors
     6 
-    7 dupI , swapI , rotI , dCopy :: ALInstruction
-    8 dupI  = SStatic 0 Copy
-    9 swapI = SStatic 1 Move
-   10 rotI  = SStatic 2 Move
-   11 dCopy = SDynamic Copy
-   12 
-   13 blAnd :: OperatorType -> BinaryInstruction
-   14 blAnd Bitwise = BAnd
-   15 blAnd Logical = LAnd
-   16 
-   17 blOr :: OperatorType -> BinaryInstruction
-   18 blOr Bitwise = BOr
-   19 blOr Logical = LOr
-   20 
-   21 blXor :: OperatorType -> BinaryInstruction
-   22 blXor Bitwise = BXor
-   23 blXor Logical = LXor
-   24 
-   25 blEQ :: OperatorType -> BinaryInstruction
-   26 blEQ Bitwise = BEQ
-   27 blEQ Logical = LEQ
+    7 blAnd :: OperatorType -> BinaryInstruction
+    8 blAnd Bitwise = BAnd
+    9 blAnd Logical = LAnd
+   10 
+   11 blOr :: OperatorType -> BinaryInstruction
+   12 blOr Bitwise = BOr
+   13 blOr Logical = LOr
+   14 
+   15 blXor :: OperatorType -> BinaryInstruction
+   16 blXor Bitwise = BXor
+   17 blXor Logical = LXor
+   18 
+   19 blEQ :: OperatorType -> BinaryInstruction
+   20 blEQ Bitwise = BEQ
+   21 blEQ Logical = LEQ
+   22 
+   23 blGT :: OperatorType -> BinaryInstruction
+   24 blGT Bitwise = BGT
+   25 blGT Logical = LGT
+   26 
+   27 -- | Other functions
    28 
-   29 blGT :: OperatorType -> BinaryInstruction
-   30 blGT Bitwise = BGT
-   31 blGT Logical = LGT
-   32 
-   33 -- | Other functions
+   29 calculateOps :: Integral a => a -> a -> [BinaryInstruction] -> [a]
+   30 calculateOps operand operand' = map (calculateOp operand operand')
+   31 
+   32 calculateOp :: Integral a => a -> a -> BinaryInstruction -> a
+   33 calculateOp operand operand' operation = doBinary operation operand' operand
    34 
-   35 calculateOps :: Integral a => a -> a -> [BinaryInstruction] -> [a]
-   36 calculateOps operand operand' = map (calculateOp operand operand')
-   37 
-   38 calculateOp :: Integral a => a -> a -> BinaryInstruction -> a
-   39 calculateOp operand operand' operation = doBinary operation operand' operand
-   40 
-   41 doBinary :: Integral a => BinaryInstruction -> a -> a -> a
-   42 doBinary Add = (+)
-   43 doBinary Sub = (-)
-   44 doBinary Mul = (*)
-   45 doBinary Div = div
-   46 doBinary Mod = mod
-   47 doBinary o   = error $ show o
+   35 doBinary :: Integral a => BinaryInstruction -> a -> a -> a
+   36 doBinary Add = (+)
+   37 doBinary Sub = (-)
+   38 doBinary Mul = (*)
+   39 doBinary Div = div
+   40 doBinary Mod = mod
+   41 doBinary o   = error $ show o
+   42 
+   43 -- | Types
+   44 data ALInstruction =
+   45     SAL      !ALInstruction2
+   46   | SIO      !IOInstruction
+   47   deriving stock (Eq , Read , Show)
    48 
-   49 -- | Types
-   50 data ALInstruction =
-   51     Cons      Integer
-   52   | Unary    !UnaryInstruction
-   53   | Binary   !BinaryInstruction
-   54   | Binaries [BinaryInstruction]
-   55   | SStatic  !StackIndex !ManipulationInstruction
-   56   | SDynamic             !ManipulationInstruction
-   57   | SIO      !IOInstruction
-   58   | Halibut
-   59   | Pick
-   60   | Discard
-   61   deriving stock (Eq , Read , Show)
-   62 
-   63 data UnaryInstruction = Neg | BNot | LNot
-   64   deriving stock (Eq , Read , Show)
-   65 
-   66 data BinaryInstruction =
-   67      Add | Sub | Mul | Div | Mod
-   68   | BAnd | BOr | BXor | BEQ | BGT
-   69   | LAnd | LOr | LXor | LEQ | LGT
-   70   deriving stock (Eq , Read , Show)
-   71 
-   72 data ManipulationInstruction = Copy | Move | Slide
-   73   deriving stock (Eq , Read , Show)
+   49 data ALInstruction2 =
+   50     Cons      Integer
+   51   | Unary    !UnaryInstruction
+   52   | Binary   !BinaryInstruction
+   53   | Binaries [BinaryInstruction]
+   54   | SStatic  !StackIndex !ManipulationInstruction
+   55   | SDynamic             !ManipulationInstruction
+   56   | Halibut
+   57   | Pick
+   58   | Discard
+   59   deriving stock (Eq , Read , Show)
+   60 
+   61 data UnaryInstruction = Neg | BNot | LNot
+   62   deriving stock (Eq , Read , Show)
+   63 
+   64 data BinaryInstruction =
+   65      Add | Sub | Mul | Div | Mod
+   66   | BAnd | BOr | BXor | BEQ | BGT
+   67   | LAnd | LOr | LXor | LEQ | LGT
+   68   deriving stock (Eq , Read , Show)
+   69 
+   70 data ManipulationInstruction = Copy | Move | Slide
+   71   deriving stock (Eq , Read , Show)
+   72 
+   73 type StackIndex = Int
    74 
-   75 type StackIndex = Int
-   76 
-   77 data OperatorType = Bitwise | Logical
+   75 data OperatorType = Bitwise | Logical
diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.CFInstruction.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.CFInstruction.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.CFInstruction.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.CFInstruction.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.IOInstruction.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.IOInstruction.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.IOInstruction.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.IOInstruction.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.LSInstruction.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.LSInstruction.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.LSInstruction.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.LSInstruction.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.SInstruction.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.SInstruction.hs.html new file mode 100644 index 000000000..845e60086 --- /dev/null +++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.SInstruction.hs.html @@ -0,0 +1,98 @@ + + + + + + +
+never executed always true always false
+
+
+    1 module HelVM.HelMA.Automaton.Instruction.SInstruction where
+    2 
+    3 import           HelVM.HelMA.Automaton.Instruction.IOInstruction
+    4 
+    5 -- | Constructors
+    6 
+    7 blAnd :: OperatorType -> BinaryInstruction
+    8 blAnd Bitwise = BAnd
+    9 blAnd Logical = LAnd
+   10 
+   11 blOr :: OperatorType -> BinaryInstruction
+   12 blOr Bitwise = BOr
+   13 blOr Logical = LOr
+   14 
+   15 blXor :: OperatorType -> BinaryInstruction
+   16 blXor Bitwise = BXor
+   17 blXor Logical = LXor
+   18 
+   19 blEQ :: OperatorType -> BinaryInstruction
+   20 blEQ Bitwise = BEQ
+   21 blEQ Logical = LEQ
+   22 
+   23 blGT :: OperatorType -> BinaryInstruction
+   24 blGT Bitwise = BGT
+   25 blGT Logical = LGT
+   26 
+   27 -- | Other functions
+   28 
+   29 calculateOps :: Integral a => a -> a -> [BinaryInstruction] -> [a]
+   30 calculateOps operand operand' = map (calculateOp operand operand')
+   31 
+   32 calculateOp :: Integral a => a -> a -> BinaryInstruction -> a
+   33 calculateOp operand operand' operation = doBinary operation operand' operand
+   34 
+   35 doBinary :: Integral a => BinaryInstruction -> a -> a -> a
+   36 doBinary Add = (+)
+   37 doBinary Sub = (-)
+   38 doBinary Mul = (*)
+   39 doBinary Div = div
+   40 doBinary Mod = mod
+   41 doBinary o   = error $ show o
+   42 
+   43 -- | Types
+   44 data SInstruction =
+   45     SAL      !ALInstruction
+   46   | SIO      !IOInstruction
+   47   deriving stock (Eq , Read , Show)
+   48 
+   49 data ALInstruction =
+   50     Cons      Integer
+   51   | Unary    !UnaryInstruction
+   52   | Binary   !BinaryInstruction
+   53   | Binaries [BinaryInstruction]
+   54   | SStatic  !StackIndex !ManipulationInstruction
+   55   | SDynamic             !ManipulationInstruction
+   56   | Halibut
+   57   | Pick
+   58   | Discard
+   59   deriving stock (Eq , Read , Show)
+   60 
+   61 data UnaryInstruction = Neg | BNot | LNot
+   62   deriving stock (Eq , Read , Show)
+   63 
+   64 data BinaryInstruction =
+   65      Add | Sub | Mul | Div | Mod
+   66   | BAnd | BOr | BXor | BEQ | BGT
+   67   | LAnd | LOr | LXor | LEQ | LGT
+   68   deriving stock (Eq , Read , Show)
+   69 
+   70 data ManipulationInstruction = Copy | Move | Slide
+   71   deriving stock (Eq , Read , Show)
+   72 
+   73 type StackIndex = Int
+   74 
+   75 data OperatorType = Bitwise | Logical
+
+
+ + diff --git a/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.hs.html new file mode 100644 index 000000000..fb3757d35 --- /dev/null +++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.hs.html @@ -0,0 +1,162 @@ + + + + + + +
+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 consI :: Integer -> Instruction
+   13 consI = sal . Cons
+   14 
+   15 addI , subI , mulI , divI , modI :: Instruction
+   16 addI = binary Add
+   17 subI = binary Sub
+   18 mulI = binary Mul
+   19 divI = binary Div
+   20 modI = binary Mod
+   21 
+   22 divModI , negI , halibutI :: Instruction
+   23 divModI  = binaries [Mod, Div]
+   24 negI     = unary Neg
+   25 halibutI = sal Halibut
+   26 
+   27 dupI , swapI , rotI , dCopy , discardI :: Instruction
+   28 dupI     = sCopyI 0
+   29 swapI    = sMoveI 1
+   30 rotI     = sMoveI 2
+   31 dCopy    = sal $ SDynamic Copy
+   32 discardI = sal Discard
+   33 
+   34 sCopyI :: StackIndex -> Instruction
+   35 sCopyI = sStatic Copy
+   36 
+   37 sMoveI :: StackIndex -> Instruction
+   38 sMoveI = sStatic Move
+   39 
+   40 sSlideI :: StackIndex -> Instruction
+   41 sSlideI = sStatic Slide
+   42 
+   43 sStatic :: ManipulationInstruction -> StackIndex -> Instruction
+   44 sStatic i = sal . flip SStatic i
+   45 
+   46 sInputI , sOutputI , sOutputDecI :: Instruction
+   47 sInputI     = sio InputChar
+   48 sOutputI    = sio OutputChar
+   49 sOutputDecI = sio OutputDec
+   50 
+   51 binaries :: [BinaryInstruction] -> Instruction
+   52 binaries = sal . Binaries
+   53 
+   54 binary :: BinaryInstruction -> Instruction
+   55 binary = sal . Binary
+   56 
+   57 unary :: UnaryInstruction -> Instruction
+   58 unary = sal . Unary
+   59 
+   60 sal :: ALInstruction -> Instruction
+   61 sal = IAL . SAL
+   62 
+   63 sio :: IOInstruction -> Instruction
+   64 sio = IAL . SIO
+   65 
+   66 dMarkI :: Natural -> Instruction
+   67 dMarkI = ICF . DMark
+   68 
+   69 sMarkIN :: Natural -> Instruction
+   70 sMarkIN = sMarkI . show
+   71 
+   72 sMarkI :: Label -> Instruction
+   73 sMarkI = ICF . SMark
+   74 
+   75 sJumpIN :: Natural -> Instruction
+   76 sJumpIN = cStaticI Jump . show
+   77 
+   78 sCallI , sJumpI :: Label -> Instruction
+   79 sCallI = cStaticI Call
+   80 sJumpI = cStaticI Jump
+   81 
+   82 sEZI , sLTZI :: Label -> Instruction
+   83 sEZI  = cStaticI (Branch EZ )
+   84 sLTZI = cStaticI (Branch LTZ)
+   85 
+   86 cStaticI :: LabelInstruction -> Label -> Instruction
+   87 cStaticI i label = ICF $ CStatic label i
+   88 
+   89 returnI :: Instruction
+   90 returnI = ICF Return
+   91 
+   92 storeI , loadI :: Instruction
+   93 storeI = ILS Store
+   94 loadI = ILS Load
+   95 
+   96 mInputI , mInputDecI :: Instruction
+   97 mInputI    = ILS (MIO InputChar)
+   98 mInputDecI = ILS (MIO InputDec )
+   99 
+  100 -- | Others
+  101 
+  102 extractPureIAL :: Instruction -> Maybe ALInstruction
+  103 extractPureIAL (IAL (SAL i)) = Just i
+  104 extractPureIAL           _   = Nothing
+  105 
+  106 isPureIAL :: Instruction -> Bool
+  107 isPureIAL (IAL (SIO _)) = False
+  108 isPureIAL (IAL      _ ) = True
+  109 isPureIAL           _   = False
+  110 
+  111 isICF :: Instruction -> Bool
+  112 isICF (ICF _) = True
+  113 isICF      _  = False
+  114 
+  115 isMark :: Instruction -> Bool
+  116 isMark (ICF (DMark _)) = True
+  117 isMark (ICF (SMark _)) = True
+  118 isMark             _   = False
+  119 
+  120 isDMark :: Natural -> Instruction -> Bool
+  121 isDMark n (ICF (DMark n')) = n == n'
+  122 isDMark _               _  = False
+  123 
+  124 isSMark :: Label -> Instruction -> Bool
+  125 isSMark l (ICF (SMark l')) = l == l'
+  126 isSMark _            _     = False
+  127 
+  128 -- | Types
+  129 
+  130 data Instruction =
+  131     IAL !SInstruction
+  132   | ILS !LSInstruction
+  133   | ICF !CFInstruction
+  134   | End
+  135   | Transfer
+  136   deriving stock (Eq , Read , Show)
+  137 
+  138 type InstructionList   = [Instruction]
+  139 type InstructionVector = Vector Instruction
+
+
+ + diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Loop.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Loop.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Loop.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Loop.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Optimizer.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Optimizer.hs.html new file mode 100644 index 000000000..52af82864 --- /dev/null +++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Optimizer.hs.html @@ -0,0 +1,64 @@ + + + + + + +
+never executed always true always false
+
+
+    1 module HelVM.HelMA.Automaton.Optimizer (
+    2   optimize,
+    3   constantFolding,
+    4 ) where
+    5 
+    6 import           HelVM.HelMA.Automaton.API.OptimizationLevel
+    7 
+    8 import           HelVM.HelMA.Automaton.Combiner.ALU
+    9 
+   10 import           HelVM.HelMA.Automaton.Instruction
+   11 
+   12 import           HelVM.HelMA.Automaton.Instruction.SInstruction
+   13 
+   14 import qualified Data.ListLike                                  as LL
+   15 
+   16 optimize :: OptimizationLevel -> InstructionList -> InstructionList
+   17 optimize NoOptimizations    = id
+   18 optimize BasicOptimizations = constantFolding
+   19 optimize SomeOptimizations  = peepholeOptimize . constantFolding
+   20 optimize AllOptimizations   = peepholeOptimize . constantFolding
+   21 
+   22 constantFolding :: InstructionList -> InstructionList
+   23 constantFolding = constantFoldingWithAcc []
+   24 
+   25 constantFoldingWithAcc :: [Integer] -> InstructionList -> InstructionList
+   26 constantFoldingWithAcc acc (i : il) = constantFoldingForI acc il i
+   27 constantFoldingWithAcc acc []       = generateIL acc
+   28 
+   29 constantFoldingForI :: [Integer] -> InstructionList -> Instruction -> InstructionList
+   30 constantFoldingForI acc il i@(IAL (SAL i')) = constantFoldingForResult il i acc $ runSAL i' acc
+   31 constantFoldingForI acc il i                = generateIL acc <> (i : constantFolding il)
+   32 
+   33 constantFoldingForResult :: InstructionList -> Instruction -> [Integer] -> Either a [Integer] -> InstructionList
+   34 constantFoldingForResult il _ _   (Right acc) = constantFoldingWithAcc acc il
+   35 constantFoldingForResult il i acc (Left  _  ) = generateIL acc <> (i : constantFolding il)
+   36 
+   37 generateIL :: [Integer] -> InstructionList
+   38 generateIL acc = consI <$> LL.reverse acc
+   39 
+   40 peepholeOptimize :: InstructionList -> InstructionList
+   41 peepholeOptimize = id
+
+
+ + diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.ReadPExtra.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.ReadPExtra.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.ReadPExtra.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.ReadPExtra.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.CellType.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.CellType.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.CellType.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.CellType.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.DumpType.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.DumpType.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.DumpType.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.DumpType.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.FormatType.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.FormatType.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.FormatType.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.FormatType.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.IntCellType.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.IntCellType.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.IntCellType.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.IntCellType.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.RAMType.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.RAMType.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.RAMType.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.RAMType.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.StackType.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.StackType.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.StackType.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.StackType.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.TokenType.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.TokenType.hs.html similarity index 100% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.TokenType.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.TokenType.hs.html diff --git a/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Unit.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Unit.hs.html new file mode 100644 index 000000000..284303210 --- /dev/null +++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Unit.hs.html @@ -0,0 +1,121 @@ + + + + + + +
+never executed always true always false
+
+
+    1 module HelVM.HelMA.Automaton.Combiner where
+    2 
+    3 import           HelVM.HelMA.Automaton.IO.AutomatonIO
+    4 
+    5 import           HelVM.HelMA.Automaton.Instruction
+    6 import           HelVM.HelMA.Automaton.Instruction.CFInstruction
+    7 
+    8 import           HelVM.HelMA.Automaton.Loop                      as Loop
+    9 
+   10 import           HelVM.HelMA.Automaton.Symbol
+   11 
+   12 import           HelVM.HelMA.Automaton.Combiner.ALU                 as Stack
+   13 import           HelVM.HelMA.Automaton.Combiner.CPU                 as CPU
+   14 import           HelVM.HelMA.Automaton.Combiner.LSU                 as LSU
+   15 
+   16 import           Control.Monad.Extra
+   17 import           Control.Type.Operator
+   18 
+   19 import           Prelude                                         hiding (swap)
+   20 
+   21 -- | Core of Automaton
+   22 
+   23 runInstruction :: (SRAutomatonIO Symbol s r m) => Instruction -> SF s r m
+   24 runInstruction (IAL      i) a = Loop.continue . updateStack   a <$> runALI i (unitStack a)
+   25 runInstruction (ILS      i) a = Loop.continue . updateFromLSU a <$> runSLI i (toLSU a)
+   26 runInstruction (ICF      i) a = Loop.continue . updateFromCPU a <$> runCFI i (toCPU a)
+   27 runInstruction  Transfer    a = transfer a
+   28 runInstruction  End         a = end a
+   29 
+   30 transfer :: (SRAutomatonIO Symbol s r m) => SF s r m
+   31 transfer = transferBranch <=< pop2ForStack
+   32 
+   33 transferBranch :: (SRAutomatonIO Symbol s r m) => (Symbol, Symbol, Unit s r) -> m $ UnitSame s r
+   34 transferBranch (_ , 0 , u) = pure $ Loop.continue u
+   35 transferBranch (0 , _ , u) = end u
+   36 transferBranch (a , _ , u) = Loop.continue . updateFromCPU u <$> runCFI dJumpI (toCPU $ push1ForStack a u)
+   37 
+   38 pop2ForStack :: (SRAutomatonIO Symbol s r m) => Unit s r -> m (Symbol , Symbol , Unit s r)
+   39 pop2ForStack a = build <$> pop2 (unitStack a) where
+   40   build (s1 , s2 , s') = (s1 , s2 , updateStack a s')
+   41 
+   42 push1ForStack :: Stack s Symbol => Symbol -> Unit s r -> Unit s r
+   43 push1ForStack e a = a { unitStack = push1 e (unitStack a) }
+   44 
+   45 end :: (SRAutomatonIO Symbol s r m) => SF s r m
+   46 end = pure . Loop.break
+   47 
+   48 -- | Constructors
+   49 
+   50 flippedNewAutomaton :: (s , r) -> InstructionList -> Unit s r
+   51 flippedNewAutomaton = flip (uncurry . newAutomaton)
+   52 
+   53 newAutomaton :: InstructionList -> s -> r -> Unit s r
+   54 newAutomaton il = Unit (newCU il)
+   55 
+   56 -- | Updaters
+   57 
+   58 incrementIC :: Unit s r -> Unit s r
+   59 incrementIC a = a { unitCU = incrementPC $ unitCU a}
+   60 
+   61 updateStack :: Unit s r -> s -> Unit s r
+   62 updateStack a s = a {unitStack = s}
+   63 
+   64 updateFromCPU :: Unit s r -> CentralProcessingUnit s -> Unit s r
+   65 updateFromCPU a cpu = a { unitCU = controlUnit cpu, unitStack = alu cpu}
+   66 
+   67 updateFromLSU :: Unit s r -> LoadStoreUnit s r -> Unit s r
+   68 updateFromLSU a lsu = a {unitStack = stack lsu , unitRAM = ram lsu}
+   69 
+   70 -- | Accessors
+   71 
+   72 unitProgram :: Unit s r -> InstructionVector
+   73 unitProgram = program . unitCU
+   74 
+   75 unitProgramCounter :: Unit s r -> InstructionCounter
+   76 unitProgramCounter = programCounter . unitCU
+   77 
+   78 toCPU :: Unit s r -> CentralProcessingUnit s
+   79 toCPU a = CPU { controlUnit = unitCU a , alu = unitStack a }
+   80 
+   81 toLSU :: Unit s r -> LoadStoreUnit s r
+   82 toLSU a = LSU { stack = unitStack a, ram = unitRAM a }
+   83 
+   84 -- | Types
+   85 
+   86 type SF s r m = Unit s r -> m $ UnitSame s r
+   87 
+   88 type F s r m = Unit s r -> m $ Unit s r
+   89 
+   90 type UnitSame s r = Same (Unit s r)
+   91 
+   92 -- | Data types
+   93 data Unit s r = Unit
+   94   { unitCU    :: ControlUnit
+   95   , unitStack :: s
+   96   , unitRAM   :: r
+   97   }
+   98   deriving stock (Show)
+
+
+ + diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Units.ALU.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Units.ALU.hs.html similarity index 99% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Units.ALU.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Units.ALU.hs.html index d66d89cd8..2c24b3da2 100644 --- a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Units.ALU.hs.html +++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Units.ALU.hs.html @@ -17,7 +17,7 @@ never executed always true always false 
-    1 module HelVM.HelMA.Automaton.Units.ALU (
+    1 module HelVM.HelMA.Automaton.Combiner.ALU (
     2   doOutputChar2,
     3   doInputChar2,
     4   doInputDec2,
diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Units.CPU.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Units.CPU.hs.html
similarity index 55%
rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Units.CPU.hs.html
rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Units.CPU.hs.html
index d94963261..981d821e4 100644
--- a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Units.CPU.hs.html
+++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Units.CPU.hs.html
@@ -17,12 +17,12 @@
 never executed always true always false
 
-    1 module HelVM.HelMA.Automaton.Units.CPU where
+    1 module HelVM.HelMA.Automaton.Combiner.CPU where
     2 
-    3 import           HelVM.HelMA.Automaton.Units.ALU
-    4 
-    5 import           HelVM.HelMA.Automaton.Instruction
-    6 import           HelVM.HelMA.Automaton.Instruction.CFInstruction
+    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
@@ -32,107 +32,94 @@
    13 import           Data.ListLike                                   hiding (show)
    14 import qualified Data.Vector                                     as Vector
    15 
-   16 
-   17 
-   18 --compileCFI :: CFInstruction
-   19 --compileCFI (DMark    _          ) = id
-   20 --compileCFI (SMark    _          ) = id
-   21 --compileCFI  Return                = popAddress
-   22 --compileCFI (CDynamic   Call     ) = dynamicCall
-   23 --compileCFI (CDynamic   Jump     ) = dynamicJump
-   24 --compileCFI (CDynamic  (Branch t)) = dynamicBranch  t
-   25 --compileCFI (CStatic l  Call     ) = staticCall   l
-   26 --compileCFI (CStatic l  Jump     ) = staticJump   l
-   27 --compileCFI (CStatic l (Branch t)) = staticBranch l t
-   28 
-   29 runCFI :: (ALU m ll element , Show element) => CFInstruction -> CentralProcessingUnit ll -> m $ CentralProcessingUnit ll
-   30 runCFI (DMark    _          ) = pure
-   31 runCFI (SMark    _          ) = pure
-   32 runCFI  Return                = popAddress
-   33 runCFI (CDynamic   Call     ) = dynamicCall
-   34 runCFI (CDynamic   Jump     ) = dynamicJump
-   35 runCFI (CDynamic  (Branch t)) = dynamicBranch  t
-   36 runCFI (CStatic l  Call     ) = staticCall   l
-   37 runCFI (CStatic l  Jump     ) = staticJump   l
-   38 runCFI (CStatic l (Branch t)) = staticBranch l t
-   39 
-   40 popAddress :: ALU m ll element  => CentralProcessingUnit ll -> m $ CentralProcessingUnit ll
-   41 popAddress (CPU (CU il _ (IS (a : is))) s) = pure $ CPU (CU il a $ IS is) s
-   42 popAddress (CPU (CU il _ (IS      [] )) _) = liftErrorWithTupleList "Empty Return Stack" [("il" , show il)]
-   43 
-   44 dynamicCall :: (ALU m ll element , Show element) => CentralProcessingUnit ll -> m $ CentralProcessingUnit ll
-   45 dynamicCall (CPU (CU il ic (IS is)) s) = appendError "CPU.dynamicCall" $ call1 =<< pop1 s where
-   46   call1 (n , s') = call2 <$> findAddressForDynamicLabel n il where
-   47     call2 a = CPU (CU il a (IS (ic : is))) s'
-   48 
-   49 dynamicJump :: (ALU m ll element , Show element) => CentralProcessingUnit ll -> m $ CentralProcessingUnit ll
-   50 dynamicJump (CPU (CU il _ is) s) = appendError "CPU.dynamicJump" $ jump1 =<< pop1 s where
-   51   jump1 (n, s') = jump2 <$> findAddressForDynamicLabel n il where
-   52     jump2 a = CPU (CU il a is) s'
-   53 
-   54 dynamicBranch :: (ALU m ll element , Show element) => BranchTest -> CentralProcessingUnit ll -> m $ CentralProcessingUnit ll
-   55 dynamicBranch t (CPU (CU il ic is) s) = appendError "CPU.dynamicBranch" $ branch =<< pop2 s where
-   56   branch (n , e , s')
-   57     | isNotJump t e = pure $ CPU (CU il ic is) s'
-   58     | otherwise     = jump <$> findAddressForDynamicLabel n il where
-   59       jump ic' = CPU (CU il ic' is) s'
-   60 
-   61 findAddressForDynamicLabel :: (MonadSafe m , Integral n , Show n) => n -> InstructionVector -> m InstructionAddress
-   62 findAddressForDynamicLabel n il
-   63   | n < 0     = liftError $ show n
-   64   | otherwise = liftMaybeOrErrorTuple ("Undefined label", show n) $ findIndex (isDMark $ fromIntegral n) il
-   65 
-   66 --
-   67 
-   68 staticCall :: ALU m ll element => Label -> CentralProcessingUnit ll -> m $ CentralProcessingUnit ll
-   69 staticCall l (CPU (CU il ic (IS is)) s) = appendError "CPU.staticCall" $ call <$> findAddressForStaticLabel l il where
-   70   call a = CPU (CU il a (IS (ic : is))) s
-   71 
-   72 staticJump :: ALU m ll element => Label -> CentralProcessingUnit ll -> m $ CentralProcessingUnit ll
-   73 staticJump l (CPU (CU il _  is) s) = appendError "CPU.staticJump" $ jump <$> findAddressForStaticLabel l il where
-   74   jump a = CPU (CU il a is) s
-   75 
-   76 staticBranch :: ALU m ll element => Label -> BranchTest -> CentralProcessingUnit ll -> m $ CentralProcessingUnit ll
-   77 staticBranch l t (CPU (CU il ic is) s) = appendError "CPU.staticBranch" $ branch =<< pop1 s where
-   78   branch (e , s')
-   79     | isNotJump t e = pure $ CPU (CU il ic is) s'
-   80     | otherwise     = jump <$> findAddressForStaticLabel l il where
-   81       jump ic' = CPU (CU il ic' is) s'
-   82 
-   83 findAddressForStaticLabel :: MonadSafe m => Label -> InstructionVector -> m InstructionAddress
-   84 findAddressForStaticLabel l = liftMaybeOrErrorTuple ("Undefined label", show l) . findIndex (isSMark l)
-   85 
-   86 -- | ControlUnit methods
-   87 
-   88 newCU :: InstructionList -> ControlUnit
-   89 newCU il = CU (Vector.fromList il) 0 (IS [])
+   16 runCFI :: (ALU m ll element , Show element) => CFInstruction -> CentralProcessingUnit ll -> m $ CentralProcessingUnit ll
+   17 runCFI (DMark    _          ) = pure
+   18 runCFI (SMark    _          ) = pure
+   19 runCFI  Return                = popAddress
+   20 runCFI (CDynamic   Call     ) = dynamicCall
+   21 runCFI (CDynamic   Jump     ) = dynamicJump
+   22 runCFI (CDynamic  (Branch t)) = dynamicBranch  t
+   23 runCFI (CStatic l  Call     ) = staticCall   l
+   24 runCFI (CStatic l  Jump     ) = staticJump   l
+   25 runCFI (CStatic l (Branch t)) = staticBranch l t
+   26 
+   27 popAddress :: ALU m ll element  => CentralProcessingUnit ll -> m $ CentralProcessingUnit ll
+   28 popAddress (CPU (CU il _ (IS (a : is))) s) = pure $ CPU (CU il a $ IS is) s
+   29 popAddress (CPU (CU il _ (IS      [] )) _) = liftErrorWithTupleList "Empty Return Stack" [("il" , show il)]
+   30 
+   31 dynamicCall :: (ALU m ll element , Show element) => CentralProcessingUnit ll -> m $ CentralProcessingUnit ll
+   32 dynamicCall (CPU (CU il ic (IS is)) s) = appendError "CPU.dynamicCall" $ call1 =<< pop1 s where
+   33   call1 (n , s') = call2 <$> findAddressForDynamicLabel n il where
+   34     call2 a = CPU (CU il a (IS (ic : is))) s'
+   35 
+   36 dynamicJump :: (ALU m ll element , Show element) => CentralProcessingUnit ll -> m $ CentralProcessingUnit ll
+   37 dynamicJump (CPU (CU il _ is) s) = appendError "CPU.dynamicJump" $ jump1 =<< pop1 s where
+   38   jump1 (n, s') = jump2 <$> findAddressForDynamicLabel n il where
+   39     jump2 a = CPU (CU il a is) s'
+   40 
+   41 dynamicBranch :: (ALU m ll element , Show element) => BranchTest -> CentralProcessingUnit ll -> m $ CentralProcessingUnit ll
+   42 dynamicBranch t (CPU (CU il ic is) s) = appendError "CPU.dynamicBranch" $ branch =<< pop2 s where
+   43   branch (n , e , s')
+   44     | isNotJump t e = pure $ CPU (CU il ic is) s'
+   45     | otherwise     = jump <$> findAddressForDynamicLabel n il where
+   46       jump ic' = CPU (CU il ic' is) s'
+   47 
+   48 findAddressForDynamicLabel :: (MonadSafe m , Integral n , Show n) => n -> InstructionVector -> m InstructionAddress
+   49 findAddressForDynamicLabel n il
+   50   | n < 0     = liftError $ show n
+   51   | otherwise = liftMaybeOrErrorTuple ("Undefined label", show n) $ findIndex (isDMark $ fromIntegral n) il
+   52 
+   53 --
+   54 
+   55 staticCall :: ALU m ll element => Label -> CentralProcessingUnit ll -> m $ CentralProcessingUnit ll
+   56 staticCall l (CPU (CU il ic (IS is)) s) = appendError "CPU.staticCall" $ call <$> findAddressForStaticLabel l il where
+   57   call a = CPU (CU il a (IS (ic : is))) s
+   58 
+   59 staticJump :: ALU m ll element => Label -> CentralProcessingUnit ll -> m $ CentralProcessingUnit ll
+   60 staticJump l (CPU (CU il _  is) s) = appendError "CPU.staticJump" $ jump <$> findAddressForStaticLabel l il where
+   61   jump a = CPU (CU il a is) s
+   62 
+   63 staticBranch :: ALU m ll element => Label -> BranchTest -> CentralProcessingUnit ll -> m $ CentralProcessingUnit ll
+   64 staticBranch l t (CPU (CU il ic is) s) = appendError "CPU.staticBranch" $ branch =<< pop1 s where
+   65   branch (e , s')
+   66     | isNotJump t e = pure $ CPU (CU il ic is) s'
+   67     | otherwise     = jump <$> findAddressForStaticLabel l il where
+   68       jump ic' = CPU (CU il ic' is) s'
+   69 
+   70 findAddressForStaticLabel :: MonadSafe m => Label -> InstructionVector -> m InstructionAddress
+   71 findAddressForStaticLabel l = liftMaybeOrErrorTuple ("Undefined label", show l) . findIndex (isSMark l)
+   72 
+   73 -- | ControlUnit methods
+   74 
+   75 newCU :: InstructionList -> ControlUnit
+   76 newCU il = CU (Vector.fromList il) 0 (IS [])
+   77 
+   78 currentInstruction :: MonadSafe m => ControlUnit -> m Instruction
+   79 currentInstruction (CU il ic _) = indexSafe il ic
+   80 
+   81 incrementPC :: ControlUnit -> ControlUnit
+   82 incrementPC cu = cu { programCounter = 1 + programCounter cu }
+   83 
+   84 -- | Types
+   85 data CentralProcessingUnit al = CPU
+   86   { controlUnit :: ControlUnit
+   87   , alu         :: al
+   88   }
+   89   deriving stock (Show)
    90 
-   91 currentInstruction :: MonadSafe m => ControlUnit -> m Instruction
-   92 currentInstruction (CU il ic _) = indexSafe il ic
-   93 
-   94 incrementPC :: ControlUnit -> ControlUnit
-   95 incrementPC cu = cu { programCounter = 1 + programCounter cu }
-   96 
-   97 -- | Types
-   98 data CentralProcessingUnit al = CPU
-   99   { controlUnit :: ControlUnit
-  100   , alu         :: al
-  101   }
-  102   deriving stock (Show)
-  103 
-  104 data ControlUnit = CU
-  105   { program        :: InstructionVector
-  106   , programCounter :: InstructionCounter
-  107   , returnStack    :: InstructionStack
-  108   }
-  109   deriving stock (Show)
-  110 
-  111 newtype InstructionStack = IS [InstructionAddress]
-  112   deriving stock (Show)
-  113 
-  114 type InstructionCounter = InstructionAddress
-  115 
-  116 type InstructionAddress = Int
+   91 data ControlUnit = CU
+   92   { program        :: InstructionVector
+   93   , programCounter :: InstructionCounter
+   94   , returnStack    :: InstructionStack
+   95   }
+   96   deriving stock (Show)
+   97 
+   98 newtype InstructionStack = IS [InstructionAddress]
+   99   deriving stock (Show)
+  100 
+  101 type InstructionCounter = InstructionAddress
+  102 
+  103 type InstructionAddress = Int
diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Units.LSU.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Units.LSU.hs.html similarity index 97% rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Units.LSU.hs.html rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Units.LSU.hs.html index cfa980320..ed2ef2b90 100644 --- a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Units.LSU.hs.html +++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Units.LSU.hs.html @@ -17,10 +17,10 @@ never executed always true always false 
-    1 module HelVM.HelMA.Automaton.Units.LSU where
+    1 module HelVM.HelMA.Automaton.Combiner.LSU where
     2 
-    3 import           HelVM.HelMA.Automaton.Units.ALU
-    4 import qualified HelVM.HelMA.Automaton.Units.RAM                 as RAM
+    3 import           HelVM.HelMA.Automaton.Combiner.ALU
+    4 import qualified HelVM.HelMA.Automaton.Combiner.RAM                 as RAM
     5 
     6 import           HelVM.HelMA.Automaton.IO.BusinessIO
     7 
diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Units.RAM.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Units.RAM.hs.html
similarity index 98%
rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Units.RAM.hs.html
rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Units.RAM.hs.html
index 04afe8859..428fcd692 100644
--- a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Units.RAM.hs.html
+++ b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Units.RAM.hs.html
@@ -17,7 +17,7 @@
 never executed always true always false
 
-    1 module HelVM.HelMA.Automaton.Units.RAM (
+    1 module HelVM.HelMA.Automaton.Combiner.RAM (
     2   genericLoad,
     3   load,
     4   flippedStoreChar,
diff --git a/docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.WrapTokenList.hs.html b/docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.WrapTokenList.hs.html
similarity index 100%
rename from docs/reports/helma-test/helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.WrapTokenList.hs.html
rename to docs/reports/helma-test/helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.WrapTokenList.hs.html
diff --git a/docs/reports/helma-test/hpc_index.html b/docs/reports/helma-test/hpc_index.html
index b0446c132..e4976447a 100644
--- a/docs/reports/helma-test/hpc_index.html
+++ b/docs/reports/helma-test/hpc_index.html
@@ -7,237 +7,249 @@
 
 
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
+
+
-
-
-
-
+
-
+
-
+
-
+
+
+
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+

 
moduleTop Level DefinitionsAlternativesExpressions
%covered / total%covered / total%covered / total
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.API.BFType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.API.BFType
 40%6/15
- 0/0 33%1/3

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
 30%4/13
92%12/13
97%40/41

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Common.Symbol  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Common.Symbol
 42%12/28
- 0/0 45%36/80

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
 87%21/24
66%10/15
82%171/207

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Evaluator
 75%3/4
45%5/11
45%22/48

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Evaluator
 78%11/14
88%15/17
92%115/125

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
 20%1/5
- 0/0 - 0/0 

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Optimizer  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Optimizer
 85%6/7
76%19/25
56%89/157

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser
 100%18/18
- 0/0 98%73/74

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Evaluator
 0%0/14
0%0/15
0%0/86

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction
 66%2/3
100%12/12
100%43/43

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser
 100%2/2
- 0/0 100%5/5

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
 0%0/7
0%0/12
0%0/40

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Evaluator
 0%0/14
0%0/12
0%0/89

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
 20%1/5
- 0/0 - 0/0 

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser
 90%9/10
- 0/0 95%39/41

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Cat.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Cat.Evaluator
 50%1/2
- 0/0 25%1/4

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.API.ETAImplType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.API.ETAImplType
 46%7/15
- 0/0 100%3/3

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Addressing  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Addressing
 100%4/4
100%2/2
76%30/39

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Automaton  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Automaton
 76%13/17
100%13/13
100%132/132

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Evaluator80%4/5
60%3/5
70%39/55
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Evaluator85%6/7
60%3/5
70%34/48

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Lexer  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Lexer
 100%2/2
- 0/0 100%9/9

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.OperandParsers  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.OperandParsers
 50%6/12
60%9/15
68%93/135

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Optimizer  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Optimizer
 100%21/21
88%15/17
96%161/167

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Parser  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Parser
 100%2/2
- 0/0 100%4/4

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.SimpleParams  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.SimpleParams
 100%5/5
- 0/0 100%10/10

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Token  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Token
 35%7/20
95%19/20
88%66/75

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.FALSE.Expression  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.FALSE.Expression
 20%1/5
- 0/0 - 0/0 

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.FALSE.Parser95%21/22
88%22/25
95%157/164
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.FALSE.Parser94%18/19
88%22/25
94%158/167

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Automaton  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Automaton
 100%7/7
80%4/5
85%42/49

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Constants  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Constants
 87%7/8
- 0/0 83%20/24

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Evaluator
 50%2/4
- 0/0 59%13/22

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.InputEncoder  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.InputEncoder
 100%7/7
93%15/16
90%88/97

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Lambda  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Lambda
 50%4/8
- 0/0 100%14/14

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Lexer  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Lexer
 100%3/3
- 0/0 100%13/13

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Parser  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Parser
 100%4/4
- 0/0 100%40/40

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Reducer  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Reducer
 100%3/3
87%7/8
80%25/31

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Rev.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Rev.Evaluator
 75%3/4
- 0/0 78%11/14

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.SubLeq.Automaton  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.SubLeq.Automaton
 53%8/15
83%5/6
84%79/94

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.SubLeq.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.SubLeq.Evaluator
 83%5/6
25%1/4
58%21/36

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.SubLeq.Lexer  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.SubLeq.Lexer
 100%5/5
- 0/0 100%27/27

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.Evaluator85%6/7
28%2/7
58%42/72
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.Evaluator75%3/4
- 0/0 71%23/32

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.Lexer  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.Lexer
 100%5/5
100%2/2
100%14/14

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.OperandParsers  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.OperandParsers
 100%13/13
75%9/12
84%84/99

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.Parser76%10/13
74%26/35
75%172/227
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.Parser76%10/13
74%26/35
74%139/187

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.SimpleParams66%8/12
- 0/0 70%19/27
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.SimpleParams69%9/13
- 0/0 76%26/34

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.Token  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.Token
 31%6/19
60%6/10
74%23/31

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Zot.Automaton  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Zot.Automaton
 75%3/4
100%2/2
76%30/39

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Zot.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Zot.Evaluator
 100%18/18
100%3/3
100%125/125

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Zot.Expression  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Zot.Expression
 58%7/12
42%6/14
43%25/58

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Zot.Parser  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Zot.Parser
 100%4/4
- 0/0 100%20/20

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.API.AutoOptions  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.AutoOptions83%5/6
- 0/0 81%9/11
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.AutomatonOptions100%5/5
- 0/0 100%10/10
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.EvalParams0%0/10
- 0/0 0%0/26
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.MemoryOptions
 0%0/4
- 0/0 0%0/4

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.API.AutoParams80%4/5
- 0/0 77%7/9
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.OptimizationLevel0%0/18
- 0/0 0%0/14
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Automaton100%11/11
44%4/9
79%68/86
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner95%19/20
100%8/8
96%115/119

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.API.EvalParams0%0/9
- 0/0 0%0/19
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.ALU82%23/28
75%18/24
68%147/215

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Automaton100%27/27
100%10/10
100%161/161
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.CPU80%17/21
64%11/17
62%132/210
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.LSU77%7/9
66%4/6
63%62/98
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.RAM50%3/6
- 0/0 48%12/25

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.IO.BusinessIO  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.IO.BusinessIO
 16%9/55
- 0/0 22%29/131

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.IO.FreeIO  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.IO.FreeIO
 25%13/52
47%8/17
30%60/196

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.IO.MockIO  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.IO.MockIO
 60%35/58
- 0/0 72%162/222

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction76%13/17
57%4/7
93%46/49
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction80%41/51
28%4/14
83%104/124

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.ALInstruction37%12/32
31%5/16
57%22/38
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.CFInstruction  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.CFInstruction
 38%7/18
33%1/3
60%9/15

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.IOInstruction  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.IOInstruction
 40%2/5
- 0/0 - 0/0 

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.LSInstruction  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.LSInstruction
 20%1/5
- 0/0 - 0/0 

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Loop  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.SInstruction33%11/33
31%5/16
48%13/27
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Loop
 100%5/5
50%2/4
75%22/29

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.ReadPExtra  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Optimizer100%7/7
80%8/10
91%42/46
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.ReadPExtra
 100%10/10
- 0/0 93%40/43

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.CellType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.CellType
 6%1/15
- 0/0 0%0/3

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.DumpType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.DumpType
 11%2/17
40%2/5
59%13/22

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.FormatType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.FormatType
 33%5/15
- 0/0 50%1/2

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.IntCellType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.IntCellType
 0%0/15
- 0/0 0%0/3

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.RAMType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.RAMType
 33%5/15
- 0/0 33%1/3

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.StackType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.StackType
 33%5/15
- 0/0 33%1/3

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.TokenType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.TokenType
 0%0/15
- 0/0 0%0/2

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Units.ALU80%21/26
70%14/20
69%134/192
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Units.CPU80%17/21
64%11/17
62%132/210
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Units.LSU77%7/9
66%4/6
63%62/98
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Units.RAM50%3/6
- 0/0 48%12/25
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.WrapTokenList  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.WrapTokenList
 75%3/4
- 0/0 100%16/16

 

   Program Coverage Total55%535/971
66%305/458
71%3216/4504
55%577/1041
66%317/479
71%3305/4637

 

diff --git a/docs/reports/helma-test/hpc_index_alt.html b/docs/reports/helma-test/hpc_index_alt.html
index 2866bcd3e..3db8cbc06 100644
--- a/docs/reports/helma-test/hpc_index_alt.html
+++ b/docs/reports/helma-test/hpc_index_alt.html
@@ -7,237 +7,249 @@
 
 
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
+
+
-
+
-
+
-
+
-
+
+
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
+
+
+
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
+
+
+
-
+
-
+

 
moduleTop Level DefinitionsAlternativesExpressions
%covered / total%covered / total%covered / total
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Automaton  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Automaton
 76%13/17
100%13/13
100%132/132

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Automaton100%27/27
100%10/10
100%161/161
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner95%19/20
100%8/8
96%115/119

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Zot.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Zot.Evaluator
 100%18/18
100%3/3
100%125/125

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Zot.Automaton  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Zot.Automaton
 75%3/4
100%2/2
76%30/39

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.Lexer  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.Lexer
 100%5/5
100%2/2
100%14/14

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Addressing  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Addressing
 100%4/4
100%2/2
76%30/39

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction
 66%2/3
100%12/12
100%43/43

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Token  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Token
 35%7/20
95%19/20
88%66/75

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.InputEncoder  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.InputEncoder
 100%7/7
93%15/16
90%88/97

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
 30%4/13
92%12/13
97%40/41

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.FALSE.Parser95%21/22
88%22/25
95%157/164
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.FALSE.Parser94%18/19
88%22/25
94%158/167

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Optimizer  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Optimizer
 100%21/21
88%15/17
96%161/167

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Evaluator
 78%11/14
88%15/17
92%115/125

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Reducer  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Reducer
 100%3/3
87%7/8
80%25/31

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.SubLeq.Automaton  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.SubLeq.Automaton
 53%8/15
83%5/6
84%79/94

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Automaton  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Automaton
 100%7/7
80%4/5
85%42/49

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Optimizer  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Optimizer100%7/7
80%8/10
91%42/46
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Optimizer
 85%6/7
76%19/25
56%89/157

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.OperandParsers  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.OperandParsers
 100%13/13
75%9/12
84%84/99

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.Parser76%10/13
74%26/35
75%172/227
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.ALU82%23/28
75%18/24
68%147/215

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Units.ALU80%21/26
70%14/20
69%134/192
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.Parser76%10/13
74%26/35
74%139/187

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Units.LSU  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.LSU
 77%7/9
66%4/6
63%62/98

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
 87%21/24
66%10/15
82%171/207

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Units.CPU  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.CPU
 80%17/21
64%11/17
62%132/210

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.Token  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.Token
 31%6/19
60%6/10
74%23/31

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.OperandParsers  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.OperandParsers
 50%6/12
60%9/15
68%93/135

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Evaluator80%4/5
60%3/5
70%39/55
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction76%13/17
57%4/7
93%46/49
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Evaluator85%6/7
60%3/5
70%34/48

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Loop  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Loop
 100%5/5
50%2/4
75%22/29

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.IO.FreeIO  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.IO.FreeIO
 25%13/52
47%8/17
30%60/196

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Evaluator
 75%3/4
45%5/11
45%22/48

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Zot.Expression  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Automaton100%11/11
44%4/9
79%68/86
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Zot.Expression
 58%7/12
42%6/14
43%25/58

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.DumpType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.DumpType
 11%2/17
40%2/5
59%13/22

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.CFInstruction  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.CFInstruction
 38%7/18
33%1/3
60%9/15

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.ALInstruction37%12/32
31%5/16
57%22/38
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.SInstruction33%11/33
31%5/16
48%13/27

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.Evaluator85%6/7
28%2/7
58%42/72
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction80%41/51
28%4/14
83%104/124

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.SubLeq.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.SubLeq.Evaluator
 83%5/6
25%1/4
58%21/36

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Evaluator
 0%0/14
0%0/12
0%0/89

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
 0%0/7
0%0/12
0%0/40

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Evaluator
 0%0/14
0%0/15
0%0/86

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Lexer  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Lexer
 100%3/3
- 0/0 100%13/13

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Units.RAM  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.RAM
 50%3/6
- 0/0 48%12/25

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.IO.BusinessIO  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.IO.BusinessIO
 16%9/55
- 0/0 22%29/131

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.API.EvalParams0%0/9
- 0/0 0%0/19
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.EvalParams0%0/10
- 0/0 0%0/26

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Zot.Parser  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.AutomatonOptions100%5/5
- 0/0 100%10/10
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Zot.Parser
 100%4/4
- 0/0 100%20/20

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.SimpleParams66%8/12
- 0/0 70%19/27
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.SimpleParams69%9/13
- 0/0 76%26/34
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.Evaluator75%3/4
- 0/0 71%23/32

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.SubLeq.Lexer  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.SubLeq.Lexer
 100%5/5
- 0/0 100%27/27

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Rev.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Rev.Evaluator
 75%3/4
- 0/0 78%11/14

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Parser  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Parser
 100%4/4
- 0/0 100%40/40

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Lambda  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Lambda
 50%4/8
- 0/0 100%14/14

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Evaluator
 50%2/4
- 0/0 59%13/22

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Constants  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Constants
 87%7/8
- 0/0 83%20/24

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.FALSE.Expression  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.FALSE.Expression
 20%1/5
- 0/0 - 0/0 

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.SimpleParams  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.SimpleParams
 100%5/5
- 0/0 100%10/10

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Parser  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Parser
 100%2/2
- 0/0 100%4/4

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Lexer  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Lexer
 100%2/2
- 0/0 100%9/9

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.API.ETAImplType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.API.ETAImplType
 46%7/15
- 0/0 100%3/3

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Cat.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Cat.Evaluator
 50%1/2
- 0/0 25%1/4

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser
 90%9/10
- 0/0 95%39/41

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
 20%1/5
- 0/0 - 0/0 

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser
 100%2/2
- 0/0 100%5/5

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser
 100%18/18
- 0/0 98%73/74

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
 20%1/5
- 0/0 - 0/0 

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Common.Symbol  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Common.Symbol
 42%12/28
- 0/0 45%36/80

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.API.BFType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.API.BFType
 40%6/15
- 0/0 33%1/3

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.WrapTokenList  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.WrapTokenList
 75%3/4
- 0/0 100%16/16

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.TokenType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.TokenType
 0%0/15
- 0/0 0%0/2

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.StackType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.StackType
 33%5/15
- 0/0 33%1/3

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.RAMType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.RAMType
 33%5/15
- 0/0 33%1/3

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.IntCellType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.IntCellType
 0%0/15
- 0/0 0%0/3

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.FormatType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.FormatType
 33%5/15
- 0/0 50%1/2

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.CellType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.CellType
 6%1/15
- 0/0 0%0/3

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.ReadPExtra  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.ReadPExtra
 100%10/10
- 0/0 93%40/43

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.LSInstruction  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.LSInstruction
 20%1/5
- 0/0 - 0/0 

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.IOInstruction  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.IOInstruction
 40%2/5
- 0/0 - 0/0 

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.IO.MockIO  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.IO.MockIO
 60%35/58
- 0/0 72%162/222

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.API.AutoParams80%4/5
- 0/0 77%7/9
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.OptimizationLevel0%0/18
- 0/0 0%0/14
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.AutoOptions83%5/6
- 0/0 81%9/11

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.API.AutoOptions  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.MemoryOptions
 0%0/4
- 0/0 0%0/4

 

   Program Coverage Total55%535/971
66%305/458
71%3216/4504
55%577/1041
66%317/479
71%3305/4637

 

diff --git a/docs/reports/helma-test/hpc_index_exp.html b/docs/reports/helma-test/hpc_index_exp.html
index d78462d01..804f37b54 100644
--- a/docs/reports/helma-test/hpc_index_exp.html
+++ b/docs/reports/helma-test/hpc_index_exp.html
@@ -7,237 +7,249 @@
 
 
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
-
+
+
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
-
-
-
+
-
-
-
-
+
-
+
-
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+

 
moduleTop Level DefinitionsAlternativesExpressions
%covered / total%covered / total%covered / total
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Lexer  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Lexer
 100%3/3
- 0/0 100%13/13

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Automaton  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Automaton
 76%13/17
100%13/13
100%132/132

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Automaton100%27/27
100%10/10
100%161/161
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.AutomatonOptions100%5/5
- 0/0 100%10/10

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Zot.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Zot.Evaluator
 100%18/18
100%3/3
100%125/125

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Zot.Parser  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Zot.Parser
 100%4/4
- 0/0 100%20/20

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.Lexer  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.Lexer
 100%5/5
100%2/2
100%14/14

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.SubLeq.Lexer  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.SubLeq.Lexer
 100%5/5
- 0/0 100%27/27

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Parser  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Parser
 100%4/4
- 0/0 100%40/40

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Lambda  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Lambda
 50%4/8
- 0/0 100%14/14

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.SimpleParams  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.SimpleParams
 100%5/5
- 0/0 100%10/10

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Parser  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Parser
 100%2/2
- 0/0 100%4/4

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Lexer  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Lexer
 100%2/2
- 0/0 100%9/9

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.API.ETAImplType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.API.ETAImplType
 46%7/15
- 0/0 100%3/3

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser
 100%2/2
- 0/0 100%5/5

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction
 66%2/3
100%12/12
100%43/43

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.WrapTokenList  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.WrapTokenList
 75%3/4
- 0/0 100%16/16

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser
 100%18/18
- 0/0 98%73/74

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
 30%4/13
92%12/13
97%40/41

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Optimizer100%21/21
88%15/17
96%161/167
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner95%19/20
100%8/8
96%115/119

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.FALSE.Parser95%21/22
88%22/25
95%157/164
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Optimizer100%21/21
88%15/17
96%161/167

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser
 90%9/10
- 0/0 95%39/41

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.ReadPExtra100%10/10
- 0/0 93%40/43
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.FALSE.Parser94%18/19
88%22/25
94%158/167

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction76%13/17
57%4/7
93%46/49
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.ReadPExtra100%10/10
- 0/0 93%40/43

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Evaluator
 78%11/14
88%15/17
92%115/125

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.InputEncoder  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Optimizer100%7/7
80%8/10
91%42/46
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.InputEncoder
 100%7/7
93%15/16
90%88/97

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Token  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Token
 35%7/20
95%19/20
88%66/75

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Automaton  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Automaton
 100%7/7
80%4/5
85%42/49

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.SubLeq.Automaton  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.SubLeq.Automaton
 53%8/15
83%5/6
84%79/94

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.OperandParsers  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.OperandParsers
 100%13/13
75%9/12
84%84/99

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Constants  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Constants
 87%7/8
- 0/0 83%20/24

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction80%41/51
28%4/14
83%104/124
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
 87%21/24
66%10/15
82%171/207

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Reducer  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.AutoOptions83%5/6
- 0/0 81%9/11
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Reducer
 100%3/3
87%7/8
80%25/31

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Rev.Evaluator75%3/4
- 0/0 78%11/14
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Automaton100%11/11
44%4/9
79%68/86

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.API.AutoParams80%4/5
- 0/0 77%7/9
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Rev.Evaluator75%3/4
- 0/0 78%11/14

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Zot.Automaton  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Zot.Automaton
 75%3/4
100%2/2
76%30/39

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Addressing100%4/4
100%2/2
76%30/39
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.SimpleParams69%9/13
- 0/0 76%26/34

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.Parser76%10/13
74%26/35
75%172/227
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Addressing100%4/4
100%2/2
76%30/39

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Loop  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Loop
 100%5/5
50%2/4
75%22/29

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.Token  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.Token
 31%6/19
60%6/10
74%23/31

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.IO.MockIO60%35/58
- 0/0 72%162/222
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.Parser76%10/13
74%26/35
74%139/187

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.SimpleParams66%8/12
- 0/0 70%19/27
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.IO.MockIO60%35/58
- 0/0 72%162/222

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Evaluator80%4/5
60%3/5
70%39/55
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.Evaluator75%3/4
- 0/0 71%23/32

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Units.ALU80%21/26
70%14/20
69%134/192
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Evaluator85%6/7
60%3/5
70%34/48

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.OperandParsers  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.OperandParsers
 50%6/12
60%9/15
68%93/135

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Units.LSU  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.ALU82%23/28
75%18/24
68%147/215
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.LSU
 77%7/9
66%4/6
63%62/98

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Units.CPU  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.CPU
 80%17/21
64%11/17
62%132/210

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.CFInstruction  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.CFInstruction
 38%7/18
33%1/3
60%9/15

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Evaluator
 50%2/4
- 0/0 59%13/22

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.DumpType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.DumpType
 11%2/17
40%2/5
59%13/22

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.Evaluator85%6/7
28%2/7
58%42/72
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.SubLeq.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.SubLeq.Evaluator
 83%5/6
25%1/4
58%21/36

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.ALInstruction37%12/32
31%5/16
57%22/38
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Optimizer  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Optimizer
 85%6/7
76%19/25
56%89/157

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.FormatType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.FormatType
 33%5/15
- 0/0 50%1/2

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Units.RAM  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.RAM
 50%3/6
- 0/0 48%12/25

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Common.Symbol  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.SInstruction33%11/33
31%5/16
48%13/27
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Common.Symbol
 42%12/28
- 0/0 45%36/80

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Evaluator
 75%3/4
45%5/11
45%22/48

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Zot.Expression  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Zot.Expression
 58%7/12
42%6/14
43%25/58

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.API.BFType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.API.BFType
 40%6/15
- 0/0 33%1/3

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.StackType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.StackType
 33%5/15
- 0/0 33%1/3

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.RAMType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.RAMType
 33%5/15
- 0/0 33%1/3

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.IO.FreeIO  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.IO.FreeIO
 25%13/52
47%8/17
30%60/196

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Cat.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Cat.Evaluator
 50%1/2
- 0/0 25%1/4

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.IO.BusinessIO  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.IO.BusinessIO
 16%9/55
- 0/0 22%29/131

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.API.EvalParams0%0/9
- 0/0 0%0/19
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.EvalParams0%0/10
- 0/0 0%0/26

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Evaluator
 0%0/14
0%0/12
0%0/89

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
 0%0/7
0%0/12
0%0/40

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Evaluator
 0%0/14
0%0/15
0%0/86

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.TokenType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.TokenType
 0%0/15
- 0/0 0%0/2

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.IntCellType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.IntCellType
 0%0/15
- 0/0 0%0/3

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.CellType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.CellType
 6%1/15
- 0/0 0%0/3

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.API.AutoOptions  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.OptimizationLevel0%0/18
- 0/0 0%0/14
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.MemoryOptions
 0%0/4
- 0/0 0%0/4

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.FALSE.Expression  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.FALSE.Expression
 20%1/5
- 0/0 - 0/0 

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
 20%1/5
- 0/0 - 0/0 

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
 20%1/5
- 0/0 - 0/0 

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.LSInstruction  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.LSInstruction
 20%1/5
- 0/0 - 0/0 

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.IOInstruction  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.IOInstruction
 40%2/5
- 0/0 - 0/0 

 

   Program Coverage Total55%535/971
66%305/458
71%3216/4504
55%577/1041
66%317/479
71%3305/4637

 

diff --git a/docs/reports/helma-test/hpc_index_fun.html b/docs/reports/helma-test/hpc_index_fun.html
index 62a685724..50e5d4617 100644
--- a/docs/reports/helma-test/hpc_index_fun.html
+++ b/docs/reports/helma-test/hpc_index_fun.html
@@ -7,237 +7,249 @@
 
 
-
+
-
-
+
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
-
-
+
+
-
+
+
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
-
-
-
+
-
+
+
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
-
+
-
+
-
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
-
+

 
moduleTop Level DefinitionsAlternativesExpressions
%covered / total%covered / total%covered / total
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Lexer  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Lexer
 100%3/3
- 0/0 100%13/13

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Automaton100%27/27
100%10/10
100%161/161
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Automaton100%11/11
44%4/9
79%68/86

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Zot.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.AutomatonOptions100%5/5
- 0/0 100%10/10
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Zot.Evaluator
 100%18/18
100%3/3
100%125/125

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Zot.Parser  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Zot.Parser
 100%4/4
- 0/0 100%20/20

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.OperandParsers  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.OperandParsers
 100%13/13
75%9/12
84%84/99

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.Lexer  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.Lexer
 100%5/5
100%2/2
100%14/14

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.SubLeq.Lexer  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.SubLeq.Lexer
 100%5/5
- 0/0 100%27/27

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Reducer  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Reducer
 100%3/3
87%7/8
80%25/31

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Parser  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Parser
 100%4/4
- 0/0 100%40/40

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.InputEncoder  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.InputEncoder
 100%7/7
93%15/16
90%88/97

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Automaton  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Automaton
 100%7/7
80%4/5
85%42/49

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.SimpleParams  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.SimpleParams
 100%5/5
- 0/0 100%10/10

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Parser  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Parser
 100%2/2
- 0/0 100%4/4

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Optimizer  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Optimizer
 100%21/21
88%15/17
96%161/167

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Lexer  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Lexer
 100%2/2
- 0/0 100%9/9

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Addressing  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Addressing
 100%4/4
100%2/2
76%30/39

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser
 100%2/2
- 0/0 100%5/5

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser
 100%18/18
- 0/0 98%73/74

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.ReadPExtra  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.ReadPExtra
 100%10/10
- 0/0 93%40/43

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Loop  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Optimizer100%7/7
80%8/10
91%42/46
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Loop
 100%5/5
50%2/4
75%22/29

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.FALSE.Parser95%21/22
88%22/25
95%157/164
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner95%19/20
100%8/8
96%115/119

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.FALSE.Parser94%18/19
88%22/25
94%158/167
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser
 90%9/10
- 0/0 95%39/41

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Constants  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Constants
 87%7/8
- 0/0 83%20/24

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
 87%21/24
66%10/15
82%171/207

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Optimizer  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Optimizer
 85%6/7
76%19/25
56%89/157

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.Evaluator85%6/7
28%2/7
58%42/72
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Evaluator85%6/7
60%3/5
70%34/48

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.SubLeq.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.SubLeq.Evaluator
 83%5/6
25%1/4
58%21/36

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Units.CPU80%17/21
64%11/17
62%132/210
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.AutoOptions83%5/6
- 0/0 81%9/11

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Units.ALU80%21/26
70%14/20
69%134/192
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.ALU82%23/28
75%18/24
68%147/215

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Evaluator80%4/5
60%3/5
70%39/55
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.CPU80%17/21
64%11/17
62%132/210

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.API.AutoParams80%4/5
- 0/0 77%7/9
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction80%41/51
28%4/14
83%104/124

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Evaluator
 78%11/14
88%15/17
92%115/125

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Units.LSU  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.LSU
 77%7/9
66%4/6
63%62/98

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Automaton  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Automaton
 76%13/17
100%13/13
100%132/132

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.Parser76%10/13
74%26/35
75%172/227
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.Parser76%10/13
74%26/35
74%139/187

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction76%13/17
57%4/7
93%46/49
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Zot.Automaton  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Zot.Automaton
 75%3/4
100%2/2
76%30/39

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Rev.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.Evaluator75%3/4
- 0/0 71%23/32
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Rev.Evaluator
 75%3/4
- 0/0 78%11/14

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Evaluator
 75%3/4
45%5/11
45%22/48

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.WrapTokenList  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.WrapTokenList
 75%3/4
- 0/0 100%16/16

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.SimpleParams66%8/12
- 0/0 70%19/27
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.SimpleParams69%9/13
- 0/0 76%26/34

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction
 66%2/3
100%12/12
100%43/43

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.IO.MockIO  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.IO.MockIO
 60%35/58
- 0/0 72%162/222

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Zot.Expression  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Zot.Expression
 58%7/12
42%6/14
43%25/58

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.SubLeq.Automaton  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.SubLeq.Automaton
 53%8/15
83%5/6
84%79/94

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Units.RAM  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Combiner.RAM
 50%3/6
- 0/0 48%12/25

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Lambda  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Lambda
 50%4/8
- 0/0 100%14/14

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.LazyK.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.LazyK.Evaluator
 50%2/4
- 0/0 59%13/22

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.OperandParsers  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.OperandParsers
 50%6/12
60%9/15
68%93/135

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.Cat.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.Cat.Evaluator
 50%1/2
- 0/0 25%1/4

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.API.ETAImplType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.API.ETAImplType
 46%7/15
- 0/0 100%3/3

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Common.Symbol  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Common.Symbol
 42%12/28
- 0/0 45%36/80

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.API.BFType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.API.BFType
 40%6/15
- 0/0 33%1/3

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.IOInstruction  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.IOInstruction
 40%2/5
- 0/0 - 0/0 

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.CFInstruction  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.CFInstruction
 38%7/18
33%1/3
60%9/15

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.ALInstruction37%12/32
31%5/16
57%22/38
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.ETA.Token  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.ETA.Token
 35%7/20
95%19/20
88%66/75

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.StackType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.StackType
 33%5/15
- 0/0 33%1/3

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.RAMType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.RAMType
 33%5/15
- 0/0 33%1/3

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.FormatType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.FormatType
 33%5/15
- 0/0 50%1/2

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.WhiteSpace.Token  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.SInstruction33%11/33
31%5/16
48%13/27
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.WhiteSpace.Token
 31%6/19
60%6/10
74%23/31

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
 30%4/13
92%12/13
97%40/41

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.IO.FreeIO  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.IO.FreeIO
 25%13/52
47%8/17
30%60/196

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.FALSE.Expression  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.FALSE.Expression
 20%1/5
- 0/0 - 0/0 

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
 20%1/5
- 0/0 - 0/0 

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
 20%1/5
- 0/0 - 0/0 

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Instruction.LSInstruction  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Instruction.LSInstruction
 20%1/5
- 0/0 - 0/0 

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.IO.BusinessIO  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.IO.BusinessIO
 16%9/55
- 0/0 22%29/131

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.DumpType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.DumpType
 11%2/17
40%2/5
59%13/22

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.CellType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.CellType
 6%1/15
- 0/0 0%0/3

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.API.EvalParams0%0/9
- 0/0 0%0/19
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.EvalParams0%0/10
- 0/0 0%0/26

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Evaluator
 0%0/14
0%0/12
0%0/89

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
 0%0/7
0%0/12
0%0/40

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Evaluator  module helma-0.8.4.4-inplace/HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Evaluator
 0%0/14
0%0/15
0%0/86

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.TokenType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.TokenType
 0%0/15
- 0/0 0%0/2

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.Types.IntCellType  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.Types.IntCellType
 0%0/15
- 0/0 0%0/3

 
  module helma-0.8.4.3-inplace/HelVM.HelMA.Automaton.API.AutoOptions  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.OptimizationLevel0%0/18
- 0/0 0%0/14
  module helma-0.8.4.4-inplace/HelVM.HelMA.Automaton.API.MemoryOptions
 0%0/4
- 0/0 0%0/4

 

   Program Coverage Total55%535/971
66%305/458
71%3216/4504
55%577/1041
66%317/479
71%3305/4637

 

diff --git a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-API-BFType.html b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-API-BFType.html
index 648515365..f9e4b1ab4 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-API-BFType.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-API-BFType.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.BrainFuck.API.BFType
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.API.BFType

\ No newline at end of file
+HelVM.HelMA.Automata.BrainFuck.API.BFType
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.API.BFType

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Common-SimpleInstruction.html b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Common-SimpleInstruction.html
index 9afd27ace..b748bf93a 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Common-SimpleInstruction.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Common-SimpleInstruction.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
Documentation
charToSimpleInstruction :: Char -> Maybe SimpleInstruction #
simpleInstructions :: [SimpleInstruction] #
data SimpleInstruction #
Constructors
MoveR 
MoveL 
Inc 
Dec 
Output 
Input 
Instances
Instances details
 Bounded SimpleInstruction # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
 
Methods
minBound :: SimpleInstruction #
maxBound :: SimpleInstruction #
 Enum SimpleInstruction # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
 
Methods
succ :: SimpleInstruction -> SimpleInstruction #
pred :: SimpleInstruction -> SimpleInstruction #
toEnum :: Int -> SimpleInstruction #
fromEnum :: SimpleInstruction -> Int #
enumFrom :: SimpleInstruction -> [SimpleInstruction] #
enumFromThen :: SimpleInstruction -> SimpleInstruction -> [SimpleInstruction] #
enumFromTo :: SimpleInstruction -> SimpleInstruction -> [SimpleInstruction] #
enumFromThenTo :: SimpleInstruction -> SimpleInstruction -> SimpleInstruction -> [SimpleInstruction] #
 Eq SimpleInstruction # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
 
Methods
(==) :: SimpleInstruction -> SimpleInstruction -> Bool #
(/=) :: SimpleInstruction -> SimpleInstruction -> Bool #
 Read SimpleInstruction # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
 
Methods
readsPrec :: Int -> ReadS SimpleInstruction #
readList :: ReadS [SimpleInstruction] #
readPrec :: ReadPrec SimpleInstruction #
readListPrec :: ReadPrec [SimpleInstruction] #
 Show SimpleInstruction # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
 
Methods
showsPrec :: Int -> SimpleInstruction -> ShowS #
show :: SimpleInstruction -> String #
showList :: [SimpleInstruction] -> ShowS #

\ No newline at end of file
+HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
Documentation
charToSimpleInstruction :: Char -> Maybe SimpleInstruction #
simpleInstructions :: [SimpleInstruction] #
data SimpleInstruction #
Constructors
MoveR 
MoveL 
Inc 
Dec 
Output 
Input 
Instances
Instances details
 Bounded SimpleInstruction # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
 
Methods
minBound :: SimpleInstruction #
maxBound :: SimpleInstruction #
 Enum SimpleInstruction # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
 
Methods
succ :: SimpleInstruction -> SimpleInstruction #
pred :: SimpleInstruction -> SimpleInstruction #
toEnum :: Int -> SimpleInstruction #
fromEnum :: SimpleInstruction -> Int #
enumFrom :: SimpleInstruction -> [SimpleInstruction] #
enumFromThen :: SimpleInstruction -> SimpleInstruction -> [SimpleInstruction] #
enumFromTo :: SimpleInstruction -> SimpleInstruction -> [SimpleInstruction] #
enumFromThenTo :: SimpleInstruction -> SimpleInstruction -> SimpleInstruction -> [SimpleInstruction] #
 Eq SimpleInstruction # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
 
Methods
(==) :: SimpleInstruction -> SimpleInstruction -> Bool #
(/=) :: SimpleInstruction -> SimpleInstruction -> Bool #
 Read SimpleInstruction # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
 
Methods
readsPrec :: Int -> ReadS SimpleInstruction #
readList :: ReadS [SimpleInstruction] #
readPrec :: ReadPrec SimpleInstruction #
readListPrec :: ReadPrec [SimpleInstruction] #
 Show SimpleInstruction # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
 
Methods
showsPrec :: Int -> SimpleInstruction -> ShowS #
show :: SimpleInstruction -> String #
showList :: [SimpleInstruction] -> ShowS #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Common-Symbol.html b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Common-Symbol.html
index 2185c1ad5..520f9447d 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Common-Symbol.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Common-Symbol.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.BrainFuck.Common.Symbol
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Common.Symbol
Synopsis
Documentation
inc :: Symbol e => e -> e -> e #
compare0 :: Integer -> Ordering #
def :: Symbol e => e #
next :: Symbol e => e -> e #
prev :: Symbol e => e -> e #
toInteger :: Integral a => a -> Integer #
conversion to Integer
fromChar :: Symbol e => Char -> e #
toChar :: Symbol e => e -> Char #
class (Bounded e, Default e, Enum e, Eq e, Integral e, Show e) => Symbol e #
Minimal complete definition
fromChar, toChar
Instances
Instances details
 Symbol Int # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.Symbol
 
Methods
fromChar :: Char -> Int #
toChar :: Int -> Char #
 Symbol Int8 # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.Symbol
 
Methods
fromChar :: Char -> Int8 #
toChar :: Int8 -> Char #
 Symbol Int16 # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.Symbol
 
Methods
fromChar :: Char -> Int16 #
toChar :: Int16 -> Char #
 Symbol Int32 # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.Symbol
 
Methods
fromChar :: Char -> Int32 #
toChar :: Int32 -> Char #
 Symbol Int64 # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.Symbol
 
Methods
fromChar :: Char -> Int64 #
toChar :: Int64 -> Char #
 Symbol Word # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.Symbol
 
Methods
fromChar :: Char -> Word #
toChar :: Word -> Char #
 Symbol Word8 # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.Symbol
 
Methods
fromChar :: Char -> Word8 #
toChar :: Word8 -> Char #
 Symbol Word16 # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.Symbol
 
Methods
fromChar :: Char -> Word16 #
toChar :: Word16 -> Char #
 Symbol Word32 # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.Symbol
 
Methods
fromChar :: Char -> Word32 #
toChar :: Word32 -> Char #
 Symbol Word64 # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.Symbol
 
Methods
fromChar :: Char -> Word64 #
toChar :: Word64 -> Char #

\ No newline at end of file
+HelVM.HelMA.Automata.BrainFuck.Common.Symbol
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Common.Symbol
Synopsis
Documentation
inc :: Symbol e => e -> e -> e #
compare0 :: Integer -> Ordering #
def :: Symbol e => e #
next :: Symbol e => e -> e #
prev :: Symbol e => e -> e #
toInteger :: Integral a => a -> Integer #
conversion to Integer
fromChar :: Symbol e => Char -> e #
toChar :: Symbol e => e -> Char #
class (Bounded e, Default e, Enum e, Eq e, Integral e, Show e) => Symbol e #
Minimal complete definition
fromChar, toChar
Instances
Instances details
 Symbol Int # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.Symbol
 
Methods
fromChar :: Char -> Int #
toChar :: Int -> Char #
 Symbol Int8 # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.Symbol
 
Methods
fromChar :: Char -> Int8 #
toChar :: Int8 -> Char #
 Symbol Int16 # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.Symbol
 
Methods
fromChar :: Char -> Int16 #
toChar :: Int16 -> Char #
 Symbol Int32 # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.Symbol
 
Methods
fromChar :: Char -> Int32 #
toChar :: Int32 -> Char #
 Symbol Int64 # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.Symbol
 
Methods
fromChar :: Char -> Int64 #
toChar :: Int64 -> Char #
 Symbol Word # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.Symbol
 
Methods
fromChar :: Char -> Word #
toChar :: Word -> Char #
 Symbol Word8 # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.Symbol
 
Methods
fromChar :: Char -> Word8 #
toChar :: Word8 -> Char #
 Symbol Word16 # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.Symbol
 
Methods
fromChar :: Char -> Word16 #
toChar :: Word16 -> Char #
 Symbol Word32 # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.Symbol
 
Methods
fromChar :: Char -> Word32 #
toChar :: Word32 -> Char #
 Symbol Word64 # 
Instance details
Defined in HelVM.HelMA.Automata.BrainFuck.Common.Symbol
 
Methods
fromChar :: Char -> Word64 #
toChar :: Word64 -> Char #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Common-TapeOfSymbols.html b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Common-TapeOfSymbols.html
index 23c21f82c..137e6e2a0 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Common-TapeOfSymbols.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Common-TapeOfSymbols.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
Synopsis
Documentation
triAndClearSymbol :: Symbol e => Integer -> Integer -> Integer -> FullTapeD e #
Complex instructions
mulDupAndClearSymbol :: Symbol e => Integer -> Integer -> Integer -> Integer -> FullTapeD e #
dupAndClearSymbol :: Symbol e => Integer -> Integer -> FullTapeD e #
mulAddAndClearSymbol :: Symbol e => Integer -> Integer -> FullTapeD e #
addAndClearSymbol :: Symbol e => Integer -> FullTapeD e #
subAndClearSymbol :: Symbol e => Integer -> FullTapeD e #
setSymbol :: Symbol e => Integer -> FullTapeD e #
Change symbols
incSymbol :: Symbol e => Integer -> FullTapeD e #
nextSymbol :: Symbol e => FullTapeD e #
prevSymbol :: Symbol e => FullTapeD e #
clearSymbol :: Symbol e => FullTapeD e #
writeSymbol :: Symbol e => Char -> FullTapeD e #
moveHead :: Symbol e => Integer -> FullTapeD e #
Moves
moveHeadRight :: Symbol e => FullTapeD e #
moveHeadLeft :: Symbol e => FullTapeD e #
newTape :: Symbol e => FullTape e #
Constructors
type FullTape e = (HalfTape e, HalfTape e) #

\ No newline at end of file
+HelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
Synopsis
Documentation
triAndClearSymbol :: Symbol e => Integer -> Integer -> Integer -> FullTapeD e #
Complex instructions
mulDupAndClearSymbol :: Symbol e => Integer -> Integer -> Integer -> Integer -> FullTapeD e #
dupAndClearSymbol :: Symbol e => Integer -> Integer -> FullTapeD e #
mulAddAndClearSymbol :: Symbol e => Integer -> Integer -> FullTapeD e #
addAndClearSymbol :: Symbol e => Integer -> FullTapeD e #
subAndClearSymbol :: Symbol e => Integer -> FullTapeD e #
setSymbol :: Symbol e => Integer -> FullTapeD e #
Change symbols
incSymbol :: Symbol e => Integer -> FullTapeD e #
nextSymbol :: Symbol e => FullTapeD e #
prevSymbol :: Symbol e => FullTapeD e #
clearSymbol :: Symbol e => FullTapeD e #
writeSymbol :: Symbol e => Char -> FullTapeD e #
moveHead :: Symbol e => Integer -> FullTapeD e #
Moves
moveHeadRight :: Symbol e => FullTapeD e #
moveHeadLeft :: Symbol e => FullTapeD e #
newTape :: Symbol e => FullTape e #
Constructors
type FullTape e = (HalfTape e, HalfTape e) #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Evaluator.html b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Evaluator.html
index b2864f6e2..eb89cf5af 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Evaluator.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Evaluator.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.BrainFuck.Evaluator
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Evaluator
Documentation
simpleEval :: BIO m => (BFType, Source, CellType) -> m () #
evalParams :: BIO m => BFType -> EvalParams -> m () #
eval :: BIO m => BFType -> Source -> CellType -> DumpType -> m () #
evalSource :: (BIO m, Symbol e) => BFType -> Source -> FullTape e -> DumpType -> m () #

\ No newline at end of file
+HelVM.HelMA.Automata.BrainFuck.Evaluator
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Evaluator
Documentation
simpleEval :: BIO m => (BFType, Source, CellType) -> m () #
evalParams :: BIO m => BFType -> EvalParams -> m () #
eval :: BIO m => BFType -> Source -> CellType -> DumpType -> m () #
evalSource :: (BIO m, Symbol e) => BFType -> Source -> FullTape e -> DumpType -> m () #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Fast-Evaluator.html b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Fast-Evaluator.html
index 887fa0e7b..c288bf2ad 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Fast-Evaluator.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Fast-Evaluator.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Evaluator
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Evaluator
Documentation
evalSource :: (BIO m, Symbol e) => Source -> FullTape e -> DumpType -> m () #

\ No newline at end of file
+HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Evaluator
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Evaluator
Documentation
evalSource :: (BIO m, Symbol e) => Source -> FullTape e -> DumpType -> m () #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Fast-Instruction.html b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Fast-Instruction.html
index 840ea42b0..4a120d23e 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Fast-Instruction.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Fast-Instruction.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction

\ No newline at end of file
+HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Fast-Optimizer.html b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Fast-Optimizer.html
index 2bfc2607e..afc0771c0 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Fast-Optimizer.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Fast-Optimizer.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Optimizer
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Optimizer

\ No newline at end of file
+HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Optimizer
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Optimizer

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Fast-Parser.html b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Fast-Parser.html
index 37cd08b49..d31fd70bf 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Fast-Parser.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Fast-Parser.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser

\ No newline at end of file
+HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Flat-Evaluator.html b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Flat-Evaluator.html
index cb3f4e792..5adbe0640 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Flat-Evaluator.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Flat-Evaluator.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Evaluator
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Evaluator
Documentation
evalSource :: (BIO m, Symbol e) => Source -> FullTape e -> DumpType -> m () #

\ No newline at end of file
+HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Evaluator
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Evaluator
Documentation
evalSource :: (BIO m, Symbol e) => Source -> FullTape e -> DumpType -> m () #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Flat-Instruction.html b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Flat-Instruction.html
index f2efeb466..97776e939 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Flat-Instruction.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Flat-Instruction.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction

\ No newline at end of file
+HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Flat-Parser.html b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Flat-Parser.html
index 7a2d957c3..813f7b8db 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Flat-Parser.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Flat-Parser.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser

\ No newline at end of file
+HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Flat-TableOfInstructions.html b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Flat-TableOfInstructions.html
index e411665ce..b87b2287f 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Flat-TableOfInstructions.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Flat-TableOfInstructions.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions

\ No newline at end of file
+HelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Tree-Evaluator.html b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Tree-Evaluator.html
index b463a17b3..107b62295 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Tree-Evaluator.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Tree-Evaluator.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Evaluator
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Evaluator
Documentation
evalSource :: (BIO m, Symbol e) => Source -> FullTape e -> DumpType -> m () #

\ No newline at end of file
+HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Evaluator
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Evaluator
Documentation
evalSource :: (BIO m, Symbol e) => Source -> FullTape e -> DumpType -> m () #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Tree-Instruction.html b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Tree-Instruction.html
index 713672cd4..3650e7052 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Tree-Instruction.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Tree-Instruction.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction

\ No newline at end of file
+HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Tree-InstructionMemory.html b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Tree-InstructionMemory.html
new file mode 100644
index 000000000..201eacdc1
--- /dev/null
+++ b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Tree-InstructionMemory.html
@@ -0,0 +1 @@
+HelVM.HelMA.Automata.BrainFuck.Impl.Tree.InstructionUnit
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Impl.Tree.InstructionUnit

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Tree-InstructionUnit.html b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Tree-InstructionUnit.html
index a3504d9a7..265a4bdd8 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Tree-InstructionUnit.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Tree-InstructionUnit.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.BrainFuck.Impl.Tree.InstructionUnit
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Impl.Tree.InstructionUnit

\ No newline at end of file
+HelVM.HelMA.Automata.BrainFuck.Impl.Tree.InstructionUnit
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Impl.Tree.InstructionUnit

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Tree-Parser.html b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Tree-Parser.html
index e417334f0..7c5e8a396 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Tree-Parser.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-BrainFuck-Impl-Tree-Parser.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser

\ No newline at end of file
+HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-Cat-Evaluator.html b/docs/reports/helma/HelVM-HelMA-Automata-Cat-Evaluator.html
index 0e73da041..4f1f29381 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-Cat-Evaluator.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-Cat-Evaluator.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.Cat.Evaluator
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.Cat.Evaluator
Documentation
evalParams :: BIO m => EvalParams -> m () #
eval :: BusinessIO m => Source -> m () #

\ No newline at end of file
+HelVM.HelMA.Automata.Cat.Evaluator
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.Cat.Evaluator
Documentation
evalParams :: BIO m => EvalParams -> m () #
eval :: BusinessIO m => Source -> m () #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-ETA-API-ETAImplType.html b/docs/reports/helma/HelVM-HelMA-Automata-ETA-API-ETAImplType.html
index 369d050b7..d46e37577 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-ETA-API-ETAImplType.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-ETA-API-ETAImplType.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.ETA.API.ETAImplType
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.ETA.API.ETAImplType

\ No newline at end of file
+HelVM.HelMA.Automata.ETA.API.ETAImplType
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.ETA.API.ETAImplType

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-ETA-Addressing.html b/docs/reports/helma/HelVM-HelMA-Automata-ETA-Addressing.html
index ac6d502ba..9e0878a16 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-ETA-Addressing.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-ETA-Addressing.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.ETA.Addressing
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.ETA.Addressing
Documentation
genericFindAddress :: (MonadSafe m, Integral cell) => Vector Token -> cell -> m InstructionAddress #
findAddress :: MonadSafe m => Vector Token -> Int -> m InstructionAddress #
genericNextLabel :: Integral cell => Vector Token -> InstructionAddress -> cell #
nextLabel :: Vector Token -> InstructionAddress -> Int #

\ No newline at end of file
+HelVM.HelMA.Automata.ETA.Addressing
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.ETA.Addressing
Documentation
genericFindAddress :: (MonadSafe m, Integral cell) => Vector Token -> cell -> m InstructionAddress #
findAddress :: MonadSafe m => Vector Token -> Int -> m InstructionAddress #
genericNextLabel :: Integral cell => Vector Token -> InstructionAddress -> cell #
nextLabel :: Vector Token -> InstructionAddress -> Int #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-ETA-Automaton.html b/docs/reports/helma/HelVM-HelMA-Automata-ETA-Automaton.html
index 60f1cd7b2..e70e88f17 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-ETA-Automaton.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-ETA-Automaton.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.ETA.Automaton
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.ETA.Automaton
Synopsis
Documentation
run :: SAutomatonIO e s m => Maybe Natural -> Automaton s -> m $ Automaton s #
newAutomaton :: TokenList -> s -> Automaton s #
Automaton methods

\ No newline at end of file
+HelVM.HelMA.Automata.ETA.Automaton
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.ETA.Automaton
Synopsis
Documentation
run :: SAutomatonIO e s m => Maybe Natural -> Memory s -> m $ Memory s #
newMemory :: TokenList -> s -> Memory s #
Memory methods

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-ETA-Evaluator.html b/docs/reports/helma/HelVM-HelMA-Automata-ETA-Evaluator.html
index 4e6fd622e..73a61e833 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-ETA-Evaluator.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-ETA-Evaluator.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.ETA.Evaluator
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.ETA.Evaluator
Documentation
simpleEval :: BIO m => SimpleParams -> m () #
evalParams :: BIO m => ETAImplType -> EvalParams -> m () #

\ No newline at end of file
+HelVM.HelMA.Automata.ETA.Evaluator
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.ETA.Evaluator
Documentation
simpleEval :: BIO m => SimpleParams -> m () #
evalParams :: BIO m => ETAImplType -> EvalParams -> m () #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-ETA-Lexer.html b/docs/reports/helma/HelVM-HelMA-Automata-ETA-Lexer.html
index c374a929c..9b225faa0 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-ETA-Lexer.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-ETA-Lexer.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.ETA.Lexer
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.ETA.Lexer

\ No newline at end of file
+HelVM.HelMA.Automata.ETA.Lexer
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.ETA.Lexer

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-ETA-OperandParsers.html b/docs/reports/helma/HelVM-HelMA-Automata-ETA-OperandParsers.html
index 91cd2c855..a80fb2f10 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-ETA-OperandParsers.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-ETA-OperandParsers.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.ETA.OperandParsers
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.ETA.OperandParsers

\ No newline at end of file
+HelVM.HelMA.Automata.ETA.OperandParsers
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.ETA.OperandParsers

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-ETA-Optimizer.html b/docs/reports/helma/HelVM-HelMA-Automata-ETA-Optimizer.html
index b6a13c438..609fef1e1 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-ETA-Optimizer.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-ETA-Optimizer.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.ETA.Optimizer
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.ETA.Optimizer
Documentation
optimize :: MonadSafe m => TokenList -> m InstructionList #

\ No newline at end of file
+HelVM.HelMA.Automata.ETA.Optimizer
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.ETA.Optimizer
Documentation
optimize :: MonadSafe m => TokenList -> m InstructionList #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-ETA-Parser.html b/docs/reports/helma/HelVM-HelMA-Automata-ETA-Parser.html
index ae4c88109..61f0cf285 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-ETA-Parser.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-ETA-Parser.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.ETA.Parser
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.ETA.Parser
Documentation
parseSafe :: Source -> Safe InstructionList #
parse :: MonadSafe m => Source -> m InstructionList #

\ No newline at end of file
+HelVM.HelMA.Automata.ETA.Parser
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.ETA.Parser
Documentation
parseSafe :: Source -> Safe InstructionList #
parse :: MonadSafe m => Source -> m InstructionList #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-ETA-SimpleParams.html b/docs/reports/helma/HelVM-HelMA-Automata-ETA-SimpleParams.html
index c4b7a6456..a7a6d1808 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-ETA-SimpleParams.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-ETA-SimpleParams.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.ETA.SimpleParams
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.ETA.SimpleParams

\ No newline at end of file
+HelVM.HelMA.Automata.ETA.SimpleParams
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.ETA.SimpleParams

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-ETA-Symbol.html b/docs/reports/helma/HelVM-HelMA-Automata-ETA-Symbol.html
index 8a32175eb..2cb9827a1 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-ETA-Symbol.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-ETA-Symbol.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.ETA.Symbol
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.ETA.Symbol

\ No newline at end of file
+HelVM.HelMA.Automata.ETA.Symbol
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.ETA.Symbol

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-ETA-Token.html b/docs/reports/helma/HelVM-HelMA-Automata-ETA-Token.html
index ee6dc51af..3029d8468 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-ETA-Token.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-ETA-Token.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.ETA.Token
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.ETA.Token
Documentation
data Token #
Constructors
E 
T 
A 
O 
I 
N 
S 
H 
R 
Instances
Instances details
 Bounded Token # 
Instance details
Defined in HelVM.HelMA.Automata.ETA.Token
 
Methods
minBound :: Token #
maxBound :: Token #
 Enum Token # 
Instance details
Defined in HelVM.HelMA.Automata.ETA.Token
 
Methods
succ :: Token -> Token #
pred :: Token -> Token #
toEnum :: Int -> Token #
fromEnum :: Token -> Int #
enumFrom :: Token -> [Token] #
enumFromThen :: Token -> Token -> [Token] #
enumFromTo :: Token -> Token -> [Token] #
enumFromThenTo :: Token -> Token -> Token -> [Token] #
 Eq Token # 
Instance details
Defined in HelVM.HelMA.Automata.ETA.Token
 
Methods
(==) :: Token -> Token -> Bool #
(/=) :: Token -> Token -> Bool #
 Read Token # 
Instance details
Defined in HelVM.HelMA.Automata.ETA.Token
 
Methods
readsPrec :: Int -> ReadS Token #
readList :: ReadS [Token] #
readPrec :: ReadPrec Token #
readListPrec :: ReadPrec [Token] #
 Show Token # 
Instance details
Defined in HelVM.HelMA.Automata.ETA.Token
 
Methods
showsPrec :: Int -> Token -> ShowS #
show :: Token -> String #
showList :: [Token] -> ShowS #
 ToDigit Token # 
Instance details
Defined in HelVM.HelMA.Automata.ETA.Token
 
Methods
toDigit :: (MonadSafe m, Integral a) => Token -> m a
type TokenList = [Token] #
type TokenVector = Vector Token #
newtype WhiteToken #
Constructors
WhiteToken 
Fields
Instances
Instances details
 Eq WhiteToken # 
Instance details
Defined in HelVM.HelMA.Automata.ETA.Token
 
Methods
(==) :: WhiteToken -> WhiteToken -> Bool #
(/=) :: WhiteToken -> WhiteToken -> Bool #
 Read WhiteToken #
Scanner
Instance details
Defined in HelVM.HelMA.Automata.ETA.Token
 
Methods
readsPrec :: Int -> ReadS WhiteToken #
readList :: ReadS [WhiteToken] #
readPrec :: ReadPrec WhiteToken #
readListPrec :: ReadPrec [WhiteToken] #
 Show WhiteToken # 
Instance details
Defined in HelVM.HelMA.Automata.ETA.Token
 
Methods
showsPrec :: Int -> WhiteToken -> ShowS #
show :: WhiteToken -> String #
showList :: [WhiteToken] -> ShowS #
type WhiteTokenList = [WhiteToken] #
tokenToWhiteTokenPair :: Token -> (WhiteToken, String) #
whiteTokenListToTokenList :: WhiteTokenList -> TokenList #

\ No newline at end of file
+HelVM.HelMA.Automata.ETA.Token
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.ETA.Token
Documentation
data Token #
Constructors
E 
T 
A 
O 
I 
N 
S 
H 
R 
Instances
Instances details
 Bounded Token # 
Instance details
Defined in HelVM.HelMA.Automata.ETA.Token
 
Methods
minBound :: Token #
maxBound :: Token #
 Enum Token # 
Instance details
Defined in HelVM.HelMA.Automata.ETA.Token
 
Methods
succ :: Token -> Token #
pred :: Token -> Token #
toEnum :: Int -> Token #
fromEnum :: Token -> Int #
enumFrom :: Token -> [Token] #
enumFromThen :: Token -> Token -> [Token] #
enumFromTo :: Token -> Token -> [Token] #
enumFromThenTo :: Token -> Token -> Token -> [Token] #
 Eq Token # 
Instance details
Defined in HelVM.HelMA.Automata.ETA.Token
 
Methods
(==) :: Token -> Token -> Bool #
(/=) :: Token -> Token -> Bool #
 Read Token # 
Instance details
Defined in HelVM.HelMA.Automata.ETA.Token
 
Methods
readsPrec :: Int -> ReadS Token #
readList :: ReadS [Token] #
readPrec :: ReadPrec Token #
readListPrec :: ReadPrec [Token] #
 Show Token # 
Instance details
Defined in HelVM.HelMA.Automata.ETA.Token
 
Methods
showsPrec :: Int -> Token -> ShowS #
show :: Token -> String #
showList :: [Token] -> ShowS #
 ToDigit Token # 
Instance details
Defined in HelVM.HelMA.Automata.ETA.Token
 
Methods
toDigit :: (MonadSafe m, Integral a) => Token -> m a
type TokenList = [Token] #
type TokenVector = Vector Token #
newtype WhiteToken #
Constructors
WhiteToken 
Fields
Instances
Instances details
 Eq WhiteToken # 
Instance details
Defined in HelVM.HelMA.Automata.ETA.Token
 
Methods
(==) :: WhiteToken -> WhiteToken -> Bool #
(/=) :: WhiteToken -> WhiteToken -> Bool #
 Read WhiteToken #
Scanner
Instance details
Defined in HelVM.HelMA.Automata.ETA.Token
 
Methods
readsPrec :: Int -> ReadS WhiteToken #
readList :: ReadS [WhiteToken] #
readPrec :: ReadPrec WhiteToken #
readListPrec :: ReadPrec [WhiteToken] #
 Show WhiteToken # 
Instance details
Defined in HelVM.HelMA.Automata.ETA.Token
 
Methods
showsPrec :: Int -> WhiteToken -> ShowS #
show :: WhiteToken -> String #
showList :: [WhiteToken] -> ShowS #
type WhiteTokenList = [WhiteToken] #
tokenToWhiteTokenPair :: Token -> (WhiteToken, String) #
whiteTokenListToTokenList :: WhiteTokenList -> TokenList #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-FALSE-Expression.html b/docs/reports/helma/HelVM-HelMA-Automata-FALSE-Expression.html
index b44af823b..4b69f11de 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-FALSE-Expression.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-FALSE-Expression.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.FALSE.Expression
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.FALSE.Expression

\ No newline at end of file
+HelVM.HelMA.Automata.FALSE.Expression
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.FALSE.Expression

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-FALSE-Parser.html b/docs/reports/helma/HelVM-HelMA-Automata-FALSE-Parser.html
index 1984f0ec6..f574ff080 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-FALSE-Parser.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-FALSE-Parser.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.FALSE.Parser
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.FALSE.Parser

\ No newline at end of file
+HelVM.HelMA.Automata.FALSE.Parser
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.FALSE.Parser

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-LazyK-Automaton.html b/docs/reports/helma/HelVM-HelMA-Automata-LazyK-Automaton.html
index 96023e7df..c42735430 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-LazyK-Automaton.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-LazyK-Automaton.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.LazyK.Automaton
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.LazyK.Automaton
Documentation
run :: BIO m => Lambda -> m () #
runWithTerminator :: BIO m => Lambda -> Lambda -> m () #
realize :: MonadSafe m => Lambda -> m Natural #
realizeWithTrue :: MonadSafe m => Lambda -> m Natural #

\ No newline at end of file
+HelVM.HelMA.Automata.LazyK.Automaton
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.LazyK.Automaton
Documentation
run :: BIO m => Lambda -> m () #
runWithTerminator :: BIO m => Lambda -> Lambda -> m () #
realize :: MonadSafe m => Lambda -> m Natural #
realizeWithTrue :: MonadSafe m => Lambda -> m Natural #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-LazyK-Constants.html b/docs/reports/helma/HelVM-HelMA-Automata-LazyK-Constants.html
index d5c25ba7c..165c5f98b 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-LazyK-Constants.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-LazyK-Constants.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.LazyK.Constants
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.LazyK.Constants

\ No newline at end of file
+HelVM.HelMA.Automata.LazyK.Constants
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.LazyK.Constants

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-LazyK-Evaluator.html b/docs/reports/helma/HelVM-HelMA-Automata-LazyK-Evaluator.html
index 7765a1cd4..99fa1724b 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-LazyK-Evaluator.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-LazyK-Evaluator.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.LazyK.Evaluator
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.LazyK.Evaluator
Documentation
evalParams :: BIO m => EvalParams -> m () #
evalSource :: BIO m => Source -> m () #
reduceSource :: BIO m => Source -> m Source #

\ No newline at end of file
+HelVM.HelMA.Automata.LazyK.Evaluator
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.LazyK.Evaluator
Documentation
evalParams :: BIO m => EvalParams -> m () #
evalSource :: BIO m => Source -> m () #
reduceSource :: BIO m => Source -> m Source #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-LazyK-InputEncoder.html b/docs/reports/helma/HelVM-HelMA-Automata-LazyK-InputEncoder.html
index ddbd9316e..1207539fe 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-LazyK-InputEncoder.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-LazyK-InputEncoder.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.LazyK.InputEncoder
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.LazyK.InputEncoder

\ No newline at end of file
+HelVM.HelMA.Automata.LazyK.InputEncoder
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.LazyK.InputEncoder

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-LazyK-Lambda.html b/docs/reports/helma/HelVM-HelMA-Automata-LazyK-Lambda.html
index e22d35d21..600436b8b 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-LazyK-Lambda.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-LazyK-Lambda.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.LazyK.Lambda
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.LazyK.Lambda
Documentation
app4 :: Lambda -> Lambda -> Lambda -> Lambda -> Lambda #
app3 :: Lambda -> Lambda -> Lambda -> Lambda #
foldlLambda :: NonEmpty Lambda -> Lambda #
data Lambda #
Constructors
S 
K 
I 
App Lambda Lambda 
Succ 
Number !Natural 
Var Text 
Instances
Instances details
 Eq Lambda # 
Instance details
Defined in HelVM.HelMA.Automata.LazyK.Lambda
 
Methods
(==) :: Lambda -> Lambda -> Bool #
(/=) :: Lambda -> Lambda -> Bool #
 Read Lambda # 
Instance details
Defined in HelVM.HelMA.Automata.LazyK.Lambda
 
Methods
readsPrec :: Int -> ReadS Lambda #
readList :: ReadS [Lambda] #
readPrec :: ReadPrec Lambda #
readListPrec :: ReadPrec [Lambda] #
 Show Lambda # 
Instance details
Defined in HelVM.HelMA.Automata.LazyK.Lambda
 
Methods
showsPrec :: Int -> Lambda -> ShowS #
show :: Lambda -> String #
showList :: [Lambda] -> ShowS #

\ No newline at end of file
+HelVM.HelMA.Automata.LazyK.Lambda
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.LazyK.Lambda
Documentation
app4 :: Lambda -> Lambda -> Lambda -> Lambda -> Lambda #
app3 :: Lambda -> Lambda -> Lambda -> Lambda #
foldlLambda :: NonEmpty Lambda -> Lambda #
data Lambda #
Constructors
S 
K 
I 
App Lambda Lambda 
Succ 
Number !Natural 
Var Text 
Instances
Instances details
 Eq Lambda # 
Instance details
Defined in HelVM.HelMA.Automata.LazyK.Lambda
 
Methods
(==) :: Lambda -> Lambda -> Bool #
(/=) :: Lambda -> Lambda -> Bool #
 Read Lambda # 
Instance details
Defined in HelVM.HelMA.Automata.LazyK.Lambda
 
Methods
readsPrec :: Int -> ReadS Lambda #
readList :: ReadS [Lambda] #
readPrec :: ReadPrec Lambda #
readListPrec :: ReadPrec [Lambda] #
 Show Lambda # 
Instance details
Defined in HelVM.HelMA.Automata.LazyK.Lambda
 
Methods
showsPrec :: Int -> Lambda -> ShowS #
show :: Lambda -> String #
showList :: [Lambda] -> ShowS #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-LazyK-Lexer.html b/docs/reports/helma/HelVM-HelMA-Automata-LazyK-Lexer.html
index 79ea76fd4..84fbddf5b 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-LazyK-Lexer.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-LazyK-Lexer.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.LazyK.Lexer
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.LazyK.Lexer

\ No newline at end of file
+HelVM.HelMA.Automata.LazyK.Lexer
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.LazyK.Lexer

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-LazyK-Parser.html b/docs/reports/helma/HelVM-HelMA-Automata-LazyK-Parser.html
index 982fa3693..cd4849874 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-LazyK-Parser.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-LazyK-Parser.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.LazyK.Parser
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.LazyK.Parser
Documentation
parse :: MonadSafe m => Source -> m Lambda #

\ No newline at end of file
+HelVM.HelMA.Automata.LazyK.Parser
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.LazyK.Parser
Documentation
parse :: MonadSafe m => Source -> m Lambda #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-LazyK-Reducer.html b/docs/reports/helma/HelVM-HelMA-Automata-LazyK-Reducer.html
index da4eb9458..18e0fddc8 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-LazyK-Reducer.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-LazyK-Reducer.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.LazyK.Reducer
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.LazyK.Reducer

\ No newline at end of file
+HelVM.HelMA.Automata.LazyK.Reducer
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.LazyK.Reducer

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-Rev-Evaluator.html b/docs/reports/helma/HelVM-HelMA-Automata-Rev-Evaluator.html
index 6d8bacf0c..023ef91d9 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-Rev-Evaluator.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-Rev-Evaluator.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.Rev.Evaluator
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.Rev.Evaluator
Documentation
evalParams :: BIO m => EvalParams -> m () #
eval :: BusinessIO m => Source -> m () #

\ No newline at end of file
+HelVM.HelMA.Automata.Rev.Evaluator
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.Rev.Evaluator
Documentation
evalParams :: BIO m => EvalParams -> m () #
eval :: BusinessIO m => Source -> m () #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-SubLeq-Automaton.html b/docs/reports/helma/HelVM-HelMA-Automata-SubLeq-Automaton.html
index cff311cd6..5d85b1781 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-SubLeq-Automaton.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-SubLeq-Automaton.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.SubLeq.Automaton
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.SubLeq.Automaton
Documentation
newAutomaton :: Num e => ram -> Automaton e ram #
run :: RAutomatonIO e r m => Maybe Natural -> Automaton e r -> m $ Automaton e r #

\ No newline at end of file
+HelVM.HelMA.Automata.SubLeq.Automaton
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.SubLeq.Automaton
Documentation
newMemory :: Num e => ram -> Automaton e ram #
run :: RAutomatonIO e r m => Maybe Natural -> Automaton e r -> m $ Automaton e r #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-SubLeq-Evaluator.html b/docs/reports/helma/HelVM-HelMA-Automata-SubLeq-Evaluator.html
index 8224727ee..473b38a7e 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-SubLeq-Evaluator.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-SubLeq-Evaluator.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.SubLeq.Evaluator
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.SubLeq.Evaluator
Documentation
simpleEval :: BIO m => RAMType -> Source -> m () #
evalParams :: BIO m => EvalParams -> m () #

\ No newline at end of file
+HelVM.HelMA.Automata.SubLeq.Evaluator
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.SubLeq.Evaluator
Documentation
simpleEval :: BIO m => RAMType -> Source -> m () #
evalParams :: BIO m => EvalParams -> m () #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-SubLeq-Lexer.html b/docs/reports/helma/HelVM-HelMA-Automata-SubLeq-Lexer.html
index 5e6c9f936..a36664b18 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-SubLeq-Lexer.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-SubLeq-Lexer.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.SubLeq.Lexer
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.SubLeq.Lexer
Documentation
tokenize :: Source -> SymbolList #
readSymbols :: Source -> Symbols #
newtype Symbols #
Constructors
Symbols SymbolList 
Instances
Instances details
 Read Symbols # 
Instance details
Defined in HelVM.HelMA.Automata.SubLeq.Lexer
 
Methods
readsPrec :: Int -> ReadS Symbols #
readList :: ReadS [Symbols] #
readPrec :: ReadPrec Symbols #
readListPrec :: ReadPrec [Symbols] #
 Show Symbols # 
Instance details
Defined in HelVM.HelMA.Automata.SubLeq.Lexer
 
Methods
showsPrec :: Int -> Symbols -> ShowS #
show :: Symbols -> String #
showList :: [Symbols] -> ShowS #
shows :: SymbolList -> [Text] #

\ No newline at end of file
+HelVM.HelMA.Automata.SubLeq.Lexer
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.SubLeq.Lexer
Documentation
tokenize :: Source -> SymbolList #
readSymbols :: Source -> Symbols #
newtype Symbols #
Constructors
Symbols SymbolList 
Instances
Instances details
 Read Symbols # 
Instance details
Defined in HelVM.HelMA.Automata.SubLeq.Lexer
 
Methods
readsPrec :: Int -> ReadS Symbols #
readList :: ReadS [Symbols] #
readPrec :: ReadPrec Symbols #
readListPrec :: ReadPrec [Symbols] #
 Show Symbols # 
Instance details
Defined in HelVM.HelMA.Automata.SubLeq.Lexer
 
Methods
showsPrec :: Int -> Symbols -> ShowS #
show :: Symbols -> String #
showList :: [Symbols] -> ShowS #
shows :: SymbolList -> [Text] #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-SubLeq-Symbol.html b/docs/reports/helma/HelVM-HelMA-Automata-SubLeq-Symbol.html
index ea0b1a89f..65fe47908 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-SubLeq-Symbol.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-SubLeq-Symbol.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.SubLeq.Symbol
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.SubLeq.Symbol
Documentation
type Symbol = Int #
type SymbolList = [Symbol] #

\ No newline at end of file
+HelVM.HelMA.Automata.SubLeq.Symbol
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.SubLeq.Symbol
Documentation
type Symbol = Int #
type SymbolList = [Symbol] #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-WhiteSpace-Evaluator.html b/docs/reports/helma/HelVM-HelMA-Automata-WhiteSpace-Evaluator.html
index 181016b48..cdb021777 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-WhiteSpace-Evaluator.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-WhiteSpace-Evaluator.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.WhiteSpace.Evaluator
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.WhiteSpace.Evaluator
Documentation
simpleEval :: BIO m => SimpleParams -> m () #
evalParams :: BIO m => TokenType -> EvalParams -> m () #

\ No newline at end of file
+HelVM.HelMA.Automata.WhiteSpace.Evaluator
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.WhiteSpace.Evaluator
Documentation
simpleEval :: BIO m => SimpleParams -> m () #
evalParams :: BIO m => TokenType -> EvalParams -> m () #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-WhiteSpace-Lexer.html b/docs/reports/helma/HelVM-HelMA-Automata-WhiteSpace-Lexer.html
index 7fb8ed071..376b7be9d 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-WhiteSpace-Lexer.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-WhiteSpace-Lexer.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.WhiteSpace.Lexer
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.WhiteSpace.Lexer

\ No newline at end of file
+HelVM.HelMA.Automata.WhiteSpace.Lexer
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.WhiteSpace.Lexer

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-WhiteSpace-OperandParsers.html b/docs/reports/helma/HelVM-HelMA-Automata-WhiteSpace-OperandParsers.html
index 97d8d23f6..93b8d7b03 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-WhiteSpace-OperandParsers.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-WhiteSpace-OperandParsers.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.WhiteSpace.OperandParsers
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.WhiteSpace.OperandParsers
Synopsis
Documentation
parseIndex :: MonadSafe m => ParserFromTokenList m Index #
parseSymbol :: MonadSafe m => ParserFromTokenList m Symbol #
parseLabel :: MonadSafe m => FormatType -> ParserFromTokenList m Label #
parseInt :: MonadSafe m => ParserFromTokenList m Int #
parseInteger :: MonadSafe m => ParserFromTokenList m Integer #
negationIntegral :: (Integer, TokenList) -> (Integer, TokenList) #
parseNatural :: MonadSafe m => ParserFromTokenList m Natural #
parseExtra :: MonadSafe m => (TokenList -> m a) -> ParserFromTokenList m a #
parseDigitString :: MonadSafe m => ParserFromTokenList m SString #
parseAsciiString :: MonadSafe m => ParserFromTokenList m SString #
moveSafe :: MonadSafe m => (m a, TokenList) -> m (a, TokenList) #
parseString' :: MonadSafe m => (TokenList -> a) -> ParserFromTokenList m a #
splitByN :: MonadSafe m => ParserFromTokenList m TokenList #
type ParserFromTokenList m a = Parser TokenList m a #
Types
type Parser b m a = b -> m (a, b) #

\ No newline at end of file
+HelVM.HelMA.Automata.WhiteSpace.OperandParsers
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.WhiteSpace.OperandParsers
Synopsis
Documentation
parseIndex :: MonadSafe m => ParserFromTokenList m Index #
parseSymbol :: MonadSafe m => ParserFromTokenList m Symbol #
parseLabel :: MonadSafe m => FormatType -> ParserFromTokenList m Label #
parseInt :: MonadSafe m => ParserFromTokenList m Int #
parseInteger :: MonadSafe m => ParserFromTokenList m Integer #
negationIntegral :: (Integer, TokenList) -> (Integer, TokenList) #
parseNatural :: MonadSafe m => ParserFromTokenList m Natural #
parseExtra :: MonadSafe m => (TokenList -> m a) -> ParserFromTokenList m a #
parseDigitString :: MonadSafe m => ParserFromTokenList m SString #
parseAsciiString :: MonadSafe m => ParserFromTokenList m SString #
moveSafe :: MonadSafe m => (m a, TokenList) -> m (a, TokenList) #
parseString' :: MonadSafe m => (TokenList -> a) -> ParserFromTokenList m a #
splitByN :: MonadSafe m => ParserFromTokenList m TokenList #
type ParserFromTokenList m a = Parser TokenList m a #
Types
type Parser b m a = b -> m (a, b) #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-WhiteSpace-Parser.html b/docs/reports/helma/HelVM-HelMA-Automata-WhiteSpace-Parser.html
index 1bb9732db..d1793ccfa 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-WhiteSpace-Parser.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-WhiteSpace-Parser.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.WhiteSpace.Parser
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.WhiteSpace.Parser

\ No newline at end of file
+HelVM.HelMA.Automata.WhiteSpace.Parser
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.WhiteSpace.Parser

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-WhiteSpace-SimpleParams.html b/docs/reports/helma/HelVM-HelMA-Automata-WhiteSpace-SimpleParams.html
index ceb55fafd..5f695d0cd 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-WhiteSpace-SimpleParams.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-WhiteSpace-SimpleParams.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.WhiteSpace.SimpleParams
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.WhiteSpace.SimpleParams

\ No newline at end of file
+HelVM.HelMA.Automata.WhiteSpace.SimpleParams
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.WhiteSpace.SimpleParams

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-WhiteSpace-Token.html b/docs/reports/helma/HelVM-HelMA-Automata-WhiteSpace-Token.html
index e39167bb8..5ff52694b 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-WhiteSpace-Token.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-WhiteSpace-Token.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.WhiteSpace.Token
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.WhiteSpace.Token
Documentation
data Token #
Constructors
S 
T 
N 
Instances
Instances details
 Bounded Token # 
Instance details
Defined in HelVM.HelMA.Automata.WhiteSpace.Token
 
Methods
minBound :: Token #
maxBound :: Token #
 Enum Token # 
Instance details
Defined in HelVM.HelMA.Automata.WhiteSpace.Token
 
Methods
succ :: Token -> Token #
pred :: Token -> Token #
toEnum :: Int -> Token #
fromEnum :: Token -> Int #
enumFrom :: Token -> [Token] #
enumFromThen :: Token -> Token -> [Token] #
enumFromTo :: Token -> Token -> [Token] #
enumFromThenTo :: Token -> Token -> Token -> [Token] #
 Eq Token # 
Instance details
Defined in HelVM.HelMA.Automata.WhiteSpace.Token
 
Methods
(==) :: Token -> Token -> Bool #
(/=) :: Token -> Token -> Bool #
 Read Token # 
Instance details
Defined in HelVM.HelMA.Automata.WhiteSpace.Token
 
Methods
readsPrec :: Int -> ReadS Token #
readList :: ReadS [Token] #
readPrec :: ReadPrec Token #
readListPrec :: ReadPrec [Token] #
 Show Token # 
Instance details
Defined in HelVM.HelMA.Automata.WhiteSpace.Token
 
Methods
showsPrec :: Int -> Token -> ShowS #
show :: Token -> String #
showList :: [Token] -> ShowS #
 ToDigit Token # 
Instance details
Defined in HelVM.HelMA.Automata.WhiteSpace.Token
 
Methods
toDigit :: (MonadSafe m, Integral a) => Token -> m a
type TokenList = [Token] #
type TokenSList = SList Token #
newtype WhiteToken #
Constructors
WhiteToken 
Fields
Instances
Instances details
 Eq WhiteToken # 
Instance details
Defined in HelVM.HelMA.Automata.WhiteSpace.Token
 
Methods
(==) :: WhiteToken -> WhiteToken -> Bool #
(/=) :: WhiteToken -> WhiteToken -> Bool #
 Read WhiteToken #
Scanner
Instance details
Defined in HelVM.HelMA.Automata.WhiteSpace.Token
 
Methods
readsPrec :: Int -> ReadS WhiteToken #
readList :: ReadS [WhiteToken] #
readPrec :: ReadPrec WhiteToken #
readListPrec :: ReadPrec [WhiteToken] #
 Show WhiteToken # 
Instance details
Defined in HelVM.HelMA.Automata.WhiteSpace.Token
 
Methods
showsPrec :: Int -> WhiteToken -> ShowS #
show :: WhiteToken -> String #
showList :: [WhiteToken] -> ShowS #
type WhiteTokenList = [WhiteToken] #
whiteTokenListToTokenList :: WhiteTokenList -> TokenList #

\ No newline at end of file
+HelVM.HelMA.Automata.WhiteSpace.Token
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.WhiteSpace.Token
Documentation
data Token #
Constructors
S 
T 
N 
Instances
Instances details
 Bounded Token # 
Instance details
Defined in HelVM.HelMA.Automata.WhiteSpace.Token
 
Methods
minBound :: Token #
maxBound :: Token #
 Enum Token # 
Instance details
Defined in HelVM.HelMA.Automata.WhiteSpace.Token
 
Methods
succ :: Token -> Token #
pred :: Token -> Token #
toEnum :: Int -> Token #
fromEnum :: Token -> Int #
enumFrom :: Token -> [Token] #
enumFromThen :: Token -> Token -> [Token] #
enumFromTo :: Token -> Token -> [Token] #
enumFromThenTo :: Token -> Token -> Token -> [Token] #
 Eq Token # 
Instance details
Defined in HelVM.HelMA.Automata.WhiteSpace.Token
 
Methods
(==) :: Token -> Token -> Bool #
(/=) :: Token -> Token -> Bool #
 Read Token # 
Instance details
Defined in HelVM.HelMA.Automata.WhiteSpace.Token
 
Methods
readsPrec :: Int -> ReadS Token #
readList :: ReadS [Token] #
readPrec :: ReadPrec Token #
readListPrec :: ReadPrec [Token] #
 Show Token # 
Instance details
Defined in HelVM.HelMA.Automata.WhiteSpace.Token
 
Methods
showsPrec :: Int -> Token -> ShowS #
show :: Token -> String #
showList :: [Token] -> ShowS #
 ToDigit Token # 
Instance details
Defined in HelVM.HelMA.Automata.WhiteSpace.Token
 
Methods
toDigit :: (MonadSafe m, Integral a) => Token -> m a
type TokenList = [Token] #
type TokenSList = SList Token #
newtype WhiteToken #
Constructors
WhiteToken 
Fields
Instances
Instances details
 Eq WhiteToken # 
Instance details
Defined in HelVM.HelMA.Automata.WhiteSpace.Token
 
Methods
(==) :: WhiteToken -> WhiteToken -> Bool #
(/=) :: WhiteToken -> WhiteToken -> Bool #
 Read WhiteToken #
Scanner
Instance details
Defined in HelVM.HelMA.Automata.WhiteSpace.Token
 
Methods
readsPrec :: Int -> ReadS WhiteToken #
readList :: ReadS [WhiteToken] #
readPrec :: ReadPrec WhiteToken #
readListPrec :: ReadPrec [WhiteToken] #
 Show WhiteToken # 
Instance details
Defined in HelVM.HelMA.Automata.WhiteSpace.Token
 
Methods
showsPrec :: Int -> WhiteToken -> ShowS #
show :: WhiteToken -> String #
showList :: [WhiteToken] -> ShowS #
type WhiteTokenList = [WhiteToken] #
whiteTokenListToTokenList :: WhiteTokenList -> TokenList #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-Zot-Automaton.html b/docs/reports/helma/HelVM-HelMA-Automata-Zot-Automaton.html
index efecef67b..53a44a603 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-Zot-Automaton.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-Zot-Automaton.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.Zot.Automaton
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.Zot.Automaton
Documentation
evalParams :: BIO m => EvalParams -> m () #
evalWithFormat :: MonadSafe m => FormatType -> Source -> Text -> m Output #

\ No newline at end of file
+HelVM.HelMA.Automata.Zot.Automaton
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.Zot.Automaton
Documentation
evalParams :: BIO m => EvalParams -> m () #
evalWithFormat :: MonadSafe m => FormatType -> Source -> Text -> m Output #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-Zot-Evaluator.html b/docs/reports/helma/HelVM-HelMA-Automata-Zot-Evaluator.html
index b42b5cdf2..ccbbe2196 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-Zot-Evaluator.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-Zot-Evaluator.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.Zot.Evaluator
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.Zot.Evaluator
Documentation
runExpressionList :: ExpressionList -> Out Expression #
High-level Expressions

\ No newline at end of file
+HelVM.HelMA.Automata.Zot.Evaluator
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.Zot.Evaluator
Documentation
runExpressionList :: ExpressionList -> Out Expression #
High-level Expressions

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-Zot-Expression.html b/docs/reports/helma/HelVM-HelMA-Automata-Zot-Expression.html
index 19f703023..75e245090 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-Zot-Expression.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-Zot-Expression.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.Zot.Expression
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.Zot.Expression

\ No newline at end of file
+HelVM.HelMA.Automata.Zot.Expression
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.Zot.Expression

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automata-Zot-Parser.html b/docs/reports/helma/HelVM-HelMA-Automata-Zot-Parser.html
index 4d374ee4b..24a3e1b97 100644
--- a/docs/reports/helma/HelVM-HelMA-Automata-Zot-Parser.html
+++ b/docs/reports/helma/HelVM-HelMA-Automata-Zot-Parser.html
@@ -1 +1 @@
-HelVM.HelMA.Automata.Zot.Parser
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.Zot.Parser
Documentation
parse :: Text -> ExpressionList #

\ No newline at end of file
+HelVM.HelMA.Automata.Zot.Parser
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automata.Zot.Parser
Documentation
parse :: Text -> ExpressionList #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-AOT.html b/docs/reports/helma/HelVM-HelMA-Automaton-AOT.html
index f92332e37..bb6398ef1 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-AOT.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-AOT.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.AOT
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.AOT

\ No newline at end of file
+HelVM.HelMA.Automaton.AOT
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.AOT

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-API-AutoOptions.html b/docs/reports/helma/HelVM-HelMA-Automaton-API-AutoOptions.html
index 9270055ea..040824e76 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-API-AutoOptions.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-API-AutoOptions.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.API.AutoOptions
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.API.AutoOptions
Documentation
data AutoOptions #
Types
Constructors
AutoOptions 
Fields

\ No newline at end of file
+HelVM.HelMA.Automaton.API.AutoOptions
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.API.AutoOptions

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-API-AutoParams.html b/docs/reports/helma/HelVM-HelMA-Automaton-API-AutoParams.html
index f447437d4..3f4ca0724 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-API-AutoParams.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-API-AutoParams.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.API.AutoParams
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.API.AutoParams

\ No newline at end of file
+HelVM.HelMA.Automaton.API.AutoOptions
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.API.AutoOptions

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-API-AutomatonOptions.html b/docs/reports/helma/HelVM-HelMA-Automaton-API-AutomatonOptions.html
new file mode 100644
index 000000000..c891dda98
--- /dev/null
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-API-AutomatonOptions.html
@@ -0,0 +1 @@
+HelVM.HelMA.Automaton.API.AutomatonOptions
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.API.AutomatonOptions

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-API-EvalParams.html b/docs/reports/helma/HelVM-HelMA-Automaton-API-EvalParams.html
index e03870818..4a9c8dad7 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-API-EvalParams.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-API-EvalParams.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.API.EvalParams
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.API.EvalParams

\ No newline at end of file
+HelVM.HelMA.Automaton.API.EvalParams
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.API.EvalParams

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-API-IOTypes.html b/docs/reports/helma/HelVM-HelMA-Automaton-API-IOTypes.html
index f8eed3756..24aa7aa2b 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-API-IOTypes.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-API-IOTypes.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.API.IOTypes
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.API.IOTypes
Documentation
type Interact = Input -> Output #
type Source = Text #
type Input = Text #
type Output = Text #

\ No newline at end of file
+HelVM.HelMA.Automaton.API.IOTypes
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.API.IOTypes
Documentation
type Interact = Input -> Output #
type Source = Text #
type Input = Text #
type Output = Text #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-API-MemoryOptions.html b/docs/reports/helma/HelVM-HelMA-Automaton-API-MemoryOptions.html
new file mode 100644
index 000000000..39cdb5464
--- /dev/null
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-API-MemoryOptions.html
@@ -0,0 +1 @@
+HelVM.HelMA.Automaton.API.MemoryOptions
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.API.MemoryOptions
Documentation
data MemoryOptions #
Types
Constructors
MemoryOptions 
Fields

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-API-OptimizationLevel.html b/docs/reports/helma/HelVM-HelMA-Automaton-API-OptimizationLevel.html
new file mode 100644
index 000000000..6b29e4bc2
--- /dev/null
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-API-OptimizationLevel.html
@@ -0,0 +1 @@
+HelVM.HelMA.Automaton.API.OptimizationLevel
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.API.OptimizationLevel
Documentation
implementedOptimizationLevels :: [OptimizationLevel] #
Constructors
fromBool :: Bool -> OptimizationLevel #
fromNatural :: Natural -> OptimizationLevel #
defaultOptimizationLevel :: OptimizationLevel #
optimizationLevels :: [OptimizationLevel] #
data OptimizationLevel #
Types
Constructors
NoOptimizations 
BasicOptimizations 
SomeOptimizations 
AllOptimizations 
Instances
Instances details
 Bounded OptimizationLevel # 
Instance details
Defined in HelVM.HelMA.Automaton.API.OptimizationLevel
 
Methods
minBound :: OptimizationLevel #
maxBound :: OptimizationLevel #
 Enum OptimizationLevel # 
Instance details
Defined in HelVM.HelMA.Automaton.API.OptimizationLevel
 
Methods
succ :: OptimizationLevel -> OptimizationLevel #
pred :: OptimizationLevel -> OptimizationLevel #
toEnum :: Int -> OptimizationLevel #
fromEnum :: OptimizationLevel -> Int #
enumFrom :: OptimizationLevel -> [OptimizationLevel] #
enumFromThen :: OptimizationLevel -> OptimizationLevel -> [OptimizationLevel] #
enumFromTo :: OptimizationLevel -> OptimizationLevel -> [OptimizationLevel] #
enumFromThenTo :: OptimizationLevel -> OptimizationLevel -> OptimizationLevel -> [OptimizationLevel] #
 Eq OptimizationLevel # 
Instance details
Defined in HelVM.HelMA.Automaton.API.OptimizationLevel
 
Methods
(==) :: OptimizationLevel -> OptimizationLevel -> Bool #
(/=) :: OptimizationLevel -> OptimizationLevel -> Bool #
 Read OptimizationLevel # 
Instance details
Defined in HelVM.HelMA.Automaton.API.OptimizationLevel
 
Methods
readsPrec :: Int -> ReadS OptimizationLevel #
readList :: ReadS [OptimizationLevel] #
readPrec :: ReadPrec OptimizationLevel #
readListPrec :: ReadPrec [OptimizationLevel] #
 Show OptimizationLevel # 
Instance details
Defined in HelVM.HelMA.Automaton.API.OptimizationLevel
 
Methods
showsPrec :: Int -> OptimizationLevel -> ShowS #
show :: OptimizationLevel -> String #
showList :: [OptimizationLevel] -> ShowS #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-API-RunParams.html b/docs/reports/helma/HelVM-HelMA-Automaton-API-RunParams.html
index 334e8124a..f3cca960a 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-API-RunParams.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-API-RunParams.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.API.EvalParams
helma-0.8.3.10: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.API.EvalParams

\ No newline at end of file
+HelVM.HelMA.Automaton.API.EvalParams
helma-0.8.3.10: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.API.EvalParams

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-API-TypeOptions.html b/docs/reports/helma/HelVM-HelMA-Automaton-API-TypeOptions.html
index 669ba4e7a..335919271 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-API-TypeOptions.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-API-TypeOptions.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.API.AutoOptions
helma-0.8.3.10: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.API.AutoOptions
Documentation
data AutoOptions #
Types
Constructors
AutoOptions 
Fields

\ No newline at end of file
+HelVM.HelMA.Automaton.API.MemoryOptions
helma-0.8.3.10: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.API.MemoryOptions
Documentation
data MemoryOptions #
Types
Constructors
MemoryOptions 
Fields

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-Automaton.html b/docs/reports/helma/HelVM-HelMA-Automaton-Automaton.html
index 609fd8436..f94ee4048 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-Automaton.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-Automaton.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.Automaton
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Automaton
Synopsis
Documentation
runAndDumpLogs :: SRAutomatonIO Symbol s r m => AutoParams -> Automaton s r -> m () #
run :: SRAutomatonIO Symbol s r m => Bool -> LimitMaybe -> F s r m #
flippedNewAutomaton :: (s, r) -> InstructionList -> Automaton s r #
Constructors
newAutomaton :: InstructionList -> s -> r -> Automaton s r #
data Automaton s r #
Data types
Instances
Instances details
 (Show s, Show r) => Show (Automaton s r) # 
Instance details
Defined in HelVM.HelMA.Automaton.Automaton
 
Methods
showsPrec :: Int -> Automaton s r -> ShowS #
show :: Automaton s r -> String #
showList :: [Automaton s r] -> ShowS #

\ No newline at end of file
+HelVM.HelMA.Automaton.Automaton
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Automaton
Documentation
start :: BIO m => InstructionList -> AutomatonOptions -> m () #
runAndDumpLogs :: SRAutomatonIO Symbol s r m => AutoOptions -> Memory s r -> m () #
run :: SRAutomatonIO Symbol s r m => Bool -> LimitMaybe -> F s r m #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-Combiner-ALU.html b/docs/reports/helma/HelVM-HelMA-Automaton-Combiner-ALU.html
new file mode 100644
index 000000000..a20fe2cf7
--- /dev/null
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-Combiner-ALU.html
@@ -0,0 +1 @@
+HelVM.HelMA.Automaton.Combiner.ALU
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Combiner.ALU
Synopsis
Documentation
runALI :: ALU m ll element => SInstruction -> ll -> m ll #
runSAL :: SafeStack m ll element => ALInstruction -> ll -> m ll #
doOutputChar2 :: ALU m ll element => ll -> m ll #
IO instructions
doInputChar2 :: ALU m ll element => ll -> m ll #
doInputDec2 :: ALU m ll element => ll -> m ll #
divMod :: SafeStack m ll element => ll -> m ll #
Arithmetic instructions
sub :: SafeStack m ll element => ll -> m ll #
binaryInstruction :: SafeStack m ll element => BinaryInstruction -> ll -> m ll #
binaryInstructions :: SafeStack m ll element => [BinaryInstruction] -> ll -> m ll #
halibut :: SafeStack m ll element => ll -> m ll #
Halibut and Pick instructions
move :: SafeStack m ll element => Index -> ll -> m ll #
Move instructions
discard :: (MonadSafe m, ListLike full item) => full -> m full #
slide :: SafeStack m ll element => Index -> ll -> m ll #
Slide instructions
copy :: SafeStack m ll element => Index -> ll -> m ll #
Copy instructions
flipPush1 :: Stack ll element => ll -> element -> ll #
charPush1 :: (Num element, Stack ll element) => Char -> ll -> ll #
genericPush1 :: (Integral v, Num element, Stack ll element) => v -> ll -> ll #
pop1 :: SafeStack m ll element => ll -> m (element, ll) #
Pop instructions
pop2 :: SafeStack m ll element => ll -> m (element, element, ll) #
push1 :: Stack ll element => element -> ll -> ll #
push2 :: Stack ll element => element -> element -> ll -> ll #
splitAt :: ListLike full item => Int -> full -> (full, full) #
drop :: ListLike full item => Int -> full -> full #
type ALU m ll element = (BIO m, SafeStack m ll element) #
Types
type SafeStack m ll element = (MonadSafe m, IntegralStack ll element) #
type Stack ll element = (Show ll, ListLike ll element, IndexSafe ll element) #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-Combiner-CPU.html b/docs/reports/helma/HelVM-HelMA-Automaton-Combiner-CPU.html
new file mode 100644
index 000000000..99f868d81
--- /dev/null
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-Combiner-CPU.html
@@ -0,0 +1 @@
+HelVM.HelMA.Automaton.Combiner.CPU
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Combiner.CPU
Synopsis
Documentation
runCFI :: (ALU m ll element, Show element) => CFInstruction -> CentralProcessingMemory ll -> m $ CentralProcessingMemory ll #
popAddress :: ALU m ll element => CentralProcessingMemory ll -> m $ CentralProcessingMemory ll #
dynamicCall :: (ALU m ll element, Show element) => CentralProcessingMemory ll -> m $ CentralProcessingMemory ll #
dynamicJump :: (ALU m ll element, Show element) => CentralProcessingMemory ll -> m $ CentralProcessingMemory ll #
dynamicBranch :: (ALU m ll element, Show element) => BranchTest -> CentralProcessingMemory ll -> m $ CentralProcessingMemory ll #
findAddressForDynamicLabel :: (MonadSafe m, Integral n, Show n) => n -> InstructionVector -> m InstructionAddress #
staticCall :: ALU m ll element => Label -> CentralProcessingMemory ll -> m $ CentralProcessingMemory ll #
staticJump :: ALU m ll element => Label -> CentralProcessingMemory ll -> m $ CentralProcessingMemory ll #
staticBranch :: ALU m ll element => Label -> BranchTest -> CentralProcessingMemory ll -> m $ CentralProcessingMemory ll #
findAddressForStaticLabel :: MonadSafe m => Label -> InstructionVector -> m InstructionAddress #
newCM :: InstructionList -> ControlMemory #
ControlMemory methods
currentInstruction :: MonadSafe m => ControlMemory -> m Instruction #
incrementPC :: ControlMemory -> ControlMemory #
data CentralProcessingMemory al #
Types
Constructors
CPM 
Fields
Instances
Instances details
 Show al => Show (CentralProcessingMemory al) # 
Instance details
Defined in HelVM.HelMA.Automaton.Combiner.CPU
 
Methods
showsPrec :: Int -> CentralProcessingMemory al -> ShowS #
show :: CentralProcessingMemory al -> String #
showList :: [CentralProcessingMemory al] -> ShowS #
data ControlMemory #
Constructors
CM 
Fields
Instances
Instances details
 Show ControlMemory # 
Instance details
Defined in HelVM.HelMA.Automaton.Combiner.CPU
 
Methods
showsPrec :: Int -> ControlMemory -> ShowS #
show :: ControlMemory -> String #
showList :: [ControlMemory] -> ShowS #
newtype InstructionStack #
Constructors
IS [InstructionAddress] 
Instances
Instances details
 Show InstructionStack # 
Instance details
Defined in HelVM.HelMA.Automaton.Combiner.CPU
 
Methods
showsPrec :: Int -> InstructionStack -> ShowS #
show :: InstructionStack -> String #
showList :: [InstructionStack] -> ShowS #
type InstructionCounter = InstructionAddress #
type InstructionAddress = Int #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-Combiner-LSU.html b/docs/reports/helma/HelVM-HelMA-Automaton-Combiner-LSU.html
new file mode 100644
index 000000000..c81a2d36b
--- /dev/null
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-Combiner-LSU.html
@@ -0,0 +1 @@
+HelVM.HelMA.Automaton.Combiner.LSU
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Combiner.LSU
Synopsis
Documentation
runSLI :: LSU m s r element => LSInstruction -> LoadStoreMemory s r -> m $ LoadStoreMemory s r #
load :: LSU m s r element => LoadStoreMemory s r -> m $ LoadStoreMemory s r #
store :: LSU m s r element => LoadStoreMemory s r -> m $ LoadStoreMemory s r #
loadOutputChar :: LSU m s r element => LoadStoreMemory s r -> m $ LoadStoreMemory s r #
loadOutputDec :: LSU m s r element => LoadStoreMemory s r -> m $ LoadStoreMemory s r #
storeInputChar :: LSU m s r element => LoadStoreMemory s r -> m $ LoadStoreMemory s r #
storeInputDec :: LSU m s r element => LoadStoreMemory s r -> m $ LoadStoreMemory s r #
type LSU m s r element = (ALU m s element, RAM r element) #
Types
data LoadStoreMemory s r #
Constructors
LSM 
Fields

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-Combiner-RAM.html b/docs/reports/helma/HelVM-HelMA-Automaton-Combiner-RAM.html
new file mode 100644
index 000000000..cdaed53d4
--- /dev/null
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-Combiner-RAM.html
@@ -0,0 +1,2 @@
+HelVM.HelMA.Automaton.Combiner.RAM
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Combiner.RAM
Synopsis
Documentation
genericLoad :: (Integral i, RAM ll element) => ll -> i -> element #
load :: RAM ll element => ll -> Address -> element #
flippedStoreChar :: (Num element, Integral address, RAM ll element) => address -> ll -> Char -> ll #
storeChar :: (Num element, Integral address, RAM ll element) => address -> Char -> ll -> ll #
genericStore :: (Integral value, Num element, Integral address, RAM ll element) => address -> value -> ll -> ll #
store :: (Integral a, RAM ll element) => a -> element -> ll -> ll #
fromList :: IsList l => [Item l] -> l #
The fromList function constructs the structure l from the given
+   list of Item l
type RAM ll element = (Show ll, Default element, II ll element) #
Types

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-Combiner.html b/docs/reports/helma/HelVM-HelMA-Automaton-Combiner.html
new file mode 100644
index 000000000..de469a33b
--- /dev/null
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-Combiner.html
@@ -0,0 +1 @@
+HelVM.HelMA.Automaton.Combiner
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Combiner
Documentation
runInstruction :: SRAutomatonIO Symbol s r m => Instruction -> SF s r m #
Core of Combiner
transfer :: SRAutomatonIO Symbol s r m => SF s r m #
transferBranch :: SRAutomatonIO Symbol s r m => (Symbol, Symbol, Memory s r) -> m $ MemorySame s r #
pop2ForStack :: SRAutomatonIO Symbol s r m => Memory s r -> m (Symbol, Symbol, Memory s r) #
push1ForStack :: Stack s Symbol => Symbol -> Memory s r -> Memory s r #
end :: SRAutomatonIO Symbol s r m => SF s r m #
flippedNewMemory :: (s, r) -> InstructionList -> Memory s r #
Constructors
newMemory :: InstructionList -> s -> r -> Memory s r #
incrementIC :: Memory s r -> Memory s r #
Updaters
updateStack :: Memory s r -> s -> Memory s r #
updateFromCPM :: Memory s r -> CentralProcessingMemory s -> Memory s r #
updateFromLSM :: Memory s r -> LoadStoreMemory s r -> Memory s r #
memoryProgram :: Memory s r -> InstructionVector #
Accessors
memoryProgramCounter :: Memory s r -> InstructionCounter #
toCPM :: Memory s r -> CentralProcessingMemory s #
toLSM :: Memory s r -> LoadStoreMemory s r #
type SF s r m = Memory s r -> m $ MemorySame s r #
Types
type F s r m = Memory s r -> m $ Memory s r #
type MemorySame s r = Same (Memory s r) #
data Memory s r #
Data types
Constructors
Memory 
Fields
Instances
Instances details
 (Show s, Show r) => Show (Memory s r) # 
Instance details
Defined in HelVM.HelMA.Automaton.Combiner
 
Methods
showsPrec :: Int -> Memory s r -> ShowS #
show :: Memory s r -> String #
showList :: [Memory s r] -> ShowS #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-IO-AutomatonIO.html b/docs/reports/helma/HelVM-HelMA-Automaton-IO-AutomatonIO.html
index 80e223661..375caceda 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-IO-AutomatonIO.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-IO-AutomatonIO.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.IO.AutomatonIO
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.IO.AutomatonIO
Documentation
type SRAutomatonIO e s r m = (Stack s e, RAM r e, AutomatonIO e m) #
type RAutomatonIO e r m = (RAM r e, AutomatonIO e m) #
type SAutomatonIO e s m = (Stack s e, AutomatonIO e m) #
type AutomatonIO e m = (Element e, BIO m) #

\ No newline at end of file
+HelVM.HelMA.Automaton.IO.AutomatonIO
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.IO.AutomatonIO
Documentation
type SRAutomatonIO e s r m = (Stack s e, RAM r e, AutomatonIO e m) #
type RAutomatonIO e r m = (RAM r e, AutomatonIO e m) #
type SAutomatonIO e s m = (Stack s e, AutomatonIO e m) #
type AutomatonIO e m = (Element e, BIO m) #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-IO-BusinessIO.html b/docs/reports/helma/HelVM-HelMA-Automaton-IO-BusinessIO.html
index beb536350..3be47150b 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-IO-BusinessIO.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-IO-BusinessIO.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.IO.BusinessIO
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.IO.BusinessIO
Documentation
type Element e = (ReadShow e, Integral e, Default e) #
type BIO m = (MonadControl m, BusinessIO m) #
class Monad m => BusinessIO m #
Minimal complete definition
wGetContentsBS, wGetContentsText, wGetContents, wGetChar, wGetLine, wPutChar, wPutStr, wLogStr
Instances
Instances details
 BusinessIO IO # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.BusinessIO
 
Methods
wPutAsChar :: Integral v => v -> IO () #
wPutAsDec :: Integral v => v -> IO () #
wGetCharAs :: Integral v => IO v #
wGetDecAs :: Integral v => IO v #
wPutIntAsChar :: Int -> IO ()
wPutIntAsDec :: Int -> IO ()
wGetCharAsInt :: IO Int
wGetDecAsInt :: IO Int
wGetContentsBS :: IO ByteString #
wGetContentsText :: IO Text #
wGetContents :: IO String #
wGetChar :: IO Char #
wGetLine :: IO Text #
wPutChar :: Char -> IO () #
wPutStr :: Text -> IO () #
wPutStrLn :: Text -> IO () #
wLogStr :: Text -> IO () #
wLogStrLn :: Text -> IO () #
wLogShow :: Show s => s -> IO () #
wFlush :: IO () #
 BusinessIO FreeIO #
Instances
Instance details
Defined in HelVM.HelMA.Automaton.IO.FreeIO
 
Methods
wPutAsChar :: Integral v => v -> FreeIO () #
wPutAsDec :: Integral v => v -> FreeIO () #
wGetCharAs :: Integral v => FreeIO v #
wGetDecAs :: Integral v => FreeIO v #
wPutIntAsChar :: Int -> FreeIO ()
wPutIntAsDec :: Int -> FreeIO ()
wGetCharAsInt :: FreeIO Int
wGetDecAsInt :: FreeIO Int
wGetContentsBS :: FreeIO ByteString #
wGetContentsText :: FreeIO Text #
wGetContents :: FreeIO String #
wGetChar :: FreeIO Char #
wGetLine :: FreeIO Text #
wPutChar :: Char -> FreeIO () #
wPutStr :: Text -> FreeIO () #
wPutStrLn :: Text -> FreeIO () #
wLogStr :: Text -> FreeIO () #
wLogStrLn :: Text -> FreeIO () #
wLogShow :: Show s => s -> FreeIO () #
wFlush :: FreeIO () #
 BusinessIO MockIO # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.MockIO
 
Methods
wPutAsChar :: Integral v => v -> MockIO () #
wPutAsDec :: Integral v => v -> MockIO () #
wGetCharAs :: Integral v => MockIO v #
wGetDecAs :: Integral v => MockIO v #
wPutIntAsChar :: Int -> MockIO ()
wPutIntAsDec :: Int -> MockIO ()
wGetCharAsInt :: MockIO Int
wGetDecAsInt :: MockIO Int
wGetContentsBS :: MockIO ByteString #
wGetContentsText :: MockIO Text #
wGetContents :: MockIO String #
wGetChar :: MockIO Char #
wGetLine :: MockIO Text #
wPutChar :: Char -> MockIO () #
wPutStr :: Text -> MockIO () #
wPutStrLn :: Text -> MockIO () #
wLogStr :: Text -> MockIO () #
wLogStrLn :: Text -> MockIO () #
wLogShow :: Show s => s -> MockIO () #
wFlush :: MockIO () #
 BusinessIO (SafeT IO) # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.BusinessIO
 
Methods
wPutAsChar :: Integral v => v -> SafeT IO () #
wPutAsDec :: Integral v => v -> SafeT IO () #
wGetCharAs :: Integral v => SafeT IO v #
wGetDecAs :: Integral v => SafeT IO v #
wPutIntAsChar :: Int -> SafeT IO ()
wPutIntAsDec :: Int -> SafeT IO ()
wGetCharAsInt :: SafeT IO Int
wGetDecAsInt :: SafeT IO Int
wGetContentsBS :: SafeT IO ByteString #
wGetContentsText :: SafeT IO Text #
wGetContents :: SafeT IO String #
wGetChar :: SafeT IO Char #
wGetLine :: SafeT IO Text #
wPutChar :: Char -> SafeT IO () #
wPutStr :: Text -> SafeT IO () #
wPutStrLn :: Text -> SafeT IO () #
wLogStr :: Text -> SafeT IO () #
wLogStrLn :: Text -> SafeT IO () #
wLogShow :: Show s => s -> SafeT IO () #
wFlush :: SafeT IO () #
 BusinessIO (SafeT FreeIO) # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.FreeIO
 
Methods
wPutAsChar :: Integral v => v -> SafeT FreeIO () #
wPutAsDec :: Integral v => v -> SafeT FreeIO () #
wGetCharAs :: Integral v => SafeT FreeIO v #
wGetDecAs :: Integral v => SafeT FreeIO v #
wPutIntAsChar :: Int -> SafeT FreeIO ()
wPutIntAsDec :: Int -> SafeT FreeIO ()
wGetCharAsInt :: SafeT FreeIO Int
wGetDecAsInt :: SafeT FreeIO Int
wGetContentsBS :: SafeT FreeIO ByteString #
wGetContentsText :: SafeT FreeIO Text #
wGetContents :: SafeT FreeIO String #
wGetChar :: SafeT FreeIO Char #
wGetLine :: SafeT FreeIO Text #
wPutChar :: Char -> SafeT FreeIO () #
wPutStr :: Text -> SafeT FreeIO () #
wPutStrLn :: Text -> SafeT FreeIO () #
wLogStr :: Text -> SafeT FreeIO () #
wLogStrLn :: Text -> SafeT FreeIO () #
wLogShow :: Show s => s -> SafeT FreeIO () #
wFlush :: SafeT FreeIO () #
 BusinessIO (SafeT MockIO) # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.MockIO
 
Methods
wPutAsChar :: Integral v => v -> SafeT MockIO () #
wPutAsDec :: Integral v => v -> SafeT MockIO () #
wGetCharAs :: Integral v => SafeT MockIO v #
wGetDecAs :: Integral v => SafeT MockIO v #
wPutIntAsChar :: Int -> SafeT MockIO ()
wPutIntAsDec :: Int -> SafeT MockIO ()
wGetCharAsInt :: SafeT MockIO Int
wGetDecAsInt :: SafeT MockIO Int
wGetContentsBS :: SafeT MockIO ByteString #
wGetContentsText :: SafeT MockIO Text #
wGetContents :: SafeT MockIO String #
wGetChar :: SafeT MockIO Char #
wGetLine :: SafeT MockIO Text #
wPutChar :: Char -> SafeT MockIO () #
wPutStr :: Text -> SafeT MockIO () #
wPutStrLn :: Text -> SafeT MockIO () #
wLogStr :: Text -> SafeT MockIO () #
wLogStrLn :: Text -> SafeT MockIO () #
wLogShow :: Show s => s -> SafeT MockIO () #
wFlush :: SafeT MockIO () #
 BusinessIO (ControlT IO) # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.BusinessIO
 
Methods
wPutAsChar :: Integral v => v -> ControlT IO () #
wPutAsDec :: Integral v => v -> ControlT IO () #
wGetCharAs :: Integral v => ControlT IO v #
wGetDecAs :: Integral v => ControlT IO v #
wPutIntAsChar :: Int -> ControlT IO ()
wPutIntAsDec :: Int -> ControlT IO ()
wGetCharAsInt :: ControlT IO Int
wGetDecAsInt :: ControlT IO Int
wGetContentsBS :: ControlT IO ByteString #
wGetContentsText :: ControlT IO Text #
wGetContents :: ControlT IO String #
wGetChar :: ControlT IO Char #
wGetLine :: ControlT IO Text #
wPutChar :: Char -> ControlT IO () #
wPutStr :: Text -> ControlT IO () #
wPutStrLn :: Text -> ControlT IO () #
wLogStr :: Text -> ControlT IO () #
wLogStrLn :: Text -> ControlT IO () #
wLogShow :: Show s => s -> ControlT IO () #
wFlush :: ControlT IO () #
 BusinessIO (ControlT FreeIO) # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.FreeIO
 
Methods
wPutAsChar :: Integral v => v -> ControlT FreeIO () #
wPutAsDec :: Integral v => v -> ControlT FreeIO () #
wGetCharAs :: Integral v => ControlT FreeIO v #
wGetDecAs :: Integral v => ControlT FreeIO v #
wPutIntAsChar :: Int -> ControlT FreeIO ()
wPutIntAsDec :: Int -> ControlT FreeIO ()
wGetCharAsInt :: ControlT FreeIO Int
wGetDecAsInt :: ControlT FreeIO Int
wGetContentsBS :: ControlT FreeIO ByteString #
wGetContentsText :: ControlT FreeIO Text #
wGetContents :: ControlT FreeIO String #
wGetChar :: ControlT FreeIO Char #
wGetLine :: ControlT FreeIO Text #
wPutChar :: Char -> ControlT FreeIO () #
wPutStr :: Text -> ControlT FreeIO () #
wPutStrLn :: Text -> ControlT FreeIO () #
wLogStr :: Text -> ControlT FreeIO () #
wLogStrLn :: Text -> ControlT FreeIO () #
wLogShow :: Show s => s -> ControlT FreeIO () #
wFlush :: ControlT FreeIO () #
 BusinessIO (ControlT MockIO) # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.MockIO
 
Methods
wPutAsChar :: Integral v => v -> ControlT MockIO () #
wPutAsDec :: Integral v => v -> ControlT MockIO () #
wGetCharAs :: Integral v => ControlT MockIO v #
wGetDecAs :: Integral v => ControlT MockIO v #
wPutIntAsChar :: Int -> ControlT MockIO ()
wPutIntAsDec :: Int -> ControlT MockIO ()
wGetCharAsInt :: ControlT MockIO Int
wGetDecAsInt :: ControlT MockIO Int
wGetContentsBS :: ControlT MockIO ByteString #
wGetContentsText :: ControlT MockIO Text #
wGetContents :: ControlT MockIO String #
wGetChar :: ControlT MockIO Char #
wGetLine :: ControlT MockIO Text #
wPutChar :: Char -> ControlT MockIO () #
wPutStr :: Text -> ControlT MockIO () #
wPutStrLn :: Text -> ControlT MockIO () #
wLogStr :: Text -> ControlT MockIO () #
wLogStrLn :: Text -> ControlT MockIO () #
wLogShow :: Show s => s -> ControlT MockIO () #
wFlush :: ControlT MockIO () #
 BusinessIO (ExceptT String IO) # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.BusinessIO
 
Methods
wPutAsChar :: Integral v => v -> ExceptT String IO () #
wPutAsDec :: Integral v => v -> ExceptT String IO () #
wGetCharAs :: Integral v => ExceptT String IO v #
wGetDecAs :: Integral v => ExceptT String IO v #
wPutIntAsChar :: Int -> ExceptT String IO ()
wPutIntAsDec :: Int -> ExceptT String IO ()
wGetCharAsInt :: ExceptT String IO Int
wGetDecAsInt :: ExceptT String IO Int
wGetContentsBS :: ExceptT String IO ByteString #
wGetContentsText :: ExceptT String IO Text #
wGetContents :: ExceptT String IO String #
wGetChar :: ExceptT String IO Char #
wGetLine :: ExceptT String IO Text #
wPutChar :: Char -> ExceptT String IO () #
wPutStr :: Text -> ExceptT String IO () #
wPutStrLn :: Text -> ExceptT String IO () #
wLogStr :: Text -> ExceptT String IO () #
wLogStrLn :: Text -> ExceptT String IO () #
wLogShow :: Show s => s -> ExceptT String IO () #
wFlush :: ExceptT String IO () #
wPutAsChar :: (BusinessIO m, Integral v) => v -> m () #
wPutAsDec :: (BusinessIO m, Integral v) => v -> m () #
wGetCharAs :: (BusinessIO m, Integral v) => m v #
wGetDecAs :: (BusinessIO m, Integral v) => m v #
wGetContentsBS :: BusinessIO m => m ByteString #
wGetContentsText :: BusinessIO m => m Text #
wGetContents :: BusinessIO m => m String #
wGetChar :: BusinessIO m => m Char #
wPutChar :: BusinessIO m => Char -> m () #
wGetLine :: BusinessIO m => m Text #
wPutStr :: BusinessIO m => Text -> m () #
wPutStrLn :: BusinessIO m => Text -> m () #
wFlush :: BusinessIO m => m () #
wLogStr :: BusinessIO m => Text -> m () #
wLogStrLn :: BusinessIO m => Text -> m () #
wLogShow :: (BusinessIO m, Show s) => s -> m () #
logStr :: Text -> IO () #
flush :: IO () #

\ No newline at end of file
+HelVM.HelMA.Automaton.IO.BusinessIO
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.IO.BusinessIO
Documentation
type Element e = (ReadShow e, Integral e, Default e) #
type BIO m = (MonadControl m, BusinessIO m) #
class Monad m => BusinessIO m #
Minimal complete definition
wGetContentsBS, wGetContentsText, wGetContents, wGetChar, wGetLine, wPutChar, wPutStr, wLogStr
Instances
Instances details
 BusinessIO IO # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.BusinessIO
 
Methods
wPutAsChar :: Integral v => v -> IO () #
wPutAsDec :: Integral v => v -> IO () #
wGetCharAs :: Integral v => IO v #
wGetDecAs :: Integral v => IO v #
wPutIntAsChar :: Int -> IO ()
wPutIntAsDec :: Int -> IO ()
wGetCharAsInt :: IO Int
wGetDecAsInt :: IO Int
wGetContentsBS :: IO ByteString #
wGetContentsText :: IO Text #
wGetContents :: IO String #
wGetChar :: IO Char #
wGetLine :: IO Text #
wPutChar :: Char -> IO () #
wPutStr :: Text -> IO () #
wPutStrLn :: Text -> IO () #
wLogStr :: Text -> IO () #
wLogStrLn :: Text -> IO () #
wLogShow :: Show s => s -> IO () #
wFlush :: IO () #
 BusinessIO FreeIO #
Instances
Instance details
Defined in HelVM.HelMA.Automaton.IO.FreeIO
 
Methods
wPutAsChar :: Integral v => v -> FreeIO () #
wPutAsDec :: Integral v => v -> FreeIO () #
wGetCharAs :: Integral v => FreeIO v #
wGetDecAs :: Integral v => FreeIO v #
wPutIntAsChar :: Int -> FreeIO ()
wPutIntAsDec :: Int -> FreeIO ()
wGetCharAsInt :: FreeIO Int
wGetDecAsInt :: FreeIO Int
wGetContentsBS :: FreeIO ByteString #
wGetContentsText :: FreeIO Text #
wGetContents :: FreeIO String #
wGetChar :: FreeIO Char #
wGetLine :: FreeIO Text #
wPutChar :: Char -> FreeIO () #
wPutStr :: Text -> FreeIO () #
wPutStrLn :: Text -> FreeIO () #
wLogStr :: Text -> FreeIO () #
wLogStrLn :: Text -> FreeIO () #
wLogShow :: Show s => s -> FreeIO () #
wFlush :: FreeIO () #
 BusinessIO MockIO # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.MockIO
 
Methods
wPutAsChar :: Integral v => v -> MockIO () #
wPutAsDec :: Integral v => v -> MockIO () #
wGetCharAs :: Integral v => MockIO v #
wGetDecAs :: Integral v => MockIO v #
wPutIntAsChar :: Int -> MockIO ()
wPutIntAsDec :: Int -> MockIO ()
wGetCharAsInt :: MockIO Int
wGetDecAsInt :: MockIO Int
wGetContentsBS :: MockIO ByteString #
wGetContentsText :: MockIO Text #
wGetContents :: MockIO String #
wGetChar :: MockIO Char #
wGetLine :: MockIO Text #
wPutChar :: Char -> MockIO () #
wPutStr :: Text -> MockIO () #
wPutStrLn :: Text -> MockIO () #
wLogStr :: Text -> MockIO () #
wLogStrLn :: Text -> MockIO () #
wLogShow :: Show s => s -> MockIO () #
wFlush :: MockIO () #
 BusinessIO (SafeT IO) # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.BusinessIO
 
Methods
wPutAsChar :: Integral v => v -> SafeT IO () #
wPutAsDec :: Integral v => v -> SafeT IO () #
wGetCharAs :: Integral v => SafeT IO v #
wGetDecAs :: Integral v => SafeT IO v #
wPutIntAsChar :: Int -> SafeT IO ()
wPutIntAsDec :: Int -> SafeT IO ()
wGetCharAsInt :: SafeT IO Int
wGetDecAsInt :: SafeT IO Int
wGetContentsBS :: SafeT IO ByteString #
wGetContentsText :: SafeT IO Text #
wGetContents :: SafeT IO String #
wGetChar :: SafeT IO Char #
wGetLine :: SafeT IO Text #
wPutChar :: Char -> SafeT IO () #
wPutStr :: Text -> SafeT IO () #
wPutStrLn :: Text -> SafeT IO () #
wLogStr :: Text -> SafeT IO () #
wLogStrLn :: Text -> SafeT IO () #
wLogShow :: Show s => s -> SafeT IO () #
wFlush :: SafeT IO () #
 BusinessIO (SafeT FreeIO) # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.FreeIO
 
Methods
wPutAsChar :: Integral v => v -> SafeT FreeIO () #
wPutAsDec :: Integral v => v -> SafeT FreeIO () #
wGetCharAs :: Integral v => SafeT FreeIO v #
wGetDecAs :: Integral v => SafeT FreeIO v #
wPutIntAsChar :: Int -> SafeT FreeIO ()
wPutIntAsDec :: Int -> SafeT FreeIO ()
wGetCharAsInt :: SafeT FreeIO Int
wGetDecAsInt :: SafeT FreeIO Int
wGetContentsBS :: SafeT FreeIO ByteString #
wGetContentsText :: SafeT FreeIO Text #
wGetContents :: SafeT FreeIO String #
wGetChar :: SafeT FreeIO Char #
wGetLine :: SafeT FreeIO Text #
wPutChar :: Char -> SafeT FreeIO () #
wPutStr :: Text -> SafeT FreeIO () #
wPutStrLn :: Text -> SafeT FreeIO () #
wLogStr :: Text -> SafeT FreeIO () #
wLogStrLn :: Text -> SafeT FreeIO () #
wLogShow :: Show s => s -> SafeT FreeIO () #
wFlush :: SafeT FreeIO () #
 BusinessIO (SafeT MockIO) # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.MockIO
 
Methods
wPutAsChar :: Integral v => v -> SafeT MockIO () #
wPutAsDec :: Integral v => v -> SafeT MockIO () #
wGetCharAs :: Integral v => SafeT MockIO v #
wGetDecAs :: Integral v => SafeT MockIO v #
wPutIntAsChar :: Int -> SafeT MockIO ()
wPutIntAsDec :: Int -> SafeT MockIO ()
wGetCharAsInt :: SafeT MockIO Int
wGetDecAsInt :: SafeT MockIO Int
wGetContentsBS :: SafeT MockIO ByteString #
wGetContentsText :: SafeT MockIO Text #
wGetContents :: SafeT MockIO String #
wGetChar :: SafeT MockIO Char #
wGetLine :: SafeT MockIO Text #
wPutChar :: Char -> SafeT MockIO () #
wPutStr :: Text -> SafeT MockIO () #
wPutStrLn :: Text -> SafeT MockIO () #
wLogStr :: Text -> SafeT MockIO () #
wLogStrLn :: Text -> SafeT MockIO () #
wLogShow :: Show s => s -> SafeT MockIO () #
wFlush :: SafeT MockIO () #
 BusinessIO (ControlT IO) # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.BusinessIO
 
Methods
wPutAsChar :: Integral v => v -> ControlT IO () #
wPutAsDec :: Integral v => v -> ControlT IO () #
wGetCharAs :: Integral v => ControlT IO v #
wGetDecAs :: Integral v => ControlT IO v #
wPutIntAsChar :: Int -> ControlT IO ()
wPutIntAsDec :: Int -> ControlT IO ()
wGetCharAsInt :: ControlT IO Int
wGetDecAsInt :: ControlT IO Int
wGetContentsBS :: ControlT IO ByteString #
wGetContentsText :: ControlT IO Text #
wGetContents :: ControlT IO String #
wGetChar :: ControlT IO Char #
wGetLine :: ControlT IO Text #
wPutChar :: Char -> ControlT IO () #
wPutStr :: Text -> ControlT IO () #
wPutStrLn :: Text -> ControlT IO () #
wLogStr :: Text -> ControlT IO () #
wLogStrLn :: Text -> ControlT IO () #
wLogShow :: Show s => s -> ControlT IO () #
wFlush :: ControlT IO () #
 BusinessIO (ControlT FreeIO) # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.FreeIO
 
Methods
wPutAsChar :: Integral v => v -> ControlT FreeIO () #
wPutAsDec :: Integral v => v -> ControlT FreeIO () #
wGetCharAs :: Integral v => ControlT FreeIO v #
wGetDecAs :: Integral v => ControlT FreeIO v #
wPutIntAsChar :: Int -> ControlT FreeIO ()
wPutIntAsDec :: Int -> ControlT FreeIO ()
wGetCharAsInt :: ControlT FreeIO Int
wGetDecAsInt :: ControlT FreeIO Int
wGetContentsBS :: ControlT FreeIO ByteString #
wGetContentsText :: ControlT FreeIO Text #
wGetContents :: ControlT FreeIO String #
wGetChar :: ControlT FreeIO Char #
wGetLine :: ControlT FreeIO Text #
wPutChar :: Char -> ControlT FreeIO () #
wPutStr :: Text -> ControlT FreeIO () #
wPutStrLn :: Text -> ControlT FreeIO () #
wLogStr :: Text -> ControlT FreeIO () #
wLogStrLn :: Text -> ControlT FreeIO () #
wLogShow :: Show s => s -> ControlT FreeIO () #
wFlush :: ControlT FreeIO () #
 BusinessIO (ControlT MockIO) # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.MockIO
 
Methods
wPutAsChar :: Integral v => v -> ControlT MockIO () #
wPutAsDec :: Integral v => v -> ControlT MockIO () #
wGetCharAs :: Integral v => ControlT MockIO v #
wGetDecAs :: Integral v => ControlT MockIO v #
wPutIntAsChar :: Int -> ControlT MockIO ()
wPutIntAsDec :: Int -> ControlT MockIO ()
wGetCharAsInt :: ControlT MockIO Int
wGetDecAsInt :: ControlT MockIO Int
wGetContentsBS :: ControlT MockIO ByteString #
wGetContentsText :: ControlT MockIO Text #
wGetContents :: ControlT MockIO String #
wGetChar :: ControlT MockIO Char #
wGetLine :: ControlT MockIO Text #
wPutChar :: Char -> ControlT MockIO () #
wPutStr :: Text -> ControlT MockIO () #
wPutStrLn :: Text -> ControlT MockIO () #
wLogStr :: Text -> ControlT MockIO () #
wLogStrLn :: Text -> ControlT MockIO () #
wLogShow :: Show s => s -> ControlT MockIO () #
wFlush :: ControlT MockIO () #
 BusinessIO (ExceptT String IO) # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.BusinessIO
 
Methods
wPutAsChar :: Integral v => v -> ExceptT String IO () #
wPutAsDec :: Integral v => v -> ExceptT String IO () #
wGetCharAs :: Integral v => ExceptT String IO v #
wGetDecAs :: Integral v => ExceptT String IO v #
wPutIntAsChar :: Int -> ExceptT String IO ()
wPutIntAsDec :: Int -> ExceptT String IO ()
wGetCharAsInt :: ExceptT String IO Int
wGetDecAsInt :: ExceptT String IO Int
wGetContentsBS :: ExceptT String IO ByteString #
wGetContentsText :: ExceptT String IO Text #
wGetContents :: ExceptT String IO String #
wGetChar :: ExceptT String IO Char #
wGetLine :: ExceptT String IO Text #
wPutChar :: Char -> ExceptT String IO () #
wPutStr :: Text -> ExceptT String IO () #
wPutStrLn :: Text -> ExceptT String IO () #
wLogStr :: Text -> ExceptT String IO () #
wLogStrLn :: Text -> ExceptT String IO () #
wLogShow :: Show s => s -> ExceptT String IO () #
wFlush :: ExceptT String IO () #
wPutAsChar :: (BusinessIO m, Integral v) => v -> m () #
wPutAsDec :: (BusinessIO m, Integral v) => v -> m () #
wGetCharAs :: (BusinessIO m, Integral v) => m v #
wGetDecAs :: (BusinessIO m, Integral v) => m v #
wGetContentsBS :: BusinessIO m => m ByteString #
wGetContentsText :: BusinessIO m => m Text #
wGetContents :: BusinessIO m => m String #
wGetChar :: BusinessIO m => m Char #
wPutChar :: BusinessIO m => Char -> m () #
wGetLine :: BusinessIO m => m Text #
wPutStr :: BusinessIO m => Text -> m () #
wPutStrLn :: BusinessIO m => Text -> m () #
wFlush :: BusinessIO m => m () #
wLogStr :: BusinessIO m => Text -> m () #
wLogStrLn :: BusinessIO m => Text -> m () #
wLogShow :: (BusinessIO m, Show s) => s -> m () #
logStr :: Text -> IO () #
flush :: IO () #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-IO-EvaluatorIO.html b/docs/reports/helma/HelVM-HelMA-Automaton-IO-EvaluatorIO.html
index e2a0ebb85..8d04c08f6 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-IO-EvaluatorIO.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-IO-EvaluatorIO.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.IO.AutomatonIO
helma-0.8.3.10: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.IO.AutomatonIO
Documentation
type SRAutomaton e s r m = (Stack s e, RAM r e, Evaluator e m) #
type REvaluator e r m = (RAM r e, Evaluator e m) #
type SEvaluator e s m = (Stack s e, Evaluator e m) #
type Evaluator e m = (Element e, BIO m) #

\ No newline at end of file
+HelVM.HelMA.Automaton.IO.AutomatonIO
helma-0.8.3.10: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.IO.AutomatonIO
Documentation
type SRAutomaton e s r m = (Stack s e, RAM r e, Evaluator e m) #
type REvaluator e r m = (RAM r e, Evaluator e m) #
type SEvaluator e s m = (Stack s e, Evaluator e m) #
type Evaluator e m = (Element e, BIO m) #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-IO-FreeIO.html b/docs/reports/helma/HelVM-HelMA-Automaton-IO-FreeIO.html
index ab8705e6f..f9b968f96 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-IO-FreeIO.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-IO-FreeIO.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.IO.FreeIO
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.IO.FreeIO
Synopsis
Documentation
interpretFreeIOToBusinessIO :: BusinessIO m => FreeIO a -> m a #
logInput :: FreeIO ~> FreeIO #
logOutput :: FreeIO ~> FreeIO #
type FreeIO = Free FreeIOF #
Types

\ No newline at end of file
+HelVM.HelMA.Automaton.IO.FreeIO
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.IO.FreeIO
Synopsis
Documentation
interpretFreeIOToBusinessIO :: BusinessIO m => FreeIO a -> m a #
logInput :: FreeIO ~> FreeIO #
logOutput :: FreeIO ~> FreeIO #
type FreeIO = Free FreeIOF #
Types

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-IO-MockIO.html b/docs/reports/helma/HelVM-HelMA-Automaton-IO-MockIO.html
index b03eef39b..69dffaf9b 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-IO-MockIO.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-IO-MockIO.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.IO.MockIO
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.IO.MockIO
Documentation
ioExecMockIOBatch :: ControlT MockIO () -> IO MockIOData #
ioExecMockIOWithInput :: Input -> ControlT MockIO () -> IO MockIOData #
safeExecMockIOBatch :: ControlT MockIO () -> Safe MockIOData #
safeExecMockIOWithInput :: Input -> ControlT MockIO () -> Safe MockIOData #
execMockIOBatch :: MockIO () -> MockIOData #
execMockIOWithInput :: Input -> MockIO () -> MockIOData #
runMockIO :: Input -> MockIO UnitSafeWithMessages -> MockIOData #
createMockIO :: Input -> MockIOData #
calculateOutput :: MockIOData -> Output #
calculateLogged :: MockIOData -> Output #
type MockIO = State MockIOData #
data MockIOData #
Instances
Instances details
 Eq MockIOData # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.MockIO
 
Methods
(==) :: MockIOData -> MockIOData -> Bool #
(/=) :: MockIOData -> MockIOData -> Bool #
 Read MockIOData # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.MockIO
 
Methods
readsPrec :: Int -> ReadS MockIOData #
readList :: ReadS [MockIOData] #
readPrec :: ReadPrec MockIOData #
readListPrec :: ReadPrec [MockIOData] #
 Show MockIOData # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.MockIO
 
Methods
showsPrec :: Int -> MockIOData -> ShowS #
show :: MockIOData -> String #
showList :: [MockIOData] -> ShowS #
 BusinessIO MockIO # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.MockIO
 
Methods
wPutAsChar :: Integral v => v -> MockIO () #
wPutAsDec :: Integral v => v -> MockIO () #
wGetCharAs :: Integral v => MockIO v #
wGetDecAs :: Integral v => MockIO v #
wPutIntAsChar :: Int -> MockIO ()
wPutIntAsDec :: Int -> MockIO ()
wGetCharAsInt :: MockIO Int
wGetDecAsInt :: MockIO Int
wGetContentsBS :: MockIO ByteString #
wGetContentsText :: MockIO Text #
wGetContents :: MockIO String #
wGetChar :: MockIO Char #
wGetLine :: MockIO Text #
wPutChar :: Char -> MockIO () #
wPutStr :: Text -> MockIO () #
wPutStrLn :: Text -> MockIO () #
wLogStr :: Text -> MockIO () #
wLogStrLn :: Text -> MockIO () #
wLogShow :: Show s => s -> MockIO () #
wFlush :: MockIO () #
 BusinessIO (SafeT MockIO) # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.MockIO
 
Methods
wPutAsChar :: Integral v => v -> SafeT MockIO () #
wPutAsDec :: Integral v => v -> SafeT MockIO () #
wGetCharAs :: Integral v => SafeT MockIO v #
wGetDecAs :: Integral v => SafeT MockIO v #
wPutIntAsChar :: Int -> SafeT MockIO ()
wPutIntAsDec :: Int -> SafeT MockIO ()
wGetCharAsInt :: SafeT MockIO Int
wGetDecAsInt :: SafeT MockIO Int
wGetContentsBS :: SafeT MockIO ByteString #
wGetContentsText :: SafeT MockIO Text #
wGetContents :: SafeT MockIO String #
wGetChar :: SafeT MockIO Char #
wGetLine :: SafeT MockIO Text #
wPutChar :: Char -> SafeT MockIO () #
wPutStr :: Text -> SafeT MockIO () #
wPutStrLn :: Text -> SafeT MockIO () #
wLogStr :: Text -> SafeT MockIO () #
wLogStrLn :: Text -> SafeT MockIO () #
wLogShow :: Show s => s -> SafeT MockIO () #
wFlush :: SafeT MockIO () #
 BusinessIO (ControlT MockIO) # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.MockIO
 
Methods
wPutAsChar :: Integral v => v -> ControlT MockIO () #
wPutAsDec :: Integral v => v -> ControlT MockIO () #
wGetCharAs :: Integral v => ControlT MockIO v #
wGetDecAs :: Integral v => ControlT MockIO v #
wPutIntAsChar :: Int -> ControlT MockIO ()
wPutIntAsDec :: Int -> ControlT MockIO ()
wGetCharAsInt :: ControlT MockIO Int
wGetDecAsInt :: ControlT MockIO Int
wGetContentsBS :: ControlT MockIO ByteString #
wGetContentsText :: ControlT MockIO Text #
wGetContents :: ControlT MockIO String #
wGetChar :: ControlT MockIO Char #
wGetLine :: ControlT MockIO Text #
wPutChar :: Char -> ControlT MockIO () #
wPutStr :: Text -> ControlT MockIO () #
wPutStrLn :: Text -> ControlT MockIO () #
wLogStr :: Text -> ControlT MockIO () #
wLogStrLn :: Text -> ControlT MockIO () #
wLogShow :: Show s => s -> ControlT MockIO () #
wFlush :: ControlT MockIO () #

\ No newline at end of file
+HelVM.HelMA.Automaton.IO.MockIO
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.IO.MockIO
Documentation
ioExecMockIOBatch :: ControlT MockIO () -> IO MockIOData #
ioExecMockIOWithInput :: Input -> ControlT MockIO () -> IO MockIOData #
safeExecMockIOBatch :: ControlT MockIO () -> Safe MockIOData #
safeExecMockIOWithInput :: Input -> ControlT MockIO () -> Safe MockIOData #
execMockIOBatch :: MockIO () -> MockIOData #
execMockIOWithInput :: Input -> MockIO () -> MockIOData #
runMockIO :: Input -> MockIO UnitSafeWithMessages -> MockIOData #
createMockIO :: Input -> MockIOData #
calculateOutput :: MockIOData -> Output #
calculateLogged :: MockIOData -> Output #
type MockIO = State MockIOData #
data MockIOData #
Instances
Instances details
 Eq MockIOData # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.MockIO
 
Methods
(==) :: MockIOData -> MockIOData -> Bool #
(/=) :: MockIOData -> MockIOData -> Bool #
 Read MockIOData # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.MockIO
 
Methods
readsPrec :: Int -> ReadS MockIOData #
readList :: ReadS [MockIOData] #
readPrec :: ReadPrec MockIOData #
readListPrec :: ReadPrec [MockIOData] #
 Show MockIOData # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.MockIO
 
Methods
showsPrec :: Int -> MockIOData -> ShowS #
show :: MockIOData -> String #
showList :: [MockIOData] -> ShowS #
 BusinessIO MockIO # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.MockIO
 
Methods
wPutAsChar :: Integral v => v -> MockIO () #
wPutAsDec :: Integral v => v -> MockIO () #
wGetCharAs :: Integral v => MockIO v #
wGetDecAs :: Integral v => MockIO v #
wPutIntAsChar :: Int -> MockIO ()
wPutIntAsDec :: Int -> MockIO ()
wGetCharAsInt :: MockIO Int
wGetDecAsInt :: MockIO Int
wGetContentsBS :: MockIO ByteString #
wGetContentsText :: MockIO Text #
wGetContents :: MockIO String #
wGetChar :: MockIO Char #
wGetLine :: MockIO Text #
wPutChar :: Char -> MockIO () #
wPutStr :: Text -> MockIO () #
wPutStrLn :: Text -> MockIO () #
wLogStr :: Text -> MockIO () #
wLogStrLn :: Text -> MockIO () #
wLogShow :: Show s => s -> MockIO () #
wFlush :: MockIO () #
 BusinessIO (SafeT MockIO) # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.MockIO
 
Methods
wPutAsChar :: Integral v => v -> SafeT MockIO () #
wPutAsDec :: Integral v => v -> SafeT MockIO () #
wGetCharAs :: Integral v => SafeT MockIO v #
wGetDecAs :: Integral v => SafeT MockIO v #
wPutIntAsChar :: Int -> SafeT MockIO ()
wPutIntAsDec :: Int -> SafeT MockIO ()
wGetCharAsInt :: SafeT MockIO Int
wGetDecAsInt :: SafeT MockIO Int
wGetContentsBS :: SafeT MockIO ByteString #
wGetContentsText :: SafeT MockIO Text #
wGetContents :: SafeT MockIO String #
wGetChar :: SafeT MockIO Char #
wGetLine :: SafeT MockIO Text #
wPutChar :: Char -> SafeT MockIO () #
wPutStr :: Text -> SafeT MockIO () #
wPutStrLn :: Text -> SafeT MockIO () #
wLogStr :: Text -> SafeT MockIO () #
wLogStrLn :: Text -> SafeT MockIO () #
wLogShow :: Show s => s -> SafeT MockIO () #
wFlush :: SafeT MockIO () #
 BusinessIO (ControlT MockIO) # 
Instance details
Defined in HelVM.HelMA.Automaton.IO.MockIO
 
Methods
wPutAsChar :: Integral v => v -> ControlT MockIO () #
wPutAsDec :: Integral v => v -> ControlT MockIO () #
wGetCharAs :: Integral v => ControlT MockIO v #
wGetDecAs :: Integral v => ControlT MockIO v #
wPutIntAsChar :: Int -> ControlT MockIO ()
wPutIntAsDec :: Int -> ControlT MockIO ()
wGetCharAsInt :: ControlT MockIO Int
wGetDecAsInt :: ControlT MockIO Int
wGetContentsBS :: ControlT MockIO ByteString #
wGetContentsText :: ControlT MockIO Text #
wGetContents :: ControlT MockIO String #
wGetChar :: ControlT MockIO Char #
wGetLine :: ControlT MockIO Text #
wPutChar :: Char -> ControlT MockIO () #
wPutStr :: Text -> ControlT MockIO () #
wPutStrLn :: Text -> ControlT MockIO () #
wLogStr :: Text -> ControlT MockIO () #
wLogStrLn :: Text -> ControlT MockIO () #
wLogShow :: Show s => s -> ControlT MockIO () #
wFlush :: ControlT MockIO () #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-Instruction-ALInstruction.html b/docs/reports/helma/HelVM-HelMA-Automaton-Instruction-ALInstruction.html
index 52b811223..d9f2260e6 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-Instruction-ALInstruction.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-Instruction-ALInstruction.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.Instruction.ALInstruction
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Instruction.ALInstruction
Documentation
dupI :: ALInstruction #
Constructors
swapI :: ALInstruction #
Constructors
rotI :: ALInstruction #
Constructors
dCopy :: ALInstruction #
Constructors
blAnd :: OperatorType -> BinaryInstruction #
blOr :: OperatorType -> BinaryInstruction #
blXor :: OperatorType -> BinaryInstruction #
blEQ :: OperatorType -> BinaryInstruction #
blGT :: OperatorType -> BinaryInstruction #
calculateOps :: Integral a => a -> a -> [BinaryInstruction] -> [a] #
Other functions
calculateOp :: Integral a => a -> a -> BinaryInstruction -> a #
doBinary :: Integral a => BinaryInstruction -> a -> a -> a #
data ALInstruction #
Types
Constructors
Cons Integer 
Unary !UnaryInstruction 
Binary !BinaryInstruction 
Binaries [BinaryInstruction] 
SStatic !StackIndex !ManipulationInstruction 
SDynamic !ManipulationInstruction 
SIO !IOInstruction 
Halibut 
Pick 
Discard 
Instances
Instances details
 Eq ALInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.ALInstruction
 
Methods
(==) :: ALInstruction -> ALInstruction -> Bool #
(/=) :: ALInstruction -> ALInstruction -> Bool #
 Read ALInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.ALInstruction
 
Methods
readsPrec :: Int -> ReadS ALInstruction #
readList :: ReadS [ALInstruction] #
readPrec :: ReadPrec ALInstruction #
readListPrec :: ReadPrec [ALInstruction] #
 Show ALInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.ALInstruction
 
Methods
showsPrec :: Int -> ALInstruction -> ShowS #
show :: ALInstruction -> String #
showList :: [ALInstruction] -> ShowS #
data UnaryInstruction #
Constructors
Neg 
BNot 
LNot 
Instances
Instances details
 Eq UnaryInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.ALInstruction
 
Methods
(==) :: UnaryInstruction -> UnaryInstruction -> Bool #
(/=) :: UnaryInstruction -> UnaryInstruction -> Bool #
 Read UnaryInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.ALInstruction
 
Methods
readsPrec :: Int -> ReadS UnaryInstruction #
readList :: ReadS [UnaryInstruction] #
readPrec :: ReadPrec UnaryInstruction #
readListPrec :: ReadPrec [UnaryInstruction] #
 Show UnaryInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.ALInstruction
 
Methods
showsPrec :: Int -> UnaryInstruction -> ShowS #
show :: UnaryInstruction -> String #
showList :: [UnaryInstruction] -> ShowS #
data BinaryInstruction #
Constructors
Add 
Sub 
Mul 
Div 
Mod 
BAnd 
BOr 
BXor 
BEQ 
BGT 
LAnd 
LOr 
LXor 
LEQ 
LGT 
Instances
Instances details
 Eq BinaryInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.ALInstruction
 
Methods
(==) :: BinaryInstruction -> BinaryInstruction -> Bool #
(/=) :: BinaryInstruction -> BinaryInstruction -> Bool #
 Read BinaryInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.ALInstruction
 
Methods
readsPrec :: Int -> ReadS BinaryInstruction #
readList :: ReadS [BinaryInstruction] #
readPrec :: ReadPrec BinaryInstruction #
readListPrec :: ReadPrec [BinaryInstruction] #
 Show BinaryInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.ALInstruction
 
Methods
showsPrec :: Int -> BinaryInstruction -> ShowS #
show :: BinaryInstruction -> String #
showList :: [BinaryInstruction] -> ShowS #
data ManipulationInstruction #
Constructors
Copy 
Move 
Slide 
Instances
Instances details
 Eq ManipulationInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.ALInstruction
 
Methods
(==) :: ManipulationInstruction -> ManipulationInstruction -> Bool #
(/=) :: ManipulationInstruction -> ManipulationInstruction -> Bool #
 Read ManipulationInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.ALInstruction
 
Methods
readsPrec :: Int -> ReadS ManipulationInstruction #
readList :: ReadS [ManipulationInstruction] #
readPrec :: ReadPrec ManipulationInstruction #
readListPrec :: ReadPrec [ManipulationInstruction] #
 Show ManipulationInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.ALInstruction
 
Methods
showsPrec :: Int -> ManipulationInstruction -> ShowS #
show :: ManipulationInstruction -> String #
showList :: [ManipulationInstruction] -> ShowS #
type StackIndex = Int #
data OperatorType #
Constructors
Bitwise 
Logical 

\ No newline at end of file
+HelVM.HelMA.Automaton.Instruction.ALInstruction
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Instruction.ALInstruction
Documentation
blAnd :: OperatorType -> BinaryInstruction #
Constructors
blOr :: OperatorType -> BinaryInstruction #
blXor :: OperatorType -> BinaryInstruction #
blEQ :: OperatorType -> BinaryInstruction #
blGT :: OperatorType -> BinaryInstruction #
calculateOps :: Integral a => a -> a -> [BinaryInstruction] -> [a] #
Other functions
calculateOp :: Integral a => a -> a -> BinaryInstruction -> a #
doBinary :: Integral a => BinaryInstruction -> a -> a -> a #
data ALInstruction #
Types
Constructors
SAL !ALInstruction2 
SIO !IOInstruction 
Instances
Instances details
 Eq ALInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.ALInstruction
 
Methods
(==) :: ALInstruction -> ALInstruction -> Bool #
(/=) :: ALInstruction -> ALInstruction -> Bool #
 Read ALInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.ALInstruction
 
Methods
readsPrec :: Int -> ReadS ALInstruction #
readList :: ReadS [ALInstruction] #
readPrec :: ReadPrec ALInstruction #
readListPrec :: ReadPrec [ALInstruction] #
 Show ALInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.ALInstruction
 
Methods
showsPrec :: Int -> ALInstruction -> ShowS #
show :: ALInstruction -> String #
showList :: [ALInstruction] -> ShowS #
data ALInstruction2 #
Constructors
Cons Integer 
Unary !UnaryInstruction 
Binary !BinaryInstruction 
Binaries [BinaryInstruction] 
SStatic !StackIndex !ManipulationInstruction 
SDynamic !ManipulationInstruction 
Halibut 
Pick 
Discard 
Instances
Instances details
 Eq ALInstruction2 # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.ALInstruction
 
Methods
(==) :: ALInstruction2 -> ALInstruction2 -> Bool #
(/=) :: ALInstruction2 -> ALInstruction2 -> Bool #
 Read ALInstruction2 # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.ALInstruction
 
Methods
readsPrec :: Int -> ReadS ALInstruction2 #
readList :: ReadS [ALInstruction2] #
readPrec :: ReadPrec ALInstruction2 #
readListPrec :: ReadPrec [ALInstruction2] #
 Show ALInstruction2 # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.ALInstruction
 
Methods
showsPrec :: Int -> ALInstruction2 -> ShowS #
show :: ALInstruction2 -> String #
showList :: [ALInstruction2] -> ShowS #
data UnaryInstruction #
Constructors
Neg 
BNot 
LNot 
Instances
Instances details
 Eq UnaryInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.ALInstruction
 
Methods
(==) :: UnaryInstruction -> UnaryInstruction -> Bool #
(/=) :: UnaryInstruction -> UnaryInstruction -> Bool #
 Read UnaryInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.ALInstruction
 
Methods
readsPrec :: Int -> ReadS UnaryInstruction #
readList :: ReadS [UnaryInstruction] #
readPrec :: ReadPrec UnaryInstruction #
readListPrec :: ReadPrec [UnaryInstruction] #
 Show UnaryInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.ALInstruction
 
Methods
showsPrec :: Int -> UnaryInstruction -> ShowS #
show :: UnaryInstruction -> String #
showList :: [UnaryInstruction] -> ShowS #
data BinaryInstruction #
Constructors
Add 
Sub 
Mul 
Div 
Mod 
BAnd 
BOr 
BXor 
BEQ 
BGT 
LAnd 
LOr 
LXor 
LEQ 
LGT 
Instances
Instances details
 Eq BinaryInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.ALInstruction
 
Methods
(==) :: BinaryInstruction -> BinaryInstruction -> Bool #
(/=) :: BinaryInstruction -> BinaryInstruction -> Bool #
 Read BinaryInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.ALInstruction
 
Methods
readsPrec :: Int -> ReadS BinaryInstruction #
readList :: ReadS [BinaryInstruction] #
readPrec :: ReadPrec BinaryInstruction #
readListPrec :: ReadPrec [BinaryInstruction] #
 Show BinaryInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.ALInstruction
 
Methods
showsPrec :: Int -> BinaryInstruction -> ShowS #
show :: BinaryInstruction -> String #
showList :: [BinaryInstruction] -> ShowS #
data ManipulationInstruction #
Constructors
Copy 
Move 
Slide 
Instances
Instances details
 Eq ManipulationInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.ALInstruction
 
Methods
(==) :: ManipulationInstruction -> ManipulationInstruction -> Bool #
(/=) :: ManipulationInstruction -> ManipulationInstruction -> Bool #
 Read ManipulationInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.ALInstruction
 
Methods
readsPrec :: Int -> ReadS ManipulationInstruction #
readList :: ReadS [ManipulationInstruction] #
readPrec :: ReadPrec ManipulationInstruction #
readListPrec :: ReadPrec [ManipulationInstruction] #
 Show ManipulationInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.ALInstruction
 
Methods
showsPrec :: Int -> ManipulationInstruction -> ShowS #
show :: ManipulationInstruction -> String #
showList :: [ManipulationInstruction] -> ShowS #
type StackIndex = Int #
data OperatorType #
Constructors
Bitwise 
Logical 

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-Instruction-CFInstruction.html b/docs/reports/helma/HelVM-HelMA-Automaton-Instruction-CFInstruction.html
index 87fbaf511..1878b77a0 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-Instruction-CFInstruction.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-Instruction-CFInstruction.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.Instruction.CFInstruction
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Instruction.CFInstruction
Documentation
dJumpI :: CFInstruction #
Constructors
isNotJump :: Integral e => BranchTest -> e -> Bool #
Others
isJump :: Integral e => BranchTest -> e -> Bool #
data CFInstruction #
Types
Constructors
SMark !Label 
DMark !Natural 
CStatic !Label !LabelInstruction 
CDynamic !LabelInstruction 
Return 
Instances
Instances details
 Eq CFInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.CFInstruction
 
Methods
(==) :: CFInstruction -> CFInstruction -> Bool #
(/=) :: CFInstruction -> CFInstruction -> Bool #
 Read CFInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.CFInstruction
 
Methods
readsPrec :: Int -> ReadS CFInstruction #
readList :: ReadS [CFInstruction] #
readPrec :: ReadPrec CFInstruction #
readListPrec :: ReadPrec [CFInstruction] #
 Show CFInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.CFInstruction
 
Methods
showsPrec :: Int -> CFInstruction -> ShowS #
show :: CFInstruction -> String #
showList :: [CFInstruction] -> ShowS #
type Label = SString #
data LabelInstruction #
Constructors
Call 
Jump 
Branch !BranchTest 
Instances
Instances details
 Eq LabelInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.CFInstruction
 
Methods
(==) :: LabelInstruction -> LabelInstruction -> Bool #
(/=) :: LabelInstruction -> LabelInstruction -> Bool #
 Read LabelInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.CFInstruction
 
Methods
readsPrec :: Int -> ReadS LabelInstruction #
readList :: ReadS [LabelInstruction] #
readPrec :: ReadPrec LabelInstruction #
readListPrec :: ReadPrec [LabelInstruction] #
 Show LabelInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.CFInstruction
 
Methods
showsPrec :: Int -> LabelInstruction -> ShowS #
show :: LabelInstruction -> String #
showList :: [LabelInstruction] -> ShowS #
data BranchTest #
Constructors
EZ 
LTZ 
GTZ 
Instances
Instances details
 Eq BranchTest # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.CFInstruction
 
Methods
(==) :: BranchTest -> BranchTest -> Bool #
(/=) :: BranchTest -> BranchTest -> Bool #
 Read BranchTest # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.CFInstruction
 
Methods
readsPrec :: Int -> ReadS BranchTest #
readList :: ReadS [BranchTest] #
readPrec :: ReadPrec BranchTest #
readListPrec :: ReadPrec [BranchTest] #
 Show BranchTest # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.CFInstruction
 
Methods
showsPrec :: Int -> BranchTest -> ShowS #
show :: BranchTest -> String #
showList :: [BranchTest] -> ShowS #

\ No newline at end of file
+HelVM.HelMA.Automaton.Instruction.CFInstruction
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Instruction.CFInstruction
Documentation
dJumpI :: CFInstruction #
Constructors
isNotJump :: Integral e => BranchTest -> e -> Bool #
Others
isJump :: Integral e => BranchTest -> e -> Bool #
data CFInstruction #
Types
Constructors
SMark !Label 
DMark !Natural 
CStatic !Label !LabelInstruction 
CDynamic !LabelInstruction 
Return 
Instances
Instances details
 Eq CFInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.CFInstruction
 
Methods
(==) :: CFInstruction -> CFInstruction -> Bool #
(/=) :: CFInstruction -> CFInstruction -> Bool #
 Read CFInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.CFInstruction
 
Methods
readsPrec :: Int -> ReadS CFInstruction #
readList :: ReadS [CFInstruction] #
readPrec :: ReadPrec CFInstruction #
readListPrec :: ReadPrec [CFInstruction] #
 Show CFInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.CFInstruction
 
Methods
showsPrec :: Int -> CFInstruction -> ShowS #
show :: CFInstruction -> String #
showList :: [CFInstruction] -> ShowS #
type Label = SString #
data LabelInstruction #
Constructors
Call 
Jump 
Branch !BranchTest 
Instances
Instances details
 Eq LabelInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.CFInstruction
 
Methods
(==) :: LabelInstruction -> LabelInstruction -> Bool #
(/=) :: LabelInstruction -> LabelInstruction -> Bool #
 Read LabelInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.CFInstruction
 
Methods
readsPrec :: Int -> ReadS LabelInstruction #
readList :: ReadS [LabelInstruction] #
readPrec :: ReadPrec LabelInstruction #
readListPrec :: ReadPrec [LabelInstruction] #
 Show LabelInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.CFInstruction
 
Methods
showsPrec :: Int -> LabelInstruction -> ShowS #
show :: LabelInstruction -> String #
showList :: [LabelInstruction] -> ShowS #
data BranchTest #
Constructors
EZ 
LTZ 
GTZ 
Instances
Instances details
 Eq BranchTest # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.CFInstruction
 
Methods
(==) :: BranchTest -> BranchTest -> Bool #
(/=) :: BranchTest -> BranchTest -> Bool #
 Read BranchTest # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.CFInstruction
 
Methods
readsPrec :: Int -> ReadS BranchTest #
readList :: ReadS [BranchTest] #
readPrec :: ReadPrec BranchTest #
readListPrec :: ReadPrec [BranchTest] #
 Show BranchTest # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.CFInstruction
 
Methods
showsPrec :: Int -> BranchTest -> ShowS #
show :: BranchTest -> String #
showList :: [BranchTest] -> ShowS #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-Instruction-IOInstruction.html b/docs/reports/helma/HelVM-HelMA-Automaton-Instruction-IOInstruction.html
index b8630b7aa..59c9542f4 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-Instruction-IOInstruction.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-Instruction-IOInstruction.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.Instruction.IOInstruction
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Instruction.IOInstruction

\ No newline at end of file
+HelVM.HelMA.Automaton.Instruction.IOInstruction
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Instruction.IOInstruction

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-Instruction-LSInstruction.html b/docs/reports/helma/HelVM-HelMA-Automaton-Instruction-LSInstruction.html
index fc2af1189..65b11a1dc 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-Instruction-LSInstruction.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-Instruction-LSInstruction.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.Instruction.LSInstruction
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Instruction.LSInstruction

\ No newline at end of file
+HelVM.HelMA.Automaton.Instruction.LSInstruction
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Instruction.LSInstruction

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-Instruction-SInstruction.html b/docs/reports/helma/HelVM-HelMA-Automaton-Instruction-SInstruction.html
new file mode 100644
index 000000000..480658b5a
--- /dev/null
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-Instruction-SInstruction.html
@@ -0,0 +1 @@
+HelVM.HelMA.Automaton.Instruction.SInstruction
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Instruction.SInstruction
Documentation
blAnd :: OperatorType -> BinaryInstruction #
Constructors
blOr :: OperatorType -> BinaryInstruction #
blXor :: OperatorType -> BinaryInstruction #
blEQ :: OperatorType -> BinaryInstruction #
blGT :: OperatorType -> BinaryInstruction #
calculateOps :: Integral a => a -> a -> [BinaryInstruction] -> [a] #
Other functions
calculateOp :: Integral a => a -> a -> BinaryInstruction -> a #
doBinary :: Integral a => BinaryInstruction -> a -> a -> a #
data SInstruction #
Types
Constructors
SAL !ALInstruction 
SIO !IOInstruction 
Instances
Instances details
 Eq SInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.SInstruction
 
Methods
(==) :: SInstruction -> SInstruction -> Bool #
(/=) :: SInstruction -> SInstruction -> Bool #
 Read SInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.SInstruction
 
Methods
readsPrec :: Int -> ReadS SInstruction #
readList :: ReadS [SInstruction] #
readPrec :: ReadPrec SInstruction #
readListPrec :: ReadPrec [SInstruction] #
 Show SInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.SInstruction
 
Methods
showsPrec :: Int -> SInstruction -> ShowS #
show :: SInstruction -> String #
showList :: [SInstruction] -> ShowS #
data ALInstruction #
Constructors
Cons Integer 
Unary !UnaryInstruction 
Binary !BinaryInstruction 
Binaries [BinaryInstruction] 
SStatic !StackIndex !ManipulationInstruction 
SDynamic !ManipulationInstruction 
Halibut 
Pick 
Discard 
Instances
Instances details
 Eq ALInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.SInstruction
 
Methods
(==) :: ALInstruction -> ALInstruction -> Bool #
(/=) :: ALInstruction -> ALInstruction -> Bool #
 Read ALInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.SInstruction
 
Methods
readsPrec :: Int -> ReadS ALInstruction #
readList :: ReadS [ALInstruction] #
readPrec :: ReadPrec ALInstruction #
readListPrec :: ReadPrec [ALInstruction] #
 Show ALInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.SInstruction
 
Methods
showsPrec :: Int -> ALInstruction -> ShowS #
show :: ALInstruction -> String #
showList :: [ALInstruction] -> ShowS #
data UnaryInstruction #
Constructors
Neg 
BNot 
LNot 
Instances
Instances details
 Eq UnaryInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.SInstruction
 
Methods
(==) :: UnaryInstruction -> UnaryInstruction -> Bool #
(/=) :: UnaryInstruction -> UnaryInstruction -> Bool #
 Read UnaryInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.SInstruction
 
Methods
readsPrec :: Int -> ReadS UnaryInstruction #
readList :: ReadS [UnaryInstruction] #
readPrec :: ReadPrec UnaryInstruction #
readListPrec :: ReadPrec [UnaryInstruction] #
 Show UnaryInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.SInstruction
 
Methods
showsPrec :: Int -> UnaryInstruction -> ShowS #
show :: UnaryInstruction -> String #
showList :: [UnaryInstruction] -> ShowS #
data BinaryInstruction #
Constructors
Add 
Sub 
Mul 
Div 
Mod 
BAnd 
BOr 
BXor 
BEQ 
BGT 
LAnd 
LOr 
LXor 
LEQ 
LGT 
Instances
Instances details
 Eq BinaryInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.SInstruction
 
Methods
(==) :: BinaryInstruction -> BinaryInstruction -> Bool #
(/=) :: BinaryInstruction -> BinaryInstruction -> Bool #
 Read BinaryInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.SInstruction
 
Methods
readsPrec :: Int -> ReadS BinaryInstruction #
readList :: ReadS [BinaryInstruction] #
readPrec :: ReadPrec BinaryInstruction #
readListPrec :: ReadPrec [BinaryInstruction] #
 Show BinaryInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.SInstruction
 
Methods
showsPrec :: Int -> BinaryInstruction -> ShowS #
show :: BinaryInstruction -> String #
showList :: [BinaryInstruction] -> ShowS #
data ManipulationInstruction #
Constructors
Copy 
Move 
Slide 
Instances
Instances details
 Eq ManipulationInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.SInstruction
 
Methods
(==) :: ManipulationInstruction -> ManipulationInstruction -> Bool #
(/=) :: ManipulationInstruction -> ManipulationInstruction -> Bool #
 Read ManipulationInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.SInstruction
 
Methods
readsPrec :: Int -> ReadS ManipulationInstruction #
readList :: ReadS [ManipulationInstruction] #
readPrec :: ReadPrec ManipulationInstruction #
readListPrec :: ReadPrec [ManipulationInstruction] #
 Show ManipulationInstruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction.SInstruction
 
Methods
showsPrec :: Int -> ManipulationInstruction -> ShowS #
show :: ManipulationInstruction -> String #
showList :: [ManipulationInstruction] -> ShowS #
type StackIndex = Int #
data OperatorType #
Constructors
Bitwise 
Logical 

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-Instruction.html b/docs/reports/helma/HelVM-HelMA-Automaton-Instruction.html
index 503c53905..192be05bf 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-Instruction.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-Instruction.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.Instruction
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Instruction

\ No newline at end of file
+HelVM.HelMA.Automaton.Instruction
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Instruction
Synopsis
Documentation
consI :: Integer -> Instruction #
Constructors
addI :: Instruction #
subI :: Instruction #
mulI :: Instruction #
divI :: Instruction #
modI :: Instruction #
divModI :: Instruction #
negI :: Instruction #
halibutI :: Instruction #
dupI :: Instruction #
swapI :: Instruction #
rotI :: Instruction #
dCopy :: Instruction #
discardI :: Instruction #
sCopyI :: StackIndex -> Instruction #
sMoveI :: StackIndex -> Instruction #
sSlideI :: StackIndex -> Instruction #
sStatic :: ManipulationInstruction -> StackIndex -> Instruction #
sInputI :: Instruction #
sOutputI :: Instruction #
sOutputDecI :: Instruction #
binaries :: [BinaryInstruction] -> Instruction #
binary :: BinaryInstruction -> Instruction #
unary :: UnaryInstruction -> Instruction #
sal :: ALInstruction -> Instruction #
sio :: IOInstruction -> Instruction #
dMarkI :: Natural -> Instruction #
sMarkIN :: Natural -> Instruction #
sMarkI :: Label -> Instruction #
sJumpIN :: Natural -> Instruction #
sCallI :: Label -> Instruction #
sJumpI :: Label -> Instruction #
sEZI :: Label -> Instruction #
sLTZI :: Label -> Instruction #
cStaticI :: LabelInstruction -> Label -> Instruction #
returnI :: Instruction #
storeI :: Instruction #
loadI :: Instruction #
mInputI :: Instruction #
mInputDecI :: Instruction #
extractPureIAL :: Instruction -> Maybe ALInstruction #
Others
isPureIAL :: Instruction -> Bool #
isICF :: Instruction -> Bool #
isMark :: Instruction -> Bool #
isDMark :: Natural -> Instruction -> Bool #
isSMark :: Label -> Instruction -> Bool #
data Instruction #
Types
Constructors
IAL !SInstruction 
ILS !LSInstruction 
ICF !CFInstruction 
End 
Transfer 
Instances
Instances details
 Eq Instruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction
 
Methods
(==) :: Instruction -> Instruction -> Bool #
(/=) :: Instruction -> Instruction -> Bool #
 Read Instruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction
 
Methods
readsPrec :: Int -> ReadS Instruction #
readList :: ReadS [Instruction] #
readPrec :: ReadPrec Instruction #
readListPrec :: ReadPrec [Instruction] #
 Show Instruction # 
Instance details
Defined in HelVM.HelMA.Automaton.Instruction
 
Methods
showsPrec :: Int -> Instruction -> ShowS #
show :: Instruction -> String #
showList :: [Instruction] -> ShowS #
type InstructionList = [Instruction] #
type InstructionVector = Vector Instruction #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-Loop.html b/docs/reports/helma/HelVM-HelMA-Automaton-Loop.html
index f43380467..6f33d2667 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-Loop.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-Loop.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.Loop
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Loop
Documentation
testMaybeLimit :: LimitMaybe #
loopMWithLimit :: Monad m => (a -> m $ Same a) -> LimitMaybe -> a -> m a #
actMWithLimit :: Monad m => (a -> m $ Same a) -> WithLimit a -> m (Either (WithLimit a) a) #
break :: b -> Either a b #
continue :: a -> Either a b #
type LimitMaybe = Maybe Natural #
type WithLimit a = (Natural, a) #
type Same a = Either a a #

\ No newline at end of file
+HelVM.HelMA.Automaton.Loop
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Loop
Documentation
testMaybeLimit :: LimitMaybe #
loopMWithLimit :: Monad m => (a -> m $ Same a) -> LimitMaybe -> a -> m a #
actMWithLimit :: Monad m => (a -> m $ Same a) -> WithLimit a -> m (Either (WithLimit a) a) #
break :: b -> Either a b #
continue :: a -> Either a b #
type LimitMaybe = Maybe Natural #
type WithLimit a = (Natural, a) #
type Same a = Either a a #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-Optimizer.html b/docs/reports/helma/HelVM-HelMA-Automaton-Optimizer.html
new file mode 100644
index 000000000..a6141e257
--- /dev/null
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-Optimizer.html
@@ -0,0 +1 @@
+HelVM.HelMA.Automaton.Optimizer
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Optimizer

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-ReadPExtra.html b/docs/reports/helma/HelVM-HelMA-Automaton-ReadPExtra.html
index 51cba8eb4..a985e8287 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-ReadPExtra.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-ReadPExtra.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.ReadPExtra
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.ReadPExtra
Synopsis
Documentation
runParser :: MonadSafe m => ReadP a -> Source -> m a #
nonEmptyRunParser :: MonadSafe m => ReadP a -> Source -> m $ NonEmpty (a, String) #
listRunParser :: ReadP a -> Source -> [(a, String)] #
oneOf :: String -> ReadP Char #
Parsers
notChar :: Char -> ReadP Char #
anyChar :: ReadP Char #
digit :: ReadP Char #
letterAscii :: ReadP Char #
isAlphaAscii :: Char -> Bool #
Extra
manyNonEmpty :: Alternative f => f a -> f $ NonEmpty a #

\ No newline at end of file
+HelVM.HelMA.Automaton.ReadPExtra
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.ReadPExtra
Synopsis
Documentation
runParser :: MonadSafe m => ReadP a -> Source -> m a #
nonEmptyRunParser :: MonadSafe m => ReadP a -> Source -> m $ NonEmpty (a, String) #
listRunParser :: ReadP a -> Source -> [(a, String)] #
oneOf :: String -> ReadP Char #
Parsers
notChar :: Char -> ReadP Char #
anyChar :: ReadP Char #
digit :: ReadP Char #
letterAscii :: ReadP Char #
isAlphaAscii :: Char -> Bool #
Extra
manyNonEmpty :: Alternative f => f a -> f $ NonEmpty a #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-Symbol.html b/docs/reports/helma/HelVM-HelMA-Automaton-Symbol.html
index e3a598e8f..ac0182dd5 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-Symbol.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-Symbol.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.Symbol
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Symbol
Documentation
type Symbol = Integer #
type SymbolList = [Symbol] #
type Index = Int #
type InstructionAddress = Int #

\ No newline at end of file
+HelVM.HelMA.Automaton.Symbol
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Symbol
Documentation
type Symbol = Integer #
type SymbolList = [Symbol] #
type Index = Int #
type InstructionAddress = Int #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-Types-CellType.html b/docs/reports/helma/HelVM-HelMA-Automaton-Types-CellType.html
index 652a33db1..5a1f7d14c 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-Types-CellType.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-Types-CellType.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.Types.CellType
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Types.CellType

\ No newline at end of file
+HelVM.HelMA.Automaton.Types.CellType
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Types.CellType

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-Types-DumpType.html b/docs/reports/helma/HelVM-HelMA-Automaton-Types-DumpType.html
index d528fc042..4382951df 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-Types-DumpType.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-Types-DumpType.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.Types.DumpType
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Types.DumpType
Synopsis

\ No newline at end of file
+HelVM.HelMA.Automaton.Types.DumpType
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Types.DumpType
Synopsis

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-Types-FormatType.html b/docs/reports/helma/HelVM-HelMA-Automaton-Types-FormatType.html
index 1737f0e12..d53e5dc6e 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-Types-FormatType.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-Types-FormatType.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.Types.FormatType
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Types.FormatType

\ No newline at end of file
+HelVM.HelMA.Automaton.Types.FormatType
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Types.FormatType

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-Types-IntCellType.html b/docs/reports/helma/HelVM-HelMA-Automaton-Types-IntCellType.html
index 6fb769efa..99b9cb905 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-Types-IntCellType.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-Types-IntCellType.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.Types.IntCellType
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Types.IntCellType

\ No newline at end of file
+HelVM.HelMA.Automaton.Types.IntCellType
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Types.IntCellType

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-Types-RAMType.html b/docs/reports/helma/HelVM-HelMA-Automaton-Types-RAMType.html
index ccc9efe76..e4cbf754e 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-Types-RAMType.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-Types-RAMType.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.Types.RAMType
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Types.RAMType

\ No newline at end of file
+HelVM.HelMA.Automaton.Types.RAMType
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Types.RAMType

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-Types-StackType.html b/docs/reports/helma/HelVM-HelMA-Automaton-Types-StackType.html
index 77cddbffa..ae577f79c 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-Types-StackType.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-Types-StackType.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.Types.StackType
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Types.StackType

\ No newline at end of file
+HelVM.HelMA.Automaton.Types.StackType
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Types.StackType

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-Types-TokenType.html b/docs/reports/helma/HelVM-HelMA-Automaton-Types-TokenType.html
index 743735419..70570b55e 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-Types-TokenType.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-Types-TokenType.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.Types.TokenType
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Types.TokenType

\ No newline at end of file
+HelVM.HelMA.Automaton.Types.TokenType
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Types.TokenType

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-Unit.html b/docs/reports/helma/HelVM-HelMA-Automaton-Unit.html
new file mode 100644
index 000000000..12e3b584b
--- /dev/null
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-Unit.html
@@ -0,0 +1 @@
+HelVM.HelMA.Automaton.Combiner
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Combiner
Synopsis
Documentation
runInstruction :: SRAutomatonIO Symbol s r m => Instruction -> SF s r m #
Core of Automaton
transfer :: SRAutomatonIO Symbol s r m => SF s r m #
transferBranch :: SRAutomatonIO Symbol s r m => (Symbol, Symbol, Unit s r) -> m $ UnitSame s r #
pop2ForStack :: SRAutomatonIO Symbol s r m => Unit s r -> m (Symbol, Symbol, Unit s r) #
push1ForStack :: Stack s Symbol => Symbol -> Unit s r -> Unit s r #
end :: SRAutomatonIO Symbol s r m => SF s r m #
flippedNewAutomaton :: (s, r) -> InstructionList -> Unit s r #
Constructors
newAutomaton :: InstructionList -> s -> r -> Unit s r #
incrementIC :: Unit s r -> Unit s r #
Updaters
updateStack :: Unit s r -> s -> Unit s r #
updateFromCPU :: Unit s r -> CentralProcessingUnit s -> Unit s r #
updateFromLSU :: Unit s r -> LoadStoreUnit s r -> Unit s r #
unitProgram :: Unit s r -> InstructionVector #
Accessors
unitProgramCounter :: Unit s r -> InstructionCounter #
toCPU :: Unit s r -> CentralProcessingUnit s #
toLSU :: Unit s r -> LoadStoreUnit s r #
type SF s r m = Unit s r -> m $ UnitSame s r #
Types
type F s r m = Unit s r -> m $ Unit s r #
type UnitSame s r = Same (Unit s r) #
data Unit s r #
Data types
Constructors
Unit 
Fields
Instances
Instances details
 (Show s, Show r) => Show (Unit s r) # 
Instance details
Defined in HelVM.HelMA.Automaton.Combiner
 
Methods
showsPrec :: Int -> Unit s r -> ShowS #
show :: Unit s r -> String #
showList :: [Unit s r] -> ShowS #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-Units-ALU.html b/docs/reports/helma/HelVM-HelMA-Automaton-Units-ALU.html
index 5c7dd8fb1..dd4a89ed8 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-Units-ALU.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-Units-ALU.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.Units.ALU
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Units.ALU
Synopsis
Documentation
doOutputChar2 :: ALU m ll element => ll -> m ll #
IO instructions
doInputChar2 :: ALU m ll element => ll -> m ll #
doInputDec2 :: ALU m ll element => ll -> m ll #
divMod :: ALU m ll element => ll -> m ll #
Arithmetic instructions
sub :: ALU m ll element => ll -> m ll #
binaryInstruction :: ALU m ll element => BinaryInstruction -> ll -> m ll #
binaryInstructions :: ALU m ll element => [BinaryInstruction] -> ll -> m ll #
halibut :: ALU m ll element => ll -> m ll #
Halibut and Pick instructions
runALI :: ALU m ll element => ALInstruction -> ll -> m ll #
move :: ALU m ll element => Index -> ll -> m ll #
Move instructions
discard :: (MonadSafe m, ListLike full item) => full -> m full #
slide :: ALU m ll element => Index -> ll -> m ll #
Slide instructions
copy :: ALU m ll element => Index -> ll -> m ll #
Copy instructions
flipPush1 :: Stack ll element => ll -> element -> ll #
charPush1 :: (Num element, Stack ll element) => Char -> ll -> ll #
genericPush1 :: (Integral v, Num element, Stack ll element) => v -> ll -> ll #
pop1 :: ALU m ll element => ll -> m (element, ll) #
Pop instructions
pop2 :: ALU m ll element => ll -> m (element, element, ll) #
push1 :: Stack ll element => element -> ll -> ll #
push2 :: Stack ll element => element -> element -> ll -> ll #
splitAt :: ListLike full item => Int -> full -> (full, full) #
drop :: ListLike full item => Int -> full -> full #
type ALU m ll element = (BIO m, Stack ll element, Integral element) #
Types
type Stack ll element = (Show ll, ListLike ll element, IndexSafe ll element) #

\ No newline at end of file
+HelVM.HelMA.Automaton.Combiner.ALU
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Combiner.ALU
Synopsis
Documentation
doOutputChar2 :: ALU m ll element => ll -> m ll #
IO instructions
doInputChar2 :: ALU m ll element => ll -> m ll #
doInputDec2 :: ALU m ll element => ll -> m ll #
divMod :: ALU m ll element => ll -> m ll #
Arithmetic instructions
sub :: ALU m ll element => ll -> m ll #
binaryInstruction :: ALU m ll element => BinaryInstruction -> ll -> m ll #
binaryInstructions :: ALU m ll element => [BinaryInstruction] -> ll -> m ll #
halibut :: ALU m ll element => ll -> m ll #
Halibut and Pick instructions
runALI :: ALU m ll element => ALInstruction -> ll -> m ll #
move :: ALU m ll element => Index -> ll -> m ll #
Move instructions
discard :: (MonadSafe m, ListLike full item) => full -> m full #
slide :: ALU m ll element => Index -> ll -> m ll #
Slide instructions
copy :: ALU m ll element => Index -> ll -> m ll #
Copy instructions
flipPush1 :: Stack ll element => ll -> element -> ll #
charPush1 :: (Num element, Stack ll element) => Char -> ll -> ll #
genericPush1 :: (Integral v, Num element, Stack ll element) => v -> ll -> ll #
pop1 :: ALU m ll element => ll -> m (element, ll) #
Pop instructions
pop2 :: ALU m ll element => ll -> m (element, element, ll) #
push1 :: Stack ll element => element -> ll -> ll #
push2 :: Stack ll element => element -> element -> ll -> ll #
splitAt :: ListLike full item => Int -> full -> (full, full) #
drop :: ListLike full item => Int -> full -> full #
type ALU m ll element = (BIO m, Stack ll element, Integral element) #
Types
type Stack ll element = (Show ll, ListLike ll element, IndexSafe ll element) #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-Units-CPU.html b/docs/reports/helma/HelVM-HelMA-Automaton-Units-CPU.html
index 389fe365d..d2600bf4d 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-Units-CPU.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-Units-CPU.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.Units.CPU
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Units.CPU
Synopsis
Documentation
runCFI :: (ALU m ll element, Show element) => CFInstruction -> CentralProcessingUnit ll -> m $ CentralProcessingUnit ll #
popAddress :: ALU m ll element => CentralProcessingUnit ll -> m $ CentralProcessingUnit ll #
dynamicCall :: (ALU m ll element, Show element) => CentralProcessingUnit ll -> m $ CentralProcessingUnit ll #
dynamicJump :: (ALU m ll element, Show element) => CentralProcessingUnit ll -> m $ CentralProcessingUnit ll #
dynamicBranch :: (ALU m ll element, Show element) => BranchTest -> CentralProcessingUnit ll -> m $ CentralProcessingUnit ll #
findAddressForDynamicLabel :: (MonadSafe m, Integral n, Show n) => n -> InstructionVector -> m InstructionAddress #
staticCall :: ALU m ll element => Label -> CentralProcessingUnit ll -> m $ CentralProcessingUnit ll #
staticJump :: ALU m ll element => Label -> CentralProcessingUnit ll -> m $ CentralProcessingUnit ll #
staticBranch :: ALU m ll element => Label -> BranchTest -> CentralProcessingUnit ll -> m $ CentralProcessingUnit ll #
findAddressForStaticLabel :: MonadSafe m => Label -> InstructionVector -> m InstructionAddress #
newCU :: InstructionList -> ControlUnit #
ControlUnit methods
currentInstruction :: MonadSafe m => ControlUnit -> m Instruction #
incrementPC :: ControlUnit -> ControlUnit #
data CentralProcessingUnit al #
Types
Constructors
CPU 
Fields
Instances
Instances details
 Show al => Show (CentralProcessingUnit al) # 
Instance details
Defined in HelVM.HelMA.Automaton.Units.CPU
 
Methods
showsPrec :: Int -> CentralProcessingUnit al -> ShowS #
show :: CentralProcessingUnit al -> String #
showList :: [CentralProcessingUnit al] -> ShowS #
data ControlUnit #
Constructors
CU 
Fields
Instances
Instances details
 Show ControlUnit # 
Instance details
Defined in HelVM.HelMA.Automaton.Units.CPU
 
Methods
showsPrec :: Int -> ControlUnit -> ShowS #
show :: ControlUnit -> String #
showList :: [ControlUnit] -> ShowS #
newtype InstructionStack #
Constructors
IS [InstructionAddress] 
Instances
Instances details
 Show InstructionStack # 
Instance details
Defined in HelVM.HelMA.Automaton.Units.CPU
 
Methods
showsPrec :: Int -> InstructionStack -> ShowS #
show :: InstructionStack -> String #
showList :: [InstructionStack] -> ShowS #
type InstructionCounter = InstructionAddress #
type InstructionAddress = Int #

\ No newline at end of file
+HelVM.HelMA.Automaton.Combiner.CPU
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Combiner.CPU
Synopsis
Documentation
runCFI :: (ALU m ll element, Show element) => CFInstruction -> CentralProcessingUnit ll -> m $ CentralProcessingUnit ll #
popAddress :: ALU m ll element => CentralProcessingUnit ll -> m $ CentralProcessingUnit ll #
dynamicCall :: (ALU m ll element, Show element) => CentralProcessingUnit ll -> m $ CentralProcessingUnit ll #
dynamicJump :: (ALU m ll element, Show element) => CentralProcessingUnit ll -> m $ CentralProcessingUnit ll #
dynamicBranch :: (ALU m ll element, Show element) => BranchTest -> CentralProcessingUnit ll -> m $ CentralProcessingUnit ll #
findAddressForDynamicLabel :: (MonadSafe m, Integral n, Show n) => n -> InstructionVector -> m InstructionAddress #
staticCall :: ALU m ll element => Label -> CentralProcessingUnit ll -> m $ CentralProcessingUnit ll #
staticJump :: ALU m ll element => Label -> CentralProcessingUnit ll -> m $ CentralProcessingUnit ll #
staticBranch :: ALU m ll element => Label -> BranchTest -> CentralProcessingUnit ll -> m $ CentralProcessingUnit ll #
findAddressForStaticLabel :: MonadSafe m => Label -> InstructionVector -> m InstructionAddress #
newCU :: InstructionList -> ControlUnit #
ControlUnit methods
currentInstruction :: MonadSafe m => ControlUnit -> m Instruction #
incrementPC :: ControlUnit -> ControlUnit #
data CentralProcessingUnit al #
Types
Constructors
CPU 
Fields
Instances
Instances details
 Show al => Show (CentralProcessingUnit al) # 
Instance details
Defined in HelVM.HelMA.Automaton.Combiner.CPU
 
Methods
showsPrec :: Int -> CentralProcessingUnit al -> ShowS #
show :: CentralProcessingUnit al -> String #
showList :: [CentralProcessingUnit al] -> ShowS #
data ControlUnit #
Constructors
CU 
Fields
Instances
Instances details
 Show ControlUnit # 
Instance details
Defined in HelVM.HelMA.Automaton.Combiner.CPU
 
Methods
showsPrec :: Int -> ControlUnit -> ShowS #
show :: ControlUnit -> String #
showList :: [ControlUnit] -> ShowS #
newtype InstructionStack #
Constructors
IS [InstructionAddress] 
Instances
Instances details
 Show InstructionStack # 
Instance details
Defined in HelVM.HelMA.Automaton.Combiner.CPU
 
Methods
showsPrec :: Int -> InstructionStack -> ShowS #
show :: InstructionStack -> String #
showList :: [InstructionStack] -> ShowS #
type InstructionCounter = InstructionAddress #
type InstructionAddress = Int #

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-Units-LSU.html b/docs/reports/helma/HelVM-HelMA-Automaton-Units-LSU.html
index c87436969..30b74e945 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-Units-LSU.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-Units-LSU.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.Units.LSU
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Units.LSU
Synopsis
Documentation
runSLI :: LSU m s r element => LSInstruction -> LoadStoreUnit s r -> m $ LoadStoreUnit s r #
load :: LSU m s r element => LoadStoreUnit s r -> m $ LoadStoreUnit s r #
store :: LSU m s r element => LoadStoreUnit s r -> m $ LoadStoreUnit s r #
loadOutputChar :: LSU m s r element => LoadStoreUnit s r -> m $ LoadStoreUnit s r #
loadOutputDec :: LSU m s r element => LoadStoreUnit s r -> m $ LoadStoreUnit s r #
storeInputChar :: LSU m s r element => LoadStoreUnit s r -> m $ LoadStoreUnit s r #
storeInputDec :: LSU m s r element => LoadStoreUnit s r -> m $ LoadStoreUnit s r #
type LSU m s r element = (ALU m s element, RAM r element) #
Types
data LoadStoreUnit s r #
Constructors
LSU 
Fields

\ No newline at end of file
+HelVM.HelMA.Automaton.Combiner.LSU
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Combiner.LSU
Synopsis
Documentation
runSLI :: LSU m s r element => LSInstruction -> LoadStoreUnit s r -> m $ LoadStoreUnit s r #
load :: LSU m s r element => LoadStoreUnit s r -> m $ LoadStoreUnit s r #
store :: LSU m s r element => LoadStoreUnit s r -> m $ LoadStoreUnit s r #
loadOutputChar :: LSU m s r element => LoadStoreUnit s r -> m $ LoadStoreUnit s r #
loadOutputDec :: LSU m s r element => LoadStoreUnit s r -> m $ LoadStoreUnit s r #
storeInputChar :: LSU m s r element => LoadStoreUnit s r -> m $ LoadStoreUnit s r #
storeInputDec :: LSU m s r element => LoadStoreUnit s r -> m $ LoadStoreUnit s r #
type LSU m s r element = (ALU m s element, RAM r element) #
Types
data LoadStoreUnit s r #
Constructors
LSU 
Fields

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-Units-RAM.html b/docs/reports/helma/HelVM-HelMA-Automaton-Units-RAM.html
index d8f2e7a1c..46ee89c25 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-Units-RAM.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-Units-RAM.html
@@ -1,2 +1,2 @@
-HelVM.HelMA.Automaton.Units.RAM
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Units.RAM
Synopsis
Documentation
genericLoad :: (Integral i, RAM ll element) => ll -> i -> element #
load :: RAM ll element => ll -> Address -> element #
flippedStoreChar :: (Num element, Integral address, RAM ll element) => address -> ll -> Char -> ll #
storeChar :: (Num element, Integral address, RAM ll element) => address -> Char -> ll -> ll #
genericStore :: (Integral value, Num element, Integral address, RAM ll element) => address -> value -> ll -> ll #
store :: (Integral a, RAM ll element) => a -> element -> ll -> ll #
fromList :: IsList l => [Item l] -> l #
The fromList function constructs the structure l from the given
+HelVM.HelMA.Automaton.Combiner.RAM
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Combiner.RAM
Synopsis
Documentation
genericLoad :: (Integral i, RAM ll element) => ll -> i -> element #
load :: RAM ll element => ll -> Address -> element #
flippedStoreChar :: (Num element, Integral address, RAM ll element) => address -> ll -> Char -> ll #
storeChar :: (Num element, Integral address, RAM ll element) => address -> Char -> ll -> ll #
genericStore :: (Integral value, Num element, Integral address, RAM ll element) => address -> value -> ll -> ll #
store :: (Integral a, RAM ll element) => a -> element -> ll -> ll #
fromList :: IsList l => [Item l] -> l #
The fromList function constructs the structure l from the given
    list of Item l
type RAM ll element = (Show ll, Default element, II ll element) #
Types

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-Units-Unit.html b/docs/reports/helma/HelVM-HelMA-Automaton-Units-Unit.html
index 71b621ea0..5d5d40e5f 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-Units-Unit.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-Units-Unit.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.Units.Unit
helma-0.8.3.10: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Units.Unit

\ No newline at end of file
+HelVM.HelMA.Automaton.Combiner.Unit
helma-0.8.3.10: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.Combiner.Unit

\ No newline at end of file
diff --git a/docs/reports/helma/HelVM-HelMA-Automaton-WrapTokenList.html b/docs/reports/helma/HelVM-HelMA-Automaton-WrapTokenList.html
index 944c47eef..d404be0e2 100644
--- a/docs/reports/helma/HelVM-HelMA-Automaton-WrapTokenList.html
+++ b/docs/reports/helma/HelVM-HelMA-Automaton-WrapTokenList.html
@@ -1 +1 @@
-HelVM.HelMA.Automaton.WrapTokenList
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.WrapTokenList
Documentation
newtype WrapTokenList a #
Constructors
WrapTokenList 
Fields
Instances
Instances details
 Eq a => Eq (WrapTokenList a) # 
Instance details
Defined in HelVM.HelMA.Automaton.WrapTokenList
 
Methods
(==) :: WrapTokenList a -> WrapTokenList a -> Bool #
(/=) :: WrapTokenList a -> WrapTokenList a -> Bool #
 Read a => Read (WrapTokenList [a]) # 
Instance details
Defined in HelVM.HelMA.Automaton.WrapTokenList
 
Methods
readsPrec :: Int -> ReadS (WrapTokenList [a]) #
readList :: ReadS [WrapTokenList [a]] #
readPrec :: ReadPrec (WrapTokenList [a]) #
readListPrec :: ReadPrec [WrapTokenList [a]] #
 Show a => Show (WrapTokenList [a]) # 
Instance details
Defined in HelVM.HelMA.Automaton.WrapTokenList
 
Methods
showsPrec :: Int -> WrapTokenList [a] -> ShowS #
show :: WrapTokenList [a] -> String #
showList :: [WrapTokenList [a]] -> ShowS #

\ No newline at end of file
+HelVM.HelMA.Automaton.WrapTokenList
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Safe HaskellNone
LanguageHaskell2010
HelVM.HelMA.Automaton.WrapTokenList
Documentation
newtype WrapTokenList a #
Constructors
WrapTokenList 
Fields
Instances
Instances details
 Eq a => Eq (WrapTokenList a) # 
Instance details
Defined in HelVM.HelMA.Automaton.WrapTokenList
 
Methods
(==) :: WrapTokenList a -> WrapTokenList a -> Bool #
(/=) :: WrapTokenList a -> WrapTokenList a -> Bool #
 Read a => Read (WrapTokenList [a]) # 
Instance details
Defined in HelVM.HelMA.Automaton.WrapTokenList
 
Methods
readsPrec :: Int -> ReadS (WrapTokenList [a]) #
readList :: ReadS [WrapTokenList [a]] #
readPrec :: ReadPrec (WrapTokenList [a]) #
readListPrec :: ReadPrec [WrapTokenList [a]] #
 Show a => Show (WrapTokenList [a]) # 
Instance details
Defined in HelVM.HelMA.Automaton.WrapTokenList
 
Methods
showsPrec :: Int -> WrapTokenList [a] -> ShowS #
show :: WrapTokenList [a] -> String #
showList :: [WrapTokenList [a]] -> ShowS #

\ No newline at end of file
diff --git a/docs/reports/helma/doc-index-A.html b/docs/reports/helma/doc-index-A.html
index f75c2457c..f345c1cc2 100644
--- a/docs/reports/helma/doc-index-A.html
+++ b/docs/reports/helma/doc-index-A.html
@@ -1 +1 @@
-helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - A)
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton

\ No newline at end of file
+helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - A)
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton

\ No newline at end of file
diff --git a/docs/reports/helma/doc-index-All.html b/docs/reports/helma/doc-index-All.html
index b36916a5b..1b355c2cd 100644
--- a/docs/reports/helma/doc-index-All.html
+++ b/docs/reports/helma/doc-index-All.html
@@ -1 +1 @@
-helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index)
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Index
AHelVM.HelMA.Automata.ETA.Token
actMWithLimitHelVM.HelMA.Automaton.Loop
AddHelVM.HelMA.Automaton.Instruction.ALInstruction
addAndClearSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
AddClrHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
ALInstructionHelVM.HelMA.Automaton.Instruction.ALInstruction
ALUHelVM.HelMA.Automaton.Units.ALU
aluHelVM.HelMA.Automaton.Units.CPU
anyCharHelVM.HelMA.Automaton.ReadPExtra
AppHelVM.HelMA.Automata.LazyK.Lambda
app3HelVM.HelMA.Automata.LazyK.Lambda
app3SIHelVM.HelMA.Automata.LazyK.Constants
app4HelVM.HelMA.Automata.LazyK.Lambda
appKHelVM.HelMA.Automata.LazyK.Constants
appKSHelVM.HelMA.Automata.LazyK.Constants
applyHelVM.HelMA.Automata.LazyK.Reducer
appSelfAppHelVM.HelMA.Automata.LazyK.Constants
AutomatonHelVM.HelMA.Automaton.Automaton
AutomatonIOHelVM.HelMA.Automaton.IO.AutomatonIO
AutoOptions 
1 (Type/Class)HelVM.HelMA.Automaton.API.AutoOptions
2 (Data Constructor)HelVM.HelMA.Automaton.API.AutoOptions
AutoParams 
1 (Type/Class)HelVM.HelMA.Automaton.API.AutoParams
2 (Data Constructor)HelVM.HelMA.Automaton.API.AutoParams
autoParams 
1 (Function)HelVM.HelMA.Automaton.API.EvalParams
2 (Function)HelVM.HelMA.Automata.ETA.SimpleParams
3 (Function)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
BAndHelVM.HelMA.Automaton.Instruction.ALInstruction
bCombinatorHelVM.HelMA.Automata.LazyK.Constants
BEQHelVM.HelMA.Automaton.Instruction.ALInstruction
BFTypeHelVM.HelMA.Automata.BrainFuck.API.BFType
bfTypesHelVM.HelMA.Automata.BrainFuck.API.BFType
BGTHelVM.HelMA.Automaton.Instruction.ALInstruction
BinariesHelVM.HelMA.Automaton.Instruction.ALInstruction
BinaryHelVM.HelMA.Automaton.Instruction.ALInstruction
BinaryInstructionHelVM.HelMA.Automaton.Instruction.ALInstruction
binaryInstructionHelVM.HelMA.Automaton.Units.ALU
binaryInstructionsHelVM.HelMA.Automaton.Units.ALU
BinaryLabelHelVM.HelMA.Automaton.Types.FormatType
BIOHelVM.HelMA.Automaton.IO.BusinessIO
BitwiseHelVM.HelMA.Automaton.Instruction.ALInstruction
blAndHelVM.HelMA.Automaton.Instruction.ALInstruction
blEQHelVM.HelMA.Automaton.Instruction.ALInstruction
blGTHelVM.HelMA.Automaton.Instruction.ALInstruction
blOrHelVM.HelMA.Automaton.Instruction.ALInstruction
blXorHelVM.HelMA.Automaton.Instruction.ALInstruction
BNotHelVM.HelMA.Automaton.Instruction.ALInstruction
BOrHelVM.HelMA.Automaton.Instruction.ALInstruction
BranchHelVM.HelMA.Automaton.Instruction.CFInstruction
BranchTestHelVM.HelMA.Automaton.Instruction.CFInstruction
breakHelVM.HelMA.Automaton.Loop
BusinessIOHelVM.HelMA.Automaton.IO.BusinessIO
BXorHelVM.HelMA.Automaton.Instruction.ALInstruction
calculateLoggedHelVM.HelMA.Automaton.IO.MockIO
calculateOpHelVM.HelMA.Automaton.Instruction.ALInstruction
calculateOpsHelVM.HelMA.Automaton.Instruction.ALInstruction
calculateOutputHelVM.HelMA.Automaton.IO.MockIO
CallHelVM.HelMA.Automaton.Instruction.CFInstruction
CDynamicHelVM.HelMA.Automaton.Instruction.CFInstruction
cellHelVM.HelMA.Automaton.API.AutoOptions
cellAutoOptionsHelVM.HelMA.Automaton.API.EvalParams
CellTypeHelVM.HelMA.Automaton.Types.CellType
cellTypesHelVM.HelMA.Automaton.Types.CellType
CentralProcessingUnitHelVM.HelMA.Automaton.Units.CPU
CFInstructionHelVM.HelMA.Automaton.Instruction.CFInstruction
charPush1HelVM.HelMA.Automaton.Units.ALU
charToExpressionHelVM.HelMA.Automata.Zot.Expression
charToExpressionListHelVM.HelMA.Automata.Zot.Expression
charToExpressionSafeHelVM.HelMA.Automata.Zot.Expression
charToSimpleInstruction 
1 (Function)HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
2 (Function)HelVM.HelMA.Automata.FALSE.Parser
churchHelVM.HelMA.Automata.LazyK.InputEncoder
clearSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
CommentHelVM.HelMA.Automata.FALSE.Expression
compare0HelVM.HelMA.Automata.BrainFuck.Common.Symbol
compileHelVM.HelMA.Automaton.API.AutoParams
CondHelVM.HelMA.Automata.FALSE.Expression
ConsHelVM.HelMA.Automaton.Instruction.ALInstruction
consHelVM.HelMA.Automata.LazyK.InputEncoder
consIHelVM.HelMA.Automaton.Instruction
continueHelVM.HelMA.Automaton.Loop
ControlUnitHelVM.HelMA.Automaton.Units.CPU
controlUnitHelVM.HelMA.Automaton.Units.CPU
CopyHelVM.HelMA.Automaton.Instruction.ALInstruction
copyHelVM.HelMA.Automaton.Units.ALU
CPUHelVM.HelMA.Automaton.Units.CPU
createMockIOHelVM.HelMA.Automaton.IO.MockIO
CStaticHelVM.HelMA.Automaton.Instruction.CFInstruction
CUHelVM.HelMA.Automaton.Units.CPU
currentInstruction 
1 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
2 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Tree.InstructionUnit
3 (Function)HelVM.HelMA.Automaton.Units.CPU
dCopyHelVM.HelMA.Automaton.Instruction.ALInstruction
DecHelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
defHelVM.HelMA.Automata.BrainFuck.Common.Symbol
defaultBFTypeHelVM.HelMA.Automata.BrainFuck.API.BFType
defaultCellTypeHelVM.HelMA.Automaton.Types.CellType
defaultDumpTypeHelVM.HelMA.Automaton.Types.DumpType
defaultETAImplTypeHelVM.HelMA.Automata.ETA.API.ETAImplType
defaultFormatTypeHelVM.HelMA.Automaton.Types.FormatType
defaultIntCellTypeHelVM.HelMA.Automaton.Types.IntCellType
defaultRAMTypeHelVM.HelMA.Automaton.Types.RAMType
defaultStackTypeHelVM.HelMA.Automaton.Types.StackType
defaultTokenTypeHelVM.HelMA.Automaton.Types.TokenType
digitHelVM.HelMA.Automaton.ReadPExtra
DiscardHelVM.HelMA.Automaton.Instruction.ALInstruction
discardHelVM.HelMA.Automaton.Units.ALU
DivHelVM.HelMA.Automaton.Instruction.ALInstruction
divModHelVM.HelMA.Automaton.Units.ALU
divModIHelVM.HelMA.Automaton.Instruction
dJumpIHelVM.HelMA.Automaton.Instruction.CFInstruction
DMarkHelVM.HelMA.Automaton.Instruction.CFInstruction
dMarkIHelVM.HelMA.Automaton.Instruction
doBinaryHelVM.HelMA.Automaton.Instruction.ALInstruction
doInputChar2HelVM.HelMA.Automaton.Units.ALU
doInputDec2HelVM.HelMA.Automaton.Units.ALU
doOutputChar2HelVM.HelMA.Automaton.Units.ALU
dropHelVM.HelMA.Automaton.Units.ALU
dumpHelVM.HelMA.Automaton.Types.DumpType
dumpAutoOptionsHelVM.HelMA.Automaton.API.EvalParams
DumpTypeHelVM.HelMA.Automaton.Types.DumpType
dumpTypeHelVM.HelMA.Automaton.API.AutoParams
dumpTypesHelVM.HelMA.Automaton.Types.DumpType
dupAndClearSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
DupClrHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
dupIHelVM.HelMA.Automaton.Instruction.ALInstruction
dynamicBranchHelVM.HelMA.Automaton.Units.CPU
dynamicCallHelVM.HelMA.Automaton.Units.CPU
dynamicJumpHelVM.HelMA.Automaton.Units.CPU
EHelVM.HelMA.Automata.ETA.Token
ElementHelVM.HelMA.Automaton.IO.BusinessIO
encodeInputHelVM.HelMA.Automata.LazyK.InputEncoder
EndHelVM.HelMA.Automaton.Instruction
endHelVM.HelMA.Automata.LazyK.InputEncoder
ETAImplTypeHelVM.HelMA.Automata.ETA.API.ETAImplType
etaImplTypesHelVM.HelMA.Automata.ETA.API.ETAImplType
eval 
1 (Function)HelVM.HelMA.Automata.Rev.Evaluator
2 (Function)HelVM.HelMA.Automata.Cat.Evaluator
3 (Function)HelVM.HelMA.Automata.BrainFuck.Evaluator
EvalParams 
1 (Type/Class)HelVM.HelMA.Automaton.API.EvalParams
2 (Data Constructor)HelVM.HelMA.Automaton.API.EvalParams
evalParams 
1 (Function)HelVM.HelMA.Automata.Zot.Automaton
2 (Function)HelVM.HelMA.Automata.Rev.Evaluator
3 (Function)HelVM.HelMA.Automata.LazyK.Evaluator
4 (Function)HelVM.HelMA.Automata.Cat.Evaluator
5 (Function)HelVM.HelMA.Automata.SubLeq.Evaluator
6 (Function)HelVM.HelMA.Automata.WhiteSpace.Evaluator
7 (Function)HelVM.HelMA.Automata.ETA.Evaluator
8 (Function)HelVM.HelMA.Automata.BrainFuck.Evaluator
evalSource 
1 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Evaluator
2 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Evaluator
3 (Function)HelVM.HelMA.Automata.LazyK.Evaluator
4 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Evaluator
5 (Function)HelVM.HelMA.Automata.BrainFuck.Evaluator
evalWithFormatHelVM.HelMA.Automata.Zot.Automaton
ExecHelVM.HelMA.Automata.FALSE.Expression
execMockIOBatchHelVM.HelMA.Automaton.IO.MockIO
execMockIOWithInputHelVM.HelMA.Automaton.IO.MockIO
Expression 
1 (Type/Class)HelVM.HelMA.Automata.Zot.Expression
2 (Data Constructor)HelVM.HelMA.Automata.Zot.Expression
3 (Type/Class)HelVM.HelMA.Automata.FALSE.Expression
ExpressionDListHelVM.HelMA.Automata.Zot.Expression
ExpressionList 
1 (Type/Class)HelVM.HelMA.Automata.Zot.Expression
2 (Type/Class)HelVM.HelMA.Automata.FALSE.Expression
EZHelVM.HelMA.Automaton.Instruction.CFInstruction
falseHelVM.HelMA.Automata.LazyK.Constants
FastHelVM.HelMA.Automata.ETA.API.ETAImplType
FastInstructionHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
FastInstructionListHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
FastTypeHelVM.HelMA.Automata.BrainFuck.API.BFType
FetchHelVM.HelMA.Automata.FALSE.Expression
filterCommentsHelVM.HelMA.Automata.LazyK.Lexer
findAddressHelVM.HelMA.Automata.ETA.Addressing
findAddressForDynamicLabelHelVM.HelMA.Automaton.Units.CPU
findAddressForStaticLabelHelVM.HelMA.Automaton.Units.CPU
FlatInstructionHelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction
FlatTreeInstructionListHelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction
FlatTypeHelVM.HelMA.Automata.BrainFuck.API.BFType
flipParseVisibleHelVM.HelMA.Automata.WhiteSpace.Parser
flipParseWhiteHelVM.HelMA.Automata.WhiteSpace.Parser
flippedApplyHelVM.HelMA.Automata.LazyK.Reducer
flippedNewAutomatonHelVM.HelMA.Automaton.Automaton
flippedStoreCharHelVM.HelMA.Automaton.Units.RAM
flipPush1HelVM.HelMA.Automaton.Units.ALU
FlushHelVM.HelMA.Automata.FALSE.Expression
flushHelVM.HelMA.Automaton.IO.BusinessIO
foldlLambdaHelVM.HelMA.Automata.LazyK.Lambda
FormatTypeHelVM.HelMA.Automaton.Types.FormatType
formatType 
1 (Function)HelVM.HelMA.Automaton.API.EvalParams
2 (Function)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
formatTypesHelVM.HelMA.Automaton.Types.FormatType
FreeIOHelVM.HelMA.Automaton.IO.FreeIO
fromCharHelVM.HelMA.Automata.BrainFuck.Common.Symbol
fromListHelVM.HelMA.Automaton.Units.RAM
FullTapeHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
genericFindAddressHelVM.HelMA.Automata.ETA.Addressing
genericLoadHelVM.HelMA.Automaton.Units.RAM
genericNextLabelHelVM.HelMA.Automata.ETA.Addressing
genericPush1HelVM.HelMA.Automaton.Units.ALU
genericStoreHelVM.HelMA.Automaton.Units.RAM
GTZHelVM.HelMA.Automaton.Instruction.CFInstruction
HHelVM.HelMA.Automata.ETA.Token
HalfTableHelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
HalibutHelVM.HelMA.Automaton.Instruction.ALInstruction
halibutHelVM.HelMA.Automaton.Units.ALU
halibutIHelVM.HelMA.Automaton.Instruction
I 
1 (Data Constructor)HelVM.HelMA.Automata.ETA.Token
2 (Data Constructor)HelVM.HelMA.Automata.LazyK.Lambda
IALHelVM.HelMA.Automaton.Instruction
ICFHelVM.HelMA.Automaton.Instruction
ILSHelVM.HelMA.Automaton.Instruction
implTypeHelVM.HelMA.Automata.ETA.SimpleParams
Inc 
1 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
2 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
incHelVM.HelMA.Automata.BrainFuck.Common.Symbol
incrementPCHelVM.HelMA.Automaton.Units.CPU
incSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
IndexHelVM.HelMA.Automaton.Symbol
Input 
1 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
2 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
3 (Type/Class)HelVM.HelMA.Automaton.API.IOTypes
InputCharHelVM.HelMA.Automaton.Instruction.IOInstruction
InputDecHelVM.HelMA.Automaton.Instruction.IOInstruction
InstHelVM.HelMA.Automata.FALSE.Expression
InstructionHelVM.HelMA.Automaton.Instruction
InstructionAddress 
1 (Type/Class)HelVM.HelMA.Automata.ETA.Symbol
2 (Type/Class)HelVM.HelMA.Automaton.Symbol
3 (Type/Class)HelVM.HelMA.Automaton.Units.CPU
InstructionCounter 
1 (Type/Class)HelVM.HelMA.Automata.BrainFuck.Impl.Tree.InstructionUnit
2 (Type/Class)HelVM.HelMA.Automata.ETA.Symbol
3 (Type/Class)HelVM.HelMA.Automaton.Units.CPU
InstructionListHelVM.HelMA.Automaton.Instruction
InstructionStackHelVM.HelMA.Automaton.Units.CPU
InstructionUnit 
1 (Type/Class)HelVM.HelMA.Automata.BrainFuck.Impl.Tree.InstructionUnit
2 (Type/Class)HelVM.HelMA.Automata.ETA.OperandParsers
InstructionVectorHelVM.HelMA.Automaton.Instruction
Int16Type 
1 (Data Constructor)HelVM.HelMA.Automaton.Types.CellType
2 (Data Constructor)HelVM.HelMA.Automaton.Types.IntCellType
Int32Type 
1 (Data Constructor)HelVM.HelMA.Automaton.Types.CellType
2 (Data Constructor)HelVM.HelMA.Automaton.Types.IntCellType
Int64Type 
1 (Data Constructor)HelVM.HelMA.Automaton.Types.CellType
2 (Data Constructor)HelVM.HelMA.Automaton.Types.IntCellType
Int8Type 
1 (Data Constructor)HelVM.HelMA.Automaton.Types.CellType
2 (Data Constructor)HelVM.HelMA.Automaton.Types.IntCellType
intCellHelVM.HelMA.Automaton.API.AutoOptions
intCellAutoOptionsHelVM.HelMA.Automaton.API.EvalParams
IntCellTypeHelVM.HelMA.Automaton.Types.IntCellType
intCellTypesHelVM.HelMA.Automaton.Types.IntCellType
IntegerTypeHelVM.HelMA.Automaton.Types.IntCellType
InteractHelVM.HelMA.Automaton.API.IOTypes
interpretFreeIOToBusinessIOHelVM.HelMA.Automaton.IO.FreeIO
ioExecMockIOBatchHelVM.HelMA.Automaton.IO.MockIO
ioExecMockIOWithInputHelVM.HelMA.Automaton.IO.MockIO
IOInstructionHelVM.HelMA.Automaton.Instruction.IOInstruction
ISHelVM.HelMA.Automaton.Units.CPU
isAlphaAsciiHelVM.HelMA.Automaton.ReadPExtra
isDMarkHelVM.HelMA.Automaton.Instruction
isHashHelVM.HelMA.Automata.LazyK.Lexer
isJumpHelVM.HelMA.Automaton.Instruction.CFInstruction
isMarkHelVM.HelMA.Automaton.Instruction
isNotJumpHelVM.HelMA.Automaton.Instruction.CFInstruction
isSMarkHelVM.HelMA.Automaton.Instruction
IU 
1 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Tree.InstructionUnit
2 (Data Constructor)HelVM.HelMA.Automata.ETA.OperandParsers
JmpBackHelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction
JmpPastHelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction
JumpHelVM.HelMA.Automaton.Instruction.CFInstruction
jumpBackHelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
jumpPastHelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
KHelVM.HelMA.Automata.LazyK.Lambda
LabelHelVM.HelMA.Automaton.Instruction.CFInstruction
LabelInstructionHelVM.HelMA.Automaton.Instruction.CFInstruction
Lambda 
1 (Type/Class)HelVM.HelMA.Automata.LazyK.Lambda
2 (Data Constructor)HelVM.HelMA.Automata.FALSE.Expression
LAndHelVM.HelMA.Automaton.Instruction.ALInstruction
LEQHelVM.HelMA.Automaton.Instruction.ALInstruction
letterAsciiHelVM.HelMA.Automaton.ReadPExtra
LGTHelVM.HelMA.Automaton.Instruction.ALInstruction
limitHelVM.HelMA.Automaton.API.AutoParams
LimitMaybeHelVM.HelMA.Automaton.Loop
ListRAMTypeHelVM.HelMA.Automaton.Types.RAMType
listRunParserHelVM.HelMA.Automaton.ReadPExtra
ListStackTypeHelVM.HelMA.Automaton.Types.StackType
LNotHelVM.HelMA.Automaton.Instruction.ALInstruction
LoadHelVM.HelMA.Automaton.Instruction.LSInstruction
load 
1 (Function)HelVM.HelMA.Automaton.Units.RAM
2 (Function)HelVM.HelMA.Automaton.Units.LSU
loadOutputCharHelVM.HelMA.Automaton.Units.LSU
loadOutputDecHelVM.HelMA.Automaton.Units.LSU
LoadStoreUnitHelVM.HelMA.Automaton.Units.LSU
logDumpHelVM.HelMA.Automaton.Types.DumpType
LogicalHelVM.HelMA.Automaton.Instruction.ALInstruction
logInputHelVM.HelMA.Automaton.IO.FreeIO
logOutputHelVM.HelMA.Automaton.IO.FreeIO
logStrHelVM.HelMA.Automaton.IO.BusinessIO
loopMWithLimitHelVM.HelMA.Automaton.Loop
LOrHelVM.HelMA.Automaton.Instruction.ALInstruction
LSInstructionHelVM.HelMA.Automaton.Instruction.LSInstruction
LSU 
1 (Data Constructor)HelVM.HelMA.Automaton.Units.LSU
2 (Type/Class)HelVM.HelMA.Automaton.Units.LSU
LTZHelVM.HelMA.Automaton.Instruction.CFInstruction
LXorHelVM.HelMA.Automaton.Instruction.ALInstruction
ManipulationInstructionHelVM.HelMA.Automaton.Instruction.ALInstruction
manyNonEmptyHelVM.HelMA.Automaton.ReadPExtra
MapListRAMTypeHelVM.HelMA.Automaton.Types.RAMType
matchNextJmpHelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
matchPrevJmpHelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
MIOHelVM.HelMA.Automaton.Instruction.LSInstruction
MockIOHelVM.HelMA.Automaton.IO.MockIO
MockIODataHelVM.HelMA.Automaton.IO.MockIO
ModHelVM.HelMA.Automaton.Instruction.ALInstruction
Move 
1 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
2 (Data Constructor)HelVM.HelMA.Automaton.Instruction.ALInstruction
moveHelVM.HelMA.Automaton.Units.ALU
moveHeadHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
moveHeadLeftHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
moveHeadRightHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
MoveLHelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
MoveRHelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
moveSafeHelVM.HelMA.Automata.WhiteSpace.OperandParsers
MulHelVM.HelMA.Automaton.Instruction.ALInstruction
mulAddAndClearSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
MulAddClrHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
mulDupAndClearSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
MulDupClrHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
N 
1 (Data Constructor)HelVM.HelMA.Automata.ETA.Token
2 (Data Constructor)HelVM.HelMA.Automata.WhiteSpace.Token
NegHelVM.HelMA.Automaton.Instruction.ALInstruction
negationIntegralHelVM.HelMA.Automata.WhiteSpace.OperandParsers
newAutomaton 
1 (Function)HelVM.HelMA.Automaton.Automaton
2 (Function)HelVM.HelMA.Automata.ETA.Automaton
3 (Function)HelVM.HelMA.Automata.SubLeq.Automaton
newCUHelVM.HelMA.Automaton.Units.CPU
newTapeHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
nextHelVM.HelMA.Automata.BrainFuck.Common.Symbol
nextICHelVM.HelMA.Automata.BrainFuck.Impl.Tree.InstructionUnit
nextInstHelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
nextIUHelVM.HelMA.Automata.ETA.OperandParsers
nextLabelHelVM.HelMA.Automata.ETA.Addressing
nextSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
NoHelVM.HelMA.Automaton.Types.DumpType
nonEmptyRunParserHelVM.HelMA.Automaton.ReadPExtra
notCharHelVM.HelMA.Automaton.ReadPExtra
NumberHelVM.HelMA.Automata.LazyK.Lambda
OHelVM.HelMA.Automata.ETA.Token
OneHelVM.HelMA.Automata.Zot.Expression
oneOfHelVM.HelMA.Automaton.ReadPExtra
OperandIUParserHelVM.HelMA.Automata.ETA.OperandParsers
OperandParserHelVM.HelMA.Automata.ETA.OperandParsers
OperatorTypeHelVM.HelMA.Automaton.Instruction.ALInstruction
optimize 
1 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Optimizer
2 (Function)HelVM.HelMA.Automata.ETA.Optimizer
OriginalHelVM.HelMA.Automata.ETA.API.ETAImplType
OutHelVM.HelMA.Automata.Zot.Expression
Output 
1 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
2 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
3 (Type/Class)HelVM.HelMA.Automaton.API.IOTypes
OutputCharHelVM.HelMA.Automaton.Instruction.IOInstruction
OutputDecHelVM.HelMA.Automaton.Instruction.IOInstruction
parse 
1 (Function)HelVM.HelMA.Automata.Zot.Parser
2 (Function)HelVM.HelMA.Automata.LazyK.Parser
3 (Function)HelVM.HelMA.Automata.FALSE.Parser
4 (Function)HelVM.HelMA.Automata.WhiteSpace.Parser
5 (Function)HelVM.HelMA.Automata.ETA.Parser
parseAsciiStringHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseAsListHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser
parseAsListSafeHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser
parseAsVectorHelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser
parseAsVectorSafeHelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser
parseDigitStringHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseExtraHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseFromTLHelVM.HelMA.Automata.WhiteSpace.Parser
parseIndexHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseIntHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseIntegerHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseLabelHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseNaturalHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseNumberHelVM.HelMA.Automata.ETA.OperandParsers
parseNumberFromTLHelVM.HelMA.Automata.ETA.OperandParsers
parseNumberFromTLLHelVM.HelMA.Automata.ETA.OperandParsers
ParserHelVM.HelMA.Automata.WhiteSpace.OperandParsers
ParserFromTokenListHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseSafe 
1 (Function)HelVM.HelMA.Automata.FALSE.Parser
2 (Function)HelVM.HelMA.Automata.ETA.Parser
parseString'HelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseSymbolHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseVisibleHelVM.HelMA.Automata.WhiteSpace.Parser
parseWhiteHelVM.HelMA.Automata.WhiteSpace.Parser
parseWithOptimizeHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser
parseWithOptimizeSafeHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser
PickHelVM.HelMA.Automaton.Instruction.ALInstruction
pop1HelVM.HelMA.Automaton.Units.ALU
pop2HelVM.HelMA.Automaton.Units.ALU
popAddressHelVM.HelMA.Automaton.Units.CPU
PrettyHelVM.HelMA.Automaton.Types.DumpType
prevHelVM.HelMA.Automata.BrainFuck.Common.Symbol
prevInstHelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
prevSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
program 
1 (Function)HelVM.HelMA.Automata.ETA.OperandParsers
2 (Function)HelVM.HelMA.Automaton.Units.CPU
programCounter 
1 (Function)HelVM.HelMA.Automata.ETA.OperandParsers
2 (Function)HelVM.HelMA.Automaton.Units.CPU
push1HelVM.HelMA.Automaton.Units.ALU
push2HelVM.HelMA.Automaton.Units.ALU
RHelVM.HelMA.Automata.ETA.Token
RAMHelVM.HelMA.Automaton.Units.RAM
ram 
1 (Function)HelVM.HelMA.Automaton.API.AutoOptions
2 (Function)HelVM.HelMA.Automaton.Units.LSU
ramAutoOptionsHelVM.HelMA.Automaton.API.EvalParams
RAMTypeHelVM.HelMA.Automaton.Types.RAMType
ramTypeHelVM.HelMA.Automata.WhiteSpace.SimpleParams
ramTypesHelVM.HelMA.Automaton.Types.RAMType
RAutomatonIOHelVM.HelMA.Automaton.IO.AutomatonIO
readExpressionListHelVM.HelMA.Automata.Zot.Expression
readInputHelVM.HelMA.Automata.LazyK.InputEncoder
readSymbolsHelVM.HelMA.Automata.SubLeq.Lexer
readTokens 
1 (Function)HelVM.HelMA.Automata.ETA.Lexer
2 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser
readVisibleTokensHelVM.HelMA.Automata.WhiteSpace.Lexer
readWhiteTokensHelVM.HelMA.Automata.WhiteSpace.Lexer
realizeHelVM.HelMA.Automata.LazyK.Automaton
realizeWithTrueHelVM.HelMA.Automata.LazyK.Automaton
reduceHelVM.HelMA.Automata.LazyK.Reducer
reduceSourceHelVM.HelMA.Automata.LazyK.Evaluator
RefHelVM.HelMA.Automata.FALSE.Expression
removeCommentHelVM.HelMA.Automata.LazyK.Lexer
ReturnHelVM.HelMA.Automaton.Instruction.CFInstruction
returnStackHelVM.HelMA.Automaton.Units.CPU
rotIHelVM.HelMA.Automaton.Instruction.ALInstruction
run 
1 (Function)HelVM.HelMA.Automata.LazyK.Automaton
2 (Function)HelVM.HelMA.Automaton.Automaton
3 (Function)HelVM.HelMA.Automata.ETA.Automaton
4 (Function)HelVM.HelMA.Automata.SubLeq.Automaton
runALIHelVM.HelMA.Automaton.Units.ALU
runAndDumpLogsHelVM.HelMA.Automaton.Automaton
runCFIHelVM.HelMA.Automaton.Units.CPU
runExpressionListHelVM.HelMA.Automata.Zot.Evaluator
runMockIOHelVM.HelMA.Automaton.IO.MockIO
runParserHelVM.HelMA.Automaton.ReadPExtra
runSLIHelVM.HelMA.Automaton.Units.LSU
runWithTerminatorHelVM.HelMA.Automata.LazyK.Automaton
S 
1 (Data Constructor)HelVM.HelMA.Automata.ETA.Token
2 (Data Constructor)HelVM.HelMA.Automata.LazyK.Lambda
3 (Data Constructor)HelVM.HelMA.Automata.WhiteSpace.Token
safeExecMockIOBatchHelVM.HelMA.Automaton.IO.MockIO
safeExecMockIOWithInputHelVM.HelMA.Automaton.IO.MockIO
SameHelVM.HelMA.Automaton.Loop
SAutomatonIOHelVM.HelMA.Automaton.IO.AutomatonIO
SDynamicHelVM.HelMA.Automaton.Instruction.ALInstruction
selfAppHelVM.HelMA.Automata.LazyK.Constants
SeqRAMTypeHelVM.HelMA.Automaton.Types.RAMType
SeqStackTypeHelVM.HelMA.Automaton.Types.StackType
SetHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
setSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
showExpressionListHelVM.HelMA.Automata.Zot.Expression
showsHelVM.HelMA.Automata.SubLeq.Lexer
Simple 
1 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction
2 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
simpleAutoParamsHelVM.HelMA.Automaton.API.AutoParams
simpleEval 
1 (Function)HelVM.HelMA.Automata.SubLeq.Evaluator
2 (Function)HelVM.HelMA.Automata.WhiteSpace.Evaluator
3 (Function)HelVM.HelMA.Automata.ETA.Evaluator
4 (Function)HelVM.HelMA.Automata.BrainFuck.Evaluator
SimpleInstructionHelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
simpleInstructionsHelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
SimpleParams 
1 (Type/Class)HelVM.HelMA.Automata.ETA.SimpleParams
2 (Data Constructor)HelVM.HelMA.Automata.ETA.SimpleParams
3 (Type/Class)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
4 (Data Constructor)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
simpleParams 
1 (Function)HelVM.HelMA.Automata.ETA.SimpleParams
2 (Function)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
simpleParamsWithDefaultsHelVM.HelMA.Automata.WhiteSpace.SimpleParams
simpleParamsWithDefaultsAndVisibleTokenTypeHelVM.HelMA.Automata.WhiteSpace.SimpleParams
simpleParamsWithDefaultsAndWhiteTokenTypeHelVM.HelMA.Automata.WhiteSpace.SimpleParams
simpleParamsWithVisibleTokenTypeHelVM.HelMA.Automata.WhiteSpace.SimpleParams
simpleParamsWithWhiteTokenTypeHelVM.HelMA.Automata.WhiteSpace.SimpleParams
sInputIHelVM.HelMA.Automaton.Instruction
SIOHelVM.HelMA.Automaton.Instruction.ALInstruction
sJumpIHelVM.HelMA.Automaton.Instruction
SlideHelVM.HelMA.Automaton.Instruction.ALInstruction
slideHelVM.HelMA.Automaton.Units.ALU
SListRAMTypeHelVM.HelMA.Automaton.Types.RAMType
SListStackTypeHelVM.HelMA.Automaton.Types.StackType
SMarkHelVM.HelMA.Automaton.Instruction.CFInstruction
sMarkIHelVM.HelMA.Automaton.Instruction
SourceHelVM.HelMA.Automaton.API.IOTypes
source 
1 (Function)HelVM.HelMA.Automaton.API.EvalParams
2 (Function)HelVM.HelMA.Automata.ETA.SimpleParams
3 (Function)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
sOutputIHelVM.HelMA.Automaton.Instruction
splitAtHelVM.HelMA.Automaton.Units.ALU
splitByNHelVM.HelMA.Automata.WhiteSpace.OperandParsers
SRAutomatonIOHelVM.HelMA.Automaton.IO.AutomatonIO
SStaticHelVM.HelMA.Automaton.Instruction.ALInstruction
StackHelVM.HelMA.Automaton.Units.ALU
stack 
1 (Function)HelVM.HelMA.Automaton.API.AutoOptions
2 (Function)HelVM.HelMA.Automaton.Units.LSU
stackAutoOptionsHelVM.HelMA.Automaton.API.EvalParams
StackIndexHelVM.HelMA.Automaton.Instruction.ALInstruction
StackTypeHelVM.HelMA.Automaton.Types.StackType
stackType 
1 (Function)HelVM.HelMA.Automata.ETA.SimpleParams
2 (Function)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
stackTypesHelVM.HelMA.Automaton.Types.StackType
staticBranchHelVM.HelMA.Automaton.Units.CPU
staticCallHelVM.HelMA.Automaton.Units.CPU
staticJumpHelVM.HelMA.Automaton.Units.CPU
Store 
1 (Data Constructor)HelVM.HelMA.Automaton.Instruction.LSInstruction
2 (Data Constructor)HelVM.HelMA.Automata.FALSE.Expression
store 
1 (Function)HelVM.HelMA.Automaton.Units.RAM
2 (Function)HelVM.HelMA.Automaton.Units.LSU
storeCharHelVM.HelMA.Automaton.Units.RAM
storeInputCharHelVM.HelMA.Automaton.Units.LSU
storeInputDecHelVM.HelMA.Automaton.Units.LSU
StrHelVM.HelMA.Automata.FALSE.Expression
stringToExpressionListHelVM.HelMA.Automata.Zot.Expression
SubHelVM.HelMA.Automaton.Instruction.ALInstruction
subHelVM.HelMA.Automaton.Units.ALU
subAndClearSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
SubClrHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
subIHelVM.HelMA.Automaton.Instruction
SuccHelVM.HelMA.Automata.LazyK.Lambda
succChurchHelVM.HelMA.Automata.LazyK.InputEncoder
successorHelVM.HelMA.Automata.LazyK.InputEncoder
swapIHelVM.HelMA.Automaton.Instruction.ALInstruction
Symbol 
1 (Type/Class)HelVM.HelMA.Automata.BrainFuck.Common.Symbol
2 (Type/Class)HelVM.HelMA.Automata.ETA.Symbol
3 (Type/Class)HelVM.HelMA.Automata.SubLeq.Symbol
4 (Type/Class)HelVM.HelMA.Automaton.Symbol
SymbolList 
1 (Type/Class)HelVM.HelMA.Automata.ETA.Symbol
2 (Type/Class)HelVM.HelMA.Automata.SubLeq.Symbol
3 (Type/Class)HelVM.HelMA.Automaton.Symbol
Symbols 
1 (Type/Class)HelVM.HelMA.Automata.SubLeq.Lexer
2 (Data Constructor)HelVM.HelMA.Automata.SubLeq.Lexer
T 
1 (Data Constructor)HelVM.HelMA.Automata.ETA.Token
2 (Data Constructor)HelVM.HelMA.Automata.WhiteSpace.Token
TableHelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
TableDHelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
testMaybeLimitHelVM.HelMA.Automaton.Loop
TextLabelHelVM.HelMA.Automaton.Types.FormatType
toCharHelVM.HelMA.Automata.BrainFuck.Common.Symbol
toIntegerHelVM.HelMA.Automata.BrainFuck.Common.Symbol
Token 
1 (Type/Class)HelVM.HelMA.Automata.ETA.Token
2 (Type/Class)HelVM.HelMA.Automata.WhiteSpace.Token
tokenize 
1 (Function)HelVM.HelMA.Automata.SubLeq.Lexer
2 (Function)HelVM.HelMA.Automata.WhiteSpace.Lexer
3 (Function)HelVM.HelMA.Automata.ETA.Lexer
4 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser
tokenizeVisibleHelVM.HelMA.Automata.WhiteSpace.Lexer
tokenizeWhiteHelVM.HelMA.Automata.WhiteSpace.Lexer
TokenList 
1 (Type/Class)HelVM.HelMA.Automata.ETA.Token
2 (Type/Class)HelVM.HelMA.Automata.WhiteSpace.Token
TokensHelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser
TokenSListHelVM.HelMA.Automata.WhiteSpace.Token
tokenToWhiteTokenPairHelVM.HelMA.Automata.ETA.Token
TokenTypeHelVM.HelMA.Automaton.Types.TokenType
tokenTypeHelVM.HelMA.Automata.WhiteSpace.SimpleParams
tokenTypesHelVM.HelMA.Automaton.Types.TokenType
TokenVectorHelVM.HelMA.Automata.ETA.Token
TransferHelVM.HelMA.Automaton.Instruction
TreeInstructionHelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
TreeInstructionDListHelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
TreeInstructionListHelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
TreeInstructionVectorHelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
TreeTypeHelVM.HelMA.Automata.BrainFuck.API.BFType
triAndClearSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
TriClrHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
trueHelVM.HelMA.Automata.LazyK.Constants
typeOptionsHelVM.HelMA.Automaton.API.EvalParams
UglyHelVM.HelMA.Automaton.Types.DumpType
UnaryHelVM.HelMA.Automaton.Instruction.ALInstruction
UnaryInstructionHelVM.HelMA.Automaton.Instruction.ALInstruction
unWhiteToken 
1 (Function)HelVM.HelMA.Automata.ETA.Token
2 (Function)HelVM.HelMA.Automata.WhiteSpace.Token
unWrapTokenListHelVM.HelMA.Automaton.WrapTokenList
updatePCHelVM.HelMA.Automata.ETA.OperandParsers
VarHelVM.HelMA.Automata.LazyK.Lambda
verySimpleAutoParamsHelVM.HelMA.Automaton.API.AutoParams
VisibleTokensHelVM.HelMA.Automata.WhiteSpace.Lexer
VisibleTokenTypeHelVM.HelMA.Automaton.Types.TokenType
wFlushHelVM.HelMA.Automaton.IO.BusinessIO
wGetCharHelVM.HelMA.Automaton.IO.BusinessIO
wGetCharAsHelVM.HelMA.Automaton.IO.BusinessIO
wGetContentsHelVM.HelMA.Automaton.IO.BusinessIO
wGetContentsBSHelVM.HelMA.Automaton.IO.BusinessIO
wGetContentsTextHelVM.HelMA.Automaton.IO.BusinessIO
wGetDecAsHelVM.HelMA.Automaton.IO.BusinessIO
wGetLineHelVM.HelMA.Automaton.IO.BusinessIO
While 
1 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
2 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
3 (Data Constructor)HelVM.HelMA.Automata.FALSE.Expression
WhiteToken 
1 (Type/Class)HelVM.HelMA.Automata.ETA.Token
2 (Data Constructor)HelVM.HelMA.Automata.ETA.Token
3 (Type/Class)HelVM.HelMA.Automata.WhiteSpace.Token
4 (Data Constructor)HelVM.HelMA.Automata.WhiteSpace.Token
WhiteTokenList 
1 (Type/Class)HelVM.HelMA.Automata.ETA.Token
2 (Type/Class)HelVM.HelMA.Automata.WhiteSpace.Token
whiteTokenListToTokenList 
1 (Function)HelVM.HelMA.Automata.ETA.Token
2 (Function)HelVM.HelMA.Automata.WhiteSpace.Token
WhiteTokens 
1 (Type/Class)HelVM.HelMA.Automata.WhiteSpace.Lexer
2 (Type/Class)HelVM.HelMA.Automata.ETA.Lexer
WhiteTokenTypeHelVM.HelMA.Automaton.Types.TokenType
WithLimitHelVM.HelMA.Automaton.Loop
wLogShowHelVM.HelMA.Automaton.IO.BusinessIO
wLogStrHelVM.HelMA.Automaton.IO.BusinessIO
wLogStrLnHelVM.HelMA.Automaton.IO.BusinessIO
Word16TypeHelVM.HelMA.Automaton.Types.CellType
Word32TypeHelVM.HelMA.Automaton.Types.CellType
Word64TypeHelVM.HelMA.Automaton.Types.CellType
Word8TypeHelVM.HelMA.Automaton.Types.CellType
wPutAsCharHelVM.HelMA.Automaton.IO.BusinessIO
wPutAsDecHelVM.HelMA.Automaton.IO.BusinessIO
wPutCharHelVM.HelMA.Automaton.IO.BusinessIO
wPutStrHelVM.HelMA.Automaton.IO.BusinessIO
wPutStrLnHelVM.HelMA.Automaton.IO.BusinessIO
WrapTokenList 
1 (Type/Class)HelVM.HelMA.Automaton.WrapTokenList
2 (Data Constructor)HelVM.HelMA.Automaton.WrapTokenList
writeSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
ZeroHelVM.HelMA.Automata.Zot.Expression

\ No newline at end of file
+helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index)
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Index
AHelVM.HelMA.Automata.ETA.Token
actMWithLimitHelVM.HelMA.Automaton.Loop
AddHelVM.HelMA.Automaton.Instruction.SInstruction
addAndClearSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
AddClrHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
addIHelVM.HelMA.Automaton.Instruction
ALInstructionHelVM.HelMA.Automaton.Instruction.SInstruction
AllOptimizationsHelVM.HelMA.Automaton.API.OptimizationLevel
almHelVM.HelMA.Automaton.Combiner.CPU
ALUHelVM.HelMA.Automaton.Combiner.ALU
anyCharHelVM.HelMA.Automaton.ReadPExtra
AppHelVM.HelMA.Automata.LazyK.Lambda
app3HelVM.HelMA.Automata.LazyK.Lambda
app3SIHelVM.HelMA.Automata.LazyK.Constants
app4HelVM.HelMA.Automata.LazyK.Lambda
appKHelVM.HelMA.Automata.LazyK.Constants
appKSHelVM.HelMA.Automata.LazyK.Constants
applyHelVM.HelMA.Automata.LazyK.Reducer
appSelfAppHelVM.HelMA.Automata.LazyK.Constants
AutomatonIOHelVM.HelMA.Automaton.IO.AutomatonIO
AutomatonOptions 
1 (Type/Class)HelVM.HelMA.Automaton.API.AutomatonOptions
2 (Data Constructor)HelVM.HelMA.Automaton.API.AutomatonOptions
automatonOptions 
1 (Function)HelVM.HelMA.Automaton.API.EvalParams
2 (Function)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
AutoOptions 
1 (Type/Class)HelVM.HelMA.Automaton.API.AutoOptions
2 (Data Constructor)HelVM.HelMA.Automaton.API.AutoOptions
autoOptions 
1 (Function)HelVM.HelMA.Automaton.API.AutomatonOptions
2 (Function)HelVM.HelMA.Automaton.API.EvalParams
3 (Function)HelVM.HelMA.Automata.ETA.SimpleParams
4 (Function)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
BAndHelVM.HelMA.Automaton.Instruction.SInstruction
BasicOptimizationsHelVM.HelMA.Automaton.API.OptimizationLevel
bCombinatorHelVM.HelMA.Automata.LazyK.Constants
BEQHelVM.HelMA.Automaton.Instruction.SInstruction
BFTypeHelVM.HelMA.Automata.BrainFuck.API.BFType
bfTypesHelVM.HelMA.Automata.BrainFuck.API.BFType
BGTHelVM.HelMA.Automaton.Instruction.SInstruction
BinariesHelVM.HelMA.Automaton.Instruction.SInstruction
binariesHelVM.HelMA.Automaton.Instruction
BinaryHelVM.HelMA.Automaton.Instruction.SInstruction
binaryHelVM.HelMA.Automaton.Instruction
BinaryInstructionHelVM.HelMA.Automaton.Instruction.SInstruction
binaryInstructionHelVM.HelMA.Automaton.Combiner.ALU
binaryInstructionsHelVM.HelMA.Automaton.Combiner.ALU
BinaryLabelHelVM.HelMA.Automaton.Types.FormatType
BIOHelVM.HelMA.Automaton.IO.BusinessIO
BitwiseHelVM.HelMA.Automaton.Instruction.SInstruction
blAndHelVM.HelMA.Automaton.Instruction.SInstruction
blEQHelVM.HelMA.Automaton.Instruction.SInstruction
blGTHelVM.HelMA.Automaton.Instruction.SInstruction
blOrHelVM.HelMA.Automaton.Instruction.SInstruction
blXorHelVM.HelMA.Automaton.Instruction.SInstruction
BNotHelVM.HelMA.Automaton.Instruction.SInstruction
BOrHelVM.HelMA.Automaton.Instruction.SInstruction
BranchHelVM.HelMA.Automaton.Instruction.CFInstruction
BranchTestHelVM.HelMA.Automaton.Instruction.CFInstruction
breakHelVM.HelMA.Automaton.Loop
BusinessIOHelVM.HelMA.Automaton.IO.BusinessIO
BXorHelVM.HelMA.Automaton.Instruction.SInstruction
calculateLoggedHelVM.HelMA.Automaton.IO.MockIO
calculateOpHelVM.HelMA.Automaton.Instruction.SInstruction
calculateOpsHelVM.HelMA.Automaton.Instruction.SInstruction
calculateOutputHelVM.HelMA.Automaton.IO.MockIO
CallHelVM.HelMA.Automaton.Instruction.CFInstruction
CDynamicHelVM.HelMA.Automaton.Instruction.CFInstruction
cellHelVM.HelMA.Automaton.API.MemoryOptions
cellAutoOptionsHelVM.HelMA.Automaton.API.EvalParams
CellTypeHelVM.HelMA.Automaton.Types.CellType
cellTypesHelVM.HelMA.Automaton.Types.CellType
CentralProcessingMemoryHelVM.HelMA.Automaton.Combiner.CPU
CFInstructionHelVM.HelMA.Automaton.Instruction.CFInstruction
charPush1HelVM.HelMA.Automaton.Combiner.ALU
charToExpressionHelVM.HelMA.Automata.Zot.Expression
charToExpressionListHelVM.HelMA.Automata.Zot.Expression
charToExpressionSafeHelVM.HelMA.Automata.Zot.Expression
charToSimpleInstruction 
1 (Function)HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
2 (Function)HelVM.HelMA.Automata.FALSE.Parser
churchHelVM.HelMA.Automata.LazyK.InputEncoder
clearSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
CMHelVM.HelMA.Automaton.Combiner.CPU
CommentHelVM.HelMA.Automata.FALSE.Expression
compare0HelVM.HelMA.Automata.BrainFuck.Common.Symbol
compileFlagHelVM.HelMA.Automaton.API.AutoOptions
CondHelVM.HelMA.Automata.FALSE.Expression
ConsHelVM.HelMA.Automaton.Instruction.SInstruction
consHelVM.HelMA.Automata.LazyK.InputEncoder
consIHelVM.HelMA.Automaton.Instruction
constantFoldingHelVM.HelMA.Automaton.Optimizer
continueHelVM.HelMA.Automaton.Loop
ControlMemoryHelVM.HelMA.Automaton.Combiner.CPU
controlMemoryHelVM.HelMA.Automaton.Combiner.CPU
CopyHelVM.HelMA.Automaton.Instruction.SInstruction
copyHelVM.HelMA.Automaton.Combiner.ALU
CPMHelVM.HelMA.Automaton.Combiner.CPU
createMockIOHelVM.HelMA.Automaton.IO.MockIO
CStaticHelVM.HelMA.Automaton.Instruction.CFInstruction
cStaticIHelVM.HelMA.Automaton.Instruction
currentInstruction 
1 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
2 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Tree.InstructionUnit
3 (Function)HelVM.HelMA.Automaton.Combiner.CPU
dCopyHelVM.HelMA.Automaton.Instruction
DecHelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
defHelVM.HelMA.Automata.BrainFuck.Common.Symbol
defaultBFTypeHelVM.HelMA.Automata.BrainFuck.API.BFType
defaultCellTypeHelVM.HelMA.Automaton.Types.CellType
defaultDumpTypeHelVM.HelMA.Automaton.Types.DumpType
defaultETAImplTypeHelVM.HelMA.Automata.ETA.API.ETAImplType
defaultFormatTypeHelVM.HelMA.Automaton.Types.FormatType
defaultIntCellTypeHelVM.HelMA.Automaton.Types.IntCellType
defaultOptimizationLevelHelVM.HelMA.Automaton.API.OptimizationLevel
defaultRAMTypeHelVM.HelMA.Automaton.Types.RAMType
defaultStackTypeHelVM.HelMA.Automaton.Types.StackType
defaultTokenTypeHelVM.HelMA.Automaton.Types.TokenType
digitHelVM.HelMA.Automaton.ReadPExtra
DiscardHelVM.HelMA.Automaton.Instruction.SInstruction
discardHelVM.HelMA.Automaton.Combiner.ALU
discardIHelVM.HelMA.Automaton.Instruction
DivHelVM.HelMA.Automaton.Instruction.SInstruction
divIHelVM.HelMA.Automaton.Instruction
divModHelVM.HelMA.Automaton.Combiner.ALU
divModIHelVM.HelMA.Automaton.Instruction
dJumpIHelVM.HelMA.Automaton.Instruction.CFInstruction
DMarkHelVM.HelMA.Automaton.Instruction.CFInstruction
dMarkIHelVM.HelMA.Automaton.Instruction
doBinaryHelVM.HelMA.Automaton.Instruction.SInstruction
doInputChar2HelVM.HelMA.Automaton.Combiner.ALU
doInputDec2HelVM.HelMA.Automaton.Combiner.ALU
doOutputChar2HelVM.HelMA.Automaton.Combiner.ALU
dropHelVM.HelMA.Automaton.Combiner.ALU
dumpHelVM.HelMA.Automaton.Types.DumpType
dumpAutoOptionsHelVM.HelMA.Automaton.API.EvalParams
DumpTypeHelVM.HelMA.Automaton.Types.DumpType
dumpTypeHelVM.HelMA.Automaton.API.AutoOptions
dumpTypesHelVM.HelMA.Automaton.Types.DumpType
dupAndClearSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
DupClrHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
dupIHelVM.HelMA.Automaton.Instruction
dynamicBranchHelVM.HelMA.Automaton.Combiner.CPU
dynamicCallHelVM.HelMA.Automaton.Combiner.CPU
dynamicJumpHelVM.HelMA.Automaton.Combiner.CPU
EHelVM.HelMA.Automata.ETA.Token
ElementHelVM.HelMA.Automaton.IO.BusinessIO
encodeInputHelVM.HelMA.Automata.LazyK.InputEncoder
EndHelVM.HelMA.Automaton.Instruction
end 
1 (Function)HelVM.HelMA.Automata.LazyK.InputEncoder
2 (Function)HelVM.HelMA.Automaton.Combiner
ETAImplTypeHelVM.HelMA.Automata.ETA.API.ETAImplType
etaImplTypesHelVM.HelMA.Automata.ETA.API.ETAImplType
eval 
1 (Function)HelVM.HelMA.Automata.Rev.Evaluator
2 (Function)HelVM.HelMA.Automata.Cat.Evaluator
3 (Function)HelVM.HelMA.Automata.BrainFuck.Evaluator
EvalParams 
1 (Type/Class)HelVM.HelMA.Automaton.API.EvalParams
2 (Data Constructor)HelVM.HelMA.Automaton.API.EvalParams
evalParams 
1 (Function)HelVM.HelMA.Automata.Zot.Automaton
2 (Function)HelVM.HelMA.Automata.SubLeq.Evaluator
3 (Function)HelVM.HelMA.Automata.Rev.Evaluator
4 (Function)HelVM.HelMA.Automata.LazyK.Evaluator
5 (Function)HelVM.HelMA.Automata.Cat.Evaluator
6 (Function)HelVM.HelMA.Automata.WhiteSpace.Evaluator
7 (Function)HelVM.HelMA.Automata.ETA.Evaluator
8 (Function)HelVM.HelMA.Automata.BrainFuck.Evaluator
evalSource 
1 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Evaluator
2 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Evaluator
3 (Function)HelVM.HelMA.Automata.LazyK.Evaluator
4 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Evaluator
5 (Function)HelVM.HelMA.Automata.BrainFuck.Evaluator
evalWithFormatHelVM.HelMA.Automata.Zot.Automaton
ExecHelVM.HelMA.Automata.FALSE.Expression
execMockIOBatchHelVM.HelMA.Automaton.IO.MockIO
execMockIOWithInputHelVM.HelMA.Automaton.IO.MockIO
Expression 
1 (Type/Class)HelVM.HelMA.Automata.Zot.Expression
2 (Data Constructor)HelVM.HelMA.Automata.Zot.Expression
3 (Type/Class)HelVM.HelMA.Automata.FALSE.Expression
ExpressionDListHelVM.HelMA.Automata.Zot.Expression
ExpressionList 
1 (Type/Class)HelVM.HelMA.Automata.Zot.Expression
2 (Type/Class)HelVM.HelMA.Automata.FALSE.Expression
extractPureIALHelVM.HelMA.Automaton.Instruction
EZHelVM.HelMA.Automaton.Instruction.CFInstruction
FHelVM.HelMA.Automaton.Combiner
falseHelVM.HelMA.Automata.LazyK.Constants
FastHelVM.HelMA.Automata.ETA.API.ETAImplType
FastInstructionHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
FastInstructionListHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
FastTypeHelVM.HelMA.Automata.BrainFuck.API.BFType
FetchHelVM.HelMA.Automata.FALSE.Expression
filterCommentsHelVM.HelMA.Automata.LazyK.Lexer
findAddressHelVM.HelMA.Automata.ETA.Addressing
findAddressForDynamicLabelHelVM.HelMA.Automaton.Combiner.CPU
findAddressForStaticLabelHelVM.HelMA.Automaton.Combiner.CPU
FlatInstructionHelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction
FlatTreeInstructionListHelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction
FlatTypeHelVM.HelMA.Automata.BrainFuck.API.BFType
flipParseVisibleHelVM.HelMA.Automata.WhiteSpace.Parser
flipParseWhiteHelVM.HelMA.Automata.WhiteSpace.Parser
flippedApplyHelVM.HelMA.Automata.LazyK.Reducer
flippedNewMemoryHelVM.HelMA.Automaton.Combiner
flippedStoreCharHelVM.HelMA.Automaton.Combiner.RAM
flipPush1HelVM.HelMA.Automaton.Combiner.ALU
FlushHelVM.HelMA.Automata.FALSE.Expression
flushHelVM.HelMA.Automaton.IO.BusinessIO
foldlLambdaHelVM.HelMA.Automata.LazyK.Lambda
FormatTypeHelVM.HelMA.Automaton.Types.FormatType
formatType 
1 (Function)HelVM.HelMA.Automaton.API.EvalParams
2 (Function)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
formatTypesHelVM.HelMA.Automaton.Types.FormatType
FreeIOHelVM.HelMA.Automaton.IO.FreeIO
fromBoolHelVM.HelMA.Automaton.API.OptimizationLevel
fromCharHelVM.HelMA.Automata.BrainFuck.Common.Symbol
fromListHelVM.HelMA.Automaton.Combiner.RAM
fromNaturalHelVM.HelMA.Automaton.API.OptimizationLevel
FullTapeHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
genericFindAddressHelVM.HelMA.Automata.ETA.Addressing
genericLoadHelVM.HelMA.Automaton.Combiner.RAM
genericNextLabelHelVM.HelMA.Automata.ETA.Addressing
genericPush1HelVM.HelMA.Automaton.Combiner.ALU
genericStoreHelVM.HelMA.Automaton.Combiner.RAM
GTZHelVM.HelMA.Automaton.Instruction.CFInstruction
HHelVM.HelMA.Automata.ETA.Token
HalfTableHelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
HalibutHelVM.HelMA.Automaton.Instruction.SInstruction
halibutHelVM.HelMA.Automaton.Combiner.ALU
halibutIHelVM.HelMA.Automaton.Instruction
I 
1 (Data Constructor)HelVM.HelMA.Automata.ETA.Token
2 (Data Constructor)HelVM.HelMA.Automata.LazyK.Lambda
IALHelVM.HelMA.Automaton.Instruction
ICFHelVM.HelMA.Automaton.Instruction
ILSHelVM.HelMA.Automaton.Instruction
IM 
1 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Tree.InstructionUnit
2 (Data Constructor)HelVM.HelMA.Automata.ETA.OperandParsers
implementedOptimizationLevelsHelVM.HelMA.Automaton.API.OptimizationLevel
implTypeHelVM.HelMA.Automata.ETA.SimpleParams
Inc 
1 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
2 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
incHelVM.HelMA.Automata.BrainFuck.Common.Symbol
incrementICHelVM.HelMA.Automaton.Combiner
incrementPCHelVM.HelMA.Automaton.Combiner.CPU
incSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
IndexHelVM.HelMA.Automaton.Symbol
Input 
1 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
2 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
3 (Type/Class)HelVM.HelMA.Automaton.API.IOTypes
InputCharHelVM.HelMA.Automaton.Instruction.IOInstruction
InputDecHelVM.HelMA.Automaton.Instruction.IOInstruction
InstHelVM.HelMA.Automata.FALSE.Expression
InstructionHelVM.HelMA.Automaton.Instruction
InstructionAddress 
1 (Type/Class)HelVM.HelMA.Automata.ETA.Symbol
2 (Type/Class)HelVM.HelMA.Automaton.Combiner.CPU
3 (Type/Class)HelVM.HelMA.Automaton.Symbol
InstructionCounter 
1 (Type/Class)HelVM.HelMA.Automata.BrainFuck.Impl.Tree.InstructionUnit
2 (Type/Class)HelVM.HelMA.Automata.ETA.Symbol
3 (Type/Class)HelVM.HelMA.Automaton.Combiner.CPU
InstructionListHelVM.HelMA.Automaton.Instruction
InstructionMemory 
1 (Type/Class)HelVM.HelMA.Automata.BrainFuck.Impl.Tree.InstructionUnit
2 (Type/Class)HelVM.HelMA.Automata.ETA.OperandParsers
InstructionStackHelVM.HelMA.Automaton.Combiner.CPU
InstructionVectorHelVM.HelMA.Automaton.Instruction
Int16Type 
1 (Data Constructor)HelVM.HelMA.Automaton.Types.CellType
2 (Data Constructor)HelVM.HelMA.Automaton.Types.IntCellType
Int32Type 
1 (Data Constructor)HelVM.HelMA.Automaton.Types.CellType
2 (Data Constructor)HelVM.HelMA.Automaton.Types.IntCellType
Int64Type 
1 (Data Constructor)HelVM.HelMA.Automaton.Types.CellType
2 (Data Constructor)HelVM.HelMA.Automaton.Types.IntCellType
Int8Type 
1 (Data Constructor)HelVM.HelMA.Automaton.Types.CellType
2 (Data Constructor)HelVM.HelMA.Automaton.Types.IntCellType
intCellHelVM.HelMA.Automaton.API.MemoryOptions
intCellAutoOptionsHelVM.HelMA.Automaton.API.EvalParams
IntCellTypeHelVM.HelMA.Automaton.Types.IntCellType
intCellTypesHelVM.HelMA.Automaton.Types.IntCellType
IntegerTypeHelVM.HelMA.Automaton.Types.IntCellType
InteractHelVM.HelMA.Automaton.API.IOTypes
interpretFreeIOToBusinessIOHelVM.HelMA.Automaton.IO.FreeIO
ioExecMockIOBatchHelVM.HelMA.Automaton.IO.MockIO
ioExecMockIOWithInputHelVM.HelMA.Automaton.IO.MockIO
IOInstructionHelVM.HelMA.Automaton.Instruction.IOInstruction
ISHelVM.HelMA.Automaton.Combiner.CPU
isAlphaAsciiHelVM.HelMA.Automaton.ReadPExtra
isDMarkHelVM.HelMA.Automaton.Instruction
isHashHelVM.HelMA.Automata.LazyK.Lexer
isICFHelVM.HelMA.Automaton.Instruction
isJumpHelVM.HelMA.Automaton.Instruction.CFInstruction
isMarkHelVM.HelMA.Automaton.Instruction
isNotJumpHelVM.HelMA.Automaton.Instruction.CFInstruction
isPureIALHelVM.HelMA.Automaton.Instruction
isSMarkHelVM.HelMA.Automaton.Instruction
JmpBackHelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction
JmpPastHelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction
JumpHelVM.HelMA.Automaton.Instruction.CFInstruction
jumpBackHelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
jumpPastHelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
KHelVM.HelMA.Automata.LazyK.Lambda
LabelHelVM.HelMA.Automaton.Instruction.CFInstruction
LabelInstructionHelVM.HelMA.Automaton.Instruction.CFInstruction
Lambda 
1 (Type/Class)HelVM.HelMA.Automata.LazyK.Lambda
2 (Data Constructor)HelVM.HelMA.Automata.FALSE.Expression
LAndHelVM.HelMA.Automaton.Instruction.SInstruction
LEQHelVM.HelMA.Automaton.Instruction.SInstruction
letterAsciiHelVM.HelMA.Automaton.ReadPExtra
LGTHelVM.HelMA.Automaton.Instruction.SInstruction
limitHelVM.HelMA.Automaton.API.AutoOptions
LimitMaybeHelVM.HelMA.Automaton.Loop
ListRAMTypeHelVM.HelMA.Automaton.Types.RAMType
listRunParserHelVM.HelMA.Automaton.ReadPExtra
ListStackTypeHelVM.HelMA.Automaton.Types.StackType
LNotHelVM.HelMA.Automaton.Instruction.SInstruction
LoadHelVM.HelMA.Automaton.Instruction.LSInstruction
load 
1 (Function)HelVM.HelMA.Automaton.Combiner.RAM
2 (Function)HelVM.HelMA.Automaton.Combiner.LSU
loadIHelVM.HelMA.Automaton.Instruction
loadOutputCharHelVM.HelMA.Automaton.Combiner.LSU
loadOutputDecHelVM.HelMA.Automaton.Combiner.LSU
LoadStoreMemoryHelVM.HelMA.Automaton.Combiner.LSU
logDumpHelVM.HelMA.Automaton.Types.DumpType
LogicalHelVM.HelMA.Automaton.Instruction.SInstruction
logInputHelVM.HelMA.Automaton.IO.FreeIO
logOutputHelVM.HelMA.Automaton.IO.FreeIO
logStrHelVM.HelMA.Automaton.IO.BusinessIO
loopMWithLimitHelVM.HelMA.Automaton.Loop
LOrHelVM.HelMA.Automaton.Instruction.SInstruction
LSInstructionHelVM.HelMA.Automaton.Instruction.LSInstruction
LSMHelVM.HelMA.Automaton.Combiner.LSU
LSUHelVM.HelMA.Automaton.Combiner.LSU
LTZHelVM.HelMA.Automaton.Instruction.CFInstruction
LXorHelVM.HelMA.Automaton.Instruction.SInstruction
ManipulationInstructionHelVM.HelMA.Automaton.Instruction.SInstruction
manyNonEmptyHelVM.HelMA.Automaton.ReadPExtra
MapListRAMTypeHelVM.HelMA.Automaton.Types.RAMType
matchNextJmpHelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
matchPrevJmpHelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
Memory 
1 (Type/Class)HelVM.HelMA.Automaton.Combiner
2 (Data Constructor)HelVM.HelMA.Automaton.Combiner
memoryCMHelVM.HelMA.Automaton.Combiner
MemoryOptions 
1 (Type/Class)HelVM.HelMA.Automaton.API.MemoryOptions
2 (Data Constructor)HelVM.HelMA.Automaton.API.MemoryOptions
memoryOptionsHelVM.HelMA.Automaton.API.EvalParams
memoryProgramHelVM.HelMA.Automaton.Combiner
memoryProgramCounterHelVM.HelMA.Automaton.Combiner
memoryRAMHelVM.HelMA.Automaton.Combiner
MemorySameHelVM.HelMA.Automaton.Combiner
memoryStackHelVM.HelMA.Automaton.Combiner
mInputDecIHelVM.HelMA.Automaton.Instruction
mInputIHelVM.HelMA.Automaton.Instruction
MIOHelVM.HelMA.Automaton.Instruction.LSInstruction
MockIOHelVM.HelMA.Automaton.IO.MockIO
MockIODataHelVM.HelMA.Automaton.IO.MockIO
ModHelVM.HelMA.Automaton.Instruction.SInstruction
modIHelVM.HelMA.Automaton.Instruction
Move 
1 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
2 (Data Constructor)HelVM.HelMA.Automaton.Instruction.SInstruction
moveHelVM.HelMA.Automaton.Combiner.ALU
moveHeadHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
moveHeadLeftHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
moveHeadRightHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
MoveLHelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
MoveRHelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
moveSafeHelVM.HelMA.Automata.WhiteSpace.OperandParsers
MulHelVM.HelMA.Automaton.Instruction.SInstruction
mulAddAndClearSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
MulAddClrHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
mulDupAndClearSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
MulDupClrHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
mulIHelVM.HelMA.Automaton.Instruction
N 
1 (Data Constructor)HelVM.HelMA.Automata.ETA.Token
2 (Data Constructor)HelVM.HelMA.Automata.WhiteSpace.Token
NegHelVM.HelMA.Automaton.Instruction.SInstruction
negationIntegralHelVM.HelMA.Automata.WhiteSpace.OperandParsers
negIHelVM.HelMA.Automaton.Instruction
newCMHelVM.HelMA.Automaton.Combiner.CPU
newMemory 
1 (Function)HelVM.HelMA.Automata.SubLeq.Automaton
2 (Function)HelVM.HelMA.Automata.ETA.Automaton
3 (Function)HelVM.HelMA.Automaton.Combiner
newTapeHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
nextHelVM.HelMA.Automata.BrainFuck.Common.Symbol
nextICHelVM.HelMA.Automata.BrainFuck.Impl.Tree.InstructionUnit
nextIMHelVM.HelMA.Automata.ETA.OperandParsers
nextInstHelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
nextLabelHelVM.HelMA.Automata.ETA.Addressing
nextSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
NoHelVM.HelMA.Automaton.Types.DumpType
nonEmptyRunParserHelVM.HelMA.Automaton.ReadPExtra
NoOptimizationsHelVM.HelMA.Automaton.API.OptimizationLevel
notCharHelVM.HelMA.Automaton.ReadPExtra
NumberHelVM.HelMA.Automata.LazyK.Lambda
OHelVM.HelMA.Automata.ETA.Token
OneHelVM.HelMA.Automata.Zot.Expression
oneOfHelVM.HelMA.Automaton.ReadPExtra
OperandIMParserHelVM.HelMA.Automata.ETA.OperandParsers
OperandParserHelVM.HelMA.Automata.ETA.OperandParsers
OperatorTypeHelVM.HelMA.Automaton.Instruction.SInstruction
OptimizationLevelHelVM.HelMA.Automaton.API.OptimizationLevel
optimizationLevelsHelVM.HelMA.Automaton.API.OptimizationLevel
optimize 
1 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Optimizer
2 (Function)HelVM.HelMA.Automata.ETA.Optimizer
3 (Function)HelVM.HelMA.Automaton.Optimizer
optLevelHelVM.HelMA.Automaton.API.AutoOptions
optLevelAutoOptionsHelVM.HelMA.Automaton.API.AutomatonOptions
OriginalHelVM.HelMA.Automata.ETA.API.ETAImplType
OutHelVM.HelMA.Automata.Zot.Expression
Output 
1 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
2 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
3 (Type/Class)HelVM.HelMA.Automaton.API.IOTypes
OutputCharHelVM.HelMA.Automaton.Instruction.IOInstruction
OutputDecHelVM.HelMA.Automaton.Instruction.IOInstruction
parse 
1 (Function)HelVM.HelMA.Automata.Zot.Parser
2 (Function)HelVM.HelMA.Automata.LazyK.Parser
3 (Function)HelVM.HelMA.Automata.FALSE.Parser
4 (Function)HelVM.HelMA.Automata.WhiteSpace.Parser
5 (Function)HelVM.HelMA.Automata.ETA.Parser
parseAsciiStringHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseAsListHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser
parseAsListSafeHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser
parseAsVectorHelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser
parseAsVectorSafeHelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser
parseDigitStringHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseExtraHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseFromTLHelVM.HelMA.Automata.WhiteSpace.Parser
parseIndexHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseIntHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseIntegerHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseLabelHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseNaturalHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseNumberHelVM.HelMA.Automata.ETA.OperandParsers
parseNumberFromTLHelVM.HelMA.Automata.ETA.OperandParsers
parseNumberFromTLLHelVM.HelMA.Automata.ETA.OperandParsers
ParserHelVM.HelMA.Automata.WhiteSpace.OperandParsers
ParserFromTokenListHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseSafe 
1 (Function)HelVM.HelMA.Automata.FALSE.Parser
2 (Function)HelVM.HelMA.Automata.ETA.Parser
parseString'HelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseSymbolHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseVisibleHelVM.HelMA.Automata.WhiteSpace.Parser
parseWhiteHelVM.HelMA.Automata.WhiteSpace.Parser
parseWithOptimizeHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser
parseWithOptimizeSafeHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser
PickHelVM.HelMA.Automaton.Instruction.SInstruction
pop1HelVM.HelMA.Automaton.Combiner.ALU
pop2HelVM.HelMA.Automaton.Combiner.ALU
pop2ForStackHelVM.HelMA.Automaton.Combiner
popAddressHelVM.HelMA.Automaton.Combiner.CPU
PrettyHelVM.HelMA.Automaton.Types.DumpType
prevHelVM.HelMA.Automata.BrainFuck.Common.Symbol
prevInstHelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
prevSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
program 
1 (Function)HelVM.HelMA.Automata.ETA.OperandParsers
2 (Function)HelVM.HelMA.Automaton.Combiner.CPU
programCounter 
1 (Function)HelVM.HelMA.Automata.ETA.OperandParsers
2 (Function)HelVM.HelMA.Automaton.Combiner.CPU
push1HelVM.HelMA.Automaton.Combiner.ALU
push1ForStackHelVM.HelMA.Automaton.Combiner
push2HelVM.HelMA.Automaton.Combiner.ALU
RHelVM.HelMA.Automata.ETA.Token
RAMHelVM.HelMA.Automaton.Combiner.RAM
ram 
1 (Function)HelVM.HelMA.Automaton.Combiner.LSU
2 (Function)HelVM.HelMA.Automaton.API.MemoryOptions
ramAutoOptionsHelVM.HelMA.Automaton.API.EvalParams
RAMTypeHelVM.HelMA.Automaton.Types.RAMType
ramType 
1 (Function)HelVM.HelMA.Automaton.API.AutomatonOptions
2 (Function)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
ramTypesHelVM.HelMA.Automaton.Types.RAMType
RAutomatonIOHelVM.HelMA.Automaton.IO.AutomatonIO
readExpressionListHelVM.HelMA.Automata.Zot.Expression
readInputHelVM.HelMA.Automata.LazyK.InputEncoder
readSymbolsHelVM.HelMA.Automata.SubLeq.Lexer
readTokens 
1 (Function)HelVM.HelMA.Automata.ETA.Lexer
2 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser
readVisibleTokensHelVM.HelMA.Automata.WhiteSpace.Lexer
readWhiteTokensHelVM.HelMA.Automata.WhiteSpace.Lexer
realizeHelVM.HelMA.Automata.LazyK.Automaton
realizeWithTrueHelVM.HelMA.Automata.LazyK.Automaton
reduceHelVM.HelMA.Automata.LazyK.Reducer
reduceSourceHelVM.HelMA.Automata.LazyK.Evaluator
RefHelVM.HelMA.Automata.FALSE.Expression
removeCommentHelVM.HelMA.Automata.LazyK.Lexer
ReturnHelVM.HelMA.Automaton.Instruction.CFInstruction
returnIHelVM.HelMA.Automaton.Instruction
returnStackHelVM.HelMA.Automaton.Combiner.CPU
rotIHelVM.HelMA.Automaton.Instruction
run 
1 (Function)HelVM.HelMA.Automata.LazyK.Automaton
2 (Function)HelVM.HelMA.Automata.SubLeq.Automaton
3 (Function)HelVM.HelMA.Automata.ETA.Automaton
4 (Function)HelVM.HelMA.Automaton.Automaton
runALIHelVM.HelMA.Automaton.Combiner.ALU
runAndDumpLogsHelVM.HelMA.Automaton.Automaton
runCFIHelVM.HelMA.Automaton.Combiner.CPU
runExpressionListHelVM.HelMA.Automata.Zot.Evaluator
runInstructionHelVM.HelMA.Automaton.Combiner
runMockIOHelVM.HelMA.Automaton.IO.MockIO
runParserHelVM.HelMA.Automaton.ReadPExtra
runSALHelVM.HelMA.Automaton.Combiner.ALU
runSLIHelVM.HelMA.Automaton.Combiner.LSU
runWithTerminatorHelVM.HelMA.Automata.LazyK.Automaton
S 
1 (Data Constructor)HelVM.HelMA.Automata.ETA.Token
2 (Data Constructor)HelVM.HelMA.Automata.LazyK.Lambda
3 (Data Constructor)HelVM.HelMA.Automata.WhiteSpace.Token
safeExecMockIOBatchHelVM.HelMA.Automaton.IO.MockIO
safeExecMockIOWithInputHelVM.HelMA.Automaton.IO.MockIO
SafeStackHelVM.HelMA.Automaton.Combiner.ALU
SALHelVM.HelMA.Automaton.Instruction.SInstruction
salHelVM.HelMA.Automaton.Instruction
SameHelVM.HelMA.Automaton.Loop
SAutomatonIOHelVM.HelMA.Automaton.IO.AutomatonIO
sCallIHelVM.HelMA.Automaton.Instruction
sCopyIHelVM.HelMA.Automaton.Instruction
SDynamicHelVM.HelMA.Automaton.Instruction.SInstruction
selfAppHelVM.HelMA.Automata.LazyK.Constants
SeqRAMTypeHelVM.HelMA.Automaton.Types.RAMType
SeqStackTypeHelVM.HelMA.Automaton.Types.StackType
SetHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
setSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
sEZIHelVM.HelMA.Automaton.Instruction
SFHelVM.HelMA.Automaton.Combiner
showExpressionListHelVM.HelMA.Automata.Zot.Expression
showsHelVM.HelMA.Automata.SubLeq.Lexer
Simple 
1 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction
2 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
simpleAutoParamsHelVM.HelMA.Automaton.API.AutoOptions
simpleEval 
1 (Function)HelVM.HelMA.Automata.SubLeq.Evaluator
2 (Function)HelVM.HelMA.Automata.WhiteSpace.Evaluator
3 (Function)HelVM.HelMA.Automata.ETA.Evaluator
4 (Function)HelVM.HelMA.Automata.BrainFuck.Evaluator
SimpleInstructionHelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
simpleInstructionsHelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
SimpleParams 
1 (Type/Class)HelVM.HelMA.Automata.ETA.SimpleParams
2 (Data Constructor)HelVM.HelMA.Automata.ETA.SimpleParams
3 (Type/Class)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
4 (Data Constructor)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
simpleParams 
1 (Function)HelVM.HelMA.Automata.ETA.SimpleParams
2 (Function)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
simpleParamsWithDefaultsHelVM.HelMA.Automata.WhiteSpace.SimpleParams
simpleParamsWithDefaultsAndVisibleTokenTypeHelVM.HelMA.Automata.WhiteSpace.SimpleParams
simpleParamsWithDefaultsAndWhiteTokenTypeHelVM.HelMA.Automata.WhiteSpace.SimpleParams
simpleParamsWithVisibleTokenTypeHelVM.HelMA.Automata.WhiteSpace.SimpleParams
simpleParamsWithWhiteTokenTypeHelVM.HelMA.Automata.WhiteSpace.SimpleParams
sInputIHelVM.HelMA.Automaton.Instruction
SInstructionHelVM.HelMA.Automaton.Instruction.SInstruction
SIOHelVM.HelMA.Automaton.Instruction.SInstruction
sioHelVM.HelMA.Automaton.Instruction
sJumpIHelVM.HelMA.Automaton.Instruction
sJumpINHelVM.HelMA.Automaton.Instruction
SlideHelVM.HelMA.Automaton.Instruction.SInstruction
slideHelVM.HelMA.Automaton.Combiner.ALU
SListRAMTypeHelVM.HelMA.Automaton.Types.RAMType
SListStackTypeHelVM.HelMA.Automaton.Types.StackType
sLTZIHelVM.HelMA.Automaton.Instruction
SMarkHelVM.HelMA.Automaton.Instruction.CFInstruction
sMarkIHelVM.HelMA.Automaton.Instruction
sMarkINHelVM.HelMA.Automaton.Instruction
sMoveIHelVM.HelMA.Automaton.Instruction
SomeOptimizationsHelVM.HelMA.Automaton.API.OptimizationLevel
SourceHelVM.HelMA.Automaton.API.IOTypes
source 
1 (Function)HelVM.HelMA.Automaton.API.EvalParams
2 (Function)HelVM.HelMA.Automata.ETA.SimpleParams
3 (Function)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
sOutputDecIHelVM.HelMA.Automaton.Instruction
sOutputIHelVM.HelMA.Automaton.Instruction
splitAtHelVM.HelMA.Automaton.Combiner.ALU
splitByNHelVM.HelMA.Automata.WhiteSpace.OperandParsers
SRAutomatonIOHelVM.HelMA.Automaton.IO.AutomatonIO
sSlideIHelVM.HelMA.Automaton.Instruction
SStaticHelVM.HelMA.Automaton.Instruction.SInstruction
sStaticHelVM.HelMA.Automaton.Instruction
StackHelVM.HelMA.Automaton.Combiner.ALU
stack 
1 (Function)HelVM.HelMA.Automaton.Combiner.LSU
2 (Function)HelVM.HelMA.Automaton.API.MemoryOptions
stackAutoOptionsHelVM.HelMA.Automaton.API.EvalParams
StackIndexHelVM.HelMA.Automaton.Instruction.SInstruction
StackTypeHelVM.HelMA.Automaton.Types.StackType
stackType 
1 (Function)HelVM.HelMA.Automaton.API.AutomatonOptions
2 (Function)HelVM.HelMA.Automata.ETA.SimpleParams
3 (Function)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
stackTypesHelVM.HelMA.Automaton.Types.StackType
startHelVM.HelMA.Automaton.Automaton
staticBranchHelVM.HelMA.Automaton.Combiner.CPU
staticCallHelVM.HelMA.Automaton.Combiner.CPU
staticJumpHelVM.HelMA.Automaton.Combiner.CPU
Store 
1 (Data Constructor)HelVM.HelMA.Automaton.Instruction.LSInstruction
2 (Data Constructor)HelVM.HelMA.Automata.FALSE.Expression
store 
1 (Function)HelVM.HelMA.Automaton.Combiner.RAM
2 (Function)HelVM.HelMA.Automaton.Combiner.LSU
storeCharHelVM.HelMA.Automaton.Combiner.RAM
storeIHelVM.HelMA.Automaton.Instruction
storeInputCharHelVM.HelMA.Automaton.Combiner.LSU
storeInputDecHelVM.HelMA.Automaton.Combiner.LSU
StrHelVM.HelMA.Automata.FALSE.Expression
stringToExpressionListHelVM.HelMA.Automata.Zot.Expression
SubHelVM.HelMA.Automaton.Instruction.SInstruction
subHelVM.HelMA.Automaton.Combiner.ALU
subAndClearSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
SubClrHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
subIHelVM.HelMA.Automaton.Instruction
SuccHelVM.HelMA.Automata.LazyK.Lambda
succChurchHelVM.HelMA.Automata.LazyK.InputEncoder
successorHelVM.HelMA.Automata.LazyK.InputEncoder
swapIHelVM.HelMA.Automaton.Instruction
Symbol 
1 (Type/Class)HelVM.HelMA.Automata.BrainFuck.Common.Symbol
2 (Type/Class)HelVM.HelMA.Automata.ETA.Symbol
3 (Type/Class)HelVM.HelMA.Automata.SubLeq.Symbol
4 (Type/Class)HelVM.HelMA.Automaton.Symbol
SymbolList 
1 (Type/Class)HelVM.HelMA.Automata.ETA.Symbol
2 (Type/Class)HelVM.HelMA.Automata.SubLeq.Symbol
3 (Type/Class)HelVM.HelMA.Automaton.Symbol
Symbols 
1 (Type/Class)HelVM.HelMA.Automata.SubLeq.Lexer
2 (Data Constructor)HelVM.HelMA.Automata.SubLeq.Lexer
T 
1 (Data Constructor)HelVM.HelMA.Automata.ETA.Token
2 (Data Constructor)HelVM.HelMA.Automata.WhiteSpace.Token
TableHelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
TableDHelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
testMaybeLimitHelVM.HelMA.Automaton.Loop
TextLabelHelVM.HelMA.Automaton.Types.FormatType
toCharHelVM.HelMA.Automata.BrainFuck.Common.Symbol
toCPMHelVM.HelMA.Automaton.Combiner
toIntegerHelVM.HelMA.Automata.BrainFuck.Common.Symbol
Token 
1 (Type/Class)HelVM.HelMA.Automata.ETA.Token
2 (Type/Class)HelVM.HelMA.Automata.WhiteSpace.Token
tokenize 
1 (Function)HelVM.HelMA.Automata.SubLeq.Lexer
2 (Function)HelVM.HelMA.Automata.WhiteSpace.Lexer
3 (Function)HelVM.HelMA.Automata.ETA.Lexer
4 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser
tokenizeVisibleHelVM.HelMA.Automata.WhiteSpace.Lexer
tokenizeWhiteHelVM.HelMA.Automata.WhiteSpace.Lexer
TokenList 
1 (Type/Class)HelVM.HelMA.Automata.ETA.Token
2 (Type/Class)HelVM.HelMA.Automata.WhiteSpace.Token
TokensHelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser
TokenSListHelVM.HelMA.Automata.WhiteSpace.Token
tokenToWhiteTokenPairHelVM.HelMA.Automata.ETA.Token
TokenTypeHelVM.HelMA.Automaton.Types.TokenType
tokenTypeHelVM.HelMA.Automata.WhiteSpace.SimpleParams
tokenTypesHelVM.HelMA.Automaton.Types.TokenType
TokenVectorHelVM.HelMA.Automata.ETA.Token
toLSMHelVM.HelMA.Automaton.Combiner
TransferHelVM.HelMA.Automaton.Instruction
transferHelVM.HelMA.Automaton.Combiner
transferBranchHelVM.HelMA.Automaton.Combiner
TreeInstructionHelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
TreeInstructionDListHelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
TreeInstructionListHelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
TreeInstructionVectorHelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
TreeTypeHelVM.HelMA.Automata.BrainFuck.API.BFType
triAndClearSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
TriClrHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
trueHelVM.HelMA.Automata.LazyK.Constants
UglyHelVM.HelMA.Automaton.Types.DumpType
UnaryHelVM.HelMA.Automaton.Instruction.SInstruction
unaryHelVM.HelMA.Automaton.Instruction
UnaryInstructionHelVM.HelMA.Automaton.Instruction.SInstruction
unWhiteToken 
1 (Function)HelVM.HelMA.Automata.ETA.Token
2 (Function)HelVM.HelMA.Automata.WhiteSpace.Token
unWrapTokenListHelVM.HelMA.Automaton.WrapTokenList
updateFromCPMHelVM.HelMA.Automaton.Combiner
updateFromLSMHelVM.HelMA.Automaton.Combiner
updatePCHelVM.HelMA.Automata.ETA.OperandParsers
updateStackHelVM.HelMA.Automaton.Combiner
VarHelVM.HelMA.Automata.LazyK.Lambda
verySimpleAutoParamsHelVM.HelMA.Automaton.API.AutoOptions
VisibleTokensHelVM.HelMA.Automata.WhiteSpace.Lexer
VisibleTokenTypeHelVM.HelMA.Automaton.Types.TokenType
wFlushHelVM.HelMA.Automaton.IO.BusinessIO
wGetCharHelVM.HelMA.Automaton.IO.BusinessIO
wGetCharAsHelVM.HelMA.Automaton.IO.BusinessIO
wGetContentsHelVM.HelMA.Automaton.IO.BusinessIO
wGetContentsBSHelVM.HelMA.Automaton.IO.BusinessIO
wGetContentsTextHelVM.HelMA.Automaton.IO.BusinessIO
wGetDecAsHelVM.HelMA.Automaton.IO.BusinessIO
wGetLineHelVM.HelMA.Automaton.IO.BusinessIO
While 
1 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
2 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
3 (Data Constructor)HelVM.HelMA.Automata.FALSE.Expression
WhiteToken 
1 (Type/Class)HelVM.HelMA.Automata.ETA.Token
2 (Data Constructor)HelVM.HelMA.Automata.ETA.Token
3 (Type/Class)HelVM.HelMA.Automata.WhiteSpace.Token
4 (Data Constructor)HelVM.HelMA.Automata.WhiteSpace.Token
WhiteTokenList 
1 (Type/Class)HelVM.HelMA.Automata.ETA.Token
2 (Type/Class)HelVM.HelMA.Automata.WhiteSpace.Token
whiteTokenListToTokenList 
1 (Function)HelVM.HelMA.Automata.ETA.Token
2 (Function)HelVM.HelMA.Automata.WhiteSpace.Token
WhiteTokens 
1 (Type/Class)HelVM.HelMA.Automata.WhiteSpace.Lexer
2 (Type/Class)HelVM.HelMA.Automata.ETA.Lexer
WhiteTokenTypeHelVM.HelMA.Automaton.Types.TokenType
withDefaultRamHelVM.HelMA.Automaton.API.AutomatonOptions
WithLimitHelVM.HelMA.Automaton.Loop
wLogShowHelVM.HelMA.Automaton.IO.BusinessIO
wLogStrHelVM.HelMA.Automaton.IO.BusinessIO
wLogStrLnHelVM.HelMA.Automaton.IO.BusinessIO
Word16TypeHelVM.HelMA.Automaton.Types.CellType
Word32TypeHelVM.HelMA.Automaton.Types.CellType
Word64TypeHelVM.HelMA.Automaton.Types.CellType
Word8TypeHelVM.HelMA.Automaton.Types.CellType
wPutAsCharHelVM.HelMA.Automaton.IO.BusinessIO
wPutAsDecHelVM.HelMA.Automaton.IO.BusinessIO
wPutCharHelVM.HelMA.Automaton.IO.BusinessIO
wPutStrHelVM.HelMA.Automaton.IO.BusinessIO
wPutStrLnHelVM.HelMA.Automaton.IO.BusinessIO
WrapTokenList 
1 (Type/Class)HelVM.HelMA.Automaton.WrapTokenList
2 (Data Constructor)HelVM.HelMA.Automaton.WrapTokenList
writeSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
ZeroHelVM.HelMA.Automata.Zot.Expression

\ No newline at end of file
diff --git a/docs/reports/helma/doc-index-B.html b/docs/reports/helma/doc-index-B.html
index e537edcbf..8ddaf888a 100644
--- a/docs/reports/helma/doc-index-B.html
+++ b/docs/reports/helma/doc-index-B.html
@@ -1 +1 @@
-helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - B)
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton

\ No newline at end of file
+helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - B)
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton

\ No newline at end of file
diff --git a/docs/reports/helma/doc-index-C.html b/docs/reports/helma/doc-index-C.html
index 9b8e5dbf8..8424c7e2d 100644
--- a/docs/reports/helma/doc-index-C.html
+++ b/docs/reports/helma/doc-index-C.html
@@ -1 +1 @@
-helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - C)
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Index - C
calculateLoggedHelVM.HelMA.Automaton.IO.MockIO
calculateOpHelVM.HelMA.Automaton.Instruction.ALInstruction
calculateOpsHelVM.HelMA.Automaton.Instruction.ALInstruction
calculateOutputHelVM.HelMA.Automaton.IO.MockIO
CallHelVM.HelMA.Automaton.Instruction.CFInstruction
CDynamicHelVM.HelMA.Automaton.Instruction.CFInstruction
cellHelVM.HelMA.Automaton.API.AutoOptions
cellAutoOptionsHelVM.HelMA.Automaton.API.EvalParams
CellTypeHelVM.HelMA.Automaton.Types.CellType
cellTypesHelVM.HelMA.Automaton.Types.CellType
CentralProcessingUnitHelVM.HelMA.Automaton.Units.CPU
CFInstructionHelVM.HelMA.Automaton.Instruction.CFInstruction
charPush1HelVM.HelMA.Automaton.Units.ALU
charToExpressionHelVM.HelMA.Automata.Zot.Expression
charToExpressionListHelVM.HelMA.Automata.Zot.Expression
charToExpressionSafeHelVM.HelMA.Automata.Zot.Expression
charToSimpleInstruction 
1 (Function)HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
2 (Function)HelVM.HelMA.Automata.FALSE.Parser
churchHelVM.HelMA.Automata.LazyK.InputEncoder
clearSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
CommentHelVM.HelMA.Automata.FALSE.Expression
compare0HelVM.HelMA.Automata.BrainFuck.Common.Symbol
compileHelVM.HelMA.Automaton.API.AutoParams
CondHelVM.HelMA.Automata.FALSE.Expression
ConsHelVM.HelMA.Automaton.Instruction.ALInstruction
consHelVM.HelMA.Automata.LazyK.InputEncoder
consIHelVM.HelMA.Automaton.Instruction
continueHelVM.HelMA.Automaton.Loop
ControlUnitHelVM.HelMA.Automaton.Units.CPU
controlUnitHelVM.HelMA.Automaton.Units.CPU
CopyHelVM.HelMA.Automaton.Instruction.ALInstruction
copyHelVM.HelMA.Automaton.Units.ALU
CPUHelVM.HelMA.Automaton.Units.CPU
createMockIOHelVM.HelMA.Automaton.IO.MockIO
CStaticHelVM.HelMA.Automaton.Instruction.CFInstruction
CUHelVM.HelMA.Automaton.Units.CPU
currentInstruction 
1 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
2 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Tree.InstructionUnit
3 (Function)HelVM.HelMA.Automaton.Units.CPU

\ No newline at end of file
+helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - C)
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Index - C
calculateLoggedHelVM.HelMA.Automaton.IO.MockIO
calculateOpHelVM.HelMA.Automaton.Instruction.SInstruction
calculateOpsHelVM.HelMA.Automaton.Instruction.SInstruction
calculateOutputHelVM.HelMA.Automaton.IO.MockIO
CallHelVM.HelMA.Automaton.Instruction.CFInstruction
CDynamicHelVM.HelMA.Automaton.Instruction.CFInstruction
cellHelVM.HelMA.Automaton.API.MemoryOptions
cellAutoOptionsHelVM.HelMA.Automaton.API.EvalParams
CellTypeHelVM.HelMA.Automaton.Types.CellType
cellTypesHelVM.HelMA.Automaton.Types.CellType
CentralProcessingMemoryHelVM.HelMA.Automaton.Combiner.CPU
CFInstructionHelVM.HelMA.Automaton.Instruction.CFInstruction
charPush1HelVM.HelMA.Automaton.Combiner.ALU
charToExpressionHelVM.HelMA.Automata.Zot.Expression
charToExpressionListHelVM.HelMA.Automata.Zot.Expression
charToExpressionSafeHelVM.HelMA.Automata.Zot.Expression
charToSimpleInstruction 
1 (Function)HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
2 (Function)HelVM.HelMA.Automata.FALSE.Parser
churchHelVM.HelMA.Automata.LazyK.InputEncoder
clearSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
CMHelVM.HelMA.Automaton.Combiner.CPU
CommentHelVM.HelMA.Automata.FALSE.Expression
compare0HelVM.HelMA.Automata.BrainFuck.Common.Symbol
compileFlagHelVM.HelMA.Automaton.API.AutoOptions
CondHelVM.HelMA.Automata.FALSE.Expression
ConsHelVM.HelMA.Automaton.Instruction.SInstruction
consHelVM.HelMA.Automata.LazyK.InputEncoder
consIHelVM.HelMA.Automaton.Instruction
constantFoldingHelVM.HelMA.Automaton.Optimizer
continueHelVM.HelMA.Automaton.Loop
ControlMemoryHelVM.HelMA.Automaton.Combiner.CPU
controlMemoryHelVM.HelMA.Automaton.Combiner.CPU
CopyHelVM.HelMA.Automaton.Instruction.SInstruction
copyHelVM.HelMA.Automaton.Combiner.ALU
CPMHelVM.HelMA.Automaton.Combiner.CPU
createMockIOHelVM.HelMA.Automaton.IO.MockIO
CStaticHelVM.HelMA.Automaton.Instruction.CFInstruction
cStaticIHelVM.HelMA.Automaton.Instruction
currentInstruction 
1 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
2 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Tree.InstructionUnit
3 (Function)HelVM.HelMA.Automaton.Combiner.CPU

\ No newline at end of file
diff --git a/docs/reports/helma/doc-index-D.html b/docs/reports/helma/doc-index-D.html
index 68692f3f9..609b9814d 100644
--- a/docs/reports/helma/doc-index-D.html
+++ b/docs/reports/helma/doc-index-D.html
@@ -1 +1 @@
-helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - D)
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Index - D
dCopyHelVM.HelMA.Automaton.Instruction.ALInstruction
DecHelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
defHelVM.HelMA.Automata.BrainFuck.Common.Symbol
defaultBFTypeHelVM.HelMA.Automata.BrainFuck.API.BFType
defaultCellTypeHelVM.HelMA.Automaton.Types.CellType
defaultDumpTypeHelVM.HelMA.Automaton.Types.DumpType
defaultETAImplTypeHelVM.HelMA.Automata.ETA.API.ETAImplType
defaultFormatTypeHelVM.HelMA.Automaton.Types.FormatType
defaultIntCellTypeHelVM.HelMA.Automaton.Types.IntCellType
defaultRAMTypeHelVM.HelMA.Automaton.Types.RAMType
defaultStackTypeHelVM.HelMA.Automaton.Types.StackType
defaultTokenTypeHelVM.HelMA.Automaton.Types.TokenType
digitHelVM.HelMA.Automaton.ReadPExtra
DiscardHelVM.HelMA.Automaton.Instruction.ALInstruction
discardHelVM.HelMA.Automaton.Units.ALU
DivHelVM.HelMA.Automaton.Instruction.ALInstruction
divModHelVM.HelMA.Automaton.Units.ALU
divModIHelVM.HelMA.Automaton.Instruction
dJumpIHelVM.HelMA.Automaton.Instruction.CFInstruction
DMarkHelVM.HelMA.Automaton.Instruction.CFInstruction
dMarkIHelVM.HelMA.Automaton.Instruction
doBinaryHelVM.HelMA.Automaton.Instruction.ALInstruction
doInputChar2HelVM.HelMA.Automaton.Units.ALU
doInputDec2HelVM.HelMA.Automaton.Units.ALU
doOutputChar2HelVM.HelMA.Automaton.Units.ALU
dropHelVM.HelMA.Automaton.Units.ALU
dumpHelVM.HelMA.Automaton.Types.DumpType
dumpAutoOptionsHelVM.HelMA.Automaton.API.EvalParams
DumpTypeHelVM.HelMA.Automaton.Types.DumpType
dumpTypeHelVM.HelMA.Automaton.API.AutoParams
dumpTypesHelVM.HelMA.Automaton.Types.DumpType
dupAndClearSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
DupClrHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
dupIHelVM.HelMA.Automaton.Instruction.ALInstruction
dynamicBranchHelVM.HelMA.Automaton.Units.CPU
dynamicCallHelVM.HelMA.Automaton.Units.CPU
dynamicJumpHelVM.HelMA.Automaton.Units.CPU

\ No newline at end of file
+helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - D)
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Index - D
dCopyHelVM.HelMA.Automaton.Instruction
DecHelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
defHelVM.HelMA.Automata.BrainFuck.Common.Symbol
defaultBFTypeHelVM.HelMA.Automata.BrainFuck.API.BFType
defaultCellTypeHelVM.HelMA.Automaton.Types.CellType
defaultDumpTypeHelVM.HelMA.Automaton.Types.DumpType
defaultETAImplTypeHelVM.HelMA.Automata.ETA.API.ETAImplType
defaultFormatTypeHelVM.HelMA.Automaton.Types.FormatType
defaultIntCellTypeHelVM.HelMA.Automaton.Types.IntCellType
defaultOptimizationLevelHelVM.HelMA.Automaton.API.OptimizationLevel
defaultRAMTypeHelVM.HelMA.Automaton.Types.RAMType
defaultStackTypeHelVM.HelMA.Automaton.Types.StackType
defaultTokenTypeHelVM.HelMA.Automaton.Types.TokenType
digitHelVM.HelMA.Automaton.ReadPExtra
DiscardHelVM.HelMA.Automaton.Instruction.SInstruction
discardHelVM.HelMA.Automaton.Combiner.ALU
discardIHelVM.HelMA.Automaton.Instruction
DivHelVM.HelMA.Automaton.Instruction.SInstruction
divIHelVM.HelMA.Automaton.Instruction
divModHelVM.HelMA.Automaton.Combiner.ALU
divModIHelVM.HelMA.Automaton.Instruction
dJumpIHelVM.HelMA.Automaton.Instruction.CFInstruction
DMarkHelVM.HelMA.Automaton.Instruction.CFInstruction
dMarkIHelVM.HelMA.Automaton.Instruction
doBinaryHelVM.HelMA.Automaton.Instruction.SInstruction
doInputChar2HelVM.HelMA.Automaton.Combiner.ALU
doInputDec2HelVM.HelMA.Automaton.Combiner.ALU
doOutputChar2HelVM.HelMA.Automaton.Combiner.ALU
dropHelVM.HelMA.Automaton.Combiner.ALU
dumpHelVM.HelMA.Automaton.Types.DumpType
dumpAutoOptionsHelVM.HelMA.Automaton.API.EvalParams
DumpTypeHelVM.HelMA.Automaton.Types.DumpType
dumpTypeHelVM.HelMA.Automaton.API.AutoOptions
dumpTypesHelVM.HelMA.Automaton.Types.DumpType
dupAndClearSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
DupClrHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
dupIHelVM.HelMA.Automaton.Instruction
dynamicBranchHelVM.HelMA.Automaton.Combiner.CPU
dynamicCallHelVM.HelMA.Automaton.Combiner.CPU
dynamicJumpHelVM.HelMA.Automaton.Combiner.CPU

\ No newline at end of file
diff --git a/docs/reports/helma/doc-index-E.html b/docs/reports/helma/doc-index-E.html
index 4fcab301e..4b24f7415 100644
--- a/docs/reports/helma/doc-index-E.html
+++ b/docs/reports/helma/doc-index-E.html
@@ -1 +1 @@
-helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - E)
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Index - E
EHelVM.HelMA.Automata.ETA.Token
ElementHelVM.HelMA.Automaton.IO.BusinessIO
encodeInputHelVM.HelMA.Automata.LazyK.InputEncoder
EndHelVM.HelMA.Automaton.Instruction
endHelVM.HelMA.Automata.LazyK.InputEncoder
ETAImplTypeHelVM.HelMA.Automata.ETA.API.ETAImplType
etaImplTypesHelVM.HelMA.Automata.ETA.API.ETAImplType
eval 
1 (Function)HelVM.HelMA.Automata.Rev.Evaluator
2 (Function)HelVM.HelMA.Automata.Cat.Evaluator
3 (Function)HelVM.HelMA.Automata.BrainFuck.Evaluator
EvalParams 
1 (Type/Class)HelVM.HelMA.Automaton.API.EvalParams
2 (Data Constructor)HelVM.HelMA.Automaton.API.EvalParams
evalParams 
1 (Function)HelVM.HelMA.Automata.Zot.Automaton
2 (Function)HelVM.HelMA.Automata.Rev.Evaluator
3 (Function)HelVM.HelMA.Automata.LazyK.Evaluator
4 (Function)HelVM.HelMA.Automata.Cat.Evaluator
5 (Function)HelVM.HelMA.Automata.SubLeq.Evaluator
6 (Function)HelVM.HelMA.Automata.WhiteSpace.Evaluator
7 (Function)HelVM.HelMA.Automata.ETA.Evaluator
8 (Function)HelVM.HelMA.Automata.BrainFuck.Evaluator
evalSource 
1 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Evaluator
2 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Evaluator
3 (Function)HelVM.HelMA.Automata.LazyK.Evaluator
4 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Evaluator
5 (Function)HelVM.HelMA.Automata.BrainFuck.Evaluator
evalWithFormatHelVM.HelMA.Automata.Zot.Automaton
ExecHelVM.HelMA.Automata.FALSE.Expression
execMockIOBatchHelVM.HelMA.Automaton.IO.MockIO
execMockIOWithInputHelVM.HelMA.Automaton.IO.MockIO
Expression 
1 (Type/Class)HelVM.HelMA.Automata.Zot.Expression
2 (Data Constructor)HelVM.HelMA.Automata.Zot.Expression
3 (Type/Class)HelVM.HelMA.Automata.FALSE.Expression
ExpressionDListHelVM.HelMA.Automata.Zot.Expression
ExpressionList 
1 (Type/Class)HelVM.HelMA.Automata.Zot.Expression
2 (Type/Class)HelVM.HelMA.Automata.FALSE.Expression
EZHelVM.HelMA.Automaton.Instruction.CFInstruction

\ No newline at end of file
+helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - E)
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Index - E
EHelVM.HelMA.Automata.ETA.Token
ElementHelVM.HelMA.Automaton.IO.BusinessIO
encodeInputHelVM.HelMA.Automata.LazyK.InputEncoder
EndHelVM.HelMA.Automaton.Instruction
end 
1 (Function)HelVM.HelMA.Automata.LazyK.InputEncoder
2 (Function)HelVM.HelMA.Automaton.Combiner
ETAImplTypeHelVM.HelMA.Automata.ETA.API.ETAImplType
etaImplTypesHelVM.HelMA.Automata.ETA.API.ETAImplType
eval 
1 (Function)HelVM.HelMA.Automata.Rev.Evaluator
2 (Function)HelVM.HelMA.Automata.Cat.Evaluator
3 (Function)HelVM.HelMA.Automata.BrainFuck.Evaluator
EvalParams 
1 (Type/Class)HelVM.HelMA.Automaton.API.EvalParams
2 (Data Constructor)HelVM.HelMA.Automaton.API.EvalParams
evalParams 
1 (Function)HelVM.HelMA.Automata.Zot.Automaton
2 (Function)HelVM.HelMA.Automata.SubLeq.Evaluator
3 (Function)HelVM.HelMA.Automata.Rev.Evaluator
4 (Function)HelVM.HelMA.Automata.LazyK.Evaluator
5 (Function)HelVM.HelMA.Automata.Cat.Evaluator
6 (Function)HelVM.HelMA.Automata.WhiteSpace.Evaluator
7 (Function)HelVM.HelMA.Automata.ETA.Evaluator
8 (Function)HelVM.HelMA.Automata.BrainFuck.Evaluator
evalSource 
1 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Evaluator
2 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Evaluator
3 (Function)HelVM.HelMA.Automata.LazyK.Evaluator
4 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Evaluator
5 (Function)HelVM.HelMA.Automata.BrainFuck.Evaluator
evalWithFormatHelVM.HelMA.Automata.Zot.Automaton
ExecHelVM.HelMA.Automata.FALSE.Expression
execMockIOBatchHelVM.HelMA.Automaton.IO.MockIO
execMockIOWithInputHelVM.HelMA.Automaton.IO.MockIO
Expression 
1 (Type/Class)HelVM.HelMA.Automata.Zot.Expression
2 (Data Constructor)HelVM.HelMA.Automata.Zot.Expression
3 (Type/Class)HelVM.HelMA.Automata.FALSE.Expression
ExpressionDListHelVM.HelMA.Automata.Zot.Expression
ExpressionList 
1 (Type/Class)HelVM.HelMA.Automata.Zot.Expression
2 (Type/Class)HelVM.HelMA.Automata.FALSE.Expression
extractPureIALHelVM.HelMA.Automaton.Instruction
EZHelVM.HelMA.Automaton.Instruction.CFInstruction

\ No newline at end of file
diff --git a/docs/reports/helma/doc-index-F.html b/docs/reports/helma/doc-index-F.html
index 98b452050..1070f064f 100644
--- a/docs/reports/helma/doc-index-F.html
+++ b/docs/reports/helma/doc-index-F.html
@@ -1 +1 @@
-helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - F)
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Index - F
falseHelVM.HelMA.Automata.LazyK.Constants
FastHelVM.HelMA.Automata.ETA.API.ETAImplType
FastInstructionHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
FastInstructionListHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
FastTypeHelVM.HelMA.Automata.BrainFuck.API.BFType
FetchHelVM.HelMA.Automata.FALSE.Expression
filterCommentsHelVM.HelMA.Automata.LazyK.Lexer
findAddressHelVM.HelMA.Automata.ETA.Addressing
findAddressForDynamicLabelHelVM.HelMA.Automaton.Units.CPU
findAddressForStaticLabelHelVM.HelMA.Automaton.Units.CPU
FlatInstructionHelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction
FlatTreeInstructionListHelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction
FlatTypeHelVM.HelMA.Automata.BrainFuck.API.BFType
flipParseVisibleHelVM.HelMA.Automata.WhiteSpace.Parser
flipParseWhiteHelVM.HelMA.Automata.WhiteSpace.Parser
flippedApplyHelVM.HelMA.Automata.LazyK.Reducer
flippedNewAutomatonHelVM.HelMA.Automaton.Automaton
flippedStoreCharHelVM.HelMA.Automaton.Units.RAM
flipPush1HelVM.HelMA.Automaton.Units.ALU
FlushHelVM.HelMA.Automata.FALSE.Expression
flushHelVM.HelMA.Automaton.IO.BusinessIO
foldlLambdaHelVM.HelMA.Automata.LazyK.Lambda
FormatTypeHelVM.HelMA.Automaton.Types.FormatType
formatType 
1 (Function)HelVM.HelMA.Automaton.API.EvalParams
2 (Function)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
formatTypesHelVM.HelMA.Automaton.Types.FormatType
FreeIOHelVM.HelMA.Automaton.IO.FreeIO
fromCharHelVM.HelMA.Automata.BrainFuck.Common.Symbol
fromListHelVM.HelMA.Automaton.Units.RAM
FullTapeHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols

\ No newline at end of file
+helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - F)
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Index - F
FHelVM.HelMA.Automaton.Combiner
falseHelVM.HelMA.Automata.LazyK.Constants
FastHelVM.HelMA.Automata.ETA.API.ETAImplType
FastInstructionHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
FastInstructionListHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
FastTypeHelVM.HelMA.Automata.BrainFuck.API.BFType
FetchHelVM.HelMA.Automata.FALSE.Expression
filterCommentsHelVM.HelMA.Automata.LazyK.Lexer
findAddressHelVM.HelMA.Automata.ETA.Addressing
findAddressForDynamicLabelHelVM.HelMA.Automaton.Combiner.CPU
findAddressForStaticLabelHelVM.HelMA.Automaton.Combiner.CPU
FlatInstructionHelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction
FlatTreeInstructionListHelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction
FlatTypeHelVM.HelMA.Automata.BrainFuck.API.BFType
flipParseVisibleHelVM.HelMA.Automata.WhiteSpace.Parser
flipParseWhiteHelVM.HelMA.Automata.WhiteSpace.Parser
flippedApplyHelVM.HelMA.Automata.LazyK.Reducer
flippedNewMemoryHelVM.HelMA.Automaton.Combiner
flippedStoreCharHelVM.HelMA.Automaton.Combiner.RAM
flipPush1HelVM.HelMA.Automaton.Combiner.ALU
FlushHelVM.HelMA.Automata.FALSE.Expression
flushHelVM.HelMA.Automaton.IO.BusinessIO
foldlLambdaHelVM.HelMA.Automata.LazyK.Lambda
FormatTypeHelVM.HelMA.Automaton.Types.FormatType
formatType 
1 (Function)HelVM.HelMA.Automaton.API.EvalParams
2 (Function)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
formatTypesHelVM.HelMA.Automaton.Types.FormatType
FreeIOHelVM.HelMA.Automaton.IO.FreeIO
fromBoolHelVM.HelMA.Automaton.API.OptimizationLevel
fromCharHelVM.HelMA.Automata.BrainFuck.Common.Symbol
fromListHelVM.HelMA.Automaton.Combiner.RAM
fromNaturalHelVM.HelMA.Automaton.API.OptimizationLevel
FullTapeHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols

\ No newline at end of file
diff --git a/docs/reports/helma/doc-index-G.html b/docs/reports/helma/doc-index-G.html
index e9a6676e4..0bf7bcb29 100644
--- a/docs/reports/helma/doc-index-G.html
+++ b/docs/reports/helma/doc-index-G.html
@@ -1 +1 @@
-helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - G)
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton

\ No newline at end of file
+helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - G)
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton

\ No newline at end of file
diff --git a/docs/reports/helma/doc-index-H.html b/docs/reports/helma/doc-index-H.html
index fe14ea66e..5985a6408 100644
--- a/docs/reports/helma/doc-index-H.html
+++ b/docs/reports/helma/doc-index-H.html
@@ -1 +1 @@
-helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - H)
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton

\ No newline at end of file
+helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - H)
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton

\ No newline at end of file
diff --git a/docs/reports/helma/doc-index-I.html b/docs/reports/helma/doc-index-I.html
index 0afb4ad0d..488d0b3a3 100644
--- a/docs/reports/helma/doc-index-I.html
+++ b/docs/reports/helma/doc-index-I.html
@@ -1 +1 @@
-helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - I)
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Index - I
I 
1 (Data Constructor)HelVM.HelMA.Automata.ETA.Token
2 (Data Constructor)HelVM.HelMA.Automata.LazyK.Lambda
IALHelVM.HelMA.Automaton.Instruction
ICFHelVM.HelMA.Automaton.Instruction
ILSHelVM.HelMA.Automaton.Instruction
implTypeHelVM.HelMA.Automata.ETA.SimpleParams
Inc 
1 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
2 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
incHelVM.HelMA.Automata.BrainFuck.Common.Symbol
incrementPCHelVM.HelMA.Automaton.Units.CPU
incSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
IndexHelVM.HelMA.Automaton.Symbol
Input 
1 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
2 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
3 (Type/Class)HelVM.HelMA.Automaton.API.IOTypes
InputCharHelVM.HelMA.Automaton.Instruction.IOInstruction
InputDecHelVM.HelMA.Automaton.Instruction.IOInstruction
InstHelVM.HelMA.Automata.FALSE.Expression
InstructionHelVM.HelMA.Automaton.Instruction
InstructionAddress 
1 (Type/Class)HelVM.HelMA.Automata.ETA.Symbol
2 (Type/Class)HelVM.HelMA.Automaton.Symbol
3 (Type/Class)HelVM.HelMA.Automaton.Units.CPU
InstructionCounter 
1 (Type/Class)HelVM.HelMA.Automata.BrainFuck.Impl.Tree.InstructionUnit
2 (Type/Class)HelVM.HelMA.Automata.ETA.Symbol
3 (Type/Class)HelVM.HelMA.Automaton.Units.CPU
InstructionListHelVM.HelMA.Automaton.Instruction
InstructionStackHelVM.HelMA.Automaton.Units.CPU
InstructionUnit 
1 (Type/Class)HelVM.HelMA.Automata.BrainFuck.Impl.Tree.InstructionUnit
2 (Type/Class)HelVM.HelMA.Automata.ETA.OperandParsers
InstructionVectorHelVM.HelMA.Automaton.Instruction
Int16Type 
1 (Data Constructor)HelVM.HelMA.Automaton.Types.CellType
2 (Data Constructor)HelVM.HelMA.Automaton.Types.IntCellType
Int32Type 
1 (Data Constructor)HelVM.HelMA.Automaton.Types.CellType
2 (Data Constructor)HelVM.HelMA.Automaton.Types.IntCellType
Int64Type 
1 (Data Constructor)HelVM.HelMA.Automaton.Types.CellType
2 (Data Constructor)HelVM.HelMA.Automaton.Types.IntCellType
Int8Type 
1 (Data Constructor)HelVM.HelMA.Automaton.Types.CellType
2 (Data Constructor)HelVM.HelMA.Automaton.Types.IntCellType
intCellHelVM.HelMA.Automaton.API.AutoOptions
intCellAutoOptionsHelVM.HelMA.Automaton.API.EvalParams
IntCellTypeHelVM.HelMA.Automaton.Types.IntCellType
intCellTypesHelVM.HelMA.Automaton.Types.IntCellType
IntegerTypeHelVM.HelMA.Automaton.Types.IntCellType
InteractHelVM.HelMA.Automaton.API.IOTypes
interpretFreeIOToBusinessIOHelVM.HelMA.Automaton.IO.FreeIO
ioExecMockIOBatchHelVM.HelMA.Automaton.IO.MockIO
ioExecMockIOWithInputHelVM.HelMA.Automaton.IO.MockIO
IOInstructionHelVM.HelMA.Automaton.Instruction.IOInstruction
ISHelVM.HelMA.Automaton.Units.CPU
isAlphaAsciiHelVM.HelMA.Automaton.ReadPExtra
isDMarkHelVM.HelMA.Automaton.Instruction
isHashHelVM.HelMA.Automata.LazyK.Lexer
isJumpHelVM.HelMA.Automaton.Instruction.CFInstruction
isMarkHelVM.HelMA.Automaton.Instruction
isNotJumpHelVM.HelMA.Automaton.Instruction.CFInstruction
isSMarkHelVM.HelMA.Automaton.Instruction
IU 
1 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Tree.InstructionUnit
2 (Data Constructor)HelVM.HelMA.Automata.ETA.OperandParsers

\ No newline at end of file
+helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - I)
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Index - I
I 
1 (Data Constructor)HelVM.HelMA.Automata.ETA.Token
2 (Data Constructor)HelVM.HelMA.Automata.LazyK.Lambda
IALHelVM.HelMA.Automaton.Instruction
ICFHelVM.HelMA.Automaton.Instruction
ILSHelVM.HelMA.Automaton.Instruction
IM 
1 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Tree.InstructionUnit
2 (Data Constructor)HelVM.HelMA.Automata.ETA.OperandParsers
implementedOptimizationLevelsHelVM.HelMA.Automaton.API.OptimizationLevel
implTypeHelVM.HelMA.Automata.ETA.SimpleParams
Inc 
1 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
2 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
incHelVM.HelMA.Automata.BrainFuck.Common.Symbol
incrementICHelVM.HelMA.Automaton.Combiner
incrementPCHelVM.HelMA.Automaton.Combiner.CPU
incSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
IndexHelVM.HelMA.Automaton.Symbol
Input 
1 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
2 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
3 (Type/Class)HelVM.HelMA.Automaton.API.IOTypes
InputCharHelVM.HelMA.Automaton.Instruction.IOInstruction
InputDecHelVM.HelMA.Automaton.Instruction.IOInstruction
InstHelVM.HelMA.Automata.FALSE.Expression
InstructionHelVM.HelMA.Automaton.Instruction
InstructionAddress 
1 (Type/Class)HelVM.HelMA.Automata.ETA.Symbol
2 (Type/Class)HelVM.HelMA.Automaton.Combiner.CPU
3 (Type/Class)HelVM.HelMA.Automaton.Symbol
InstructionCounter 
1 (Type/Class)HelVM.HelMA.Automata.BrainFuck.Impl.Tree.InstructionUnit
2 (Type/Class)HelVM.HelMA.Automata.ETA.Symbol
3 (Type/Class)HelVM.HelMA.Automaton.Combiner.CPU
InstructionListHelVM.HelMA.Automaton.Instruction
InstructionMemory 
1 (Type/Class)HelVM.HelMA.Automata.BrainFuck.Impl.Tree.InstructionUnit
2 (Type/Class)HelVM.HelMA.Automata.ETA.OperandParsers
InstructionStackHelVM.HelMA.Automaton.Combiner.CPU
InstructionVectorHelVM.HelMA.Automaton.Instruction
Int16Type 
1 (Data Constructor)HelVM.HelMA.Automaton.Types.CellType
2 (Data Constructor)HelVM.HelMA.Automaton.Types.IntCellType
Int32Type 
1 (Data Constructor)HelVM.HelMA.Automaton.Types.CellType
2 (Data Constructor)HelVM.HelMA.Automaton.Types.IntCellType
Int64Type 
1 (Data Constructor)HelVM.HelMA.Automaton.Types.CellType
2 (Data Constructor)HelVM.HelMA.Automaton.Types.IntCellType
Int8Type 
1 (Data Constructor)HelVM.HelMA.Automaton.Types.CellType
2 (Data Constructor)HelVM.HelMA.Automaton.Types.IntCellType
intCellHelVM.HelMA.Automaton.API.MemoryOptions
intCellAutoOptionsHelVM.HelMA.Automaton.API.EvalParams
IntCellTypeHelVM.HelMA.Automaton.Types.IntCellType
intCellTypesHelVM.HelMA.Automaton.Types.IntCellType
IntegerTypeHelVM.HelMA.Automaton.Types.IntCellType
InteractHelVM.HelMA.Automaton.API.IOTypes
interpretFreeIOToBusinessIOHelVM.HelMA.Automaton.IO.FreeIO
ioExecMockIOBatchHelVM.HelMA.Automaton.IO.MockIO
ioExecMockIOWithInputHelVM.HelMA.Automaton.IO.MockIO
IOInstructionHelVM.HelMA.Automaton.Instruction.IOInstruction
ISHelVM.HelMA.Automaton.Combiner.CPU
isAlphaAsciiHelVM.HelMA.Automaton.ReadPExtra
isDMarkHelVM.HelMA.Automaton.Instruction
isHashHelVM.HelMA.Automata.LazyK.Lexer
isICFHelVM.HelMA.Automaton.Instruction
isJumpHelVM.HelMA.Automaton.Instruction.CFInstruction
isMarkHelVM.HelMA.Automaton.Instruction
isNotJumpHelVM.HelMA.Automaton.Instruction.CFInstruction
isPureIALHelVM.HelMA.Automaton.Instruction
isSMarkHelVM.HelMA.Automaton.Instruction

\ No newline at end of file
diff --git a/docs/reports/helma/doc-index-J.html b/docs/reports/helma/doc-index-J.html
index 1dc4f3e9d..cbcdcc11b 100644
--- a/docs/reports/helma/doc-index-J.html
+++ b/docs/reports/helma/doc-index-J.html
@@ -1 +1 @@
-helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - J)
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton

\ No newline at end of file
+helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - J)
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton

\ No newline at end of file
diff --git a/docs/reports/helma/doc-index-K.html b/docs/reports/helma/doc-index-K.html
index 1d1fcf17f..6b70b6a76 100644
--- a/docs/reports/helma/doc-index-K.html
+++ b/docs/reports/helma/doc-index-K.html
@@ -1 +1 @@
-helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - K)
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton

\ No newline at end of file
+helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - K)
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton

\ No newline at end of file
diff --git a/docs/reports/helma/doc-index-L.html b/docs/reports/helma/doc-index-L.html
index f037e9988..094081a45 100644
--- a/docs/reports/helma/doc-index-L.html
+++ b/docs/reports/helma/doc-index-L.html
@@ -1 +1 @@
-helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - L)
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Index - L
LabelHelVM.HelMA.Automaton.Instruction.CFInstruction
LabelInstructionHelVM.HelMA.Automaton.Instruction.CFInstruction
Lambda 
1 (Type/Class)HelVM.HelMA.Automata.LazyK.Lambda
2 (Data Constructor)HelVM.HelMA.Automata.FALSE.Expression
LAndHelVM.HelMA.Automaton.Instruction.ALInstruction
LEQHelVM.HelMA.Automaton.Instruction.ALInstruction
letterAsciiHelVM.HelMA.Automaton.ReadPExtra
LGTHelVM.HelMA.Automaton.Instruction.ALInstruction
limitHelVM.HelMA.Automaton.API.AutoParams
LimitMaybeHelVM.HelMA.Automaton.Loop
ListRAMTypeHelVM.HelMA.Automaton.Types.RAMType
listRunParserHelVM.HelMA.Automaton.ReadPExtra
ListStackTypeHelVM.HelMA.Automaton.Types.StackType
LNotHelVM.HelMA.Automaton.Instruction.ALInstruction
LoadHelVM.HelMA.Automaton.Instruction.LSInstruction
load 
1 (Function)HelVM.HelMA.Automaton.Units.RAM
2 (Function)HelVM.HelMA.Automaton.Units.LSU
loadOutputCharHelVM.HelMA.Automaton.Units.LSU
loadOutputDecHelVM.HelMA.Automaton.Units.LSU
LoadStoreUnitHelVM.HelMA.Automaton.Units.LSU
logDumpHelVM.HelMA.Automaton.Types.DumpType
LogicalHelVM.HelMA.Automaton.Instruction.ALInstruction
logInputHelVM.HelMA.Automaton.IO.FreeIO
logOutputHelVM.HelMA.Automaton.IO.FreeIO
logStrHelVM.HelMA.Automaton.IO.BusinessIO
loopMWithLimitHelVM.HelMA.Automaton.Loop
LOrHelVM.HelMA.Automaton.Instruction.ALInstruction
LSInstructionHelVM.HelMA.Automaton.Instruction.LSInstruction
LSU 
1 (Data Constructor)HelVM.HelMA.Automaton.Units.LSU
2 (Type/Class)HelVM.HelMA.Automaton.Units.LSU
LTZHelVM.HelMA.Automaton.Instruction.CFInstruction
LXorHelVM.HelMA.Automaton.Instruction.ALInstruction

\ No newline at end of file
+helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - L)
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Index - L
LabelHelVM.HelMA.Automaton.Instruction.CFInstruction
LabelInstructionHelVM.HelMA.Automaton.Instruction.CFInstruction
Lambda 
1 (Type/Class)HelVM.HelMA.Automata.LazyK.Lambda
2 (Data Constructor)HelVM.HelMA.Automata.FALSE.Expression
LAndHelVM.HelMA.Automaton.Instruction.SInstruction
LEQHelVM.HelMA.Automaton.Instruction.SInstruction
letterAsciiHelVM.HelMA.Automaton.ReadPExtra
LGTHelVM.HelMA.Automaton.Instruction.SInstruction
limitHelVM.HelMA.Automaton.API.AutoOptions
LimitMaybeHelVM.HelMA.Automaton.Loop
ListRAMTypeHelVM.HelMA.Automaton.Types.RAMType
listRunParserHelVM.HelMA.Automaton.ReadPExtra
ListStackTypeHelVM.HelMA.Automaton.Types.StackType
LNotHelVM.HelMA.Automaton.Instruction.SInstruction
LoadHelVM.HelMA.Automaton.Instruction.LSInstruction
load 
1 (Function)HelVM.HelMA.Automaton.Combiner.RAM
2 (Function)HelVM.HelMA.Automaton.Combiner.LSU
loadIHelVM.HelMA.Automaton.Instruction
loadOutputCharHelVM.HelMA.Automaton.Combiner.LSU
loadOutputDecHelVM.HelMA.Automaton.Combiner.LSU
LoadStoreMemoryHelVM.HelMA.Automaton.Combiner.LSU
logDumpHelVM.HelMA.Automaton.Types.DumpType
LogicalHelVM.HelMA.Automaton.Instruction.SInstruction
logInputHelVM.HelMA.Automaton.IO.FreeIO
logOutputHelVM.HelMA.Automaton.IO.FreeIO
logStrHelVM.HelMA.Automaton.IO.BusinessIO
loopMWithLimitHelVM.HelMA.Automaton.Loop
LOrHelVM.HelMA.Automaton.Instruction.SInstruction
LSInstructionHelVM.HelMA.Automaton.Instruction.LSInstruction
LSMHelVM.HelMA.Automaton.Combiner.LSU
LSUHelVM.HelMA.Automaton.Combiner.LSU
LTZHelVM.HelMA.Automaton.Instruction.CFInstruction
LXorHelVM.HelMA.Automaton.Instruction.SInstruction

\ No newline at end of file
diff --git a/docs/reports/helma/doc-index-M.html b/docs/reports/helma/doc-index-M.html
index 76e35c0dc..9712f26cc 100644
--- a/docs/reports/helma/doc-index-M.html
+++ b/docs/reports/helma/doc-index-M.html
@@ -1 +1 @@
-helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - M)
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton

\ No newline at end of file
+helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - M)
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Index - M
ManipulationInstructionHelVM.HelMA.Automaton.Instruction.SInstruction
manyNonEmptyHelVM.HelMA.Automaton.ReadPExtra
MapListRAMTypeHelVM.HelMA.Automaton.Types.RAMType
matchNextJmpHelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
matchPrevJmpHelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
Memory 
1 (Type/Class)HelVM.HelMA.Automaton.Combiner
2 (Data Constructor)HelVM.HelMA.Automaton.Combiner
memoryCMHelVM.HelMA.Automaton.Combiner
MemoryOptions 
1 (Type/Class)HelVM.HelMA.Automaton.API.MemoryOptions
2 (Data Constructor)HelVM.HelMA.Automaton.API.MemoryOptions
memoryOptionsHelVM.HelMA.Automaton.API.EvalParams
memoryProgramHelVM.HelMA.Automaton.Combiner
memoryProgramCounterHelVM.HelMA.Automaton.Combiner
memoryRAMHelVM.HelMA.Automaton.Combiner
MemorySameHelVM.HelMA.Automaton.Combiner
memoryStackHelVM.HelMA.Automaton.Combiner
mInputDecIHelVM.HelMA.Automaton.Instruction
mInputIHelVM.HelMA.Automaton.Instruction
MIOHelVM.HelMA.Automaton.Instruction.LSInstruction
MockIOHelVM.HelMA.Automaton.IO.MockIO
MockIODataHelVM.HelMA.Automaton.IO.MockIO
ModHelVM.HelMA.Automaton.Instruction.SInstruction
modIHelVM.HelMA.Automaton.Instruction
Move 
1 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
2 (Data Constructor)HelVM.HelMA.Automaton.Instruction.SInstruction
moveHelVM.HelMA.Automaton.Combiner.ALU
moveHeadHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
moveHeadLeftHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
moveHeadRightHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
MoveLHelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
MoveRHelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
moveSafeHelVM.HelMA.Automata.WhiteSpace.OperandParsers
MulHelVM.HelMA.Automaton.Instruction.SInstruction
mulAddAndClearSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
MulAddClrHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
mulDupAndClearSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
MulDupClrHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
mulIHelVM.HelMA.Automaton.Instruction

\ No newline at end of file
diff --git a/docs/reports/helma/doc-index-N.html b/docs/reports/helma/doc-index-N.html
index ebc34f681..f4ff642f8 100644
--- a/docs/reports/helma/doc-index-N.html
+++ b/docs/reports/helma/doc-index-N.html
@@ -1 +1 @@
-helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - N)
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton

\ No newline at end of file
+helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - N)
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton

\ No newline at end of file
diff --git a/docs/reports/helma/doc-index-O.html b/docs/reports/helma/doc-index-O.html
index 627f1d40e..57cf68a86 100644
--- a/docs/reports/helma/doc-index-O.html
+++ b/docs/reports/helma/doc-index-O.html
@@ -1 +1 @@
-helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - O)
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton

\ No newline at end of file
+helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - O)
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton

\ No newline at end of file
diff --git a/docs/reports/helma/doc-index-P.html b/docs/reports/helma/doc-index-P.html
index b3133c3ff..552a2d1d4 100644
--- a/docs/reports/helma/doc-index-P.html
+++ b/docs/reports/helma/doc-index-P.html
@@ -1 +1 @@
-helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - P)
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Index - P
parse 
1 (Function)HelVM.HelMA.Automata.Zot.Parser
2 (Function)HelVM.HelMA.Automata.LazyK.Parser
3 (Function)HelVM.HelMA.Automata.FALSE.Parser
4 (Function)HelVM.HelMA.Automata.WhiteSpace.Parser
5 (Function)HelVM.HelMA.Automata.ETA.Parser
parseAsciiStringHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseAsListHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser
parseAsListSafeHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser
parseAsVectorHelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser
parseAsVectorSafeHelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser
parseDigitStringHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseExtraHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseFromTLHelVM.HelMA.Automata.WhiteSpace.Parser
parseIndexHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseIntHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseIntegerHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseLabelHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseNaturalHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseNumberHelVM.HelMA.Automata.ETA.OperandParsers
parseNumberFromTLHelVM.HelMA.Automata.ETA.OperandParsers
parseNumberFromTLLHelVM.HelMA.Automata.ETA.OperandParsers
ParserHelVM.HelMA.Automata.WhiteSpace.OperandParsers
ParserFromTokenListHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseSafe 
1 (Function)HelVM.HelMA.Automata.FALSE.Parser
2 (Function)HelVM.HelMA.Automata.ETA.Parser
parseString'HelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseSymbolHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseVisibleHelVM.HelMA.Automata.WhiteSpace.Parser
parseWhiteHelVM.HelMA.Automata.WhiteSpace.Parser
parseWithOptimizeHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser
parseWithOptimizeSafeHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser
PickHelVM.HelMA.Automaton.Instruction.ALInstruction
pop1HelVM.HelMA.Automaton.Units.ALU
pop2HelVM.HelMA.Automaton.Units.ALU
popAddressHelVM.HelMA.Automaton.Units.CPU
PrettyHelVM.HelMA.Automaton.Types.DumpType
prevHelVM.HelMA.Automata.BrainFuck.Common.Symbol
prevInstHelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
prevSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
program 
1 (Function)HelVM.HelMA.Automata.ETA.OperandParsers
2 (Function)HelVM.HelMA.Automaton.Units.CPU
programCounter 
1 (Function)HelVM.HelMA.Automata.ETA.OperandParsers
2 (Function)HelVM.HelMA.Automaton.Units.CPU
push1HelVM.HelMA.Automaton.Units.ALU
push2HelVM.HelMA.Automaton.Units.ALU

\ No newline at end of file
+helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - P)
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Index - P
parse 
1 (Function)HelVM.HelMA.Automata.Zot.Parser
2 (Function)HelVM.HelMA.Automata.LazyK.Parser
3 (Function)HelVM.HelMA.Automata.FALSE.Parser
4 (Function)HelVM.HelMA.Automata.WhiteSpace.Parser
5 (Function)HelVM.HelMA.Automata.ETA.Parser
parseAsciiStringHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseAsListHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser
parseAsListSafeHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser
parseAsVectorHelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser
parseAsVectorSafeHelVM.HelMA.Automata.BrainFuck.Impl.Tree.Parser
parseDigitStringHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseExtraHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseFromTLHelVM.HelMA.Automata.WhiteSpace.Parser
parseIndexHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseIntHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseIntegerHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseLabelHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseNaturalHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseNumberHelVM.HelMA.Automata.ETA.OperandParsers
parseNumberFromTLHelVM.HelMA.Automata.ETA.OperandParsers
parseNumberFromTLLHelVM.HelMA.Automata.ETA.OperandParsers
ParserHelVM.HelMA.Automata.WhiteSpace.OperandParsers
ParserFromTokenListHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseSafe 
1 (Function)HelVM.HelMA.Automata.FALSE.Parser
2 (Function)HelVM.HelMA.Automata.ETA.Parser
parseString'HelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseSymbolHelVM.HelMA.Automata.WhiteSpace.OperandParsers
parseVisibleHelVM.HelMA.Automata.WhiteSpace.Parser
parseWhiteHelVM.HelMA.Automata.WhiteSpace.Parser
parseWithOptimizeHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser
parseWithOptimizeSafeHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Parser
PickHelVM.HelMA.Automaton.Instruction.SInstruction
pop1HelVM.HelMA.Automaton.Combiner.ALU
pop2HelVM.HelMA.Automaton.Combiner.ALU
pop2ForStackHelVM.HelMA.Automaton.Combiner
popAddressHelVM.HelMA.Automaton.Combiner.CPU
PrettyHelVM.HelMA.Automaton.Types.DumpType
prevHelVM.HelMA.Automata.BrainFuck.Common.Symbol
prevInstHelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
prevSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
program 
1 (Function)HelVM.HelMA.Automata.ETA.OperandParsers
2 (Function)HelVM.HelMA.Automaton.Combiner.CPU
programCounter 
1 (Function)HelVM.HelMA.Automata.ETA.OperandParsers
2 (Function)HelVM.HelMA.Automaton.Combiner.CPU
push1HelVM.HelMA.Automaton.Combiner.ALU
push1ForStackHelVM.HelMA.Automaton.Combiner
push2HelVM.HelMA.Automaton.Combiner.ALU

\ No newline at end of file
diff --git a/docs/reports/helma/doc-index-R.html b/docs/reports/helma/doc-index-R.html
index 300e0e294..ce8923cfc 100644
--- a/docs/reports/helma/doc-index-R.html
+++ b/docs/reports/helma/doc-index-R.html
@@ -1 +1 @@
-helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - R)
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Index - R
RHelVM.HelMA.Automata.ETA.Token
RAMHelVM.HelMA.Automaton.Units.RAM
ram 
1 (Function)HelVM.HelMA.Automaton.API.AutoOptions
2 (Function)HelVM.HelMA.Automaton.Units.LSU
ramAutoOptionsHelVM.HelMA.Automaton.API.EvalParams
RAMTypeHelVM.HelMA.Automaton.Types.RAMType
ramTypeHelVM.HelMA.Automata.WhiteSpace.SimpleParams
ramTypesHelVM.HelMA.Automaton.Types.RAMType
RAutomatonIOHelVM.HelMA.Automaton.IO.AutomatonIO
readExpressionListHelVM.HelMA.Automata.Zot.Expression
readInputHelVM.HelMA.Automata.LazyK.InputEncoder
readSymbolsHelVM.HelMA.Automata.SubLeq.Lexer
readTokens 
1 (Function)HelVM.HelMA.Automata.ETA.Lexer
2 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser
readVisibleTokensHelVM.HelMA.Automata.WhiteSpace.Lexer
readWhiteTokensHelVM.HelMA.Automata.WhiteSpace.Lexer
realizeHelVM.HelMA.Automata.LazyK.Automaton
realizeWithTrueHelVM.HelMA.Automata.LazyK.Automaton
reduceHelVM.HelMA.Automata.LazyK.Reducer
reduceSourceHelVM.HelMA.Automata.LazyK.Evaluator
RefHelVM.HelMA.Automata.FALSE.Expression
removeCommentHelVM.HelMA.Automata.LazyK.Lexer
ReturnHelVM.HelMA.Automaton.Instruction.CFInstruction
returnStackHelVM.HelMA.Automaton.Units.CPU
rotIHelVM.HelMA.Automaton.Instruction.ALInstruction
run 
1 (Function)HelVM.HelMA.Automata.LazyK.Automaton
2 (Function)HelVM.HelMA.Automaton.Automaton
3 (Function)HelVM.HelMA.Automata.ETA.Automaton
4 (Function)HelVM.HelMA.Automata.SubLeq.Automaton
runALIHelVM.HelMA.Automaton.Units.ALU
runAndDumpLogsHelVM.HelMA.Automaton.Automaton
runCFIHelVM.HelMA.Automaton.Units.CPU
runExpressionListHelVM.HelMA.Automata.Zot.Evaluator
runMockIOHelVM.HelMA.Automaton.IO.MockIO
runParserHelVM.HelMA.Automaton.ReadPExtra
runSLIHelVM.HelMA.Automaton.Units.LSU
runWithTerminatorHelVM.HelMA.Automata.LazyK.Automaton

\ No newline at end of file
+helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - R)
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Index - R
RHelVM.HelMA.Automata.ETA.Token
RAMHelVM.HelMA.Automaton.Combiner.RAM
ram 
1 (Function)HelVM.HelMA.Automaton.Combiner.LSU
2 (Function)HelVM.HelMA.Automaton.API.MemoryOptions
ramAutoOptionsHelVM.HelMA.Automaton.API.EvalParams
RAMTypeHelVM.HelMA.Automaton.Types.RAMType
ramType 
1 (Function)HelVM.HelMA.Automaton.API.AutomatonOptions
2 (Function)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
ramTypesHelVM.HelMA.Automaton.Types.RAMType
RAutomatonIOHelVM.HelMA.Automaton.IO.AutomatonIO
readExpressionListHelVM.HelMA.Automata.Zot.Expression
readInputHelVM.HelMA.Automata.LazyK.InputEncoder
readSymbolsHelVM.HelMA.Automata.SubLeq.Lexer
readTokens 
1 (Function)HelVM.HelMA.Automata.ETA.Lexer
2 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser
readVisibleTokensHelVM.HelMA.Automata.WhiteSpace.Lexer
readWhiteTokensHelVM.HelMA.Automata.WhiteSpace.Lexer
realizeHelVM.HelMA.Automata.LazyK.Automaton
realizeWithTrueHelVM.HelMA.Automata.LazyK.Automaton
reduceHelVM.HelMA.Automata.LazyK.Reducer
reduceSourceHelVM.HelMA.Automata.LazyK.Evaluator
RefHelVM.HelMA.Automata.FALSE.Expression
removeCommentHelVM.HelMA.Automata.LazyK.Lexer
ReturnHelVM.HelMA.Automaton.Instruction.CFInstruction
returnIHelVM.HelMA.Automaton.Instruction
returnStackHelVM.HelMA.Automaton.Combiner.CPU
rotIHelVM.HelMA.Automaton.Instruction
run 
1 (Function)HelVM.HelMA.Automata.LazyK.Automaton
2 (Function)HelVM.HelMA.Automata.SubLeq.Automaton
3 (Function)HelVM.HelMA.Automata.ETA.Automaton
4 (Function)HelVM.HelMA.Automaton.Automaton
runALIHelVM.HelMA.Automaton.Combiner.ALU
runAndDumpLogsHelVM.HelMA.Automaton.Automaton
runCFIHelVM.HelMA.Automaton.Combiner.CPU
runExpressionListHelVM.HelMA.Automata.Zot.Evaluator
runInstructionHelVM.HelMA.Automaton.Combiner
runMockIOHelVM.HelMA.Automaton.IO.MockIO
runParserHelVM.HelMA.Automaton.ReadPExtra
runSALHelVM.HelMA.Automaton.Combiner.ALU
runSLIHelVM.HelMA.Automaton.Combiner.LSU
runWithTerminatorHelVM.HelMA.Automata.LazyK.Automaton

\ No newline at end of file
diff --git a/docs/reports/helma/doc-index-S.html b/docs/reports/helma/doc-index-S.html
index 629f87064..7455410c4 100644
--- a/docs/reports/helma/doc-index-S.html
+++ b/docs/reports/helma/doc-index-S.html
@@ -1 +1 @@
-helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - S)
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Index - S
S 
1 (Data Constructor)HelVM.HelMA.Automata.ETA.Token
2 (Data Constructor)HelVM.HelMA.Automata.LazyK.Lambda
3 (Data Constructor)HelVM.HelMA.Automata.WhiteSpace.Token
safeExecMockIOBatchHelVM.HelMA.Automaton.IO.MockIO
safeExecMockIOWithInputHelVM.HelMA.Automaton.IO.MockIO
SameHelVM.HelMA.Automaton.Loop
SAutomatonIOHelVM.HelMA.Automaton.IO.AutomatonIO
SDynamicHelVM.HelMA.Automaton.Instruction.ALInstruction
selfAppHelVM.HelMA.Automata.LazyK.Constants
SeqRAMTypeHelVM.HelMA.Automaton.Types.RAMType
SeqStackTypeHelVM.HelMA.Automaton.Types.StackType
SetHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
setSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
showExpressionListHelVM.HelMA.Automata.Zot.Expression
showsHelVM.HelMA.Automata.SubLeq.Lexer
Simple 
1 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction
2 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
simpleAutoParamsHelVM.HelMA.Automaton.API.AutoParams
simpleEval 
1 (Function)HelVM.HelMA.Automata.SubLeq.Evaluator
2 (Function)HelVM.HelMA.Automata.WhiteSpace.Evaluator
3 (Function)HelVM.HelMA.Automata.ETA.Evaluator
4 (Function)HelVM.HelMA.Automata.BrainFuck.Evaluator
SimpleInstructionHelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
simpleInstructionsHelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
SimpleParams 
1 (Type/Class)HelVM.HelMA.Automata.ETA.SimpleParams
2 (Data Constructor)HelVM.HelMA.Automata.ETA.SimpleParams
3 (Type/Class)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
4 (Data Constructor)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
simpleParams 
1 (Function)HelVM.HelMA.Automata.ETA.SimpleParams
2 (Function)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
simpleParamsWithDefaultsHelVM.HelMA.Automata.WhiteSpace.SimpleParams
simpleParamsWithDefaultsAndVisibleTokenTypeHelVM.HelMA.Automata.WhiteSpace.SimpleParams
simpleParamsWithDefaultsAndWhiteTokenTypeHelVM.HelMA.Automata.WhiteSpace.SimpleParams
simpleParamsWithVisibleTokenTypeHelVM.HelMA.Automata.WhiteSpace.SimpleParams
simpleParamsWithWhiteTokenTypeHelVM.HelMA.Automata.WhiteSpace.SimpleParams
sInputIHelVM.HelMA.Automaton.Instruction
SIOHelVM.HelMA.Automaton.Instruction.ALInstruction
sJumpIHelVM.HelMA.Automaton.Instruction
SlideHelVM.HelMA.Automaton.Instruction.ALInstruction
slideHelVM.HelMA.Automaton.Units.ALU
SListRAMTypeHelVM.HelMA.Automaton.Types.RAMType
SListStackTypeHelVM.HelMA.Automaton.Types.StackType
SMarkHelVM.HelMA.Automaton.Instruction.CFInstruction
sMarkIHelVM.HelMA.Automaton.Instruction
SourceHelVM.HelMA.Automaton.API.IOTypes
source 
1 (Function)HelVM.HelMA.Automaton.API.EvalParams
2 (Function)HelVM.HelMA.Automata.ETA.SimpleParams
3 (Function)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
sOutputIHelVM.HelMA.Automaton.Instruction
splitAtHelVM.HelMA.Automaton.Units.ALU
splitByNHelVM.HelMA.Automata.WhiteSpace.OperandParsers
SRAutomatonIOHelVM.HelMA.Automaton.IO.AutomatonIO
SStaticHelVM.HelMA.Automaton.Instruction.ALInstruction
StackHelVM.HelMA.Automaton.Units.ALU
stack 
1 (Function)HelVM.HelMA.Automaton.API.AutoOptions
2 (Function)HelVM.HelMA.Automaton.Units.LSU
stackAutoOptionsHelVM.HelMA.Automaton.API.EvalParams
StackIndexHelVM.HelMA.Automaton.Instruction.ALInstruction
StackTypeHelVM.HelMA.Automaton.Types.StackType
stackType 
1 (Function)HelVM.HelMA.Automata.ETA.SimpleParams
2 (Function)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
stackTypesHelVM.HelMA.Automaton.Types.StackType
staticBranchHelVM.HelMA.Automaton.Units.CPU
staticCallHelVM.HelMA.Automaton.Units.CPU
staticJumpHelVM.HelMA.Automaton.Units.CPU
Store 
1 (Data Constructor)HelVM.HelMA.Automaton.Instruction.LSInstruction
2 (Data Constructor)HelVM.HelMA.Automata.FALSE.Expression
store 
1 (Function)HelVM.HelMA.Automaton.Units.RAM
2 (Function)HelVM.HelMA.Automaton.Units.LSU
storeCharHelVM.HelMA.Automaton.Units.RAM
storeInputCharHelVM.HelMA.Automaton.Units.LSU
storeInputDecHelVM.HelMA.Automaton.Units.LSU
StrHelVM.HelMA.Automata.FALSE.Expression
stringToExpressionListHelVM.HelMA.Automata.Zot.Expression
SubHelVM.HelMA.Automaton.Instruction.ALInstruction
subHelVM.HelMA.Automaton.Units.ALU
subAndClearSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
SubClrHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
subIHelVM.HelMA.Automaton.Instruction
SuccHelVM.HelMA.Automata.LazyK.Lambda
succChurchHelVM.HelMA.Automata.LazyK.InputEncoder
successorHelVM.HelMA.Automata.LazyK.InputEncoder
swapIHelVM.HelMA.Automaton.Instruction.ALInstruction
Symbol 
1 (Type/Class)HelVM.HelMA.Automata.BrainFuck.Common.Symbol
2 (Type/Class)HelVM.HelMA.Automata.ETA.Symbol
3 (Type/Class)HelVM.HelMA.Automata.SubLeq.Symbol
4 (Type/Class)HelVM.HelMA.Automaton.Symbol
SymbolList 
1 (Type/Class)HelVM.HelMA.Automata.ETA.Symbol
2 (Type/Class)HelVM.HelMA.Automata.SubLeq.Symbol
3 (Type/Class)HelVM.HelMA.Automaton.Symbol
Symbols 
1 (Type/Class)HelVM.HelMA.Automata.SubLeq.Lexer
2 (Data Constructor)HelVM.HelMA.Automata.SubLeq.Lexer

\ No newline at end of file
+helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - S)
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Index - S
S 
1 (Data Constructor)HelVM.HelMA.Automata.ETA.Token
2 (Data Constructor)HelVM.HelMA.Automata.LazyK.Lambda
3 (Data Constructor)HelVM.HelMA.Automata.WhiteSpace.Token
safeExecMockIOBatchHelVM.HelMA.Automaton.IO.MockIO
safeExecMockIOWithInputHelVM.HelMA.Automaton.IO.MockIO
SafeStackHelVM.HelMA.Automaton.Combiner.ALU
SALHelVM.HelMA.Automaton.Instruction.SInstruction
salHelVM.HelMA.Automaton.Instruction
SameHelVM.HelMA.Automaton.Loop
SAutomatonIOHelVM.HelMA.Automaton.IO.AutomatonIO
sCallIHelVM.HelMA.Automaton.Instruction
sCopyIHelVM.HelMA.Automaton.Instruction
SDynamicHelVM.HelMA.Automaton.Instruction.SInstruction
selfAppHelVM.HelMA.Automata.LazyK.Constants
SeqRAMTypeHelVM.HelMA.Automaton.Types.RAMType
SeqStackTypeHelVM.HelMA.Automaton.Types.StackType
SetHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
setSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
sEZIHelVM.HelMA.Automaton.Instruction
SFHelVM.HelMA.Automaton.Combiner
showExpressionListHelVM.HelMA.Automata.Zot.Expression
showsHelVM.HelMA.Automata.SubLeq.Lexer
Simple 
1 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Instruction
2 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
simpleAutoParamsHelVM.HelMA.Automaton.API.AutoOptions
simpleEval 
1 (Function)HelVM.HelMA.Automata.SubLeq.Evaluator
2 (Function)HelVM.HelMA.Automata.WhiteSpace.Evaluator
3 (Function)HelVM.HelMA.Automata.ETA.Evaluator
4 (Function)HelVM.HelMA.Automata.BrainFuck.Evaluator
SimpleInstructionHelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
simpleInstructionsHelVM.HelMA.Automata.BrainFuck.Common.SimpleInstruction
SimpleParams 
1 (Type/Class)HelVM.HelMA.Automata.ETA.SimpleParams
2 (Data Constructor)HelVM.HelMA.Automata.ETA.SimpleParams
3 (Type/Class)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
4 (Data Constructor)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
simpleParams 
1 (Function)HelVM.HelMA.Automata.ETA.SimpleParams
2 (Function)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
simpleParamsWithDefaultsHelVM.HelMA.Automata.WhiteSpace.SimpleParams
simpleParamsWithDefaultsAndVisibleTokenTypeHelVM.HelMA.Automata.WhiteSpace.SimpleParams
simpleParamsWithDefaultsAndWhiteTokenTypeHelVM.HelMA.Automata.WhiteSpace.SimpleParams
simpleParamsWithVisibleTokenTypeHelVM.HelMA.Automata.WhiteSpace.SimpleParams
simpleParamsWithWhiteTokenTypeHelVM.HelMA.Automata.WhiteSpace.SimpleParams
sInputIHelVM.HelMA.Automaton.Instruction
SInstructionHelVM.HelMA.Automaton.Instruction.SInstruction
SIOHelVM.HelMA.Automaton.Instruction.SInstruction
sioHelVM.HelMA.Automaton.Instruction
sJumpIHelVM.HelMA.Automaton.Instruction
sJumpINHelVM.HelMA.Automaton.Instruction
SlideHelVM.HelMA.Automaton.Instruction.SInstruction
slideHelVM.HelMA.Automaton.Combiner.ALU
SListRAMTypeHelVM.HelMA.Automaton.Types.RAMType
SListStackTypeHelVM.HelMA.Automaton.Types.StackType
sLTZIHelVM.HelMA.Automaton.Instruction
SMarkHelVM.HelMA.Automaton.Instruction.CFInstruction
sMarkIHelVM.HelMA.Automaton.Instruction
sMarkINHelVM.HelMA.Automaton.Instruction
sMoveIHelVM.HelMA.Automaton.Instruction
SomeOptimizationsHelVM.HelMA.Automaton.API.OptimizationLevel
SourceHelVM.HelMA.Automaton.API.IOTypes
source 
1 (Function)HelVM.HelMA.Automaton.API.EvalParams
2 (Function)HelVM.HelMA.Automata.ETA.SimpleParams
3 (Function)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
sOutputDecIHelVM.HelMA.Automaton.Instruction
sOutputIHelVM.HelMA.Automaton.Instruction
splitAtHelVM.HelMA.Automaton.Combiner.ALU
splitByNHelVM.HelMA.Automata.WhiteSpace.OperandParsers
SRAutomatonIOHelVM.HelMA.Automaton.IO.AutomatonIO
sSlideIHelVM.HelMA.Automaton.Instruction
SStaticHelVM.HelMA.Automaton.Instruction.SInstruction
sStaticHelVM.HelMA.Automaton.Instruction
StackHelVM.HelMA.Automaton.Combiner.ALU
stack 
1 (Function)HelVM.HelMA.Automaton.Combiner.LSU
2 (Function)HelVM.HelMA.Automaton.API.MemoryOptions
stackAutoOptionsHelVM.HelMA.Automaton.API.EvalParams
StackIndexHelVM.HelMA.Automaton.Instruction.SInstruction
StackTypeHelVM.HelMA.Automaton.Types.StackType
stackType 
1 (Function)HelVM.HelMA.Automaton.API.AutomatonOptions
2 (Function)HelVM.HelMA.Automata.ETA.SimpleParams
3 (Function)HelVM.HelMA.Automata.WhiteSpace.SimpleParams
stackTypesHelVM.HelMA.Automaton.Types.StackType
startHelVM.HelMA.Automaton.Automaton
staticBranchHelVM.HelMA.Automaton.Combiner.CPU
staticCallHelVM.HelMA.Automaton.Combiner.CPU
staticJumpHelVM.HelMA.Automaton.Combiner.CPU
Store 
1 (Data Constructor)HelVM.HelMA.Automaton.Instruction.LSInstruction
2 (Data Constructor)HelVM.HelMA.Automata.FALSE.Expression
store 
1 (Function)HelVM.HelMA.Automaton.Combiner.RAM
2 (Function)HelVM.HelMA.Automaton.Combiner.LSU
storeCharHelVM.HelMA.Automaton.Combiner.RAM
storeIHelVM.HelMA.Automaton.Instruction
storeInputCharHelVM.HelMA.Automaton.Combiner.LSU
storeInputDecHelVM.HelMA.Automaton.Combiner.LSU
StrHelVM.HelMA.Automata.FALSE.Expression
stringToExpressionListHelVM.HelMA.Automata.Zot.Expression
SubHelVM.HelMA.Automaton.Instruction.SInstruction
subHelVM.HelMA.Automaton.Combiner.ALU
subAndClearSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
SubClrHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
subIHelVM.HelMA.Automaton.Instruction
SuccHelVM.HelMA.Automata.LazyK.Lambda
succChurchHelVM.HelMA.Automata.LazyK.InputEncoder
successorHelVM.HelMA.Automata.LazyK.InputEncoder
swapIHelVM.HelMA.Automaton.Instruction
Symbol 
1 (Type/Class)HelVM.HelMA.Automata.BrainFuck.Common.Symbol
2 (Type/Class)HelVM.HelMA.Automata.ETA.Symbol
3 (Type/Class)HelVM.HelMA.Automata.SubLeq.Symbol
4 (Type/Class)HelVM.HelMA.Automaton.Symbol
SymbolList 
1 (Type/Class)HelVM.HelMA.Automata.ETA.Symbol
2 (Type/Class)HelVM.HelMA.Automata.SubLeq.Symbol
3 (Type/Class)HelVM.HelMA.Automaton.Symbol
Symbols 
1 (Type/Class)HelVM.HelMA.Automata.SubLeq.Lexer
2 (Data Constructor)HelVM.HelMA.Automata.SubLeq.Lexer

\ No newline at end of file
diff --git a/docs/reports/helma/doc-index-T.html b/docs/reports/helma/doc-index-T.html
index d8258cedf..87489155f 100644
--- a/docs/reports/helma/doc-index-T.html
+++ b/docs/reports/helma/doc-index-T.html
@@ -1 +1 @@
-helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - T)
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Index - T
T 
1 (Data Constructor)HelVM.HelMA.Automata.ETA.Token
2 (Data Constructor)HelVM.HelMA.Automata.WhiteSpace.Token
TableHelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
TableDHelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
testMaybeLimitHelVM.HelMA.Automaton.Loop
TextLabelHelVM.HelMA.Automaton.Types.FormatType
toCharHelVM.HelMA.Automata.BrainFuck.Common.Symbol
toIntegerHelVM.HelMA.Automata.BrainFuck.Common.Symbol
Token 
1 (Type/Class)HelVM.HelMA.Automata.ETA.Token
2 (Type/Class)HelVM.HelMA.Automata.WhiteSpace.Token
tokenize 
1 (Function)HelVM.HelMA.Automata.SubLeq.Lexer
2 (Function)HelVM.HelMA.Automata.WhiteSpace.Lexer
3 (Function)HelVM.HelMA.Automata.ETA.Lexer
4 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser
tokenizeVisibleHelVM.HelMA.Automata.WhiteSpace.Lexer
tokenizeWhiteHelVM.HelMA.Automata.WhiteSpace.Lexer
TokenList 
1 (Type/Class)HelVM.HelMA.Automata.ETA.Token
2 (Type/Class)HelVM.HelMA.Automata.WhiteSpace.Token
TokensHelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser
TokenSListHelVM.HelMA.Automata.WhiteSpace.Token
tokenToWhiteTokenPairHelVM.HelMA.Automata.ETA.Token
TokenTypeHelVM.HelMA.Automaton.Types.TokenType
tokenTypeHelVM.HelMA.Automata.WhiteSpace.SimpleParams
tokenTypesHelVM.HelMA.Automaton.Types.TokenType
TokenVectorHelVM.HelMA.Automata.ETA.Token
TransferHelVM.HelMA.Automaton.Instruction
TreeInstructionHelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
TreeInstructionDListHelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
TreeInstructionListHelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
TreeInstructionVectorHelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
TreeTypeHelVM.HelMA.Automata.BrainFuck.API.BFType
triAndClearSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
TriClrHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
trueHelVM.HelMA.Automata.LazyK.Constants
typeOptionsHelVM.HelMA.Automaton.API.EvalParams

\ No newline at end of file
+helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - T)
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Index - T
T 
1 (Data Constructor)HelVM.HelMA.Automata.ETA.Token
2 (Data Constructor)HelVM.HelMA.Automata.WhiteSpace.Token
TableHelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
TableDHelVM.HelMA.Automata.BrainFuck.Impl.Flat.TableOfInstructions
testMaybeLimitHelVM.HelMA.Automaton.Loop
TextLabelHelVM.HelMA.Automaton.Types.FormatType
toCharHelVM.HelMA.Automata.BrainFuck.Common.Symbol
toCPMHelVM.HelMA.Automaton.Combiner
toIntegerHelVM.HelMA.Automata.BrainFuck.Common.Symbol
Token 
1 (Type/Class)HelVM.HelMA.Automata.ETA.Token
2 (Type/Class)HelVM.HelMA.Automata.WhiteSpace.Token
tokenize 
1 (Function)HelVM.HelMA.Automata.SubLeq.Lexer
2 (Function)HelVM.HelMA.Automata.WhiteSpace.Lexer
3 (Function)HelVM.HelMA.Automata.ETA.Lexer
4 (Function)HelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser
tokenizeVisibleHelVM.HelMA.Automata.WhiteSpace.Lexer
tokenizeWhiteHelVM.HelMA.Automata.WhiteSpace.Lexer
TokenList 
1 (Type/Class)HelVM.HelMA.Automata.ETA.Token
2 (Type/Class)HelVM.HelMA.Automata.WhiteSpace.Token
TokensHelVM.HelMA.Automata.BrainFuck.Impl.Flat.Parser
TokenSListHelVM.HelMA.Automata.WhiteSpace.Token
tokenToWhiteTokenPairHelVM.HelMA.Automata.ETA.Token
TokenTypeHelVM.HelMA.Automaton.Types.TokenType
tokenTypeHelVM.HelMA.Automata.WhiteSpace.SimpleParams
tokenTypesHelVM.HelMA.Automaton.Types.TokenType
TokenVectorHelVM.HelMA.Automata.ETA.Token
toLSMHelVM.HelMA.Automaton.Combiner
TransferHelVM.HelMA.Automaton.Instruction
transferHelVM.HelMA.Automaton.Combiner
transferBranchHelVM.HelMA.Automaton.Combiner
TreeInstructionHelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
TreeInstructionDListHelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
TreeInstructionListHelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
TreeInstructionVectorHelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
TreeTypeHelVM.HelMA.Automata.BrainFuck.API.BFType
triAndClearSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols
TriClrHelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
trueHelVM.HelMA.Automata.LazyK.Constants

\ No newline at end of file
diff --git a/docs/reports/helma/doc-index-U.html b/docs/reports/helma/doc-index-U.html
index 7cab6cb88..f099a0422 100644
--- a/docs/reports/helma/doc-index-U.html
+++ b/docs/reports/helma/doc-index-U.html
@@ -1 +1 @@
-helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - U)
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton

\ No newline at end of file
+helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - U)
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton

\ No newline at end of file
diff --git a/docs/reports/helma/doc-index-V.html b/docs/reports/helma/doc-index-V.html
index 548181f1b..ddad0056a 100644
--- a/docs/reports/helma/doc-index-V.html
+++ b/docs/reports/helma/doc-index-V.html
@@ -1 +1 @@
-helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - V)
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton

\ No newline at end of file
+helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - V)
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton

\ No newline at end of file
diff --git a/docs/reports/helma/doc-index-W.html b/docs/reports/helma/doc-index-W.html
index d94ab5faa..caac69dd7 100644
--- a/docs/reports/helma/doc-index-W.html
+++ b/docs/reports/helma/doc-index-W.html
@@ -1 +1 @@
-helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - W)
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Index - W
wFlushHelVM.HelMA.Automaton.IO.BusinessIO
wGetCharHelVM.HelMA.Automaton.IO.BusinessIO
wGetCharAsHelVM.HelMA.Automaton.IO.BusinessIO
wGetContentsHelVM.HelMA.Automaton.IO.BusinessIO
wGetContentsBSHelVM.HelMA.Automaton.IO.BusinessIO
wGetContentsTextHelVM.HelMA.Automaton.IO.BusinessIO
wGetDecAsHelVM.HelMA.Automaton.IO.BusinessIO
wGetLineHelVM.HelMA.Automaton.IO.BusinessIO
While 
1 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
2 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
3 (Data Constructor)HelVM.HelMA.Automata.FALSE.Expression
WhiteToken 
1 (Type/Class)HelVM.HelMA.Automata.ETA.Token
2 (Data Constructor)HelVM.HelMA.Automata.ETA.Token
3 (Type/Class)HelVM.HelMA.Automata.WhiteSpace.Token
4 (Data Constructor)HelVM.HelMA.Automata.WhiteSpace.Token
WhiteTokenList 
1 (Type/Class)HelVM.HelMA.Automata.ETA.Token
2 (Type/Class)HelVM.HelMA.Automata.WhiteSpace.Token
whiteTokenListToTokenList 
1 (Function)HelVM.HelMA.Automata.ETA.Token
2 (Function)HelVM.HelMA.Automata.WhiteSpace.Token
WhiteTokens 
1 (Type/Class)HelVM.HelMA.Automata.WhiteSpace.Lexer
2 (Type/Class)HelVM.HelMA.Automata.ETA.Lexer
WhiteTokenTypeHelVM.HelMA.Automaton.Types.TokenType
WithLimitHelVM.HelMA.Automaton.Loop
wLogShowHelVM.HelMA.Automaton.IO.BusinessIO
wLogStrHelVM.HelMA.Automaton.IO.BusinessIO
wLogStrLnHelVM.HelMA.Automaton.IO.BusinessIO
Word16TypeHelVM.HelMA.Automaton.Types.CellType
Word32TypeHelVM.HelMA.Automaton.Types.CellType
Word64TypeHelVM.HelMA.Automaton.Types.CellType
Word8TypeHelVM.HelMA.Automaton.Types.CellType
wPutAsCharHelVM.HelMA.Automaton.IO.BusinessIO
wPutAsDecHelVM.HelMA.Automaton.IO.BusinessIO
wPutCharHelVM.HelMA.Automaton.IO.BusinessIO
wPutStrHelVM.HelMA.Automaton.IO.BusinessIO
wPutStrLnHelVM.HelMA.Automaton.IO.BusinessIO
WrapTokenList 
1 (Type/Class)HelVM.HelMA.Automaton.WrapTokenList
2 (Data Constructor)HelVM.HelMA.Automaton.WrapTokenList
writeSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols

\ No newline at end of file
+helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - W)
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Index - W
wFlushHelVM.HelMA.Automaton.IO.BusinessIO
wGetCharHelVM.HelMA.Automaton.IO.BusinessIO
wGetCharAsHelVM.HelMA.Automaton.IO.BusinessIO
wGetContentsHelVM.HelMA.Automaton.IO.BusinessIO
wGetContentsBSHelVM.HelMA.Automaton.IO.BusinessIO
wGetContentsTextHelVM.HelMA.Automaton.IO.BusinessIO
wGetDecAsHelVM.HelMA.Automaton.IO.BusinessIO
wGetLineHelVM.HelMA.Automaton.IO.BusinessIO
While 
1 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Fast.Instruction
2 (Data Constructor)HelVM.HelMA.Automata.BrainFuck.Impl.Tree.Instruction
3 (Data Constructor)HelVM.HelMA.Automata.FALSE.Expression
WhiteToken 
1 (Type/Class)HelVM.HelMA.Automata.ETA.Token
2 (Data Constructor)HelVM.HelMA.Automata.ETA.Token
3 (Type/Class)HelVM.HelMA.Automata.WhiteSpace.Token
4 (Data Constructor)HelVM.HelMA.Automata.WhiteSpace.Token
WhiteTokenList 
1 (Type/Class)HelVM.HelMA.Automata.ETA.Token
2 (Type/Class)HelVM.HelMA.Automata.WhiteSpace.Token
whiteTokenListToTokenList 
1 (Function)HelVM.HelMA.Automata.ETA.Token
2 (Function)HelVM.HelMA.Automata.WhiteSpace.Token
WhiteTokens 
1 (Type/Class)HelVM.HelMA.Automata.WhiteSpace.Lexer
2 (Type/Class)HelVM.HelMA.Automata.ETA.Lexer
WhiteTokenTypeHelVM.HelMA.Automaton.Types.TokenType
withDefaultRamHelVM.HelMA.Automaton.API.AutomatonOptions
WithLimitHelVM.HelMA.Automaton.Loop
wLogShowHelVM.HelMA.Automaton.IO.BusinessIO
wLogStrHelVM.HelMA.Automaton.IO.BusinessIO
wLogStrLnHelVM.HelMA.Automaton.IO.BusinessIO
Word16TypeHelVM.HelMA.Automaton.Types.CellType
Word32TypeHelVM.HelMA.Automaton.Types.CellType
Word64TypeHelVM.HelMA.Automaton.Types.CellType
Word8TypeHelVM.HelMA.Automaton.Types.CellType
wPutAsCharHelVM.HelMA.Automaton.IO.BusinessIO
wPutAsDecHelVM.HelMA.Automaton.IO.BusinessIO
wPutCharHelVM.HelMA.Automaton.IO.BusinessIO
wPutStrHelVM.HelMA.Automaton.IO.BusinessIO
wPutStrLnHelVM.HelMA.Automaton.IO.BusinessIO
WrapTokenList 
1 (Type/Class)HelVM.HelMA.Automaton.WrapTokenList
2 (Data Constructor)HelVM.HelMA.Automaton.WrapTokenList
writeSymbolHelVM.HelMA.Automata.BrainFuck.Common.TapeOfSymbols

\ No newline at end of file
diff --git a/docs/reports/helma/doc-index-Z.html b/docs/reports/helma/doc-index-Z.html
index fe98bd27a..982ac6037 100644
--- a/docs/reports/helma/doc-index-Z.html
+++ b/docs/reports/helma/doc-index-Z.html
@@ -1 +1 @@
-helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - Z)
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton

\ No newline at end of file
+helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index - Z)
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton

\ No newline at end of file
diff --git a/docs/reports/helma/doc-index.html b/docs/reports/helma/doc-index.html
index 9c48e9105..45d2811b0 100644
--- a/docs/reports/helma/doc-index.html
+++ b/docs/reports/helma/doc-index.html
@@ -1 +1 @@
-helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index)
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton

\ No newline at end of file
+helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton (Index)
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton

\ No newline at end of file
diff --git a/docs/reports/helma/helma.haddock b/docs/reports/helma/helma.haddock
index 2cd8dff61365ae3250bbd0381448d27e332bb768..4b11badaa4b2e2fa355c33a2b339dfc1da10471e 100644
GIT binary patch
literal 33321
zcmcJY2Vhi1yZ7guIp?I45Wrvq1WkBfAkq^QO9-IRgdoB4dh2Ghfn1Yp+}()W``!D}
z1jXLFGyz4y-V0SM2#N~WX)5;K8{hx`oU>MV30+l2&OO0UtsB1{>~
zD424X(J*6R#=@Kgb23Z?%qcLZ!c@Xk!Hk2cRw`}0Qt79`On|9@nFw<_%o#9e!knd4
z#@}GhhWRI$e}?%Nn16-&H<*8i3Bc4Ul^KMog9*XZ!%Tvi4ATJfA28=AmDLE-1k(%?
zhG~I07bc=qb`&P2R8A|*c`#F8&WD)_^Pe#P1@nJk{u}0hlh=++s
zh)0RXh{uU1h$o4sfG$rHD~VOaYGMtsmRLtT19V+aJWD)BJWsqpY#?3)x@{yj5ibD;
zy-aKd3SJ>zC0--85L=0D#OuTx#GAxh#M{I>#Jj|HVh6F4*hTCn-Xq=zx_?0IAwDEN
zB0eTQAwDHOBR(g-AigBNBEBZRA-*NPBfbX?{sB1TN8r$(h@XjHh+l!jej|P-_7c-D
z@EkUsm_f`04xdF_K+Fbu%poo$E+Xa<7ZaBdmlBr|mlIbIR}xndR}X5tm%RpK?E&lX}Uv5k10c!PM8c#C+Oc!zkG*iP&qb`raY-Nbvu
z`@{#t9^ymdBjRJ?6XH|iGvagN3*g8viLZ#SiEoH+iSLN-i64NYek6V(ekOh)ekFb*
zeg_Ko64UU|E1XWuAZ8M?hzp3>#2n&6;v!-$aWQcTaVc>baXE1XaV2pTaW!!baV>Ej
zaXoPZaU*dPaWioXaVv2fF^`x}EFcyVi-_Ba#l#X~DRBpJC$WsUi@2LuPOKpAA?_va
zBkm_2ARZ(hA|56lAs!_jBOWK7Af6>zd$yNKPyd&K+1
z2gDxYL*gUiW8xFyQ{pq?bK(o)OX4fyYvLQ?TjD$7d*TP6?~lY!#LvVp#IM9}#P7sj
zVwwd^CuR^ciCM%2#B5>?@RtjL?2CxG#KpuV#HGY##O1^l#FfNV#MQ(##I?kA#P!4t
z#EryF#LdJl#I3|_#5~}y^N9t-LShln?{;D_v4mJk+(Fz)EFA}*82SbAB{1wO;%nj?;#*+&cf|L^55$i^$xp=3
z#4p6J#Bap!#9m?=Ci^ARi5bL9Vis`$F`Jk}Tu59*%q1=+E+H-@E+Z}{t{|=iO0OcW
zCaxi_C9Wf`CvG5aByJ*ZCT<~aC2k|;5%Y-!z=(y!BI0&pF|mYLO58!*Nh~AoBJL)Z
z6DxpY?ji0a?j!Ce9v~hh9wHtFj(vo9lz5DIoOl8l`6Tfa@ieiLSOpxnnpi`uCDswo
z5bKF&iRXyti5Gz5HxMrp8;MQCOT^2>X5tm%RpK>b3$c~hM!ZhE0i5tA@fPtm@ec7W
zv7OjK>?C#(yNUOR_lXaH6Za4w5+4yC6Q2;D5}y&D6JHQt5?>Kt17+V3-xA*u-xEI&
zKN3F?KNG(YzY@Ozqkbp$64UUaIchpFgO~}F&mt}$W)pLW3yF(}xxna)iA#t}fiag6
zmlIbIR}xndR}#J$9Q#Qnqr#Dl~`K-I&1{i(}
zYh1WFWEe-J6&&8H&yhzJ7WExaJaF*H<4;(nR;x8?om#J+SDVyk^_tqMwy8JN4z*K#
zq&~;BoewchW!RHLjZFbCWlG5QKz_Je(T@Ju4bxFf=$MGkedP>E~
zCygC_V)>}DF`ZIeSRBIA&Vfh?OEX5bfrTP01s#a^R-;nKpEj{(f=yuYiIwkuI?{-`
z9*pIsv;KDWKmGH+{OiB{dm!`dzn$e-8F%J^NCAsaPHnI*G^yT!sSDOJQmiP-r$c$)
zf-*U$v8g$1H-{UWutb8{%7@@E(`jakM8#%yDb
zaiMXAahY+caj`MixX8G~xZJqXxXQTN$ZyYM4lZ#oogsmk$-D!R)3pYc{rsHT9KWL~
z>sI47W1cbJSODKe#_h&pV~MfU$Vylj`T@9{h{wPI$V&m1jjg+kyN%_>3d6TBVyu13
zrz5Sn;AZrOdyEH-`;7aI2aJb|dyR*UM~p{}$BZoZtF0%K#EQFoI+AktZWx=MGM+Y8
z8mo-e#u{U-vCh~>z+}3*iFK$~bzfm(Wz?_Hlx~EDQs2X_j!j0BOnb&yZ#-)}XFPAb
zU~DkjIGG>hUOpWuf`hS3pXX7i#P^=KPjOC>rI&MIjKwS)VwDF(N~Kim&00`V3#C>Bi^y
zD&Z^udsp)5NFg1H=b!O|fj>qivom~mD8`K#kA5_MGJZCGF|1$k^^?I>cdVil_;e)p
z!}{T=`m6Dq@w>6tm}c7iqH`J+O|dXf;M1WLE=8xCY0fe)FugCv*n_~QBQYPIZ_ZAd
z^}7ucI|hDpNEvlh=4|sKbFO)zImf)%yu`fJyv)4Z%uHAl-prWXe@8QTlY#9BKRaHJ
zNr&({>`vT(eTkc}Baxo$;05?#%TzucDV`pfLwCEyyvtl>-f7-#-eE2^7n@7W+s#Gh
zLUVyR-<)UOYTjlpH&>YVnD?69R=|3Th~~j_0Rk;T;3c?dDK5Snkt{=G49cwalKge7
z0(;znru~rlu=$Ajs4135VP(Wew28fU>O0}EKlM`B^Jo)0D{YD&yD7dTqXKU?f#x9Q
z8rEaxDc^I7vb^Lg_HbA$P!xzWsS
zPq^0P9uIax4nXR?Dl~R#{5y7=Aa-YbNlG8Vj*ai($dfs$@?SHznOn^*=IiEL<{Rdl
z=G*2w<}P!Gx!ru%+-dGM-!tDg^WCpxkGK5`;t}w6jyw?ev>jvC7v?wS*XCE|mu8Zc
zksoycQaGZhGeG8K+JP_&qsIl48COz!;_>z=b!hVnMkt?;-
ztG=~47?Vfcpx@1DdapTM&(Ig>nR=FN)yaeTBY8U#_p#m+7nYrTR*JiN09R
z)z|48^$q%ZeUo0K7wQFizMiLV)3@lG^{vR%61`Y2)pzJS^)h{zzFRNXEA*hY0ykKD
z5yT_^qfEpzJ6*fkXPFiqfP(FFvc}GpUs`TOVz-DqxIsLqTL2uA6>WzAneo4QqH|tmQtNJy)MQ_#H^y~T!{ic3PzpdZV@9OP(
zhu*1o>D~H0{l5M{@6jLXkMzg-6aA_FOn4~j{FkOp*a@*
z7!{5#$)_VR77kCx{+r(z+;)R4IA2mw7HNo0ZVJU3f+=fc*pl{OY^V#Rcw>9d_wLN~wiI9N`z3tK!!1)&e6bk{iy>oV(d>k8{i>niJN>l*7?>pJUt>jvva>n7`F
z>lW))>o)5U26O|&gI|MStIcZ>)D6Z97&IE0i>SH9i7iIAk~%a2Ec_7jhk4d~Yk{@U
z!ruZ|=Sl3C)yk(MZJ_8ZV`)-hc@Kf?Mb_=s5^J%w)VjmE(^_WTW!-Hpw^mr$sm`TV
zJRmcI<81QjNPhZen%FJ%E6*Ftk|f=*%pHq_8>>Q1;mFipXq=P7by0Q5J=VR}eb)Wf
z1J;AqBi2LK!`7qLW7ZSa>&m_U{$HI1wEq
zzt`fvFLqJg8|_fN_FaXgiWjYo)+XyE>t$=R^@{bXm7cI}f)_V+u{C=DQu_-cF<-N`
zSmqXsTfo@YJrJ?ZGq7Xq*H))Cm14eOy=e)U*1!Xi;CHxADnLDhV)-G$e^`7;<^?|j=`q28wYFEf?4L%Tg+k;{M
zV+((b45vcn(~&OLZv@^|Ke0ZwKC`?pMmf}txI<04-_@v{&#f;k0V5oCAY%Op1K^j|
zSJv0oHE1C
z68lp7GW&A7`yU0^i)enc64A2AN)JG}6{njxcj4cITR=Em;Y(7=KxJKN-)P@pUvFP$
zUu$1uUu|Dy-(=rxXA%2)F@NX-^65y^DPC?aNXn9%NgUwVPbSkB*o*9i_U-m!dx^c&
zzQazBTjCzf5zcnYrz06V8cTBNE9`sh2kiUp`|Nw|2knRKbRt>EWR7(c>rfj%`XY=_
z58L=-WH^&9pAO~!EyVbQjXy?(tqS>cB*uYfnK<0ySBzU#IN#z+QrnZg%3foyw%6M0
zY=P@!E@U?q-yO=#iw2I&_({8&QMoVJ8|)YDjrJz{CHrN2v;B(ws{NY1#olUfvtPG!
z_wTjA<}nu
zp5{z0cMpN_;l^n4TNul%x;O>!K$@&!o`((Fr}%bd%dE1j#HE1avHYn*GH>zwPI8=UN9
zM{*!$ZY+UMhcfv+rdT&RH#q{vhWU$pIuh$JXaboxJGVFjMt8CsX@~MUY$0O3)w#_P
zFv5xh5$lg=0P~#r&H~5#Vx*@WfS89*Kz6IJ@U3?T!XGzUNC)hbQ|kXSs8?v%DZ&C)m)=qD}Zfb)O8;2{6}8kTr_)rTX!Vxed(iZg+JkVEzfQX6UxPHqZB
z&QZA!IS)IJIFC7xJ5M-II*&R}IZrz)omI|iXN|Mg$xU^(4b1x+cOY)^S~Sje&NI$>
z$NOTWa%2kM9jVI^hJhoFeo@$!q4Rm9;00%c^P;oS+2p+ByzHbUtQ#Djjl>B@0-p}0
zjdMuOX6F^>Rp&Kli?h{9aWMAN2z)w}%4T%GZO-eCfU%)J%BLf-9&@URlbwljlT$Z1
z=9!SVC8^(V-gMq_G{K{wIQZ!%-l2OsW-;#RZRZ_Fzz8QEh**C?tnWJ89RVXe{Q$&z
zY@LC#t$w*U?kb4VJDi=)E=LnQ0E&bx8KtOxdGSDL|
zqmgJLngJCiT8MKAoR+avl!y_nxM6)Bpr#P#6H^Ijvl{BZ2c5HqA^uKGGsx+}
z8N!)D>a`l`0^w}o9MIO(ZM7AZTWv+{R$E;xq<*WdsNiZVYPj0!av^nGZFQxPTCTRD
znyam-=V~h)tpl$UUN5`>bTpM+9ZhXl$GBO@A%bP$uq+&d>aUK$18WYBuaWbF^Mwn9
zI1LB+B2rNe)=`UvOTaX>6inAtg-zGgg-ti844ZD;C8RoRx}rX8x}rjCy1EC<&{T=d
z(Dw%CVXH2_e;EGxbxXq?;*sl&PpJo2ga`
zSAki2wQvoI(`Gyd$`rE{6=$;)&WC~P4aIX`3Ocj$O|{t^y@52SIGcmxTA-rpY>wjD
zsvJe-*&MZ5NcGtq^{S8xw4Ef?PI`;jw+hj;a`iS?bM@;aPD}BGCDm$kHT7z9HIGT<
zYHHTz^2`-T-P&AZyKskar*M~Ww~!jPxdx9j<*E;adxX@o%~e#h%~jO1%~d!#1ya*C
zS5ehAS5enCSA8L*wr!sNO332Mlj6!#)VPI0}aPy={
z^At64^H{Jr5BZCb8o8a-Z$j$i=Igzr!Mn(pvp)F-?=Ih%Zjv*EGljEAMK#@gh2u6L
z6?O9!HFfh9Rdw^#T(FD6(HoH3x?L32b-O6)>vmC8*zKaO5K?8gi=xhMS4E}Wu8LZ_
zT@{bLbXC;b?W(R9QggSfx)JQAsJq)uQF*tUqW11VniYEx$BY80*aE580;$*nsn`O2
zD*_fs#TH1#7Rc=uNW~Tyti}Sx>MBsIt^%p90;#S7sjdR4t^%p90;#S7sjdRW>gukk
zJltK+BaQjO1wxVNh2p!2RJRMMN!(p65mJ}9yP`62cSUXD?rNFvE+G|)yDMrGAFQZS
ze2Ah>@u3=H$e|iz$f25Na1PbfFFs6D!T2yksHkUrn4+TbVd^0vRgDi*JXLeJqO$Sf
zibq=xS5!Cdp{Z}&!=S=(5928zRgQZYD@nCVxLU{~DLvF$;W{BTk9(-~Lh2s(P*gtd
zp{RXq>K910K}ZE;Q&9uiR8&DW6?KqJ^)lE~QwzDLdPPV*Fbaxe9<@Dm{wlzS;^C?BDzqI`s+j`9)eOChzCkC1qdP>kmY^|cT>%io&cnTpEF
zy*190fK*rRt$q?xVY#=W#&T~(mF3>*HzAdld#k;|Y1pOjt)>fS2$|pBl1^_mQzWy5
z)MM_gW`lij*aI}E%G}4GE^{A)%FKOm+=KQ@gw$v5V_YV3YBcx3@eoR=)7;0PQga`J
zTFre7sx|j9sMp*_QL(v?qGod+Mb+j$in`5x6qTF%C~7zNQB-g4qp089N8KizC!8-_
z03L~hCZMrMh?6g{Q_uNGV+pBn@&%--^O1_W&PU{s12G2?q
z8Y_jXgsX*XglmQCgw%#EG;qKKe3ryf5!$H{U1(4xy3n9bbRmw8&`z!BLSvJVdeMaj
z6{8CcYDO0tRE;h)s2g2qP&vBLpmua2j+oF+{pdo23ets&8q$S|D$<3DI?{!TO45aj
zTGEB;UEy}&4&hGWF5zzBdqQeU7pf10dxTV&E>zT*E>u*RE>zT+E>xcisWn}waBc<^
zy=fd}!O0yQXCXy(+7R7oLzJft(VjL$ecGV@bdjP0b&;Y5b&;Y9b&;YDb&;YHb&;YL
zb&>jAxK}t08&E}Rx^RYYrf`;!+SEmAwveYmiWE;96e(&{7bzU+0I5@5q%INSNC)gx
zt1eQP3#nLLq;QM_q-u4MqHcAO!r=`N2QxsNzW{O00=z*;4eKIxlaM;rMT$z+MT%P1
zMT%
zr?v>Ug8gN7*k5Lf{q;6VjMqg@P4E8PxW|bNPQLof%2r!?Yu-&@4Q4`C#2?iiK6OxiMmmU{ZZI&7E=AZL?)ai>Q=F{q)HT((M!}k;d~*s
zFd=lp{TGvLOms<%K8YkQn*UE
zTDS&0Mq^)39b*U;)z^th`)|6yK5J
zJ5qc{itkAAJx*gIPaS8xDBMUYs=ptnsQ-SPq5}MJYP0YaA$8!7Q=$Z~MGIbUh2(f8
zdhkjV;T1OEAbC^xmXONu$E$aQREIxaVM`9&A>1k4CEN|3phYR(5UqHrwG#~1*9it|
z>I8#zbb`We8n{RJq3|Q&$HGs9pModq&qzbm<_*!CH$-vX_=pQxxk
zf1<)R7)bs36O|~?>z`mRGkzBSA`~Thg&iwZrl>|=ruGV_VO6M1O&87(&ICv4S)?IU
z91};$_&7>kK)IR?mTS?lH-t(Q?UiWStGV=5)U_{HqHM3IZ9iI3-F~!;7h|+&-5WwB
z%J)jN@0FSSVaXDr`4^i-k*sONCVH
zuT<3QuT;yxDoLeEQmInZ@~@Iqs^s3QB&{kby(&quO7TYksuX_(pi1#)0IJkILjDjy
zmE3!kP)%nOsS(YCFH?sEn+xWtrI>Y
zT<<*Vbel{q{Q(1uON)mV4;|3Z+|n2bhWeizYCNN=7_2HQE^Cd2n{XbecvK|N&^)#^
zcup}+`!t1{i)%#Tymvc+;Tb;>R6L=q>M!jCNsg~e6W
zn)TmvzX9D!>#<+|iQ#iX%|-k5u5JlMaJ<_)GTCRp;mYdjL{qVO(h=>3sSNz*)KiNq
z15LGcfg}Gx2-yM*G{>UtXUUDGqPe9tHl{fkt_wxlE5!g3VsaBgb*;hu1*vJRtqh&(
zb;hIG&C;2Z8)BiF7WC|5DW>*s|LkzAIH9Q7etsm(d4a~(0Dius{mNnxx0u^2L5vKn
z@``HN;A$^KpxC=3+3@Ps?hSdhz`ezO?F8@=@p@o@14JeDP}{q2gsrG99@QGf@x^Gg
zqWT|Isy7sdo7=l{H=?oVRTb6y_pb^E	+v0LVjQWj(4!``2|M2f?|q_F)GaqntuID+{V?d^5LKylLO
zo%$4O@6m!gbYrb(j>U^>Kf|6I4%0JQ_ETDJn3`B1cn+=mNs(ph>Qs28`q%dFH(vI*
z-EgxPbU#C-->LRf*NlqAixwAXinibL_$2bqmuKo9jY#t~~q5`Z3L|O|Byoj&prEA2Gh8W^#Cn
z>*(yZoTQn6{HWLjVWqBU4(idNpi|u%!&KIm32i}eav(A>yw8RCQEAsnQAG=mtY^CW
z1cjVg*hhYde?R+p;S%23KJsq7%YCGd`!JFM#?PlkoLHD&x}iCk9>mYB1tOt=8bxX~
zht7{#`0R=_Dpgy+EUbyn+Re}
zIOvs?NTRK^
zsbMmrp_rRe28znHWd#%IXR^FpaVAU63o!)>x*^w|-UJ=llTqn8amxh!PE0I2?y3yc
z$I_ZZQ+R(}*xr-c3%f#Y8<|C&TN{H(V@TJ8Vh$!{<&6;scZaWxD!ESzP%56lwK)?b
z4G?r;^Jo(#nhaazzEZZyHq!L4_nKcIJ(08j#H88HFM4Q_%yHXd+9^#f<8gQV9)+iC
zJk8X=kV=}VQa8`3GDnsHM%(h00fpvzvE>I_Bau*Zat6{_FU(Ln>x!0aJdcBu$3u+F
zxQ=n~f+PJuFqvXD#UlCS$dhzCXN34ej$PYGNAu3Rv=K^aw2{fJw2^s5v9FXx(MFn|
zl$COfbkHj6oFsB5C1ypHBllX4sK=bUkH0tC>?40kG0T+==Y$3fEiNf89Z))ASfHeI
zP)Y5eK_#U_Lc!9(!BAlEz`EMti25NVC8fg#*A5H}99%NEE)*CZ99CO8Z1{-4kby%3
z!4X3S)ejt!PrbV0c%;RnF#KC}k#I{|w572jRu;>`qbj}+MIA?NeH*GWcZ@nh
zteVzf&~fvp&j>`UKugO|Vn|kfxUsI$4J$JU*NP_>OUHMxcw9$Tt@|F%6{AeVP!npb
zM+#|C_uFBlH5E3#POV`Ir`q*_Msy4;?S?WUh*KsNSvWzDWiqkrP;;FX#LJr#oZK1-
zPR@)Xv*lvVpjFgJoro-&W!E=0w6uikkYeLhCek=HQ>w6rtyg2-l9^cZvd#`g!n(RS
z)F~lju-t@GMz;JYyNLgrW(<KG^Q4L4RB=~#dXy^6Yb)F*R862hgwfJ#
z=ZUK^q)E%?DsV#TwfGbP>n9=T9BFM%xOfY;G&iRvj4}D#Uyr88*x0e2
zoy9x#gf#_GFyjK-;P(*D3wchbA$oEkI=M4n1+i3~
zSg6Y#C-3KRSu`I*WkWDIShRCZxG9t($t!DYOc5L|^G&83s!R5ewLo`rJt`b-%;GG2
zTp-pO2{d;1#@T&>=ZD+oF`Af+?i1RZjP4_s=g&S;uP?VJXG!iO*LY{o@;Y*5I8bLb
z0(o9TuR%8paW0z?joY%lu;OKlI5V-}nK@;AYpg6Pm$+6;=rgCB6pB$)7R{g)qOxcw
z5#o0(Sd*h_@{*ksF^ps<3)01b7{pSE)zx&y&N$O(sfk50yzk29v?-P0Ng{E-E1T0r
zg1dL7jBRX483xxR){K2SY8fiF_LR3%Z_cV0*$rcn~B)
zR#ac*i^pR(smY51c7J2zn13I$!qD9#VNB}-Toa$jAd7?;|F
zEJ&64VRNxwpB!VCgxe33fzo#q%?_fNV#W~d>UUOswibD*gq=u8M4nBZG-+#mIr5_G@u_KAtMDK_vH>a;0~VZDmX>MV6DYaba=%vt?k@RTb3|ZAt(y
z+O{&e_2ey$Y?+>+4|3fkZB#>SN<%c1hQ`%^mX|3DpcPn0IlrJP(A?0%mWb8kq~f&r
z<4(5xJXGgV7&anPlRPzMVj3@|8n2^zbi;YNDqLrc!ke`oRUNTLofVGgQDaWiqfVM=
zRZ?0BX(gqVkXD{FG4J%Y5snK@vPPlVSd~CdS!GgU$Vqe5mMa`LC+YIl5Q?VNcrCHU
zYl&%iQRFXQS^U+jw9)QhkeysEx~8mB*Hl#7wT;M`Rohq{ffad!b-Qej7@1X?PrNH|tu*Rk!VdykR|CrT&2xG+cG@~UAyjXV4dGdkyDfG%H^0ZL%zGbqbqBwFsns*XuNjAB_&Z)S<#6#oVcl+gcEnt
z$!!Jko6Jc#;hC3IR#LuZMNJN>DDjJKW_cA}gxH?Mzn~oRQoKKmkA(U9iPt_aZ{_2w
za?r^V7wSM`6RQXh?o1R{{2jf{of@zWXL)uu3!BQwqeJPqZyKt0vGC
z%HZ^_60dl%Okq`EYHg?!_2$JUGE`Q$rOFSOgASN**|m{S;2f;XH^&;9u`Gc6y5)
Am!?})Jq=I5=j*Z1a2P%>?((&?3Yn_|J&10Hc
zVpAu?B{_{4X?>TC|1zh#KCLsr2CfCo0|Sg}$NOfc8;Z4Qj5TYRu|)b9L%x67CoNCS@h==Vc}Cl&r)ZURIKv%u3uTLpK{Ax(jzfWK|_Ah|M!>#b7gJ
zlHJH2pI+xB-u1jtWU9OQ!45fIHtzGHvPP2-WQMS*?=C@QCJshqjgl#~3|1LjY7kpz
zugH_a)%#~Dq8OySVo&&UB8q}f2zdMFCY;{uPKto{oDg_FH_!#y$8Rsn(k<7;*qt(^
z^GTm_dzrfg=87f5>0XFfcHF}4-aO2%yw?eA|KcIy`g$u;?&b2fo+nqyY9HnY7@Ayx
z3?r^UHrLqk-6&jPQMzm|jG8(Qb3*@62<=Rr?IOOrkmQ}+kO-QzyO0!uvvZVXlEj+=
z`APUwpkxV)GwGT%@BB%psz3`1(Q{_Y@~r2`tO=d#S+kPDbn>d-^Ge46AdMWA=vBPu
z!-oWN8jpfip73F3OSqUj&y^vA4`a+m`o5!+$~+;e+wraR0qyB2-2-OT}a
zoXK_vCHKN~jz?1I?j^3&-Lj%MX}^okyfYf24On@XEd>#HEx;FK%DOqdl3IZ8>$L#i
zEiJ%zc`YE>%@*LhabyHz599tza&CFwUd=^OTZw%xhV1tbLbkn`?)wYdqpe438okO1E*OTVN-Eu`|OfTzF
z!&8zJo6J_w7^3kAI>~De1ro{~aJ?wpF>QzIsksLz8Ny71*`+d*d
z^xhXBAWD>?Fp;S{2}}l4z&BtjmbX05}K^fy3YkI0}w|<4nU7Orw+F6gbUuyeQuVdudG
z@Eh~eMQ{mR23MHytKb^A4t@uJfE(Z@xCL&5JK!$32kwIh;30U#M09hR?k@Q#q6dmS
zK`+o7^Z|WAKhPfx00Y4wrtx4f1Plekz;G}ESSE5L7zIXyFTfZkYAhHBd|$%x;43Ej
zYcK&!1e3sIFa>-Arh;i;IukPk%mlN*Y%mAR1@pjsumCIsi$DQb?E2UxC@y7Umx1Nr
zTd)Fr2Uddb!78vCtO0Am4`3Y=w;ucmHh_&_6W9#4fUV#su#NG>ZAWnj6TcJe0=vN;
zuowIc_JLo(uV6noz`T4A90G^I5pWb7W11WXC%{Q?3Y-RKz*!$W2hM{F;5X)#i{KLT
z>Sb_+dF?8=2Cg%&{|^3On%)36!7Xqb+yQsNJtpBkcmN)PN1&VG`!Aup;bITa6Z8VT
znPz=JU(gTq2Lr%BFbE6=L%>il3=9V&fMrUJ1f#%c@C6tH#sc3s_$3$*z5-u^31A|a
z1SW$i;2SU%Oas%w3?^|Vm<48oIbbfB2j+tXU?Erp3Jl+WiHlKO0+xbhU^(~}tN`DE
zmEe1@3akcez*_JFSO?aF9~rd)Yy_LYX0Qcp1wS#qq-|`{cCZ8N1iQd)um|h~KZAYX
z7w{|7d_On<4uV6>8;8LWa1i%)E64
zTm{#_b?`g*gZax1a1-1Dx4|877u;h~?}G>6A$WxQFSVP8i`|*Gdw`xyi(a5N=)<(^
z3;Hpw`hx+?I|IQWFqmmQ1Plekz;LF`2w=fTu$PGVyI1}kw?$62*KzEzz$jHF%U&(p
zO_kYTbIX0K%7)n8Se&@V}k^aHAD?ogVaDZK=oIBRX_EG8l%RlajN1NF7}bC
z{@gf_HyX?v596JN^UkBWlabsRHpOvk+FgN(Rjbt}awn*XYLc3)q%fI_Xb-ZhYa}IB
zTcCK1=a`P(tj=j#nRox$#hb_Dx}uumDcO1XY1!%CJaVU~Z`4#ZO}T{&3=T19OQ@a{
zRhmEebJSclPt8{g)IzmL6{y8(iCU_bsZxJdIakfGO>3qERNtaEK6ALj6WFHg)zE{o}?A$3q4P|pa04iE~?+u1$A5fu5PL8>ZZD;Zm6s34|PRdR+rQr
zbzj|6chv*cSNGAqbuZmrKT^$gx)o}Q~`>p6Osp05|^g?f=L(2MmFy;LvL%k{TdktcUZXea)q0D5VT=AZjW)PWN|{=(@P~W5
z=6}4f`gmatYYibPwnOjKyYz0oNAJ}?>wUV|)8Z~}!kC%|z}UWB?OKY*%0(B#uT@%Z
z9^ceFOfIT3&Hs^~n?@ym(ZA~b`hY&D59!1Dh(4;1=|8PR?+wv=nc8Fc43BI6M_nVi
z^tCVW_v{IMQlHX~7ibGbn}3}o{^2{V&u9VlVW_WKXB>ZLoYm*_d3`|_70~`tVf$@v
z|4m=im-J=rUgpI`jlnvPr{$P+yDJ{2KYc~=opKv*cjeG4`j)<_Z|Fbt@A|sFrmyPT
z`i?FM{&$moR6jW&Bt-Ej{kh(HyWCq~y<(4acek6{!|mzza(lad++t4(Pa1GmjqRk6
zq@a;ReuLb>?l5<#JH#FCj&S`zQI);eAf-&mL%xL8<$vrLg_l#jUMsE}_=YI~
z^|mP;vPpfbi@p2Xo
z>L?z+Ki9_|>7$Bghr8R|cv4|^ge8YJ81L{H{<&SrbHF|59(517hutIY
zzpU6-UrKJ*u)gA4sDI6Y`sT(G~1*RNdjKOYUV?u-W0s0gYPnXY7i5)xG9EUf_DX
zj_cvyXeMud-TmDaP~Q~waiL`$ep)CxO*wD!`@_BA-ga-gcidaF(Hn9|R#
zJij5%pp=~aONWZ_V@S~f3r~Kuv2E+ts=*H+MGa+AS_Wl4J(s+%j2%_?MfJ6@tLs)*
z6O27lx0;%0?0sHLGPX)cwT}bya%U@RMw(G(wE4n}F=Nd*^Q9SYzA|5%31*_1WG0&_
z<{LBBOf%C>U}58vO~2yZCYafLgo%$g!sgg8FL$J|#wJ82`@)wieq<>+$-=Yer;nl<
zf4+eExj9*FvorI9I(zdw=49kil^JHHnPq01IcBa|VCI?mW}#VR7MlXI#4I(-%yRRs
zSz*32E6w+2m04}pn6;+LpEQL$ZhNx#)Be!=OoL}HzTt48n?!VT_`#>>#0pQ9igD!z
zv(aoao6Q!p)f9Vn1v~Ix683*P;-SM2K+o@A>L;_!>@eHSPP5DGHhauo^RwA!elex~
zb#(n$JTl!p
z|FVM3-o|F-H}QFO_w?`xsBU4?Vv=5Nruaea>7nKKmY>?5))bzM?&;~}>Fv<~Pj>tq
zhuuq!=U)4G`g(w^5uf58bDeAYdHQ<g1^f-<@;U1~hVnsI
zU>Cm9qJq)A9ez5XK4M?d`oG#b!lOs?ibsC|oiQRG*n?ww_?XOCsT?PM>DbY)27gAA
zutt-`DXbrT!xqz1#c9x)F3u2VLYgJc7U!_V^;~hDI3LmiaiM5yyjIOuLNDW$5_-A#
zt+)cp0ZPc}m7woXLo3Da*^+vdxEeZZpmbf5)=K#Yah*f!ogW?A@OZhAYhTctptD)r
zQVt8+D*hzeEw5E;Sz7upt#@-(X}w3}3tvX>GddIS$&yT%4)odvhpg*(iN2Hs?=YT@^$fd@elEacvHkHElamVe!WzV
zZi{!syW%~zyuJ^eW8wqY!Z{)<55-4fH-1nq?{tUML+mN`5_^k%#J;RQ^%MI;o7J@T
z3l(S>mn+b4Xva6L-mxMf)u~8`bt)2aol0^+E8$KKkP8|h7c@XFXnKeCUXTyr>!>FsepKjH(eL
zqiTfAs5&7us!m9asuN$^AwH>5gwH?G=wH@SLwF!Y&Z5k>{t4d&!q;9Y^9XE%}!t0hl8RSVKoLFh@c#M^Z3HVlZcdbUjg=B-*c&s{0(|UUhhG
z0S89%Rmb7zi=8d?bEG_1oF~o~7l;eRMPh-tSX?45g|tlMDGe@vE3Oc~6MZXX@x8c8
zTrI8<*NQ)g>%{fqkKzV#qqs@jEN&6Eia&|lL`+lEmC1*?4ide(&aO9Qfl#k5A=Rr(
zi1q3ca=j3qxPVCZLU`(db&&0aI6Ps&BHasd5buRJ*7L^4zIyU?P|ra&SI@!MU_Ixu
zl=<18%VVVmQC&R;VPZW8iCsMhkzG9pnO!{xp}^i1r##PZ8l>146pj
zfcl8Y_ZrHVR3qxgN-+w1`MBoF^JsLMRwcgvHYP-djR~2dFOrZNM$%#tv0)_PXET!UgBc~QQPLVkXpNHAC~1w>JX1l@
z4kE^A2N`2DA!LlE72i)-UPRIuO{>`$y$1U9S}X{0V+`@M1&hEjhLAYM&;}8i
zV+?H)kvhiE77@8)3?X=op=~0P$5_o%7ZmFtdyJL0ELPsESb3Xb9lSxYgitb;e267u
z3Atn}?G=9(_ldu-aT?)doP%^S4pSTKK@kCE932)BQO40x@tAmAL`)e+C)s$7pfcV;
zQW@{?WI`6Wx|1*QZFgvz)gu~Ehs@F22F7KN>=Lh!wU5m
zk%cA@!q5al8k#^ntHB}=ytT(0pO{sZPzRKRD
z1Kj#1xAOg;EX~Q%oGi`B(wrrE{`!Uc4Y;key11i{F;Rzb%JvAzinSPFv7LZfz;Q
zaV_OHu9a-rO16AQBVc|mF4C5?&UuaP-&)r%_^};N@^@_)^2{dhe;8`dzF*0%`EWZ9
zU0lv2EU{Hvtd%HSOKsB@eFnVHGOTEdDWxSgut(l+WP5#BotMRV8G_R-nEX*!$El2y
z&x5bK=ttiD>_vvZ9UoEf8?idAk(4w-=1r&Sf@jqjyaz{SG$8!GxPFO
zGdp=hqrzgt;zA>%I%Gt(PxpGg86DCx;v-`lr^Sc2kM%}HH;#+!5EUI6nVu2bxP3-s
zbfu__*!0M_h?w?i5shObGrZ|BQL%Bc1;sLsI8Ix8*4sX)ZLzLhGSc$BtrGd@t-Wa(
z&mFy>Q-{T>V8mbNI!!yorN^X4XSC0VY2P?5Jv=I|Lv%!Vcy#-;Xs9Qm7;i*)T5N{`UlwP*Q*v%r)@@Q+`X#4jWw!5{@3zWJ
z@8p-1nU|iHn_;)-R%ZSVd4J-h1jqXqr{ndh(w=l}mG52qnXif+~E`{k&+C
fQrX_m?I)jCE?FWkvvZd$Z}Y#WWfhd`9_aiJ2euhelma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
helma-0.8.4.3: HELMA - Haskellish Esoteric Limited Minimal Automaton
Please see the README on GitHub at https://github.com/helvm/helma#readme
Modules

\ No newline at end of file
+helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
helma-0.8.4.4: HELMA - Haskellish Esoteric Limited Minimal Automaton
Please see the README on GitHub at https://github.com/helvm/helma#readme
Modules

\ No newline at end of file
diff --git a/docs/reports/stan.html b/docs/reports/stan.html
index 0244b3e27..8661af809 100644
--- a/docs/reports/stan.html
+++ b/docs/reports/stan.html
@@ -1,5 +1,5 @@
 
-Stan Report
Stan Report
This is the Haskell Static Analysis report generated by Stan
Stan Info
In this section, you can find the general information about the used Stan tool, compile-time and run-time environment variables and settings, including build information, system data and execution configurations.
Stan Version
Version0.0.1.0
Git Revisiondcbc8682a964ae6f642ae37adbd46f6545d39aa6
Release DateFri Jul 29 13:18:20 2022 +0100
System Info
Operating Systemlinux
Architecturex86_64
Compilerghc
Compiler Version8.10
Environment
Environment VariablesSTAN_USE_DEFAULT_CONFIG=True
TOML configuration files/home/kamil-adam/git/helvm/helma/.stan.toml
CLI arguments-s --hide-solution report
Project Info
Information about the analysed project
Project namehelma
Cabal Fileshelma.cabal
HIE Files Directory.hie
Files Number128
Analysis Info
Summary stats from the static analysis
Modules128
LoC5666
Extensions30
SafeHaskell Extensions0
Available inspections44
Checked inspections44
Found Observations0
Ignored Observations0
Static Analysis Summary
Here you can find the overall conclusion based on the various metadata and gathered information during the work of Stan on this project.
  • Project health: 100%
    This number was calculated based on the total number of used inspections and the number of triggered inspections in the project. The calculated number also defines the overall project health status.
  • The project is healthy
    Excellent work! Stan does not have any suggestions for your code.
  • Congratulations! Your project has zero suggestions!
    Stan carefully ran all configured inspection and found 0 observations for the project.
Observations
Based on the analysis results, Stan found several areas for improvement in the analysed files. In Stan terminology, we call these findings Observations. Below you can see the more detailed information about each observation, and find the possible ways to fix them for your project.
Configurations
This section describes the final Stan configuration that was used on the project and explains how this result was assembled. Stan runtime settings have many parts, and each of them can come from different configuration sources. Stan is using Environment variables, TOML configuration file and CLI arguments to get the final results. If some option is specified through the multiple sources, the most prioritized one is used. 
ActionFilterScope
Configuration Process Information
Information and warnings that were gathered during the configuration assemble process. This helps to understand how different parts of the configurations were retrieved.
  • No TOML value is specified for key: check
  • No CLI option specified for: checks
  • configChecks is set through the source: TOML
  • No TOML value is specified for key: remove
  • No CLI option specified for: remove
  • configRemoved is set through the source: TOML
  • No TOML value is specified for key: ignore
  • No CLI option specified for: ignore
  • configIgnored is set through the source: TOML
Report Explained
Inspections
List of Inspections used for analysing the project
Inspection STAN-0001
Partial: base/head
Usage of partial function 'head' for lists
Warning
  • Partial
  • List
Possible solutions
  • Replace list with 'NonEmpty' from 'Data.List.NonEmpty'
  • Use explicit pattern-matching over lists
Inspection STAN-0002
Partial: base/tail
Usage of partial function 'tail' for lists
Warning
  • Partial
  • List
Possible solutions
  • Replace list with 'NonEmpty' from 'Data.List.NonEmpty'
  • Use explicit pattern-matching over lists
Inspection STAN-0003
Partial: base/init
Usage of partial function 'init' for lists
Warning
  • Partial
  • List
Possible solutions
  • Replace list with 'NonEmpty' from 'Data.List.NonEmpty'
  • Use explicit pattern-matching over lists
Inspection STAN-0004
Partial: base/last
Usage of partial function 'last' for lists
Warning
  • Partial
  • List
Possible solutions
  • Replace list with 'NonEmpty' from 'Data.List.NonEmpty'
  • Use explicit pattern-matching over lists
Inspection STAN-0005
Partial: base/!!
Usage of partial function '!!' for lists
Warning
  • Partial
  • List
Inspection STAN-0006
Partial: base/cycle
Usage of partial function 'cycle' for lists
Warning
  • Partial
  • List
Possible solutions
  • Replace list with 'NonEmpty' from 'Data.List.NonEmpty'
  • Use explicit pattern-matching over lists
Inspection STAN-0007
Partial: base/genericIndex
Usage of partial function 'genericIndex' for lists
Warning
  • Partial
  • List
Inspection STAN-0008
Partial: base/fromJust
Usage of partial function 'fromJust' for 'Maybe'
Warning
  • Partial
Possible solutions
  • Use explicit pattern-matching over Maybe
  • Use one of the standard functions: 'maybe', 'fromMaybe'
Inspection STAN-0009
Partial: base/read
Usage of partial function 'read' for parsing 'String'
Warning
  • Partial
Possible solutions
  • Use 'readMaybe' or 'readEither' to handle failed parsing
Inspection STAN-0010
Partial: base/succ
Usage of partial function 'succ' for enumerable types
Warning
  • Partial
Possible solutions
  • Use '(+ 1)' for integral types (but be aware of arithmetic overflow)
  • {Extra dependency} Use 'next' from 'Relude.Extra.Enum' in 'relude'
Inspection STAN-0011
Partial: base/pred
Usage of partial function 'pred' for enumerable types
Warning
  • Partial
Possible solutions
  • Use '(- 1)' for integral types (but be aware of arithmetic overflow)
  • {Extra dependency} Use 'prev' from 'Relude.Extra.Enum' in 'relude'
Inspection STAN-0012
Partial: base/toEnum
Usage of partial function 'toEnum' for enumerable types
Warning
  • Partial
Possible solutions
  • {Extra dependency} Use 'safeToEnum' from 'Relude.Extra.Enum' in 'relude'
Inspection STAN-0013
Partial: base/maximum
Usage of partial function 'maximum' for 
Warning
  • Partial
Inspection STAN-0014
Partial: base/minimum
Usage of partial function 'minimum' for 
Warning
  • Partial
Inspection STAN-0015
Partial: base/maximumBy
Usage of partial function 'maximumBy' for 
Warning
  • Partial
Inspection STAN-0016
Partial: base/minimumBy
Usage of partial function 'minimumBy' for 
Warning
  • Partial
Inspection STAN-0017
Partial: base/foldl1
Usage of partial function 'foldl1' for 
Warning
  • Partial
Inspection STAN-0018
Partial: base/foldl1'
Usage of partial function 'foldl1'' for lists
Warning
  • Partial
  • List
Possible solutions
  • Replace list with 'NonEmpty' from 'Data.List.NonEmpty'
  • Use explicit pattern-matching over lists
Inspection STAN-0019
Partial: base/foldr1
Usage of partial function 'foldr1' for 
Warning
  • Partial
Inspection STAN-0020
Partial: base/fromList
Usage of partial function 'fromList' for 
Warning
  • Partial
Inspection STAN-0021
Partial: base/fromInteger
Usage of partial function 'fromInteger' for 
Warning
  • Partial
Inspection STAN-0101
Infinite: base/reverse
Usage of the 'reverse' function that hangs on infinite lists
PotentialBug
  • Infinite
  • List
Possible solutions
  • Don't use 'reverse' if you expect your function to work with infinite lists
  • {Extra dependency} Use the 'slist' library for fast and safe functions on infinite lists
Inspection STAN-0102
Infinite: base/isSuffixOf
Usage of the 'isSuffixOf' function that hangs on infinite lists
PotentialBug
  • Infinite
  • List
Possible solutions
  • Don't use 'isSuffixOf' if you expect your function to work with infinite lists
  • {Extra dependency} Use the 'slist' library for fast and safe functions on infinite lists
Inspection STAN-0103
Infinite: base/length
Usage of the 'length' function that hangs on infinite lists
PotentialBug
  • Infinite
  • List
Possible solutions
  • Don't use 'length' if you expect your function to work with infinite lists
  • {Extra dependency} Use the 'slist' library for fast and safe functions on infinite lists
Inspection STAN-0104
Infinite: base/genericLength
Usage of the 'genericLength' function that hangs on infinite lists
PotentialBug
  • Infinite
  • List
Possible solutions
  • Don't use 'genericLength' if you expect your function to work with infinite lists
  • {Extra dependency} Use the 'slist' library for fast and safe functions on infinite lists
Inspection STAN-0105
Infinite: base/sum
Usage of the 'sum' function that hangs on infinite lists
PotentialBug
  • Infinite
  • List
Possible solutions
  • Don't use 'sum' if you expect your function to work with infinite lists
  • {Extra dependency} Use the 'slist' library for fast and safe functions on infinite lists
Inspection STAN-0106
Infinite: base/product
Usage of the 'product' function that hangs on infinite lists
PotentialBug
  • Infinite
  • List
Possible solutions
  • Don't use 'product' if you expect your function to work with infinite lists
  • {Extra dependency} Use the 'slist' library for fast and safe functions on infinite lists
Inspection STAN-0201
Anti-pattern: [0 .. length xs]
Creating a list with wrong number of indices
PotentialBug
  • AntiPattern
Possible solutions
  • Replace '[0 .. length xs]' with '[0 .. length xs - 1]'
  • Use 'zip [0 ..] xs` to work with list of pairs: index and element
Inspection STAN-0202
Anti-pattern: foldl
Usage of space-leaking function 'foldl'
Error
  • SpaceLeak
  • AntiPattern
Possible solutions
  • Replace 'foldl' with 'foldl''
  • Use 'foldr (flip . f)` instead of 'foldl f'
Inspection STAN-0203
Anti-pattern: Data.ByteString.Char8.pack
Usage of 'pack' function that doesn't handle Unicode characters
Error
  • AntiPattern
Possible solutions
  • Convert to 'Text' and use 'encodeUtf8' from 'Data.Text.Encoding'
  • {Extra dependency} Use 'encodeUtf8' from 'relude'
  • {Extra dependency} Use the 'utf8-string' package
Inspection STAN-0204
Anti-pattern: HashMap size
Usage of 'size' or 'length' for 'HashMap' that runs in linear time
Performance
  • AntiPattern
Possible solutions
  • {Extra dependency} Switch to 'Map' from 'containers'
Inspection STAN-0205
Anti-pattern: HashSet size
Usage of 'size' or 'length' for 'HashSet' that runs in linear time
Performance
  • AntiPattern
Possible solutions
  • {Extra dependency} Switch to 'Set' from 'containers'
Inspection STAN-0206
Data types with non-strict fields
Defining lazy fields in data types can lead to unexpected space leaks
Performance
  • SpaceLeak
  • Syntax
Possible solutions
  • Add '!' before the type, e.g. !Int or !(Maybe Bool)
  • Enable the 'StrictData' extension: {-# LANGUAGE StrictData #-}
Inspection STAN-0207
Anti-pattern: Foldable methods on possibly error-prone structures
Usage of Foldable methods on (,), Maybe, Either
PotentialBug
  • AntiPattern
Possible solutions
  • Use more explicit functions with specific monomorphic types
Inspection STAN-0208
Anti-pattern: Slow 'length' for Text
Usage of 'length' for 'Text' that runs in linear time
Performance
  • AntiPattern
Possible solutions
  • {Extra dependency} Switch to 'ByteString' from 'bytestring'
Inspection STAN-0209
Anti-pattern: Slow 'nub' for lists
Usage of 'nub' on lists that runs in quadratic time
Performance
  • AntiPattern
Possible solutions
  • {Extra dependency} Switch list to 'Set' from 'containers'
  • {Extra dependency} Use 'ordNub/hashNub/sortNub/unstableNub' from 'relude'
  • {Extra dependency} Use 'nubOrd' from 'containers'
  • {Extra dependency} Use 'nubOrd' from 'extra'
Inspection STAN-0210
Anti-pattern: Slow 'for_' on ranges
Usage of 'for_' or 'forM_' on numerical ranges is slow
Performance
  • AntiPattern
Possible solutions
  • {Extra dependency} Use 'loop' library for fast monadic looping
Inspection STAN-0211
Anti-pattern: '</>' for URLs
Usage of '</>' for URLs results in the errors on Windows
Error
  • AntiPattern
Possible solutions
  • {Extra dependency} Use type-safe library for URLs
  • Concatenate URLs with slashes '/'
Inspection STAN-0212
Anti-pattern: unsafe functions
Usage of unsafe functions breaks referential transparency
Error
  • Unsafe
  • AntiPattern
Possible solutions
  • Remove 'undefined' or at least replace with 'error' to give better error messages
  • Replace 'unsafeCoerce' with 'coerce'
  • Rewrite the code to avoid using 'unsafePerformIO' and other unsafe IO functions
Inspection STAN-0213
Anti-pattern: Pattern matching on '_'
Pattern matching on '_' for sum types can create maintainability issues
Warning
  • AntiPattern
Possible solutions
  • Pattern match on each constructor explicitly
  • Add meaningful names to holes, e.g. '_anyOtherFailure'
Inspection STAN-0214
Anti-pattern: use 'compare'
Usage of multiple comparison operators instead of single 'compare'
Performance
  • AntiPattern
Possible solutions
  • Rewrite code to use single 'compare' instead of many comparison operators
Inspection STAN-0215
Anti-pattern: Slashes in paths
Usage of '/' or '\' in paths results in the errors on different operation systems
Error
  • AntiPattern
Possible solutions
  • {Extra dependency} Use '</>' operator from 'filepath'
Inspection STAN-0301
Missing fixity declaration for operator
Using the implicit default fixity for operator: infixl 9
Style
  • Syntax
Possible solutions
  • Add 'infix[l|r]' declaration to the operator with explicit precedence
Inspection STAN-0302
Big tuples
Using tuples of big size (>= 4) can decrease code readability
Style
  • AntiPattern
  • Syntax
Possible solutions
  • Consider defining and using a custom data type to improve code comprehension
Severity
We are using the following severity system to indicate the observation level
SeverityDescription
StyleCode style issues. Usually harmless.
PerformanceSerious defects that could cause slowness and space leaking.
PotentialBugHuman errors in code.
WarningPotential runtime errors on some inputs.
ErrorDangerous behaviour.