unwind: rename env frames.

Unwind frames of type ENV exist for the sake of the pattern
language. Let's rename them accordingly.

* match.c (tleval, tleval_progn, h_fun, tx_subst_vars, v_bind,
v_output, v_filter, v_fun): Occurrences of the macros
uw_env_begin and uw_env_end are renamed.

* unwind.c (uw_env_stack): Renamed to uw_menv_stack.
(uw_unwind_to_exit_point, uw_abscond_to_exit_point,
uw_find_env, uw_pop_frame, revive_cont): Follow
rename of UW_ENV to UW_MENV and uw_env_stack to uw_menv_stack.
(uw_push_env): Renamed to uw_push_match_env, and updated to
follow renames.

* unwind.h (enum uw_frtype, uw_frtype_t): UW_ENV renamed
to UW_MENV.
(uw_push_env): Renamed to uw_push_match_env.
(uw_env_begin, uw_env_end): Renamed to uw_match_env_begin an
uw_match_env_end.

1 files changed, 5 insertions, 5 deletions

diff --git a/unwind.h b/unwind.h
index 98f4b7b7..ad7c5f3b 100644
--- a/unwind.h
+++ b/unwind.h
@@ -27,7 +27,7 @@
 
 typedef union uw_frame uw_frame_t;
 typedef enum uw_frtype {
-  UW_BLOCK, UW_CAPTURED_BLOCK, UW_ENV, UW_CATCH, UW_HANDLE,
+  UW_BLOCK, UW_CAPTURED_BLOCK, UW_MENV, UW_CATCH, UW_HANDLE,
   UW_CONT_COPY, UW_GUARD, UW_DBG
 } uw_frtype_t;
 
@@ -117,7 +117,7 @@ union uw_frame {
 } UW_FRAME_ALIGN;
 
 void uw_push_block(uw_frame_t *, val tag);
-void uw_push_env(uw_frame_t *);
+void uw_push_match_env(uw_frame_t *);
 val uw_get_func(val sym);
 val uw_set_func(val sym, val value);
 val uw_get_match_context(void);
@@ -193,12 +193,12 @@ noreturn val type_mismatch(val, ...);
     uw_pop_block(&uw_blk, uw_rslt);             \
   } while (0)
 
-#define uw_env_begin                    \
+#define uw_match_env_begin              \
   do {                                  \
     uw_frame_t uw_env;                  \
-    uw_push_env(&uw_env)
+    uw_push_match_env(&uw_env)
 
-#define uw_env_end                      \
+#define uw_match_env_end                \
     uw_pop_frame(&uw_env);              \
   } while (0)