From e2886e53033ec3a9efb59e4db1ac8b7c798efb7a Mon Sep 17 00:00:00 2001
From: Irmen de Jong <irmen@razorvine.net>
Date: Fri, 1 Apr 2022 20:50:24 +0200
Subject: [PATCH] x16 r39: update vtui lib and example

---
 .../src/prog8/ast/statements/AstStatements.kt    |   1 +
 docs/source/todo.rst                             |   1 -
 examples/cx16/vtui/VTUI0.8.BIN                   | Bin 1016 -> 0 bytes
 examples/cx16/vtui/VTUI0.9.BIN                   | Bin 0 -> 953 bytes
 examples/cx16/vtui/testvtui.p8                   |   4 ++--
 5 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 examples/cx16/vtui/VTUI0.8.BIN
 create mode 100644 examples/cx16/vtui/VTUI0.9.BIN

diff --git a/compilerAst/src/prog8/ast/statements/AstStatements.kt b/compilerAst/src/prog8/ast/statements/AstStatements.kt
index 0b1f8fe2f..3468c0d9d 100644
--- a/compilerAst/src/prog8/ast/statements/AstStatements.kt
+++ b/compilerAst/src/prog8/ast/statements/AstStatements.kt
@@ -1092,6 +1092,7 @@ class Pipe(override var source: Expression,
 // Calls to builtin functions will be replaced with this node just before handing the Ast to the codegen.
 // this is meant to eventually (?) be able to not have any FunctionCallStatement nodes to worry about anymore
 // in the codegen, because they have been converted into GoSub (for instance) or this node.
+// However, if/when the codegen is moved over to use the new CodeAst (PtProgram etc etc) this is all moot.
 class BuiltinFunctionCallStatement(override var target: IdentifierReference,
                                    override var args: MutableList<Expression>,
                                    override val position: Position) : Statement(), IFunctionCall {
diff --git a/docs/source/todo.rst b/docs/source/todo.rst
index 1e61518bf..77663a412 100644
--- a/docs/source/todo.rst
+++ b/docs/source/todo.rst
@@ -6,7 +6,6 @@ For next release
 - x16: add new keyboard APIs https://github.com/commanderx16/x16-docs/blob/master/Commander%20X16%20Programmer%27s%20Reference%20Guide.md#keyboard
 - x16: optimize diskio load_raw because headerless files are now supported https://github.com/commanderx16/x16-rom/pull/216
   note: must still work on c64/c128 that don't have this!
-- x16: fix wormfood (requires new VTUI lib)
 
 - vm codegen: When
 - vm codegen: Pipe expression
diff --git a/examples/cx16/vtui/VTUI0.8.BIN b/examples/cx16/vtui/VTUI0.8.BIN
deleted file mode 100644
index 0611db812ec3c5f2980cdedfe97e84740193bdad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1016
zcma)5O=}ZD7@nP(jrnMs^urpf$Rv%3;-SX~LW8H;4yXq`cyTV3MDXJv3I$=2yb#1l
zDhNFkCWmfu#7JBG0fHYm3bKL)k%Ay9?7<T7Q1D=Vx6z8F2bVp(^SsaV%)TE>h<8NZ
zBhn}GF_F)Syy?iiBi|AEiOBCn#vC#3$c7^iIr69@T8^|-9$*rfB*c_~nkiuBEO0Xh
zu2B#ZloZ2LKxaY%%%|B31Mag50k`Qa^0uRvc)&5(n_c3Q^e%>zY?}MLLv$mex1ua*
z$1QDhyB;ucZe6wVy1^5UM-Tq2=e0`W0~Eo7X_rPoCm+ZBT6C-rYeZ}&V0VVKdi3Yy
z-ojAbiqd0$^W|Ewx&?Y8G`_1jjkz!Cc1|bjLMtm8DO+kJtXg2<s4{1iEiLS@V!^GH
zl)0vWS6w3^1G~%ji(wD+mdCIOeKXk#hoLf7wx>y+x$X2KE$|U0b`y~yFTHPSHm7HW
zZl0|2=Fw{Gq0m)2M{f%~$MHk4fLgGIpYkFWgvvSrH|M=6OM`vp62#3FNSGUtG#4Rd
zO3($}<{0!q+ACWY^qJ$xIE{=6WQ;?~Td_RIo0Ev1Ky(UGiMs31WiF%gD)g8Os6A|5
z)Sg3D1z91oKBD%$jkWuXfH))|390C==%$T=`(ZFDd1$lbVmJT;8|CkuDTckUtBjq<
zwuHv1<utH4Uh@-Je$DR^{lt%BxY_f$Sgq!##USx1cHL(~^_)h`??LEIPWve&NBVA5
zc0_&>A%%?tx8P>>7^l8po8AR#GPn%CUC?B9zn<r<VO?-Xl6UD>8qlxIWA%dG4to_W
z&vP6?r}Oqd-6QLzP3u-c;{><Ewz^ljX?BL)si;XloE4wfr+(P(_Jkb>_C6u)Z#5&3
rgG~$>HfBSBY;XA)Z@-<UxSg+YJ7c(=Ps7oU*}tYQy$2f((LeDEEK!S&

diff --git a/examples/cx16/vtui/VTUI0.9.BIN b/examples/cx16/vtui/VTUI0.9.BIN
new file mode 100644
index 0000000000000000000000000000000000000000..86c086bf5e1d38fa10b241b26ce0bf34dc921e97
GIT binary patch
literal 953
zcma)4&ubGw7@eJ+jcIDzjj1*LahNpep%>{f2ce;-)DGB-3cYkLm0iIf2eA+kB4i+k
zM%sdqLtz%lmaa6K_8(BNN>`z*hk}%Xf>K<xl9MexSien5soI0X!p^+!eUJCO8HDmC
zdySZj*ayUX#GWgRDQq9Hu)?|(c2S|z3VWfj>k2a!x~;GhX5TOyRT)C`Xx%tkx9>i<
zmC1~Zj9wkP9Q?<x<k<9`dp9Rd|6}lX41t}TP@M@uoUG6sE<zNewEs}xvX6vn<G85`
zVyh++nx(9ey24k9M_|(zUnNs`9=22J9I;80s0GCQHjlH(!)m{rB`r!G5B@6kOCEtG
zFo1&{8V-PFJq-1|;8;q^pt$eqp86;$`SOYLv!pBsgzQO%QS`q518z_W-;acZ>SrD)
zQCT)?rG(@zoo#h9vn?*Kss1o`u5mY0JLA%tW@fl^p9@mZ942(pZ7ikzb`dqQkifZe
z+$5sMfU$Zlw5HWNR&a_8sk9qW9j)hgxmBA<$OS5`@dB|f6++8Y7H|d6P+1}17$zxt
zd*J6y$n&`ys-;BCSc;o%LN~IY8lBjBg6tS%v$Uc=4zGXx6!v}|1QvRZEu{TU(b=$b
zzMS@>;(`Ir;tjJg(N(1qVogY)R!Grq0b51;ER7*M4BO*4DxqT0?x0=B#*m4v_CO|p
z+3f&rB&6L6<e<L|I-5;)gy{&T5n4*qdmW`TAf0FpJ33s}kqBrk49G=NP0Exu6q(06
z*uy(&UM;2MY1mtDbCEzY%{W~Cf9iqs>alb+B_Y<+u)oy{#Ic$;&>YA@TNCulVeY_f
ztB<*zUf)Yp-z_>6IFO;QLN1L4VCOg2Nd5gBhDY-b9!&@y%`1PnDfXx6dj4rcf&T_B
Ct8qR6

literal 0
HcmV?d00001

diff --git a/examples/cx16/vtui/testvtui.p8 b/examples/cx16/vtui/testvtui.p8
index ac7734726..bfac7e06f 100644
--- a/examples/cx16/vtui/testvtui.p8
+++ b/examples/cx16/vtui/testvtui.p8
@@ -11,7 +11,7 @@ main {
         store_logo()
 
         txt.lowercase()
-        vtui.screen_set(2)
+        vtui.screen_set(0)
         vtui.clr_scr('%', $50)
         vtui.gotoxy(5,5)
         vtui.fill_box(':', 70, 50, $c6)
@@ -110,7 +110,7 @@ char_loop:
 
 vtui $1000 {
 
-    %asmbinary "VTUI0.8.BIN", 2     ; skip the 2 dummy load address bytes
+    %asmbinary "VTUI0.9.BIN", 2     ; skip the 2 dummy load address bytes
 
     ; NOTE: base address $1000 here must be the same as the block's memory address, for obvious reasons!
     ; The routines below are for VTUI 0.8