From bf5be735e5b72d7c0b375807e567ff0da7f01fd4 Mon Sep 17 00:00:00 2001 From: Sam TH Date: Mon, 19 Apr 2010 15:21:49 -0400 Subject: [PATCH 1/3] Ignore this generated file --- collects/teachpack/2htdp/scribblings/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 collects/teachpack/2htdp/scribblings/.gitignore diff --git a/collects/teachpack/2htdp/scribblings/.gitignore b/collects/teachpack/2htdp/scribblings/.gitignore new file mode 100644 index 0000000000..8617481f53 --- /dev/null +++ b/collects/teachpack/2htdp/scribblings/.gitignore @@ -0,0 +1 @@ +output.txt From c3eb49562752b1e3c57c691fe7d2b65cb7e19f92 Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Mon, 19 Apr 2010 17:20:07 -0400 Subject: [PATCH 2/3] Fix this file to delete output.txt when it's done. --- collects/teachpack/2htdp/scribblings/.gitignore | 1 - collects/teachpack/2htdp/scribblings/batch-io.scrbl | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 collects/teachpack/2htdp/scribblings/.gitignore diff --git a/collects/teachpack/2htdp/scribblings/.gitignore b/collects/teachpack/2htdp/scribblings/.gitignore deleted file mode 100644 index 8617481f53..0000000000 --- a/collects/teachpack/2htdp/scribblings/.gitignore +++ /dev/null @@ -1 +0,0 @@ -output.txt diff --git a/collects/teachpack/2htdp/scribblings/batch-io.scrbl b/collects/teachpack/2htdp/scribblings/batch-io.scrbl index 272e929fa1..11ecdda6b4 100644 --- a/collects/teachpack/2htdp/scribblings/batch-io.scrbl +++ b/collects/teachpack/2htdp/scribblings/batch-io.scrbl @@ -139,3 +139,5 @@ There is only one writer function at the moment: } ] +@(delete-file "output.txt") + From 8116350df418e321363e2b72d4d75f5bfe7271e3 Mon Sep 17 00:00:00 2001 From: tewk Date: Mon, 19 Apr 2010 15:19:23 -0600 Subject: [PATCH 3/3] [Places] fix stack_base --- src/mzscheme/src/places.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/mzscheme/src/places.c b/src/mzscheme/src/places.c index 98bfb012b7..bdfcc6ff86 100644 --- a/src/mzscheme/src/places.c +++ b/src/mzscheme/src/places.c @@ -36,6 +36,7 @@ static void register_traversers(void); # endif static void *place_start_proc(void *arg); +static void *place_start_proc_after_stack(void *data_arg, void *stack_base); # define PLACE_PRIM_W_ARITY(name, func, a1, a2, env) GLOBAL_PRIM_W_ARITY(name, func, a1, a2, env) @@ -608,6 +609,14 @@ Scheme_Struct_Type *scheme_make_prefab_struct_type_in_master(Scheme_Object *base static void *place_start_proc(void *data_arg) { void *stack_base; + void *rc; + stack_base = PROMPT_STACK(stack_base); + rc = place_start_proc_after_stack(data_arg, stack_base); + stack_base = NULL; + return rc; +} + +static void *place_start_proc_after_stack(void *data_arg, void *stack_base) { Place_Start_Data *place_data; Scheme_Object *place_main; Scheme_Object *a[2], *channel; @@ -615,7 +624,6 @@ static void *place_start_proc(void *data_arg) { long rc = 0; ptid = mz_proc_thread_self(); - stack_base = PROMPT_STACK(stack_base); place_data = (Place_Start_Data *) data_arg; data_arg = NULL;