fix: "int 1" in clear program

joe-p · joe-p · commit cd7d5614133a · 2023-09-05T10:40:43.000-04:00
diff --git a/examples/simple/SimpleClient.ts b/examples/simple/SimpleClient.ts
@@ -81,7 +81,7 @@ export const APP_SPEC: AppSpec = {
   },
   "source": {
     "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCnR4biBBcHBsaWNhdGlvbklECmludCAwCj4KaW50IDYKKgp0eG4gT25Db21wbGV0aW9uCisKc3dpdGNoIGNyZWF0ZV9Ob09wIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgY2FsbF9Ob09wCgpOT1RfSU1QTEVNRU5URUQ6CgllcnIKCmFiaV9yb3V0ZV9pbmNyOgoJLy8gbm8gZHVwbiBuZWVkZWQKCXR4bmEgQXBwbGljYXRpb25BcmdzIDEKCWJ0b2kKCWNhbGxzdWIgaW5jcgoJaW50IDEKCXJldHVybgoKaW5jcjoKCXByb3RvIDEgMAoKCS8vIGV4YW1wbGVzL3NpbXBsZS9zaW1wbGUuYWxnby50czo3CgkvLyB0aGlzLmNvdW50ZXIudmFsdWUgPSB0aGlzLmNvdW50ZXIudmFsdWUgKyBpCglieXRlICJjb3VudGVyIgoJYnl0ZSAiY291bnRlciIKCWFwcF9nbG9iYWxfZ2V0CglmcmFtZV9kaWcgLTEgLy8gaTogdWludDY0CgkrCglhcHBfZ2xvYmFsX3B1dAoJcmV0c3ViCgphYmlfcm91dGVfZGVjcjoKCS8vIG5vIGR1cG4gbmVlZGVkCgl0eG5hIEFwcGxpY2F0aW9uQXJncyAxCglidG9pCgljYWxsc3ViIGRlY3IKCWludCAxCglyZXR1cm4KCmRlY3I6Cglwcm90byAxIDAKCgkvLyBleGFtcGxlcy9zaW1wbGUvc2ltcGxlLmFsZ28udHM6MTEKCS8vIHRoaXMuY291bnRlci52YWx1ZSA9IHRoaXMuY291bnRlci52YWx1ZSAtIGkKCWJ5dGUgImNvdW50ZXIiCglieXRlICJjb3VudGVyIgoJYXBwX2dsb2JhbF9nZXQKCWZyYW1lX2RpZyAtMSAvLyBpOiB1aW50NjQKCS0KCWFwcF9nbG9iYWxfcHV0CglyZXRzdWIKCmFiaV9yb3V0ZV9hZGQ6CgkvLyBubyBkdXBuIG5lZWRlZAoJdHhuYSBBcHBsaWNhdGlvbkFyZ3MgMgoJdHhuYSBBcHBsaWNhdGlvbkFyZ3MgMQoJY2FsbHN1YiBhZGQKCWludCAxCglyZXR1cm4KCmFkZDoKCXByb3RvIDIgMAoKCS8vIGV4YW1wbGVzL3NpbXBsZS9zaW1wbGUuYWxnby50czoxNQoJLy8gcmV0dXJuIGEgKyBiOwoJZnJhbWVfZGlnIC0xIC8vIGE6IHVpbnQyNTYKCWZyYW1lX2RpZyAtMiAvLyBiOiB1aW50MjU2CgliKwoJYnl0ZSAweEZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkYKCWImCglkdXBuIDIKCWJ5dGUgMHhGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGCgliPD0KCWFzc2VydAoJbGVuCglpbnQgMzIKCS0KCWludCAzMgoJZXh0cmFjdDMKCWJ5dGUgMHgxNTFmN2M3NQoJc3dhcAoJY29uY2F0Cglsb2cKCXJldHN1YgoKYWJpX3JvdXRlX3N1YjoKCS8vIG5vIGR1cG4gbmVlZGVkCgl0eG5hIEFwcGxpY2F0aW9uQXJncyAyCgl0eG5hIEFwcGxpY2F0aW9uQXJncyAxCgljYWxsc3ViIHN1YgoJaW50IDEKCXJldHVybgoKc3ViOgoJcHJvdG8gMiAwCgoJLy8gZXhhbXBsZXMvc2ltcGxlL3NpbXBsZS5hbGdvLnRzOjE5CgkvLyByZXR1cm4gYSAtIGI7CglmcmFtZV9kaWcgLTEgLy8gYTogdWludDI1NgoJZnJhbWVfZGlnIC0yIC8vIGI6IHVpbnQyNTYKCWItCglieXRlIDB4RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRgoJYiYKCWR1cG4gMgoJYnl0ZSAweEZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkYKCWI8PQoJYXNzZXJ0CglsZW4KCWludCAzMgoJLQoJaW50IDMyCglleHRyYWN0MwoJYnl0ZSAweDE1MWY3Yzc1Cglzd2FwCgljb25jYXQKCWxvZwoJcmV0c3ViCgphYmlfcm91dGVfZGVmYXVsdFRFQUxTY3JpcHRDcmVhdGU6CglpbnQgMQoJcmV0dXJuCgpjcmVhdGVfTm9PcDoKCXR4biBOdW1BcHBBcmdzCglieiBhYmlfcm91dGVfZGVmYXVsdFRFQUxTY3JpcHRDcmVhdGUKCWVycgoKY2FsbF9Ob09wOgoJbWV0aG9kICJpbmNyKHVpbnQ2NCl2b2lkIgoJbWV0aG9kICJkZWNyKHVpbnQ2NCl2b2lkIgoJbWV0aG9kICJhZGQodWludDI1Nix1aW50MjU2KXVpbnQyNTYiCgltZXRob2QgInN1Yih1aW50MjU2LHVpbnQyNTYpdWludDI1NiIKCXR4bmEgQXBwbGljYXRpb25BcmdzIDAKCW1hdGNoIGFiaV9yb3V0ZV9pbmNyIGFiaV9yb3V0ZV9kZWNyIGFiaV9yb3V0ZV9hZGQgYWJpX3JvdXRlX3N1YgoJZXJy",
-    "clear": "I3ByYWdtYSB2ZXJzaW9uIDkKLy8gZXhhbXBsZXMvc2ltcGxlL3NpbXBsZS5hbGdvLnRzOjIzCi8vIHRoaXMuY291bnRlci52YWx1ZSA9IHRoaXMuY291bnRlci52YWx1ZSArIDEKYnl0ZSAiY291bnRlciIKYXBwX2dsb2JhbF9nZXQKYnl0ZSAiY291bnRlciIKYnl0ZSAiY291bnRlciIKYXBwX2dsb2JhbF9nZXQKaW50IDEKKwphcHBfZ2xvYmFsX3B1dA=="
+    "clear": "I3ByYWdtYSB2ZXJzaW9uIDkKLy8gZXhhbXBsZXMvc2ltcGxlL3NpbXBsZS5hbGdvLnRzOjIzCi8vIHRoaXMuY291bnRlci52YWx1ZSA9IHRoaXMuY291bnRlci52YWx1ZSArIDEKYnl0ZSAiY291bnRlciIKYXBwX2dsb2JhbF9nZXQKYnl0ZSAiY291bnRlciIKYnl0ZSAiY291bnRlciIKYXBwX2dsb2JhbF9nZXQKaW50IDEKKwphcHBfZ2xvYmFsX3B1dAppbnQgMQ=="
   },
   "contract": {
     "name": "Simple",
diff --git a/examples/simple/artifacts/Simple.clear.teal b/examples/simple/artifacts/Simple.clear.teal
@@ -8,4 +8,5 @@ byte "counter"
 app_global_get
 int 1
 +
-app_global_put
+app_global_put
+int 1
diff --git a/examples/simple/artifacts/Simple.json b/examples/simple/artifacts/Simple.json
@@ -55,7 +55,7 @@
   },
   "source": {
     "approval": "I3ByYWdtYSB2ZXJzaW9uIDkKCnR4biBBcHBsaWNhdGlvbklECmludCAwCj4KaW50IDYKKgp0eG4gT25Db21wbGV0aW9uCisKc3dpdGNoIGNyZWF0ZV9Ob09wIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgTk9UX0lNUExFTUVOVEVEIE5PVF9JTVBMRU1FTlRFRCBOT1RfSU1QTEVNRU5URUQgY2FsbF9Ob09wCgpOT1RfSU1QTEVNRU5URUQ6CgllcnIKCmFiaV9yb3V0ZV9pbmNyOgoJLy8gbm8gZHVwbiBuZWVkZWQKCXR4bmEgQXBwbGljYXRpb25BcmdzIDEKCWJ0b2kKCWNhbGxzdWIgaW5jcgoJaW50IDEKCXJldHVybgoKaW5jcjoKCXByb3RvIDEgMAoKCS8vIGV4YW1wbGVzL3NpbXBsZS9zaW1wbGUuYWxnby50czo3CgkvLyB0aGlzLmNvdW50ZXIudmFsdWUgPSB0aGlzLmNvdW50ZXIudmFsdWUgKyBpCglieXRlICJjb3VudGVyIgoJYnl0ZSAiY291bnRlciIKCWFwcF9nbG9iYWxfZ2V0CglmcmFtZV9kaWcgLTEgLy8gaTogdWludDY0CgkrCglhcHBfZ2xvYmFsX3B1dAoJcmV0c3ViCgphYmlfcm91dGVfZGVjcjoKCS8vIG5vIGR1cG4gbmVlZGVkCgl0eG5hIEFwcGxpY2F0aW9uQXJncyAxCglidG9pCgljYWxsc3ViIGRlY3IKCWludCAxCglyZXR1cm4KCmRlY3I6Cglwcm90byAxIDAKCgkvLyBleGFtcGxlcy9zaW1wbGUvc2ltcGxlLmFsZ28udHM6MTEKCS8vIHRoaXMuY291bnRlci52YWx1ZSA9IHRoaXMuY291bnRlci52YWx1ZSAtIGkKCWJ5dGUgImNvdW50ZXIiCglieXRlICJjb3VudGVyIgoJYXBwX2dsb2JhbF9nZXQKCWZyYW1lX2RpZyAtMSAvLyBpOiB1aW50NjQKCS0KCWFwcF9nbG9iYWxfcHV0CglyZXRzdWIKCmFiaV9yb3V0ZV9hZGQ6CgkvLyBubyBkdXBuIG5lZWRlZAoJdHhuYSBBcHBsaWNhdGlvbkFyZ3MgMgoJdHhuYSBBcHBsaWNhdGlvbkFyZ3MgMQoJY2FsbHN1YiBhZGQKCWludCAxCglyZXR1cm4KCmFkZDoKCXByb3RvIDIgMAoKCS8vIGV4YW1wbGVzL3NpbXBsZS9zaW1wbGUuYWxnby50czoxNQoJLy8gcmV0dXJuIGEgKyBiOwoJZnJhbWVfZGlnIC0xIC8vIGE6IHVpbnQyNTYKCWZyYW1lX2RpZyAtMiAvLyBiOiB1aW50MjU2CgliKwoJYnl0ZSAweEZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkYKCWImCglkdXBuIDIKCWJ5dGUgMHhGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGCgliPD0KCWFzc2VydAoJbGVuCglpbnQgMzIKCS0KCWludCAzMgoJZXh0cmFjdDMKCWJ5dGUgMHgxNTFmN2M3NQoJc3dhcAoJY29uY2F0Cglsb2cKCXJldHN1YgoKYWJpX3JvdXRlX3N1YjoKCS8vIG5vIGR1cG4gbmVlZGVkCgl0eG5hIEFwcGxpY2F0aW9uQXJncyAyCgl0eG5hIEFwcGxpY2F0aW9uQXJncyAxCgljYWxsc3ViIHN1YgoJaW50IDEKCXJldHVybgoKc3ViOgoJcHJvdG8gMiAwCgoJLy8gZXhhbXBsZXMvc2ltcGxlL3NpbXBsZS5hbGdvLnRzOjE5CgkvLyByZXR1cm4gYSAtIGI7CglmcmFtZV9kaWcgLTEgLy8gYTogdWludDI1NgoJZnJhbWVfZGlnIC0yIC8vIGI6IHVpbnQyNTYKCWItCglieXRlIDB4RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRgoJYiYKCWR1cG4gMgoJYnl0ZSAweEZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkYKCWI8PQoJYXNzZXJ0CglsZW4KCWludCAzMgoJLQoJaW50IDMyCglleHRyYWN0MwoJYnl0ZSAweDE1MWY3Yzc1Cglzd2FwCgljb25jYXQKCWxvZwoJcmV0c3ViCgphYmlfcm91dGVfZGVmYXVsdFRFQUxTY3JpcHRDcmVhdGU6CglpbnQgMQoJcmV0dXJuCgpjcmVhdGVfTm9PcDoKCXR4biBOdW1BcHBBcmdzCglieiBhYmlfcm91dGVfZGVmYXVsdFRFQUxTY3JpcHRDcmVhdGUKCWVycgoKY2FsbF9Ob09wOgoJbWV0aG9kICJpbmNyKHVpbnQ2NCl2b2lkIgoJbWV0aG9kICJkZWNyKHVpbnQ2NCl2b2lkIgoJbWV0aG9kICJhZGQodWludDI1Nix1aW50MjU2KXVpbnQyNTYiCgltZXRob2QgInN1Yih1aW50MjU2LHVpbnQyNTYpdWludDI1NiIKCXR4bmEgQXBwbGljYXRpb25BcmdzIDAKCW1hdGNoIGFiaV9yb3V0ZV9pbmNyIGFiaV9yb3V0ZV9kZWNyIGFiaV9yb3V0ZV9hZGQgYWJpX3JvdXRlX3N1YgoJZXJy",
-    "clear": "I3ByYWdtYSB2ZXJzaW9uIDkKLy8gZXhhbXBsZXMvc2ltcGxlL3NpbXBsZS5hbGdvLnRzOjIzCi8vIHRoaXMuY291bnRlci52YWx1ZSA9IHRoaXMuY291bnRlci52YWx1ZSArIDEKYnl0ZSAiY291bnRlciIKYXBwX2dsb2JhbF9nZXQKYnl0ZSAiY291bnRlciIKYnl0ZSAiY291bnRlciIKYXBwX2dsb2JhbF9nZXQKaW50IDEKKwphcHBfZ2xvYmFsX3B1dA=="
+    "clear": "I3ByYWdtYSB2ZXJzaW9uIDkKLy8gZXhhbXBsZXMvc2ltcGxlL3NpbXBsZS5hbGdvLnRzOjIzCi8vIHRoaXMuY291bnRlci52YWx1ZSA9IHRoaXMuY291bnRlci52YWx1ZSArIDEKYnl0ZSAiY291bnRlciIKYXBwX2dsb2JhbF9nZXQKYnl0ZSAiY291bnRlciIKYnl0ZSAiY291bnRlciIKYXBwX2dsb2JhbF9nZXQKaW50IDEKKwphcHBfZ2xvYmFsX3B1dAppbnQgMQ=="
   },
   "contract": {
     "name": "Simple",
diff --git a/examples/simple/artifacts/Simple.src_map.json b/examples/simple/artifacts/Simple.src_map.json
@@ -5,7 +5,7 @@
       "simple.algo.ts"
     ],
     "names": [],
