repair for identifier handling

mflatt · mflatt · commit 02bc905c02a4 · 2014-05-17T19:56:25.000+01:00
Repairs commit d67082e.
diff --git a/racket/src/racket/src/compenv.c b/racket/src/racket/src/compenv.c
@@ -1911,13 +1911,14 @@ scheme_lookup_binding(Scheme_Object *find_id, Scheme_Comp_Env *env, int flags,
     if (genv->module && genv->disallow_unbound) {
       /* double-check for a local-module binding that's not in find_id's context;
          see a similar test in scheme_check_top_identifier_bound() */
-      find_global_id = scheme_tl_id_sym(genv, find_id, NULL, 0, NULL, NULL);
-      if (!SAME_OBJ(find_global_id, SCHEME_STX_SYM(find_id))) {
+      if (SCHEME_STXP(find_id))
+        find_global_id = scheme_tl_id_sym(genv, find_id, NULL, 0, NULL, NULL);
+      else
+        find_global_id = NULL;
+      if (find_global_id && !SAME_OBJ(find_global_id, SCHEME_STX_SYM(find_id))) {
         /* it's defined after all; fall through below assumes a binding
            in the enclosing module */
       } else {
-        /* If find_global_id is not find_id, then the module must have a
-           definition of the identifier. */
         if (genv->disallow_unbound > 0) {
           /* Free identifier. Maybe don't continue. */
           if (flags & (SCHEME_SETTING | SCHEME_REFERENCING)) {
diff --git a/racket/src/racket/src/schvers.h b/racket/src/racket/src/schvers.h
@@ -13,12 +13,12 @@
    consistently.)
 */
 
-#define MZSCHEME_VERSION "6.0.1.9"
+#define MZSCHEME_VERSION "6.0.1.10"
 
 #define MZSCHEME_VERSION_X 6
 #define MZSCHEME_VERSION_Y 0
 #define MZSCHEME_VERSION_Z 1
-#define MZSCHEME_VERSION_W 9
+#define MZSCHEME_VERSION_W 10
 
 #define MZSCHEME_VERSION_MAJOR ((MZSCHEME_VERSION_X * 100) + MZSCHEME_VERSION_Y)
 #define MZSCHEME_VERSION_MINOR ((MZSCHEME_VERSION_Z * 1000) + MZSCHEME_VERSION_W)
