From 394c9f894c48925b53da610d907b5a66ee1e61f0 Mon Sep 17 00:00:00 2001
From: "Kartik K. Agaram" <vc@akkartik.com>
Date: Mon, 11 Apr 2022 22:41:26 -0700
Subject: fix a few sample apps
Broken since Mar 18, when I started running tests in src/file.lua.
It's more than a little ugly that .lua files in src/ require helpers
inside .tlv apps.
---
chesstv.tlv | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
counter.tlv | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
hanoi.tlv | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
sieve.tlv | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 272 insertions(+)
diff --git a/chesstv.tlv b/chesstv.tlv
index 74acefd..f440fa1 100644
--- a/chesstv.tlv
+++ b/chesstv.tlv
@@ -16,6 +16,74 @@
#
# If these constraints are violated, Teliva may unceremoniously crash. Please
# report bugs at http://akkartik.name/contact
+- __teliva_timestamp: original
+ check:
+ >function check(x, msg)
+ > if x then
+ > Window:addch('.')
+ > else
+ > print('F - '..msg)
+ > print(' '..str(x)..' is false/nil')
+ > teliva_num_test_failures = teliva_num_test_failures + 1
+ > -- overlay first test failure on editors
+ > if teliva_first_failure == nil then
+ > teliva_first_failure = msg
+ > end
+ > end
+ >end
+- __teliva_timestamp: original
+ check_eq:
+ >function check_eq(x, expected, msg)
+ > if eq(x, expected) then
+ > Window:addch('.')
+ > else
+ > print('F - '..msg)
+ > print(' expected '..str(expected)..' but got '..str(x))
+ > teliva_num_test_failures = teliva_num_test_failures + 1
+ > -- overlay first test failure on editors
+ > if teliva_first_failure == nil then
+ > teliva_first_failure = msg
+ > end
+ > end
+ >end
+- __teliva_timestamp: original
+ eq:
+ >function eq(a, b)
+ > if type(a) ~= type(b) then return false end
+ > if type(a) == 'table' then
+ > if #a ~= #b then return false end
+ > for k, v in pairs(a) do
+ > if b[k] ~= v then
+ > return false
+ > end
+ > end
+ > for k, v in pairs(b) do
+ > if a[k] ~= v then
+ > return false
+ > end
+ > end
+ > return true
+ > end
+ > return a == b
+ >end
+- __teliva_timestamp: original
+ str:
+ >-- smarter tostring
+ >-- slow; used only for debugging
+ >function str(x)
+ > if type(x) == 'table' then
+ > local result = ''
+ > result = result..#x..'{'
+ > for k, v in pairs(x) do
+ > result = result..str(k)..'='..str(v)..', '
+ > end
+ > result = result..'}'
+ > return result
+ > elseif type(x) == 'string' then
+ > return '"'..x..'"'
+ > end
+ > return tostring(x)
+ >end
- __teliva_timestamp: original
Window:
>Window = curses.stdscr()
diff --git a/counter.tlv b/counter.tlv
index f8a34f8..f20033e 100644
--- a/counter.tlv
+++ b/counter.tlv
@@ -16,6 +16,74 @@
#
# If these constraints are violated, Teliva may unceremoniously crash. Please
# report bugs at http://akkartik.name/contact
+- __teliva_timestamp: original
+ check:
+ >function check(x, msg)
+ > if x then
+ > Window:addch('.')
+ > else
+ > print('F - '..msg)
+ > print(' '..str(x)..' is false/nil')
+ > teliva_num_test_failures = teliva_num_test_failures + 1
+ > -- overlay first test failure on editors
+ > if teliva_first_failure == nil then
+ > teliva_first_failure = msg
+ > end
+ > end
+ >end
+- __teliva_timestamp: original
+ check_eq:
+ >function check_eq(x, expected, msg)
+ > if eq(x, expected) then
+ > Window:addch('.')
+ > else
+ > print('F - '..msg)
+ > print(' expected '..str(expected)..' but got '..str(x))
+ > teliva_num_test_failures = teliva_num_test_failures + 1
+ > -- overlay first test failure on editors
+ > if teliva_first_failure == nil then
+ > teliva_first_failure = msg
+ > end
+ > end
+ >end
+- __teliva_timestamp: original
+ eq:
+ >function eq(a, b)
+ > if type(a) ~= type(b) then return false end
+ > if type(a) == 'table' then
+ > if #a ~= #b then return false end
+ > for k, v in pairs(a) do
+ > if b[k] ~= v then
+ > return false
+ > end
+ > end
+ > for k, v in pairs(b) do
+ > if a[k] ~= v then
+ > return false
+ > end
+ > end
+ > return true
+ > end
+ > return a == b
+ >end
+- __teliva_timestamp: original
+ str:
+ >-- smarter tostring
+ >-- slow; used only for debugging
+ >function str(x)
+ > if type(x) == 'table' then
+ > local result = ''
+ > result = result..#x..'{'
+ > for k, v in pairs(x) do
+ > result = result..str(k)..'='..str(v)..', '
+ > end
+ > result = result..'}'
+ > return result
+ > elseif type(x) == 'string' then
+ > return '"'..x..'"'
+ > end
+ > return tostring(x)
+ >end
- __teliva_timestamp: original
Window:
>Window = curses.stdscr()
diff --git a/hanoi.tlv b/hanoi.tlv
index 6794558..a78ac0d 100644
--- a/hanoi.tlv
+++ b/hanoi.tlv
@@ -16,6 +16,74 @@
#
# If these constraints are violated, Teliva may unceremoniously crash. Please
# report bugs at http://akkartik.name/contact
+- __teliva_timestamp: original
+ check:
+ >function check(x, msg)
+ > if x then
+ > Window:addch('.')
+ > else
+ > print('F - '..msg)
+ > print(' '..str(x)..' is false/nil')
+ > teliva_num_test_failures = teliva_num_test_failures + 1
+ > -- overlay first test failure on editors
+ > if teliva_first_failure == nil then
+ > teliva_first_failure = msg
+ > end
+ > end
+ >end
+- __teliva_timestamp: original
+ check_eq:
+ >function check_eq(x, expected, msg)
+ > if eq(x, expected) then
+ > Window:addch('.')
+ > else
+ > print('F - '..msg)
+ > print(' expected '..str(expected)..' but got '..str(x))
+ > teliva_num_test_failures = teliva_num_test_failures + 1
+ > -- overlay first test failure on editors
+ > if teliva_first_failure == nil then
+ > teliva_first_failure = msg
+ > end
+ > end
+ >end
+- __teliva_timestamp: original
+ eq:
+ >function eq(a, b)
+ > if type(a) ~= type(b) then return false end
+ > if type(a) == 'table' then
+ > if #a ~= #b then return false end
+ > for k, v in pairs(a) do
+ > if b[k] ~= v then
+ > return false
+ > end
+ > end
+ > for k, v in pairs(b) do
+ > if a[k] ~= v then
+ > return false
+ > end
+ > end
+ > return true
+ > end
+ > return a == b
+ >end
+- __teliva_timestamp: original
+ str:
+ >-- smarter tostring
+ >-- slow; used only for debugging
+ >function str(x)
+ > if type(x) == 'table' then
+ > local result = ''
+ > result = result..#x..'{'
+ > for k, v in pairs(x) do
+ > result = result..str(k)..'='..str(v)..', '
+ > end
+ > result = result..'}'
+ > return result
+ > elseif type(x) == 'string' then
+ > return '"'..x..'"'
+ > end
+ > return tostring(x)
+ >end
- __teliva_timestamp: original
render:
>function render(window)
diff --git a/sieve.tlv b/sieve.tlv
index e5852e5..d5cc295 100644
--- a/sieve.tlv
+++ b/sieve.tlv
@@ -16,6 +16,74 @@
#
# If these constraints are violated, Teliva may unceremoniously crash. Please
# report bugs at http://akkartik.name/contact
+- __teliva_timestamp: original
+ check:
+ >function check(x, msg)
+ > if x then
+ > Window:addch('.')
+ > else
+ > print('F - '..msg)
+ > print(' '..str(x)..' is false/nil')
+ > teliva_num_test_failures = teliva_num_test_failures + 1
+ > -- overlay first test failure on editors
+ > if teliva_first_failure == nil then
+ > teliva_first_failure = msg
+ > end
+ > end
+ >end
+- __teliva_timestamp: original
+ check_eq:
+ >function check_eq(x, expected, msg)
+ > if eq(x, expected) then
+ > Window:addch('.')
+ > else
+ > print('F - '..msg)
+ > print(' expected '..str(expected)..' but got '..str(x))
+ > teliva_num_test_failures = teliva_num_test_failures + 1
+ > -- overlay first test failure on editors
+ > if teliva_first_failure == nil then
+ > teliva_first_failure = msg
+ > end
+ > end
+ >end
+- __teliva_timestamp: original
+ eq:
+ >function eq(a, b)
+ > if type(a) ~= type(b) then return false end
+ > if type(a) == 'table' then
+ > if #a ~= #b then return false end
+ > for k, v in pairs(a) do
+ > if b[k] ~= v then
+ > return false
+ > end
+ > end
+ > for k, v in pairs(b) do
+ > if a[k] ~= v then
+ > return false
+ > end
+ > end
+ > return true
+ > end
+ > return a == b
+ >end
+- __teliva_timestamp: original
+ str:
+ >-- smarter tostring
+ >-- slow; used only for debugging
+ >function str(x)
+ > if type(x) == 'table' then
+ > local result = ''
+ > result = result..#x..'{'
+ > for k, v in pairs(x) do
+ > result = result..str(k)..'='..str(v)..', '
+ > end
+ > result = result..'}'
+ > return result
+ > elseif type(x) == 'string' then
+ > return '"'..x..'"'
+ > end
+ > return tostring(x)
+ >end
- __teliva_timestamp: original
menu:
>-- To show app-specific hotkeys in the menu bar, add hotkey/command
--
cgit 1.4.1-2-gfad0