-    "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIE;;;AAAA;AAAA;AAAA;;;AACE;;AAAA;AADF;;AAIA;AAH4C;AAGvC;AAAA;;;;AAAL;;;AAJA;AAAK;AAKH;;;AAA0C;;AAD5C;AAIkB;;AAAd;AAAJ;AAAA;AAAA;;;AACE;;;AAAO;;;AAAI;AAAF;AAAA;;;AAAA;;;;AAAA;AAAA;AAAA;AAAT;;AAAA;AAAA;AAAA;AAAA;AAGF;AAHW;AAGO;AAAd;AAAJ;AAAA;AAAA;AAAA;AAAA;AARA;;;;;;AASW;;;AAAA;AAAA;AAAA;;;AAAA;;;;AAAT;AAAA;AAAA;AAAA;;AAAA;AAIA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAZqB;AADvB;;AASW;;;AART;AAIS;;;;;;AAIA;;;;;;AAAA;;;;;;AAAF;;;;;;AAJE;;;AAIA;;;;;;;;;;AAJA;AARY",
+    "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIE;;;AAAA;AAAA;AAAA;;;AACE;;AAAA;AADF;;AAIA;AAH4C;AAGvC;AAAA;;;;AAAL;;;AAJA;AAAK;AAKH;;;AAA0C;;AAD5C;AAIkB;;AAAd;AAAJ;AAAA;AAAA;;;AACE;;;AAAO;;;AAAI;AAAF;AAAA;;;AAAA;;;;AAAA;AAAA;AAAA;AAAT;;AAAA;AAAA;AAAA;AAAA;AAGF;AAHW;AAGO;AAAd;AAAJ;AAAA;AAAA;AAAA;AAAA;AARA;;;;;;AASW;;;AAAA;AAAA;AAAA;;;AAAA;;;;AAAT;AAAA;AAAA;AAAA;;AAAA;AAIA;AADiB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAXI;AADvB;;AASW;;;AART;AAIS;;;;;;AAIA;;;;;;AAAA;;;;;;AAAF;;;;;;AAJE;;;AAIA;;;;;;;;;;AAJA;AARY",
     "file": "Simple.approval.teal",
     "sourceRoot": ""
   },
