diff options
| author | Andy Wingo <wingo@pobox.com> | 2013-11-19 19:18:36 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2013-11-19 19:36:38 +0100 |
| commit | a1eb8d1168c35889d50893e636eee7cfec581cba (patch) | |
| tree | 5e2ae7d14514574f09e061789a0383af889cda42 /libguile/programs.h | |
| parent | d1100525ff1b4e6e1fdb7d818cef3ec7a838e002 (diff) | |
| download | guile-a1eb8d1168c35889d50893e636eee7cfec581cba.tar.gz | |
Reorganize programs.h.
* libguile/programs.h: Reorganize.
Diffstat (limited to 'libguile/programs.h')
| -rw-r--r-- | libguile/programs.h | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/libguile/programs.h b/libguile/programs.h index 846a3af82..eed02ba1a 100644 --- a/libguile/programs.h +++ b/libguile/programs.h @@ -22,7 +22,7 @@ #include <libguile.h> /* - * The new RTL programs. + * Programs */ #define SCM_PROGRAM_P(x) (SCM_HAS_TYP7 (x, scm_tc7_program)) @@ -33,6 +33,20 @@ #define SCM_PROGRAM_NUM_FREE_VARIABLES(x) (SCM_CELL_WORD_0 (x) >> 16) #define SCM_VALIDATE_PROGRAM(p,x) SCM_MAKE_VALIDATE (p, x, PROGRAM_P) +#define SCM_F_PROGRAM_IS_BOOT 0x100 +#define SCM_F_PROGRAM_IS_PRIMITIVE 0x200 +#define SCM_F_PROGRAM_IS_PRIMITIVE_GENERIC 0x400 +#define SCM_F_PROGRAM_IS_CONTINUATION 0x800 +#define SCM_F_PROGRAM_IS_PARTIAL_CONTINUATION 0x1000 +#define SCM_F_PROGRAM_IS_FOREIGN 0x2000 + +#define SCM_PROGRAM_IS_BOOT(x) (SCM_CELL_WORD_0 (x) & SCM_F_PROGRAM_IS_BOOT) +#define SCM_PROGRAM_IS_PRIMITIVE(x) (SCM_CELL_WORD_0 (x) & SCM_F_PROGRAM_IS_PRIMITIVE) +#define SCM_PROGRAM_IS_PRIMITIVE_GENERIC(x) (SCM_CELL_WORD_0 (x) & SCM_F_PROGRAM_IS_PRIMITIVE_GENERIC) +#define SCM_PROGRAM_IS_CONTINUATION(x) (SCM_CELL_WORD_0 (x) & SCM_F_PROGRAM_IS_CONTINUATION) +#define SCM_PROGRAM_IS_PARTIAL_CONTINUATION(x) (SCM_CELL_WORD_0 (x) & SCM_F_PROGRAM_IS_PARTIAL_CONTINUATION) +#define SCM_PROGRAM_IS_FOREIGN(x) (SCM_CELL_WORD_0 (x) & SCM_F_PROGRAM_IS_FOREIGN) + #ifdef BUILDING_LIBGUILE static inline SCM scm_i_make_program (const scm_t_uint32 *code) @@ -53,24 +67,6 @@ SCM_INTERNAL SCM scm_i_program_properties (SCM program); SCM_INTERNAL SCM scm_find_source_for_addr (SCM ip); -/* - * Programs - */ - -#define SCM_F_PROGRAM_IS_BOOT 0x100 -#define SCM_F_PROGRAM_IS_PRIMITIVE 0x200 -#define SCM_F_PROGRAM_IS_PRIMITIVE_GENERIC 0x400 -#define SCM_F_PROGRAM_IS_CONTINUATION 0x800 -#define SCM_F_PROGRAM_IS_PARTIAL_CONTINUATION 0x1000 -#define SCM_F_PROGRAM_IS_FOREIGN 0x2000 - -#define SCM_PROGRAM_IS_BOOT(x) (SCM_CELL_WORD_0 (x) & SCM_F_PROGRAM_IS_BOOT) -#define SCM_PROGRAM_IS_PRIMITIVE(x) (SCM_CELL_WORD_0 (x) & SCM_F_PROGRAM_IS_PRIMITIVE) -#define SCM_PROGRAM_IS_PRIMITIVE_GENERIC(x) (SCM_CELL_WORD_0 (x) & SCM_F_PROGRAM_IS_PRIMITIVE_GENERIC) -#define SCM_PROGRAM_IS_CONTINUATION(x) (SCM_CELL_WORD_0 (x) & SCM_F_PROGRAM_IS_CONTINUATION) -#define SCM_PROGRAM_IS_PARTIAL_CONTINUATION(x) (SCM_CELL_WORD_0 (x) & SCM_F_PROGRAM_IS_PARTIAL_CONTINUATION) -#define SCM_PROGRAM_IS_FOREIGN(x) (SCM_CELL_WORD_0 (x) & SCM_F_PROGRAM_IS_FOREIGN) - SCM_API SCM scm_program_source (SCM program, SCM ip, SCM sources); SCM_API SCM scm_program_num_free_variables (SCM program); SCM_API SCM scm_program_free_variable_ref (SCM program, SCM i); |