From 4af8f3786ebebecf46bc396d8aa4a104ed84c2c9 Mon Sep 17 00:00:00 2001
From: Koichi Nakamura <koichi@idein.jp>
Date: Mon, 11 Jan 2021 01:24:43 +0900
Subject: [PATCH] Add welcome message

---
 Makefile         |  6 +++---
 bootstrap.fs     | 48 +++++++++++++++++++++++++++++++++++++++---------
 others/planck.c  |  5 ++++-
 others/planck.py |  7 ++++++-
 4 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index e541205..8cae919 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,14 @@
 # planckforth -
 # Copyright (C) 2021 nineties
 
-default: x86hex
+default: i386-linux-handwrite
 	
-x86hex: planck.xxd
+i386-linux-handwrite: planck.xxd
 	xxd -r -c 8 $< > planck
 	chmod +x planck
 
 c: others/planck.c
-	gcc -Wall -O2 $< -o planck
+	gcc -Wall -O2 $< -o planck -DCOMPILER="\"`gcc --version | head -n1`\""
 
 python: others/planck.py
 	cp others/planck.py planck
diff --git a/bootstrap.fs b/bootstrap.fs
index 5ecaf86..31a073d 100644
--- a/bootstrap.fs
+++ b/bootstrap.fs
@@ -458,7 +458,7 @@ alias-builtin and       &
 alias-builtin or        |
 alias-builtin xor       ^
 alias-builtin u<        u
-alias-builtin version   V
+alias-builtin runtime-info_ V
 
 \ Rename existing FORTH words
 : >cfa      G ;
@@ -476,7 +476,7 @@ alias-builtin version   V
 
 \ === Stub Functions ===
 \ Use 1-step indirect reference so that we can replace
-\ the implementation later.
+\ the runtime later.
 
 : allot-cell &here @ # cell + &here ! ;
 
@@ -613,7 +613,7 @@ allot-cell : &find! [ ' L , , ] ; \ ( c-addr -- nt ) Throw exception at error
 
 \ ( -- a-addr )
 \ The bottom address of stacks.
-\ sp@ and rp@ points bottom if implementation so far is correct.
+\ sp@ and rp@ points bottom if runtime so far is correct.
 : sp0 [ sp@ ] literal ;
 : rp0 [ rp@ ] literal ;
 
@@ -1744,7 +1744,7 @@ end-struct file%
     >r 3drop r> r> r> swap
 ;
 
-\ Temporary implementation stdin and stdout using 'key' and 'type'
+\ Temporary runtime stdin and stdout using 'key' and 'type'
 
 create stdin_ file% %allot drop
 R/O stdin_ file>fam c!
@@ -2068,9 +2068,37 @@ v argc ! argv !
     shift-args
 ;
 
-( === Environment-Dependent Code === )
+( === Version and Copyright === )
 
-version s" hand-written i386-linux" streq [if]
+\ The version of planckforth (not runtime)
+: version s" 0.0.1" ;
+
+: strchr ( c-addr2 c -- c-addr2 )
+    begin over c@ while
+        over c@ over = if drop exit then
+        swap 1+ swap
+    repeat
+    2drop 0
+;
+
+\ The version string is colon separated
+\ <runtime name>:<copyright>
+
+create runtime-info runtime-info_ strcpy,
+
+runtime-info constant runtime
+runtime-info ':' strchr 0 over c! 1+ constant copyright-text
+
+: copyright
+    copyright-text type cr
+;
+
+\ The version of PlanckForth (not runtime)
+: version s" 0.0.1" ;
+
+( === Environment Dependent Code === )
+
+runtime  s" i386-linux handwrite" streq [if]
 
 %000 constant eax immediate
 %001 constant ecx immediate
@@ -2401,7 +2429,7 @@ need-defined (read)
 
         words id. name>string name>link
         include included source >in
-        next-arg shift-args arg argv argc version
+        next-arg shift-args arg argv argc version runtime copyright
 
         [if] [unless] [else] [then] defined?
         open-file close-file write-file flush-file
@@ -2457,8 +2485,10 @@ need-defined (read)
         next-arg dup argv @ !
         included
     else
-        ." PlanckForth (" version type ." )" cr
-        ." Ready." cr
+        ." Welcome to PlanckForth " version type
+        ."  [" runtime type ." ]" cr
+        copyright
+        ." Type 'bye' to exit." cr
         s" /dev/tty" included
     then
 ; execute
diff --git a/others/planck.c b/others/planck.c
index 82c40e1..c0b4cb2 100644
--- a/others/planck.c
+++ b/others/planck.c
@@ -13,7 +13,10 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#define VERSION "C"
+#define COPYRIGHT "Copyright (c) 2021 Koichi Nakamura <koichi@idein.jp>"
+#define RUNTIME_NAME COMPILER
+
+#define VERSION RUNTIME_NAME ":" COPYRIGHT
 
 typedef uintptr_t cell;
 typedef void (**cfa)();
diff --git a/others/planck.py b/others/planck.py
index da28514..176c133 100644
--- a/others/planck.py
+++ b/others/planck.py
@@ -8,8 +8,13 @@ import sys
 import operator
 import array
 import ctypes
+import platform
+
+RUNTIME_NAME = "Python {}".format(platform.python_version())
+COPYRIGHT = "Copyright (c) 2021 Koichi Nakamura <koichi@idein.jp>"
+
+VERSION = "{}:{}".format(RUNTIME_NAME, COPYRIGHT)
 
-VERSION = "Python 3.x"
 MEMORY_SIZE = 0x10000
 
 memory = array.array('i', [0]*MEMORY_SIZE)