Update from development backup 201505312256

Author: programandala-net

Diff for: Makefile

@@ -46,11 +46,9 @@ MAKEFLAGS = --no-print-directory
 ################################################################
 # Main
 
-.PHONY: all
 all: \
 	abersoft_forth.rebuilt.tap
 
-.PHONY: tools
 tools: \
 	abersoftforth2z80dasmblocks \
 	abersoftforth2nfa4vim \
@@ -150,7 +148,6 @@ tidy_name_fields.vim: \
 tidy_branches.vim:
 	vim -e -c "set fileformat=unix|wq" tidy_branches.vim
 
-.PHONY: tidy
 tidy: \
 	tidy_name_fields.vim \
 	tidy_branches.vim \
@@ -195,7 +192,7 @@ abersoft_forth.rebuilt.bin.tap: abersoft_forth.disassembled.z80s
 abersoft_forth.rebuilt.tap: \
 	abersoft_forth_loader.tap \
 	abersoft_forth.rebuilt.bin.tap
-	cat abersoft_forth_loader.bas.tap abersoft_forth.rebuilt.bin.tap > \
+	cat abersoft_forth_loader.tap abersoft_forth.rebuilt.bin.tap > \
 		abersoft_forth.rebuilt.tap \
 
 ################################################################
@@ -204,7 +201,6 @@ abersoft_forth.rebuilt.tap: \
 %.tap: %.fsb
 	fsb2abersoft16k $<
 
-.PHONY: abersoftforth2z80dasmblocks
 abersoftforth2z80dasmblocks: abersoftforth2z80dasmblocks_compiling.tap
 
 abersoftforth2z80dasmblocks_compiling.tap: \
@@ -238,7 +234,6 @@ abersoftforth2z80dasmblocks_compiling.tap: \
 		> abersoftforth2z80dasmblocks_compiling.tap ; \
 	rm -f abersoftforth2z80dasmblocks.tap
 
-.PHONY: abersoftforth2nfa4vim
 abersoftforth2nfa4vim: abersoftforth2nfa4vim_compiling.tap
 
 abersoftforth2nfa4vim_compiling.tap: abersoftforth2nfa4vim.tap
@@ -272,7 +267,6 @@ abersoftforth2nfa4vim_compiling.tap: abersoftforth2nfa4vim.tap
 		> abersoftforth2nfa4vim_compiling.tap ; \
 	rm -f abersoftforth2nfa4vim.tap
 
-.PHONY: abersoftforth2branches
 abersoftforth2branches: abersoftforth2branches_compiling.tap
 
 abersoftforth2branches_compiling.tap: \
@@ -310,6 +304,7 @@ abersoftforth2branches_compiling.tap: \
 ################################################################
 # Backup
 
+.PHONY: backup
 backup:
 	tar -czf backups/$$(date +%Y%m%d%H%M)_abersoft_forth_disassembled.tgz \
 		Makefile \
@@ -321,9 +316,6 @@ backup:
 		z80dasm_symbols.z80s \
 		tidy_z80.vim \
 		word_labels.*.vim \
