HCoop
/
bpt
/
guile.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
guile-private-ref
[bpt/guile.git]
/
libguile
/
memoize.h
diff --git
a/libguile/memoize.h
b/libguile/memoize.h
index
5a96ef6
..
23c0306
100644
(file)
--- a/
libguile/memoize.h
+++ b/
libguile/memoize.h
@@
-3,7
+3,7
@@
#ifndef SCM_MEMOIZE_H
#define SCM_MEMOIZE_H
#ifndef SCM_MEMOIZE_H
#define SCM_MEMOIZE_H
-/* Copyright (C) 1995,1996,1998,1999,2000,2001,2002,2004,2008,2009
+/* 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
* Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
@@
-47,9
+47,6
@@
SCM_API SCM scm_sym_uq_splicing;
SCM_API SCM scm_sym_at;
SCM_API SCM scm_sym_atat;
SCM_API SCM scm_sym_at;
SCM_API SCM scm_sym_atat;
-SCM_API SCM scm_sym_atapply;
-SCM_API SCM scm_sym_atcall_cc;
-SCM_API SCM scm_sym_at_call_with_values;
SCM_API SCM scm_sym_delay;
SCM_API SCM scm_sym_eval_when;
SCM_API SCM scm_sym_arrow;
SCM_API SCM scm_sym_delay;
SCM_API SCM scm_sym_eval_when;
SCM_API SCM scm_sym_arrow;
@@
-61,30
+58,28
@@
SCM_API SCM scm_sym_args;
/* {Memoized Source}
*/
/* {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
{
enum
{
- SCM_M_
BEGIN
,
+ SCM_M_
SEQ
,
SCM_M_IF,
SCM_M_LAMBDA,
SCM_M_IF,
SCM_M_LAMBDA,
+ SCM_M_CAPTURE_ENV,
SCM_M_LET,
SCM_M_QUOTE,
SCM_M_LET,
SCM_M_QUOTE,
- SCM_M_
DEFIN
E,
+ SCM_M_
CAPTURE_MODUL
E,
SCM_M_APPLY,
SCM_M_CONT,
SCM_M_CALL_WITH_VALUES,
SCM_M_CALL,
SCM_M_LEXICAL_REF,
SCM_M_LEXICAL_SET,
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_SE
T
+ SCM_M_
BOX
_REF,
+ SCM_M_
BOX
_SET,
+ SCM_M_
RESOLVE
,
+ SCM_M_
CALL_WITH_PROMP
T
};
};
@@
-92,7
+87,8
@@
enum
SCM_INTERNAL SCM scm_memoize_expression (SCM exp);
SCM_INTERNAL SCM scm_unmemoize_expression (SCM memoized);
SCM_INTERNAL SCM scm_memoize_expression (SCM exp);
SCM_INTERNAL SCM scm_unmemoize_expression (SCM memoized);
-SCM_API SCM scm_memoized_p (SCM obj);
+SCM_INTERNAL SCM scm_memoized_typecode (SCM sym);
+SCM_INTERNAL SCM scm_sys_resolve_variable (SCM loc, SCM module);
SCM_INTERNAL void scm_init_memoize (void);
SCM_INTERNAL void scm_init_memoize (void);