From cf66f23dc8da4f1f5e1b6032f46b22a957dfff6e Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Wed, 4 Mar 2009 20:49:42 +0000
Subject: [PATCH] fix certification in syntax-local-make-delta-introducer

svn: r13960
---
 src/mzscheme/src/env.c | 8 +++++++-
 src/mzscheme/src/fun.c | 6 ++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/mzscheme/src/env.c b/src/mzscheme/src/env.c
index 33d2512a6e..9d005b0475 100644
--- a/src/mzscheme/src/env.c
+++ b/src/mzscheme/src/env.c
@@ -4592,6 +4592,7 @@ local_make_delta_introduce(int argc, Scheme_Object *argv[])
   Scheme_Object *introducers = scheme_null, *mappers = scheme_null;
   int renamed = 0;
   Scheme_Comp_Env *env;
+  Scheme_Object *certs;
 
   env = scheme_current_thread->current_local_env;
   if (!env)
@@ -4605,6 +4606,8 @@ local_make_delta_introduce(int argc, Scheme_Object *argv[])
 
   sym = scheme_stx_activate_certs(sym);
 
+  certs = scheme_current_thread->current_local_certs;
+
   while (1) {
     binder = NULL;
 
@@ -4613,7 +4616,7 @@ local_make_delta_introduce(int argc, Scheme_Object *argv[])
 			       + SCHEME_RESOLVE_MODIDS
 			       + SCHEME_APP_POS + SCHEME_ENV_CONSTANTS_OK
 			       + SCHEME_OUT_OF_CONTEXT_OK + SCHEME_ELIM_CONST),
-			      scheme_current_thread->current_local_certs, 
+			      certs, 
 			      scheme_current_thread->current_local_modidx, 
 			      NULL, NULL, &binder);
     
@@ -4642,7 +4645,10 @@ local_make_delta_introduce(int argc, Scheme_Object *argv[])
     
     v = SCHEME_PTR_VAL(v);
     if (SAME_TYPE(SCHEME_TYPE(v), scheme_id_macro_type)) {
+      certs = scheme_stx_extract_certs(sym, certs);
+
       sym = SCHEME_PTR1_VAL(v);
+      sym = scheme_stx_activate_certs(sym);
 
       v = SCHEME_PTR2_VAL(v);
       if (!SCHEME_FALSEP(v))
diff --git a/src/mzscheme/src/fun.c b/src/mzscheme/src/fun.c
index 89a8be5665..ff2731e552 100644
--- a/src/mzscheme/src/fun.c
+++ b/src/mzscheme/src/fun.c
@@ -2517,6 +2517,12 @@ cert_with_specials(Scheme_Object *code, Scheme_Object *mark, Scheme_Env *menv,
       /* Default transparency depends on module-identifier=? comparison
 	 to `begin', `define-values', and `define-syntaxes'. */
       int trans = deflt;
+      if (SCHEME_TRUEP(prop))
+        scheme_log(NULL,
+                   SCHEME_LOG_WARNING,
+                   0,
+                   "warning: unrecognized 'certify-mode property value: %V",
+                   prop);
       if (SCHEME_STX_PAIRP(code)) {
 	Scheme_Object *name;
 	name = SCHEME_STX_CAR(code);