Fix infinite loop in expander

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

diff --git a/libguile/memoize.h b/libguile/memoize.h
index 68dcd21..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
@@ -66,9 +66,9 @@ 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_CAPTURE_MODULE,
     SCM_M_APPLY,
     SCM_M_CONT,
@@ -76,10 +76,9 @@ enum
     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
   };
 
@@ -89,7 +88,7 @@ enum
 SCM_INTERNAL SCM scm_memoize_expression (SCM exp);
 SCM_INTERNAL SCM scm_unmemoize_expression (SCM memoized);
 SCM_INTERNAL SCM scm_memoized_typecode (SCM sym);
-SCM_INTERNAL SCM scm_memoize_variable_access_x (SCM memoized, SCM module);
+SCM_INTERNAL SCM scm_sys_resolve_variable (SCM loc, SCM module);
 
 SCM_INTERNAL void scm_init_memoize (void);