GH-86 Sidebar: Move SH and SOURCE from C to Forth.

SirWumpus · Dec 10, 2024 · 38f194f · 38f194f
1 parent 2664ce4
commit 38f194f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 36 deletions.
diff --git a/src/hooks.c b/src/hooks.c
@@ -7,33 +7,17 @@
 #include "post4.h"
 
 #ifdef HAVE_HOOKS
-
-# ifdef HOOK_SHELL
-/*
- * SH ( `remaining input line` -- )
- */
-static void
-p4System(P4_Ctx *ctx)
-{
-	P4_Input *input = ctx->input;
-	// Assumes input buffer is writeable.
-	input->buffer[input->length] = '\0';
-	(void) system(input->buffer + input->offset);
-	input->offset = input->length;
-}
-
 /*
  * SHELL ( caddr u -- n )
  */
 static void
-p4SystemString(P4_Ctx *ctx)
+p4Shell(P4_Ctx *ctx)
 {
-	P4_DROP(ctx->ds, 1);	/* Ignore u */
-	char *s = P4_TOP(ctx->ds).s;
-	// Assumes caddr NUL terminated.
-	P4_TOP(ctx->ds).n = system(s);
+	size_t len = P4_POP(ctx->ds).z;
+	char *cmd = strndup(P4_TOP(ctx->ds).s, len);
+	P4_TOP(ctx->ds).n = system(cmd);
+	free(cmd);
 }
-# endif
 
 # ifdef HOOK_PRIMATIVES
 /* Examples of how some words, in particular those calling libc
@@ -121,13 +105,10 @@ p4SystemPath(P4_Ctx *ctx)
 }
 
 P4_Hook p4_hooks[] = {
-# ifdef HOOK_SHELL
-	P4_HOOK(0x00, "SH", p4System),
-	P4_HOOK(0x21, "SHELL", p4SystemString),
-# endif
 # ifdef HOOK_PRIMATIVES
 	P4_HOOK(0x30, "MOVE", p4Move),
 # endif
+	P4_HOOK(0x21, "shell", p4Shell),
 	P4_HOOK(0x02, "getcwd", p4GetCwd),
 	P4_HOOK(0x22, "getenv", p4GetEnv),
 	P4_HOOK(0x02, "system-path", p4SystemPath),

diff --git a/src/post4.c b/src/post4.c
@@ -1279,7 +1279,6 @@ p4Repl(P4_Ctx *ctx, volatile int thrown)
 		P4_WORD("MS",		&&_ms,		0, 0x10),
 		P4_WORD("_parse",	&&_parse,	0, 0x22),	// p4
 		P4_WORD("PARSE-NAME",	&&_parse_name,	0, 0x02),
-		P4_WORD("SOURCE",	&&_source,	0, 0x02),
 		P4_WORD("SOURCE-ID",	&&_source_id,	0, 0x01),
 
 		P4_WORD(NULL,		NULL,		0, 0),
@@ -2003,12 +2002,6 @@ _input_offset:	p4AllocStack(ctx, &ctx->ds, 1);
 		P4_PUSH(ctx->ds, (P4_Cell *) &ctx->input->offset);
 		NEXT;
 
-		// ( -- caddr u )
-_source:	p4AllocStack(ctx, &ctx->ds, 2);
-		P4_PUSH(ctx->ds, ctx->input->buffer);
-		P4_PUSH(ctx->ds, ctx->input->length);
-		NEXT;
-
 		// ( -- -1 | 0 | fp )
 		// Alias FILE *stdin to NULL.
 _source_id:	p4AllocStack(ctx, &ctx->ds, 1);

diff --git a/src/post4.h b/src/post4.h
@@ -117,10 +117,6 @@ extern "C" {
 #define HAVE_HOOKS			1
 #endif
 
-#ifdef HAVE_HOOKS
-#define HOOK_SHELL			1
-#endif
-
 /***********************************************************************
  *** No configuration below this point.
  ***********************************************************************/

diff --git a/src/post4.p4 b/src/post4.p4
@@ -967,6 +967,9 @@ MAX-U MAX-N 2CONSTANT MAX-D $02 _pp!
 	THEN
 ; IMMEDIATE $10 _pp!
 
+\ (S: -- caddr u )
+: SOURCE _ctx ctx.input @ DUP in.buffer @ SWAP in.length @ ; $20 _pp!
+
 \ (S: -- u )
 : source-offset >IN @ ; $01 _pp!
 
@@ -1980,6 +1983,11 @@ VARIABLE SCR
 \
 : PAGE 0 0 AT-XY S\" \e[0J" TYPE ;
 
+[DEFINED] shell [IF]
+\ (S: `remaining input line` -- n )
+: sh source-remaining SOURCE NIP set-source-offset shell ;
+[THEN]
+
 \ (S: i*x fd -- j*x )
 \ *** An uncaught exception within the include file will leak the file
 \ *** handle and some memory.