mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-21 19:20:21 +02:00
add <primcall> to tree-il
* libguile/expand.c: * libguile/expand.h (SCM_EXPANDED_PRIMCALL_TYPE_NAME): (SCM_EXPANDED_PRIMCALL_FIELD_NAMES): (SCM_EXPANDED_PRIMCALL_SRC): (SCM_EXPANDED_PRIMCALL_NAME): (SCM_EXPANDED_PRIMCALL_ARGS): (SCM_MAKE_EXPANDED_PRIMCALL): Add "primcall" Tree-IL type. * doc/ref/compiler.texi (Tree-IL): Update docs. * libguile/memoize.c (memoize): Memoizer for primcalls. * module/ice-9/psyntax.scm: Build primcalls, sometimes. Also change build-primref to just make a primitive-ref. * module/language/tree-il.scm: Add primcall to the exports, parsers, serializers, etc. * module/language/tree-il/analyze.scm: * module/language/tree-il/compile-glil.scm: * module/language/tree-il/fix-letrec.scm: * module/language/tree-il/inline.scm: * module/language/tree-il/primitives.scm: * module/language/elisp/compile-tree-il.scm: Add primcall support. * test-suite/tests/tree-il.test: Use primcalls sometimes.
This commit is contained in:
parent
7081d4f981
commit
a881a4ae3b
14 changed files with 7186 additions and 7090 deletions
|
@ -1244,6 +1244,7 @@ scm_init_expand ()
|
|||
DEFINE_NAMES (TOPLEVEL_DEFINE);
|
||||
DEFINE_NAMES (CONDITIONAL);
|
||||
DEFINE_NAMES (CALL);
|
||||
DEFINE_NAMES (PRIMCALL);
|
||||
DEFINE_NAMES (SEQUENCE);
|
||||
DEFINE_NAMES (LAMBDA);
|
||||
DEFINE_NAMES (LAMBDA_CASE);
|
||||
|
|
|
@ -48,6 +48,7 @@ typedef enum
|
|||
SCM_EXPANDED_TOPLEVEL_DEFINE,
|
||||
SCM_EXPANDED_CONDITIONAL,
|
||||
SCM_EXPANDED_CALL,
|
||||
SCM_EXPANDED_PRIMCALL,
|
||||
SCM_EXPANDED_SEQUENCE,
|
||||
SCM_EXPANDED_LAMBDA,
|
||||
SCM_EXPANDED_LAMBDA_CASE,
|
||||
|
@ -241,6 +242,19 @@ enum
|
|||
#define SCM_MAKE_EXPANDED_CALL(src, proc, args) \
|
||||
scm_c_make_struct (exp_vtables[SCM_EXPANDED_CALL], 0, SCM_NUM_EXPANDED_CALL_FIELDS, SCM_UNPACK (src), SCM_UNPACK (proc), SCM_UNPACK (args))
|
||||
|
||||
#define SCM_EXPANDED_PRIMCALL_TYPE_NAME "primcall"
|
||||
#define SCM_EXPANDED_PRIMCALL_FIELD_NAMES \
|
||||
{ "src", "name", "args", }
|
||||
enum
|
||||
{
|
||||
SCM_EXPANDED_PRIMCALL_SRC,
|
||||
SCM_EXPANDED_PRIMCALL_NAME,
|
||||
SCM_EXPANDED_PRIMCALL_ARGS,
|
||||
SCM_NUM_EXPANDED_PRIMCALL_FIELDS,
|
||||
};
|
||||
#define SCM_MAKE_EXPANDED_PRIMCALL(src, name, args) \
|
||||
scm_c_make_struct (exp_vtables[SCM_EXPANDED_PRIMCALL], 0, SCM_NUM_EXPANDED_PRIMCALL_FIELDS, SCM_UNPACK (src), SCM_UNPACK (name), SCM_UNPACK (args))
|
||||
|
||||
#define SCM_EXPANDED_SEQUENCE_TYPE_NAME "sequence"
|
||||
#define SCM_EXPANDED_SEQUENCE_FIELD_NAMES \
|
||||
{ "src", "exps", }
|
||||
|
|
|
@ -263,6 +263,20 @@ memoize (SCM exp, SCM env)
|
|||
return MAKMEMO_CALL (memoize (proc, env), scm_ilength (args), args);
|
||||
}
|
||||
|
||||
case SCM_EXPANDED_PRIMCALL:
|
||||
{
|
||||
SCM proc, args;
|
||||
|
||||
if (scm_is_eq (scm_current_module (), scm_the_root_module ()))
|
||||
proc = MAKMEMO_TOP_REF (REF (exp, PRIMCALL, NAME));
|
||||
else
|
||||
proc = MAKMEMO_MOD_REF (list_of_guile, REF (exp, PRIMCALL, NAME),
|
||||
SCM_BOOL_F);
|
||||
args = memoize_exps (REF (exp, PRIMCALL, ARGS), env);
|
||||
|
||||
return MAKMEMO_CALL (proc, scm_ilength (args), args);
|
||||
}
|
||||
|
||||
case SCM_EXPANDED_SEQUENCE:
|
||||
return MAKMEMO_BEGIN (memoize_exps (REF (exp, SEQUENCE, EXPS), env));
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue