Fix infinite loop in expander

[bpt/guile.git] / libguile / memoize.h

diff --git a/libguile/memoize.h b/libguile/memoize.h
index 7b4d716..23c0306 100644 (file)
--- a/libguile/memoize.h
+++ b/libguile/memoize.h
@@ -3,7 +3,7 @@
 #ifndef SCM_MEMOIZE_H
 #define SCM_MEMOIZE_H
 
-/* Copyright (C) 1995,1996,1998,1999,2000,2001,2002,2004,2008,2009,2010,2011,2013
+/* Copyright (C) 1995,1996,1998,1999,2000,2001,2002,2004,2008,2009,2010,2011,2013,2014
  * Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -44,12 +44,10 @@ SCM_API SCM scm_sym_quote;
 SCM_API SCM scm_sym_quasiquote;
 SCM_API SCM scm_sym_unquote;
 SCM_API SCM scm_sym_uq_splicing;
-SCM_API SCM scm_sym_with_fluids;
 
 SCM_API SCM scm_sym_at;
 SCM_API SCM scm_sym_atat;
 SCM_API SCM scm_sym_delay;
-SCM_API SCM scm_sym_at_dynamic_wind;
 SCM_API SCM scm_sym_eval_when;
 SCM_API SCM scm_sym_arrow;
 SCM_API SCM scm_sym_else;
@@ -60,32 +58,27 @@ SCM_API SCM scm_sym_args;
 /* {Memoized Source}
  */
 
-SCM_INTERNAL scm_t_bits scm_tc16_memoized;
-
-#define SCM_MEMOIZED_P(x)      (SCM_SMOB_PREDICATE (scm_tc16_memoized, (x)))
-#define SCM_MEMOIZED_TAG(x)    (SCM_SMOB_FLAGS (x))
-#define SCM_MEMOIZED_ARGS(x)   (SCM_SMOB_OBJECT (x))
+#define SCM_MEMOIZED_TAG(x)    (scm_to_uint16 (scm_car (x)))
+#define SCM_MEMOIZED_ARGS(x)   (scm_cdr (x))
 
 enum
   {
     SCM_M_SEQ,
     SCM_M_IF,
     SCM_M_LAMBDA,
+    SCM_M_CAPTURE_ENV,
     SCM_M_LET,
     SCM_M_QUOTE,
-    SCM_M_DEFINE,
-    SCM_M_DYNWIND,
-    SCM_M_WITH_FLUIDS,
+    SCM_M_CAPTURE_MODULE,
     SCM_M_APPLY,
     SCM_M_CONT,
     SCM_M_CALL_WITH_VALUES,
     SCM_M_CALL,
     SCM_M_LEXICAL_REF,
     SCM_M_LEXICAL_SET,
-    SCM_M_TOPLEVEL_REF,
-    SCM_M_TOPLEVEL_SET,
-    SCM_M_MODULE_REF,
-    SCM_M_MODULE_SET,
+    SCM_M_BOX_REF,
+    SCM_M_BOX_SET,
+    SCM_M_RESOLVE,
     SCM_M_CALL_WITH_PROMPT
   };
 
@@ -94,11 +87,8 @@ enum
 
 SCM_INTERNAL SCM scm_memoize_expression (SCM exp);
 SCM_INTERNAL SCM scm_unmemoize_expression (SCM memoized);
-SCM_INTERNAL SCM scm_memoized_expression_typecode (SCM memoized);
-SCM_INTERNAL SCM scm_memoized_expression_data (SCM memoized);
 SCM_INTERNAL SCM scm_memoized_typecode (SCM sym);
-SCM_INTERNAL SCM scm_memoize_variable_access_x (SCM memoized, SCM module);
-SCM_API SCM scm_memoized_p (SCM obj);
+SCM_INTERNAL SCM scm_sys_resolve_variable (SCM loc, SCM module);
 
 SCM_INTERNAL void scm_init_memoize (void);