@@ -15,7 +15,7 @@
       "simple.algo.ts"
     ],
     "names": [],
-    "mappings": ";;;;;;;;;;;;;;;;AAIE;AAAA;AAAA;AAAA;;;AACE;;;;;AAAA;AADF;AAIA;AAH4C;AAGvC;AAAA;;;;;AAAL;AAJA;AAAK;AAKH;;;AAA0C;;;;;AAD5C;AAIkB;AAAd;AAAJ;AAAA;AAAA;;;;AACE;AAAO;AAAI;AAAF;AAAA;;;AAAA;;;;;AAAA;AAAA;AAAA;AAAT;AAAA;AAAA;AAAA;AAAA;AAGF;AAHW;AAGO;AAAd;AAAJ;AAAA;AAAA;AAAA;AAAA;AARA;;;;;AASW;AAAA;AAAA;AAAA;;;AAAA;;;;;AAAT;AAAA;AAAA;AAAA;AAAA;AAIA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;AAZqB;AADvB;;;AASW;AART;AAIS;;;AAIA;AAAA;AAAF;AAJE;AAIA;AAJA;AARY",
+    "mappings": ";;;;;;;;;;;;;;;;AAIE;AAAA;AAAA;AAAA;;;AACE;;;;;AAAA;AADF;AAIA;AAH4C;AAGvC;AAAA;;;;;AAAL;AAJA;AAAK;AAKH;;;AAA0C;;;;;AAD5C;AAIkB;AAAd;AAAJ;AAAA;AAAA;;;;AACE;AAAO;AAAI;AAAF;AAAA;;;AAAA;;;;;AAAA;AAAA;AAAA;AAAT;AAAA;AAAA;AAAA;AAAA;AAGF;AAHW;AAGO;AAAd;AAAJ;AAAA;AAAA;AAAA;AAAA;AARA;;;;;AASW;AAAA;AAAA;AAAA;;;AAAA;;;;;AAAT;AAAA;AAAA;AAAA;AAAA;AAIA;AADiB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;AAXI;AADvB;;;AASW;AART;AAIS;;;AAIA;AAAA;AAAF;AAJE;AAIA;AAJA;AARY",
     "file": "Simple.approval.teal",
     "sourceRoot": ""
   }
diff --git a/src/lib/compiler.ts b/src/lib/compiler.ts
@@ -3478,6 +3478,7 @@ export default class Compiler {
 
     this.compilingApproval = false;
     this.processNode(fn.body!);
+    this.pushVoid(fn.body!, 'int 1');
     this.clearStateCompiled = true;
     this.compilingApproval = true;
   }

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,5 @@ byte "counter"`
`8`	`8`	`app_global_get`
`9`	`9`	`int 1`
`10`	`10`	`+`
`11`		`-app_global_put`
	`11`	`+app_global_put`
	`12`	`+int 1`
Original file line number	Diff line number	Diff line change
`@@ -3478,6 +3478,7 @@ export default class Compiler {`
`3478`	`3478`
`3479`	`3479`	`this.compilingApproval = false;`
`3480`	`3480`	`this.processNode(fn.body!);`
	`3481`	`+ this.pushVoid(fn.body!, 'int 1');`
`3481`	`3482`	`this.clearStateCompiled = true;`
`3482`	`3483`	`this.compilingApproval = true;`
`3483`	`3484`	`}`