-		sys/*.bas \
-		_drafts/* \
-		_tests/*.fsb \
 		_ex/*
 
 ################################################################

Diff for: TO-DO.adoc

@@ -1,15 +1,15 @@
 = Abersoft Forth disassembled TO-DO
 :author: Marcos Cruz (programandala.net)
-:revdate: 2015-05-30
+:revdate: 2015-05-31
 
 
-.2015-05-29:
+.2015-05-31:
 
-Document `implementation_attributes`, using Z80 fig-Forth 1.1.g
+Strange problem with <abersoftforth2branches.fsb>: one instance is not
+found.  Others are not translated later.
 
-.2015-05-30:
+Document `cold_start`, `COLD`, `warm_start` and `WARM`.
 
-Finish <abersoftforth2branches.fsb> (notes inside).
-
-Convert its printout <tidy_branches.vim> to Unix file format, in Makefile, with Vim.
+Make the automatic blocks unlabeled?
 
+Tidy the strings.

Diff for: abersoftforth2branches.boot.symbols-output.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
+# abersoftforth2branches.boot.symbols-output.sh
 # 2015-05-30
 
 rm -f ./z80dasm_symbols.branches.vim

Diff for: abersoftforth2branches.boot.vim-output.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
+# abersoftforth2branches.boot.vim-output.sh
 # 2015-05-30
 
 rm -f ./tidy_branches.vim

Diff for: abersoftforth2branches.fsb

@@ -36,21 +36,33 @@
 
   \ 2015-05-30: Start, with code extrated from the deprecated
   \ tool `dis`.
+  \
+  \ 2015-05-31: Fix: `editor` is immediate! It needed a
+  \ `[compile]`.
 
   \ -----------------------------------------------------------
 
-forth definitions -->
+forth 
+
+               \  <------------------------------>
+128k? dup   ?\ ." ERROR: this program needs a" cr
+            ?\ ." ZX Spectrum 128 or later." cr quit
+
+definitions -->
 
 ( Boot )
 
-vocabulary print-voc  print-voc definitions  hex
+vocabulary print-voc immediate  print-voc definitions  hex
 
 : printer-width  ( b -- )  5B64 !  ;  \ ZX Spectrum 128 only
 : program-name  ( -- )  ." AbersoftForth2branches"  ;
 
-               \  <------------------------------>
-128k? dup   ?\ ." ERROR: this program needs a" cr
-            ?\ ." ZX Spectrum 128 or later." cr quit
+0 variable current-pfa
+
+0 variable mode
+  \ Print mode:
+  \ 0 for Vim command to convert branches
+  \ 1 for destination branch symbols
 
 03 0A thru cls program-name cr cr usage
 
@@ -97,6 +109,10 @@ vocabulary print-voc  print-voc definitions  hex
 
 : cfa-label  ( cfa -- )  cfa-label$ type  ;
 
+: ~  ( -- )
+  \ Start a comment line of the output file.
+  cr mode @ if  [char] ;  else  [char] "  then  emit space  ;
+
 ( branch-symbol vim-command )
 
 : destination  ( pfa+n1 -- pfa+n2 )
@@ -118,28 +134,21 @@ vocabulary print-voc  print-voc definitions  hex
   \ in the Z80 source.
   \ pfa+n   = address of a branch word
   \ pfa+n+2 = address of its relative jump literal
-  \ XXX TODO -- use `call search()` instead, in order to
-  \ convert only the first match!
 
-  [char] " emit space ." Branch word at " dup hexa. cr
+  ~ ." Branch word at " dup hexa.
+    ."  in " current-pfa @ nfa id.
 
-  ." if search('defw " dup @ dup >r cfa-label ." \s;\s" 
+  cr ." if search('defw " dup @ dup >r cfa-label ." \s;\s"
   dup hexa.  2+ ." \n\s\+defw " dup @ hexa. ." $','wc')"
 
   cr ."   silent s`\(defw " r> cfa-label
   ." \)\s;\s0x[A-F0-9]\{4}\n\s\+defw \(" dup @ hexa.
   ." \)$`\1,\2 ; to " dup destination branch-label ." `" cr
 
-  ." else" cr ."   echoerr 'Branch not found'" cr
-              ."   wq" cr
+  ." else" cr ."   echoerr 'Branch not found'" cr ."   wq" cr
   ." endif" cr  ;
 
-( mode print-branch colon-end? )
-
-0 variable mode
-  \ Print mode:
-  \ 0 for Vim command to convert branches
-  \ 1 for destination branch symbols
+( print-branch colon-end? )
 
 : print-branch  ( pfa+n -- pfn+n+2 )
   \ pfa+n   = address of a branch word
@@ -178,9 +187,9 @@ vocabulary print-voc  print-voc definitions  hex
 
 : print-colon  ( pfa --- )
   \ Print branches of a colon definition.
-  begin   dup colon-end? 0=
-  while   (print-colon) 2+
-  repeat  drop  ;
+  dup current-pfa !   begin   dup colon-end? 0=
+                      while   (print-colon) 2+
+                      repeat  drop  ;
 
 ( print-pfa )
 
@@ -190,9 +199,10 @@ vocabulary print-voc  print-voc definitions  hex
   \ Print branches of a word.
   dup colon?  if  print-colon  exit  then  drop  ;
 
+: print-pfa  ( pfa -- )
   \ Print a word, if it belongs to the original system.
-: print-pfa  ( pfa -- )  dup [ ' udg 1+ ] literal u<
-                         if  (print-pfa)  else  drop  then  ;
+  dup [ ' udg 1+ ] literal u<
+  if  (print-pfa)  else  drop  then  ;
 
 : print-from-nfa  ( nfa -- )
   \ Print branches of words starting from a word.
@@ -222,23 +232,19 @@ vocabulary print-voc  print-voc definitions  hex
 
 ( run )
 
-: ~  ( -- )
-  \ Start a comment line of the output file.
-  cr mode @ if  [char] ;  else  [char] "  then  emit space  ;
-
 : file-header  ( -- )
   ~ ." This file was automatically created by " program-name
   ~ ." This file is part of Abersoft Forth disassembled"
   ~ ." By Marcos Cruz (programandala.net), 2015-05"
   ~ ." http://programandala.net/en.program.abersoft_forth.html"
-  cr cr  mode @ 0= if  ." call cursor(1,1)" cr  then   ;
+  cr cr  ;
 
 : run  ( n -- )
   \ n = 0: Print out Vim commands to convert branches.
   \     1: Print out destination branch symbols.
   mode !
   hex  FF printer-width  1 link  file-header
-  editor print-context
+  [compile] editor print-context [compile] print-voc
   0 link  decimal cr done  ;
 
 : vim  ( -- )  0 run  ;

Diff for: abersoftforth2nfa4vim.boot.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+# abersoftforth2nfa4vim.boot.sh
+# 2015-05-31
+
+rm -f ./abersoftforth2nfa4vim_printout.txt
+fuse \
+	--machine 128 \
+	--no-divide \
+  --tape ./abersoftforth2nfa4vim_compiling.tap \
+  --printer \
+  --textfile ./abersoftforth2nfa4vim_printout.txt \
+	$* \
+	&
+

Diff for: abersoftforth2nfa4vim.fsb

@@ -42,25 +42,28 @@
   \
   \ 2015-05-30: The 48 K model is detected and an error is
   \ given. Improved instructions.
+  \
+  \ 2015-05-31: Fix: `editor` is immediate! It needed a
+  \ `[compile]`.
 
   \ -----------------------------------------------------------
 
--->
+forth
 
-( Boot )
+               \  <------------------------------>
+128k? dup   ?\ ." ERROR: this program needs a" cr
+            ?\ ." ZX Spectrum 128 or later." cr quit
 
-forth definitions
+definitions -->
 
-vocabulary print-voc  print-voc definitions  hex
+( Boot )
+
+vocabulary print-voc immediate  print-voc definitions  hex
 
 : printer-width  ( b -- )  5B64 !  ;  \ ZX Spectrum 128 only
 : program-name  ( -- )  ." AbersoftForth2nfa4Vim"  ;
 
-               \  <------------------------------>
-128k? dup   ?\ ." ERROR: this program needs a" cr
-            ?\ ." ZX Spectrum 128 or later." cr quit
-
-3 7 thru cls greeting cr cr program-name cr cr usage
+3 9 thru cls greeting cr cr program-name cr cr usage
 
 ( usage )
 
@@ -209,7 +212,7 @@ char " constant quote
 
   \ If the given word belongs to the original system and is not
   \ a dummy, print a Vim command that will substitute the
-  \ disassembled name field of the that word with a new one,
+  \ disassembled name field of the word with a new one,
   \ using a more legible format.
 
   dup dummy? if  drop exit  then
@@ -218,13 +221,14 @@ char " constant quote
 ( Done )
 
 : done  ( -- )
+  cls
   \  <------------------------------>
-  ." Done." cr
+  ." Done." cr cr
   ." If you have not launched this" cr
   ." program with the provided" cr
   ." boot shell file for Fuse, copy" cr
-  ." copy the printout of your" cr
-  ." emulator to the file "
+  ." the printout of your emulator" cr
+  ." to the file "
   ." <abersoftforth2nfa4vim_printout."
   ." txt>." cr cr
   ." Then close the emulator and use" cr
@@ -247,14 +251,14 @@ char " constant quote
 : file-header  ( -- )
   " ." This file was automatically created by " program-name
   " ." This file is part of Abersoft Forth disassembled"
-  ~ ." By Marcos Cruz (programandala.net), 2015-05"
+  " ." By Marcos Cruz (programandala.net), 2015-05"
   " ." http://programandala.net/en.program.abersoft_forth.html"
   cr cr  ;
 
 : run  ( -- )
   \ Print out all original words of the Forth system.
   hex  FF printer-width  1 link  file-header
-  editor print-context
+  [compile] editor print-context [compile] print-voc
   0 link  decimal cr done  ;
 
   \ vim: filetype=abersoftforthafera

Diff for: abersoftforth2z80dasmblocks.boot.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
+# abersoftforth2z80dasmblocks.boot.sh
 # 2015-05-30
 
 rm -f ./abersoftforth2z80dasmblocks_printout.txt