From 6dbe30064d1d58b21cbddb3f36a0cf597478d54d Mon Sep 17 00:00:00 2001
From: Philip Zembrod <pzembrod@google.com>
Date: Tue, 30 Jun 2020 23:35:18 +0200
Subject: [PATCH 1/7] Fix include so that printing the file name is outside the
 file open flow. Else include doesn't work if cr and type log to a file
 themselves.

---
 6502/C64/disks/file-words.d64 | Bin 174848 -> 174848 bytes
 6502/C64/disks/file-words.fth |  14 +++++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/6502/C64/disks/file-words.d64 b/6502/C64/disks/file-words.d64
index 29af1f0eabff64f4787c39868db241c2fda38c07..682dfd199d240496435dca38bad7eb3d55e03caa 100644
GIT binary patch
delta 165
zcmZp;#?^3*YlFN7ld-{OMU6L1l2!_OZk|4_evZDb3JOLpp#cicK?)&}0j`q+H7&)}
zkz`L^R`B=Jb@TCebeX(Rt80^vJPXj2$%+PRCU3B2QE+n&g3Bu?s4MvS`v)j^2E)ZB
opD@tpfE)1DKyk8yq2XkvAd$&-8obT34cliMGH#!3$dp<M0H0ql-2eap

delta 93
zcmZp;#?^3*YlFN7lcC9GMU6L1lLgE_Z2qgQ#KL4?Ia$$Q&E#(eT9fUKcqW?}3Qu;>
x-~zJQCi@#|Pd3s}<Ti2%4N!0nQV59*m=q*7*-nF_dA4EuY(vKFvkjS2D*?Zi9wPt%

diff --git a/6502/C64/disks/file-words.fth b/6502/C64/disks/file-words.fth
index 9c1342e..efc0dad 100644
--- a/6502/C64/disks/file-words.fth
+++ b/6502/C64/disks/file-words.fth
@@ -281,7 +281,7 @@
 
 \ *** Block No. 10, Hexblock a
 
-\ include loadscreen           14jun20pz
+\ include loadscreen           30jun20pz
 
 
   : i/o-status?  $90 c@ ;
@@ -300,9 +300,9 @@
   1 4 +thru
 
 
+  : .filename  2dup cr type ;
 
-
-
+  ' .filename IS on-fload
 
 
 
@@ -337,16 +337,16 @@
 
 \ *** Block No. 12, Hexblock c
 
-\   fload-open  fload-close    09jun20pz
+\   fload-open  fload-close    30jun20pz
 
 | : i/o-status?abort  i/o-status? IF cr
    fload-dev @ dos-error abort THEN ;
 
+  defer on-fload  ' noop is on-fload
 | : fload-open ( addr c -- )
- fload-dev @
+ on-fload  fload-dev @
  fload-2nd @ 1- dup fload-2nd !
- busopen
- 2dup cr type bustype
+ busopen bustype
  " ,s,r" count bustype busoff
  i/o-status?abort ;
 

From 83c123884033feef4f5f44fb52ebdf5b9d549dc0 Mon Sep 17 00:00:00 2001
From: Philip Zembrod <pzembrod@google.com>
Date: Tue, 30 Jun 2020 23:35:57 +0200
Subject: [PATCH 2/7] Log test output to file

---
 6502/C64/tests/logtofile.fth    | 27 +++++++++++++++++++++++++++
 6502/C64/tests/run-vf-tests.fth |  6 ++++++
 2 files changed, 33 insertions(+)
 create mode 100644 6502/C64/tests/logtofile.fth

diff --git a/6502/C64/tests/logtofile.fth b/6502/C64/tests/logtofile.fth
new file mode 100644
index 0000000..37a5ebd
--- /dev/null
+++ b/6502/C64/tests/logtofile.fth
@@ -0,0 +1,27 @@
+
+create log-dev  8 ,
+create log-2nd  2 ,
+: log-dev-2nd@ log-dev @ log-2nd @ ;
+
+: log-emit
+  dup c64emit log-dev-2nd@ busout bus! busoff ;
+
+: log-cr
+  c64cr log-dev-2nd@ busout #cr bus! busoff ;
+
+: log-type
+  2dup c64type log-dev-2nd@ busout bustype busoff ;
+
+Output: alsologtofile
+ log-emit log-cr log-type c64del c64page
+ c64at c64at? ;
+
+: logopen"
+  ascii " parse  log-dev-2nd@ busopen
+  2dup type
+  bustype " ,s,w" count bustype busoff
+  i/o-status? IF c64cr log-dev @ dos-error abort THEN
+  alsologtofile ;
+
+: logclose
+  log-dev-2nd@ busclose  display ;
diff --git a/6502/C64/tests/run-vf-tests.fth b/6502/C64/tests/run-vf-tests.fth
index a52fa64..f6b8d6c 100644
--- a/6502/C64/tests/run-vf-tests.fth
+++ b/6502/C64/tests/run-vf-tests.fth
@@ -1,4 +1,8 @@
 
+include logtofile.fth
+
+logopen" test.log"
+
 : \vf  [compile] \ ; immediate
 
 include ans-shim.fth
@@ -21,3 +25,5 @@ include coreexttest.fth
 include doubletest.fth
 
 REPORT-ERRORS
+
+logclose

From 7d8f24690caa9711ee72230d0034656824b3549a Mon Sep 17 00:00:00 2001
From: Philip Zembrod <pzembrod@google.com>
Date: Tue, 30 Jun 2020 23:38:45 +0200
Subject: [PATCH 3/7] check in updated testbase and testbase16 saved systems

---
 6502/C64/cbmfiles/testbase   | Bin 16370 -> 16408 bytes
 6502/C64/cbmfiles/testbase16 | Bin 16441 -> 16478 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/6502/C64/cbmfiles/testbase b/6502/C64/cbmfiles/testbase
index 1af77eaceb5ae5663dd9254eed1b48d01e2bf2b0..4eca2cb44e596d5dd46b5e446cdb84da037595ab 100644
GIT binary patch
delta 331
zcmexVKcj(hf+~}^$42!kSr$eQMvu))W&IR1cz76iTsh94(>-?P{J|rCHF!OiD>Jwy
zx#;nf0C6$@5g_f(v(a`kubsC3S67Z>2M=F4dF`nEa%GUbm;nDnfedaQ23I$JumQS<
z&z!$}RQKSSGs~3&Ca2qJGR9AyXeTQ?*NxNe%E?2z=P#W+9;K8c$;+^N@<BU8#<P<@
z+i9}0xIJ{!ovdgtD)!%v`N+vj%atwN*Ya<)6%$aAw|i=1IoZeFydETU(l&#ekHOiU
z`N;Xp%ax0Do=8_nyyTf6EX-i(4s^?GTT`I&Jo7wZ7KR=kOLt}$kn&mX%!dzNS+1OC
zZs~prXevY-Naa0OkO+@mh}}1<H_j7;fBXkp1{48V!^LpYom21F$umdK9Xxw<xiZIB
L-aPXv^9*hPV-tPN

delta 278
zcmbQy!1$?tf-2KT_l@dRvMjsZce`(1D(j~pwOl#LMUSThh>Q7;0BLugjkaHT^USNv
zCrjIDOY^vL96NaU%E@a-?UyTqREY`jKNQH|=3y|OoM<P^=rp<1PLnZk@_aj4;eIzx
zyDKLT>7KuI@_3X|jwCO`+R5kb3>o)NX0+F2{p5PtO@6Yzy{OnnH|8TJFD+Nrc3;cC
z(N;`AMc(eIjrQayd-Hsd&`H}2ZaxN6cjhDKFE3Xv)_EdbA@P!Dg0L`ywmZ=F*|w%Y
z<$30L!Ym9uJlgKeE+FMS?#zb|URkc3XRhsj31})r8%X6nSC9ygU5MQ`t2fRQgn#@8
KS_TvWSpxvH<zpiN

diff --git a/6502/C64/cbmfiles/testbase16 b/6502/C64/cbmfiles/testbase16
index f2c1e3122b01cfe5b707fe4c820457f9dcfabc50..c3a1241e49990a579b2f97755b0c687cbb7b7bd0 100644
GIT binary patch
delta 334
zcmdnlz<95Lae^vi>_)X}S!VYD_svUW&14w+Hs7|4XHn;22=?VTe@^$<nezva{51#;
zSg!5nx6(&XWH%5Oiyr~f?jp}!Cx_T+Gg<phZnTpS?e^mbtJXby=KSTOx(CmkS*|^8
z@;W<B#-)>Q*vX1K_T#j>a`KSw`Aa8{M``6K@-i^`Pv*2YU=*HgWv^-A<)`jn>=&)b
zEO7*gGlZ9GgRILC=3{X6XFhWB(sJ#3|Fz=JUBx6+Qry0})K8vlZ(a`)VsHZ~>I5n}
ze|fofvB?wV3Wb*<6QqS1>ixwe_%FIP0F~$2=Sj0L^oZ2^d-;HrKk#QheDKP0?L7N>
z|4TqqA=*GHRsBFBfo}8N-Z~lkOpyNZA7~j+1Y`{t1AhRg-m#Nsj-ESs_ULkLj<2G5
J_Eq*7!T|p)fY$&3

delta 320
zcmccDz__!4ae^wN#YVMiS!SjHrp-%a&14uoH{Z65XOUX2z0yZdWH%5Oiyr~f?jp}!
zzl!GBSJ_Waw9{q^_MO~kCm~wr$A9e1`GZGv51%=I`Ka!}GiR1-cTV1Ir)f09&oO4X
z_60>fkqOdl3=FCP!qGtX5k+^A3}Ie|Ykr(|S56+%J%8!s@hGhvMP7z4ev`%Q4H(%b
zyW49TSo%r%r};%IGD{o*;tXMkV={#K7%cpmkDR=;T)W7Bt@v|SF$t9vx34ZmlNZ>V
z=Yxb8+(3$IfQrsvUanni@<h2p;U&-o!VE?JViNopT^oSP^X&7aSr~dmiu}ENK*}%s
tGao*9Ww~~qeUbkqps5gTAeE|qAdx_~`EGBWjD03Z|M(BI3@8G!1_0cAbSeM<


From c9e0e63ea04e610390b6b0cc09dcad6841b7df18 Mon Sep 17 00:00:00 2001
From: Philip Zembrod <pzembrod@google.com>
Date: Wed, 1 Jul 2020 21:20:49 +0200
Subject: [PATCH 4/7] Check in updated devenv binary after include was fixed

---
 6502/C64/cbmfiles/devenv | Bin 0 -> 21425 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 6502/C64/cbmfiles/devenv

diff --git a/6502/C64/cbmfiles/devenv b/6502/C64/cbmfiles/devenv
new file mode 100644
index 0000000000000000000000000000000000000000..d3fed125061e64487acfd4f41ba72ea9a1c5f69e
GIT binary patch
literal 21425
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
UmQ4{33Nz+k6@G%rQuz1(0y;glL;wH)

literal 0
HcmV?d00001


From e25e95717b6f2c6b3a8fd9c847d75ba1168c375e Mon Sep 17 00:00:00 2001
From: Philip Zembrod <pzembrod@google.com>
Date: Wed, 1 Jul 2020 21:22:41 +0200
Subject: [PATCH 5/7] Add C64/disks/.gitignore containing ascii version of
 empty disk image.

---
 6502/C64/disks/.gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 6502/C64/disks/.gitignore

diff --git a/6502/C64/disks/.gitignore b/6502/C64/disks/.gitignore
new file mode 100644
index 0000000..73508a6
--- /dev/null
+++ b/6502/C64/disks/.gitignore
@@ -0,0 +1 @@
+empty.fth

From ecbcd52f8f8ef14b5a01f979323d28526a711c56 Mon Sep 17 00:00:00 2001
From: Philip Zembrod <pzembrod@google.com>
Date: Thu, 2 Jul 2020 22:02:39 +0200
Subject: [PATCH 6/7] Make C64/C16 tests completely automated.

---
 6502/C64/Makefile               |  31 +++++--
 6502/C64/tests/evaluate-test.sh |  15 ++++
 6502/C64/tests/run-vf-tests.fth |  13 +--
 6502/C64/tests/test-c16.golden  |  74 ++++++++++++++++
 6502/C64/tests/test-c64.golden  | 150 ++++++++++++++++++++++++++++++++
 5 files changed, 272 insertions(+), 11 deletions(-)
 create mode 100755 6502/C64/tests/evaluate-test.sh
 create mode 100644 6502/C64/tests/test-c16.golden
 create mode 100644 6502/C64/tests/test-c64.golden

diff --git a/6502/C64/Makefile b/6502/C64/Makefile
index 876f8bd..199a314 100644
--- a/6502/C64/Makefile
+++ b/6502/C64/Makefile
@@ -14,24 +14,43 @@ test_files_petscii = $(patsubst tests/%, cbmfiles/%, $(test_files))
 vf_blk_fth: $(vf_blk_fth_files)
 
 
+clean:
+	rm -f cbmfiles/*.fr cbmfiles/%.fth *.log *.result
+
+
 # Convenience targets
 
+test: test-c64.result test-c16.result
+
+test64: test-c64.result
+
 run-devenv: emulator/devenv.T64
 	emulator/run-in-vice.sh devenv
 
 run-testbase: emulator/testbase.T64
 	emulator/run-in-vice.sh testbase
 
-test: emulator/testbase.T64 $(test_files_petscii)
-	emulator/run-in-vice.sh testbase \
-	  "include run-vf-tests.fth\n"
-
 run-testbase16: emulator/testbase16.T64
 	VICE=xplus4 emulator/run-in-vice.sh testbase16
 
-test16: emulator/testbase.T64 $(test_files_petscii)
+
+# Core test targets
+
+test-c64.result: emulator/testbase.T64 $(test_files_petscii) \
+    emulator/run-in-vice.sh tests/evaluate-test.sh tests/test-c64.golden
+	rm -f test-c64.log test-c64.result
+	emulator/run-in-vice.sh testbase \
+	  "include run-vf-tests.fth\n1234567890\ndos s0:notdone\n"
+	petscii2ascii cbmfiles/test.log test-c64.log
+	tests/evaluate-test.sh test-c64
+
+test-c16.result: emulator/testbase16.T64 $(test_files_petscii) \
+    emulator/run-in-vice.sh tests/evaluate-test.sh tests/test-c16.golden
+	rm -f test-c16.log test-c16.result
 	VICE=xplus4 emulator/run-in-vice.sh testbase16 \
-	  "include run-vf-tests.fth\n"
+	  "include run-vf-tests.fth\n1234567890\ndos s0:notdone\n"
+	petscii2ascii cbmfiles/test.log test-c16.log
+	tests/evaluate-test.sh test-c16
 
 
 # Rules for building Forth binaries on top of the plain vanilla
diff --git a/6502/C64/tests/evaluate-test.sh b/6502/C64/tests/evaluate-test.sh
new file mode 100755
index 0000000..f76fd8e
--- /dev/null
+++ b/6502/C64/tests/evaluate-test.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+testsdir="$(realpath --relative-to="$PWD" "$(dirname "${BASH_SOURCE[0]}")")"
+basedir="$(realpath --relative-to="$PWD" "${testsdir}/..")"
+
+testname="$1"
+
+diff "${testsdir}/${testname}.golden" "${basedir}/${testname}.log" > tmp.result
+exitcode=$?
+test $exitcode -eq 0 \
+  && echo "PASS: ${testname}" >> tmp.result \
+  || echo "FAIL: ${testname}" >> tmp.result
+cat tmp.result
+mv tmp.result "${basedir}/${testname}.result"
+exit $exitcode
diff --git a/6502/C64/tests/run-vf-tests.fth b/6502/C64/tests/run-vf-tests.fth
index f6b8d6c..36c685f 100644
--- a/6502/C64/tests/run-vf-tests.fth
+++ b/6502/C64/tests/run-vf-tests.fth
@@ -17,13 +17,16 @@ include core.fr
 
 include coreplustest.fth
 
-include utilities.fth
-include errorreport.fth
+\ The C16 VolksForth has LIMIT at $8000.
+\ More tests than up to here fill the dictionary.
 
-include coreexttest.fth
+(64 include utilities.fth C)
+(64 include errorreport.fth C)
 
-include doubletest.fth
+(64 include coreexttest.fth C)
 
-REPORT-ERRORS
+(64 include doubletest.fth C)
+
+(64 REPORT-ERRORS C)
 
 logclose
diff --git a/6502/C64/tests/test-c16.golden b/6502/C64/tests/test-c16.golden
new file mode 100644
index 0000000..09682a7
--- /dev/null
+++ b/6502/C64/tests/test-c16.golden
@@ -0,0 +1,74 @@
+
+ans-shim.fth CHAR exists  0> exists 
+
+prelimtest.fth
+
+CR CR SOURCE TYPE ( Preliminary test ) CR
+SOURCE ( These lines test SOURCE, TYPE, CR and parenthetic comments ) TYPE CR
+( The next line of output should be blank to test CR ) SOURCE TYPE CR CR
+
+( Pass #1: testing 0 >IN +! ) 0 >IN +! SOURCE TYPE CR
+( Pass #2: testing 1 >IN +! ) 1 >IN +! xSOURCE TYPE CR
+( Pass #3: testing 1+ ) 1 1+ >IN +! xxSOURCE TYPE CR
+( Pass #4: testing @ ! BASE ) 0 1+ 1+ BASE ! BASE @ >IN +! xxSOURCE TYPE CR
+( Pass #5: testing decimal BASE ) BASE @ >IN +! xxxxxxxxxxSOURCE TYPE CR
+( Pass #6: testing : ; ) : .SRC SOURCE TYPE CR ; 6 >IN +! xxxxxx.SRC
+( Pass #7: testing number input ) 19 >IN +! xxxxxxxxxxxxxxxxxxx.SRC
+( Pass #8: testing VARIABLE ) VARIABLE Y 2 Y ! Y @ >IN +! xx.SRC
+( Pass #9: testing WORD COUNT ) 5 MSG abcdef) Y ! Y ! >IN +! xxxxx.SRC
+( Pass #10: testing WORD COUNT ) MSG ab) >IN +! xxY ! .SRC
+Pass #11: testing WORD COUNT .MSG
+Pass #12: testing = returns all 1's for true
+Pass #13: testing = returns 0 for false
+Pass #14: testing -1 interpreted correctly
+Pass #15: testing 2*
+Pass #16: testing 2*
+Pass #17: testing AND
+Pass #18: testing AND
+Pass #19: testing AND
+Pass #20: testing ?F~ ?~~ Pass Error
+Pass #21: testing ?~
+Pass #22: testing EMIT
+Pass #23: testing S"
+
+Results: 
+
+Pass messages #1 to #23 should be displayed above
+and no error messages
+
+0 tests failed out of 57 additional tests
+
+
+--- End of Preliminary Tests --- 
+
+tester.fth ERROR exists 
+core.fr
+*********************YOU SHOULD SEE THE STANDARD GRAPHIC CHARACTERS:
+ !"#$%&'()*+,-./0123456789:;<=>?@
+abcdefghijklmnopqrstuvwxyz[\]^_`
+ABCDEFGHIJKLMNOPQRSTUVWXYZ{|}~
+YOU SHOULD SEE 0-9 SEPARATED BY A SPACE:
+0 1 2 3 4 5 6 7 8 9 
+YOU SHOULD SEE 0-9 (WITH NO SPACES):
+0123456789
+YOU SHOULD SEE A-G SEPARATED BY A SPACE:
+A B C D E F G 
+YOU SHOULD SEE 0-5 SEPARATED BY TWO SPACES:
+0  1  2  3  4  5  
+YOU SHOULD SEE TWO SEPARATE LINES:
+LINE 1
+LINE 2
+YOU SHOULD SEE THE NUMBER RANGES OF SIGNED AND UNSIGNED NUMBERS:
+  SIGNED: -8000 7FFF 
+UNSIGNED: 0 FFFF 
+*
+PLEASE TYPE UP TO 80 CHARACTERS:
+1234567890 
+RECEIVED: "1234567890"
+* GDX exists 
+End of Core word set tests
+
+coreplustest.fth********
+You should see 2345: 2345
+*****
+End of additional Core tests
diff --git a/6502/C64/tests/test-c64.golden b/6502/C64/tests/test-c64.golden
new file mode 100644
index 0000000..853418a
--- /dev/null
+++ b/6502/C64/tests/test-c64.golden
@@ -0,0 +1,150 @@
+
+ans-shim.fth CHAR exists  0> exists 
+
+prelimtest.fth
+
+CR CR SOURCE TYPE ( Preliminary test ) CR
+SOURCE ( These lines test SOURCE, TYPE, CR and parenthetic comments ) TYPE CR
+( The next line of output should be blank to test CR ) SOURCE TYPE CR CR
+
+( Pass #1: testing 0 >IN +! ) 0 >IN +! SOURCE TYPE CR
+( Pass #2: testing 1 >IN +! ) 1 >IN +! xSOURCE TYPE CR
+( Pass #3: testing 1+ ) 1 1+ >IN +! xxSOURCE TYPE CR
+( Pass #4: testing @ ! BASE ) 0 1+ 1+ BASE ! BASE @ >IN +! xxSOURCE TYPE CR
+( Pass #5: testing decimal BASE ) BASE @ >IN +! xxxxxxxxxxSOURCE TYPE CR
+( Pass #6: testing : ; ) : .SRC SOURCE TYPE CR ; 6 >IN +! xxxxxx.SRC
+( Pass #7: testing number input ) 19 >IN +! xxxxxxxxxxxxxxxxxxx.SRC
+( Pass #8: testing VARIABLE ) VARIABLE Y 2 Y ! Y @ >IN +! xx.SRC
+( Pass #9: testing WORD COUNT ) 5 MSG abcdef) Y ! Y ! >IN +! xxxxx.SRC
+( Pass #10: testing WORD COUNT ) MSG ab) >IN +! xxY ! .SRC
+Pass #11: testing WORD COUNT .MSG
+Pass #12: testing = returns all 1's for true
+Pass #13: testing = returns 0 for false
+Pass #14: testing -1 interpreted correctly
+Pass #15: testing 2*
+Pass #16: testing 2*
+Pass #17: testing AND
+Pass #18: testing AND
+Pass #19: testing AND
+Pass #20: testing ?F~ ?~~ Pass Error
+Pass #21: testing ?~
+Pass #22: testing EMIT
+Pass #23: testing S"
+
+Results: 
+
+Pass messages #1 to #23 should be displayed above
+and no error messages
+
+0 tests failed out of 57 additional tests
+
+
+--- End of Preliminary Tests --- 
+
+tester.fth ERROR exists 
+core.fr
+*********************YOU SHOULD SEE THE STANDARD GRAPHIC CHARACTERS:
+ !"#$%&'()*+,-./0123456789:;<=>?@
+abcdefghijklmnopqrstuvwxyz[\]^_`
+ABCDEFGHIJKLMNOPQRSTUVWXYZ{|}~
+YOU SHOULD SEE 0-9 SEPARATED BY A SPACE:
+0 1 2 3 4 5 6 7 8 9 
+YOU SHOULD SEE 0-9 (WITH NO SPACES):
+0123456789
+YOU SHOULD SEE A-G SEPARATED BY A SPACE:
+A B C D E F G 
+YOU SHOULD SEE 0-5 SEPARATED BY TWO SPACES:
+0  1  2  3  4  5  
+YOU SHOULD SEE TWO SEPARATE LINES:
+LINE 1
+LINE 2
+YOU SHOULD SEE THE NUMBER RANGES OF SIGNED AND UNSIGNED NUMBERS:
+  SIGNED: -8000 7FFF 
+UNSIGNED: 0 FFFF 
+*
+PLEASE TYPE UP TO 80 CHARACTERS:
+1234567890 
+RECEIVED: "1234567890"
+* GDX exists 
+End of Core word set tests
+
+coreplustest.fth********
+You should see 2345: 2345
+*****
+End of additional Core tests
+
+utilities.fth ?DEFTEST1 exists 
+Test utilities loaded
+
+errorreport.fth
+coreexttest.fth**************
+
+Output from .(
+You should see -9876: -9876 
+and again: -9876
+
+
+On the next 2 lines you should see First then Second messages:
+First message via .( 
+Second message via ."
+
+*
+
+Output from .R and U.R
+You should see lines duplicated:
+indented by 0 spaces
+30278 
+30278
+-31871 
+-31871
+30278 
+30278
+33665 
+33665
+
+indented by 0 spaces
+30278 
+30278
+-31871 
+-31871
+30278 
+30278
+33665 
+33665
+
+indented by 5 spaces
+     30278 
+     30278
+     -31871 
+     -31871
+     30278 
+     30278
+     33665 
+     33665
+
+***
+End of Core Extension word tests
+
+doubletest.fth*****************
+End of Double-Number word tests
+
+---------------------------
+        Error Report
+Word Set             Errors
+---------------------------
+Core                    0
+Core extension          0
+Block                   -
+Double number           0
+Exception               -
+Facility                -
+File-access             -
+Locals                  -
+Memory-allocation       -
+Programming-tools       -
+Search-order            -
+String                  -
+---------------------------
+Total                   0
+---------------------------
+

From de4d0cc474ed09c5c442a8e2773f1b4052e3c921 Mon Sep 17 00:00:00 2001
From: Philip Zembrod <pzembrod@google.com>
Date: Thu, 2 Jul 2020 22:04:55 +0200
Subject: [PATCH 7/7] Small fix to make clean rule

---
 6502/C64/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/6502/C64/Makefile b/6502/C64/Makefile
index 199a314..f4f00cf 100644
--- a/6502/C64/Makefile
+++ b/6502/C64/Makefile
@@ -15,7 +15,7 @@ vf_blk_fth: $(vf_blk_fth_files)
 
 
 clean:
-	rm -f cbmfiles/*.fr cbmfiles/%.fth *.log *.result
+	rm -f cbmfiles/*.fr cbmfiles/*.fth cbmfiles/*.log *.log *.result
 
 
 # Convenience targets