diff options
author | Andy Wingo <wingo@pobox.com> | 2009-10-17 17:23:09 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2009-10-23 15:10:25 +0200 |
commit | 7e01997e88c54216678271de36b1c2088377492d (patch) | |
tree | b8f9817abd25a3b2802367b1f115548f8c2202fc /libguile/vm-i-system.c | |
parent | 8753fd537c4eadf7495f4ba867def99e77246dfc (diff) | |
download | guile-7e01997e88c54216678271de36b1c2088377492d.tar.gz |
finish support for optional & keyword args; update ecmascript compiler
* libguile/_scm.h (SCM_OBJCODE_MINOR_VERSION): Bump.
* libguile/vm-i-system.c (br-if-nargs-ne, br-if-args-lt)
(br-if-nargs-gt): New instructions, for use by different lambda cases.
(bind-optionals, bind-optionals/shuffle, bind-kwargs): New
instructions, for binding optional and keyword arguments. Renumber
other ops.
* module/language/ecmascript/compile-tree-il.scm (comp, comp-body):
Update for new tree-il. Use the new optional argument mechanism
instead of emulating it with rest arguments.
* module/language/glil/compile-assembly.scm (glil->assembly): Tweaks for
optional and keyword argument compilation.
* module/language/tree-il.scm (parse-tree-il, unparse-tree-il): Make the
else case optional, in the s-expression serialization of tree-il.
* module/language/tree-il/compile-glil.scm (flatten): Handle all of the
lambda-case capabilities.
Diffstat (limited to 'libguile/vm-i-system.c')
-rw-r--r-- | libguile/vm-i-system.c | 186 |
1 files changed, 155 insertions, 31 deletions
diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c index b1a261a68..66e493511 100644 --- a/libguile/vm-i-system.c +++ b/libguile/vm-i-system.c @@ -480,7 +480,43 @@ VM_DEFINE_INSTRUCTION (37, br_if_not_null, "br-if-not-null", 3, 0, 0) * Subprogram call */ -VM_DEFINE_INSTRUCTION (38, assert_nargs_ee, "assert-nargs-ee", 2, 0, 0) +VM_DEFINE_INSTRUCTION (38, br_if_nargs_ne, "br-if-nargs-ne", 5, 0, 0) +{ + scm_t_ptrdiff n; + n = FETCH () << 8; + n += FETCH (); + scm_t_int32 offset; + FETCH_OFFSET (offset); + if (sp - (fp - 1) != n) + ip += offset; + NEXT; +} + +VM_DEFINE_INSTRUCTION (39, br_if_nargs_lt, "br-if-nargs-lt", 5, 0, 0) +{ + scm_t_ptrdiff n; + n = FETCH () << 8; + n += FETCH (); + scm_t_int32 offset; + FETCH_OFFSET (offset); + if (sp - (fp - 1) < n) + ip += offset; + NEXT; +} + +VM_DEFINE_INSTRUCTION (40, br_if_nargs_gt, "br-if-nargs-gt", 5, 0, 0) +{ + scm_t_ptrdiff n; + n = FETCH () << 8; + n += FETCH (); + scm_t_int32 offset; + FETCH_OFFSET (offset); + if (sp - (fp - 1) > n) + ip += offset; + NEXT; +} + +VM_DEFINE_INSTRUCTION (41, assert_nargs_ee, "assert-nargs-ee", 2, 0, 0) { scm_t_ptrdiff n; n = FETCH () << 8; @@ -490,7 +526,7 @@ VM_DEFINE_INSTRUCTION (38, assert_nargs_ee, "assert-nargs-ee", 2, 0, 0) NEXT; } -VM_DEFINE_INSTRUCTION (39, assert_nargs_ge, "assert-nargs-ge", 2, 0, 0) +VM_DEFINE_INSTRUCTION (42, assert_nargs_ge, "assert-nargs-ge", 2, 0, 0) { scm_t_ptrdiff n; n = FETCH () << 8; @@ -500,7 +536,95 @@ VM_DEFINE_INSTRUCTION (39, assert_nargs_ge, "assert-nargs-ge", 2, 0, 0) NEXT; } -VM_DEFINE_INSTRUCTION (40, bind_rest, "bind-rest", 2, -1, -1) +VM_DEFINE_INSTRUCTION (43, bind_optionals, "bind-optionals", 2, -1, -1) +{ + scm_t_ptrdiff n; + n = FETCH () << 8; + n += FETCH (); + while (sp - (fp - 1) < n) + PUSH (SCM_UNDEFINED); + NEXT; +} + +VM_DEFINE_INSTRUCTION (44, bind_optionals_shuffle, "bind-optionals/shuffle", 6, -1, -1) +{ + SCM *walk; + scm_t_ptrdiff nreq, nreq_and_opt, ntotal; + nreq = FETCH () << 8; + nreq += FETCH (); + nreq_and_opt = FETCH () << 8; + nreq_and_opt += FETCH (); + ntotal = FETCH () << 8; + ntotal += FETCH (); + + /* look in optionals for first keyword or last positional */ + /* starting after the last required positional arg */ + walk = (fp - 1) + nreq; + while (/* while we have args */ + walk <= sp + /* and we still have positionals to fill */ + && walk - (fp - 1) < nreq_and_opt + /* and we haven't reached a keyword yet */ + && !scm_is_keyword (*walk)) + /* bind this optional arg (by leaving it in place) */ + walk++; + /* now shuffle up, from walk to ntotal */ + { + scm_t_ptrdiff nshuf = sp - walk + 1; + sp = (fp - 1) + ntotal + nshuf; + CHECK_OVERFLOW (); + while (nshuf--) + sp[-nshuf] = walk[nshuf]; + } + /* and fill optionals & keyword args with SCM_UNDEFINED */ + while (walk < (fp - 1) + ntotal) + *walk++ = SCM_UNDEFINED; + + NEXT; +} + +VM_DEFINE_INSTRUCTION (45, bind_kwargs, "bind-kwargs", 5, 0, 0) +{ + scm_t_uint16 idx; + scm_t_ptrdiff nkw; + int allow_other_keys; + SCM kw; + idx = FETCH () << 8; + idx += FETCH (); + nkw = FETCH () << 8; + nkw += FETCH (); + allow_other_keys = FETCH (); + + if ((sp - (fp - 1) - nkw) % 2) + goto vm_error_kwargs_length_not_even; + + CHECK_OBJECT (idx); + kw = OBJECT_REF (idx); + /* switch nkw to be a negative index below sp */ + for (nkw = -(sp - (fp - 1) - nkw) + 1; nkw < 0; nkw += 2) + { + SCM walk; + if (!scm_is_keyword (sp[nkw])) + goto vm_error_kwargs_invalid_keyword; + for (walk = kw; scm_is_pair (walk); walk = SCM_CDR (walk)) + { + if (scm_is_eq (SCM_CAAR (walk), sp[nkw])) + { + SCM si = SCM_CDAR (walk); + LOCAL_SET (SCM_I_INUMP (si) ? SCM_I_INUM (si) : scm_to_long (si), + sp[nkw + 1]); + break; + } + } + if (!allow_other_keys && !scm_is_pair (walk)) + goto vm_error_kwargs_unrecognized_keyword; + nkw += 2; + } + + NEXT; +} + +VM_DEFINE_INSTRUCTION (46, bind_rest, "bind-rest", 2, -1, -1) { scm_t_ptrdiff n; SCM rest = SCM_EOL; @@ -513,7 +637,7 @@ VM_DEFINE_INSTRUCTION (40, bind_rest, "bind-rest", 2, -1, -1) NEXT; } -VM_DEFINE_INSTRUCTION (41, reserve_locals, "reserve-locals", 2, -1, -1) +VM_DEFINE_INSTRUCTION (47, reserve_locals, "reserve-locals", 2, -1, -1) { SCM *old_sp; scm_t_int32 n; @@ -534,7 +658,7 @@ VM_DEFINE_INSTRUCTION (41, reserve_locals, "reserve-locals", 2, -1, -1) NEXT; } -VM_DEFINE_INSTRUCTION (42, new_frame, "new-frame", 0, 0, 3) +VM_DEFINE_INSTRUCTION (48, new_frame, "new-frame", 0, 0, 3) { /* NB: if you change this, see frames.c:vm-frame-num-locals */ /* and frames.h, vm-engine.c, etc of course */ @@ -544,7 +668,7 @@ VM_DEFINE_INSTRUCTION (42, new_frame, "new-frame", 0, 0, 3) NEXT; } -VM_DEFINE_INSTRUCTION (43, call, "call", 1, -1, 1) +VM_DEFINE_INSTRUCTION (49, call, "call", 1, -1, 1) { SCM x; nargs = FETCH (); @@ -605,7 +729,7 @@ VM_DEFINE_INSTRUCTION (43, call, "call", 1, -1, 1) goto vm_error_wrong_type_apply; } -VM_DEFINE_INSTRUCTION (44, goto_args, "goto/args", 1, -1, 1) +VM_DEFINE_INSTRUCTION (50, goto_args, "goto/args", 1, -1, 1) { register SCM x; nargs = FETCH (); @@ -678,7 +802,7 @@ VM_DEFINE_INSTRUCTION (44, goto_args, "goto/args", 1, -1, 1) goto vm_error_wrong_type_apply; } -VM_DEFINE_INSTRUCTION (45, goto_nargs, "goto/nargs", 0, 0, 1) +VM_DEFINE_INSTRUCTION (51, goto_nargs, "goto/nargs", 0, 0, 1) { SCM x; POP (x); @@ -687,7 +811,7 @@ VM_DEFINE_INSTRUCTION (45, goto_nargs, "goto/nargs", 0, 0, 1) goto vm_goto_args; } -VM_DEFINE_INSTRUCTION (46, call_nargs, "call/nargs", 0, 0, 1) +VM_DEFINE_INSTRUCTION (52, call_nargs, "call/nargs", 0, 0, 1) { SCM x; POP (x); @@ -696,7 +820,7 @@ VM_DEFINE_INSTRUCTION (46, call_nargs, "call/nargs", 0, 0, 1) goto vm_call; } -VM_DEFINE_INSTRUCTION (47, mv_call, "mv-call", 4, -1, 1) +VM_DEFINE_INSTRUCTION (53, mv_call, "mv-call", 4, -1, 1) { SCM x; scm_t_int32 offset; @@ -758,7 +882,7 @@ VM_DEFINE_INSTRUCTION (47, mv_call, "mv-call", 4, -1, 1) goto vm_error_wrong_type_apply; } -VM_DEFINE_INSTRUCTION (48, apply, "apply", 1, -1, 1) +VM_DEFINE_INSTRUCTION (54, apply, "apply", 1, -1, 1) { int len; SCM ls; @@ -777,7 +901,7 @@ VM_DEFINE_INSTRUCTION (48, apply, "apply", 1, -1, 1) goto vm_call; } -VM_DEFINE_INSTRUCTION (49, goto_apply, "goto/apply", 1, -1, 1) +VM_DEFINE_INSTRUCTION (55, goto_apply, "goto/apply", 1, -1, 1) { int len; SCM ls; @@ -796,7 +920,7 @@ VM_DEFINE_INSTRUCTION (49, goto_apply, "goto/apply", 1, -1, 1) goto vm_goto_args; } -VM_DEFINE_INSTRUCTION (50, call_cc, "call/cc", 0, 1, 1) +VM_DEFINE_INSTRUCTION (56, call_cc, "call/cc", 0, 1, 1) { int first; SCM proc, cont; @@ -833,7 +957,7 @@ VM_DEFINE_INSTRUCTION (50, call_cc, "call/cc", 0, 1, 1) } } -VM_DEFINE_INSTRUCTION (51, goto_cc, "goto/cc", 0, 1, 1) +VM_DEFINE_INSTRUCTION (57, goto_cc, "goto/cc", 0, 1, 1) { int first; SCM proc, cont; @@ -865,7 +989,7 @@ VM_DEFINE_INSTRUCTION (51, goto_cc, "goto/cc", 0, 1, 1) } } -VM_DEFINE_INSTRUCTION (52, return, "return", 0, 1, 1) +VM_DEFINE_INSTRUCTION (58, return, "return", 0, 1, 1) { vm_return: EXIT_HOOK (); @@ -901,7 +1025,7 @@ VM_DEFINE_INSTRUCTION (52, return, "return", 0, 1, 1) NEXT; } -VM_DEFINE_INSTRUCTION (53, return_values, "return/values", 1, -1, -1) +VM_DEFINE_INSTRUCTION (59, return_values, "return/values", 1, -1, -1) { /* nvalues declared at top level, because for some reason gcc seems to think that perhaps it might be used without declaration. Fooey to that, I say. */ @@ -956,7 +1080,7 @@ VM_DEFINE_INSTRUCTION (53, return_values, "return/values", 1, -1, -1) NEXT; } -VM_DEFINE_INSTRUCTION (54, return_values_star, "return/values*", 1, -1, -1) +VM_DEFINE_INSTRUCTION (60, return_values_star, "return/values*", 1, -1, -1) { SCM l; @@ -979,7 +1103,7 @@ VM_DEFINE_INSTRUCTION (54, return_values_star, "return/values*", 1, -1, -1) goto vm_return_values; } -VM_DEFINE_INSTRUCTION (55, truncate_values, "truncate-values", 2, -1, -1) +VM_DEFINE_INSTRUCTION (61, truncate_values, "truncate-values", 2, -1, -1) { SCM x; int nbinds, rest; @@ -1002,7 +1126,7 @@ VM_DEFINE_INSTRUCTION (55, truncate_values, "truncate-values", 2, -1, -1) NEXT; } -VM_DEFINE_INSTRUCTION (56, box, "box", 1, 1, 0) +VM_DEFINE_INSTRUCTION (62, box, "box", 1, 1, 0) { SCM val; POP (val); @@ -1016,7 +1140,7 @@ VM_DEFINE_INSTRUCTION (56, box, "box", 1, 1, 0) (set! a (lambda () (b ...))) ...) */ -VM_DEFINE_INSTRUCTION (57, empty_box, "empty-box", 1, 0, 0) +VM_DEFINE_INSTRUCTION (63, empty_box, "empty-box", 1, 0, 0) { SYNC_BEFORE_GC (); LOCAL_SET (FETCH (), @@ -1024,7 +1148,7 @@ VM_DEFINE_INSTRUCTION (57, empty_box, "empty-box", 1, 0, 0) NEXT; } -VM_DEFINE_INSTRUCTION (58, local_boxed_ref, "local-boxed-ref", 1, 0, 1) +VM_DEFINE_INSTRUCTION (64, local_boxed_ref, "local-boxed-ref", 1, 0, 1) { SCM v = LOCAL_REF (FETCH ()); ASSERT_BOUND_VARIABLE (v); @@ -1032,7 +1156,7 @@ VM_DEFINE_INSTRUCTION (58, local_boxed_ref, "local-boxed-ref", 1, 0, 1) NEXT; } -VM_DEFINE_INSTRUCTION (59, local_boxed_set, "local-boxed-set", 1, 1, 0) +VM_DEFINE_INSTRUCTION (65, local_boxed_set, "local-boxed-set", 1, 1, 0) { SCM v, val; v = LOCAL_REF (FETCH ()); @@ -1042,7 +1166,7 @@ VM_DEFINE_INSTRUCTION (59, local_boxed_set, "local-boxed-set", 1, 1, 0) NEXT; } -VM_DEFINE_INSTRUCTION (60, free_ref, "free-ref", 1, 0, 1) +VM_DEFINE_INSTRUCTION (66, free_ref, "free-ref", 1, 0, 1) { scm_t_uint8 idx = FETCH (); @@ -1053,7 +1177,7 @@ VM_DEFINE_INSTRUCTION (60, free_ref, "free-ref", 1, 0, 1) /* no free-set -- if a var is assigned, it should be in a box */ -VM_DEFINE_INSTRUCTION (61, free_boxed_ref, "free-boxed-ref", 1, 0, 1) +VM_DEFINE_INSTRUCTION (67, free_boxed_ref, "free-boxed-ref", 1, 0, 1) { SCM v; scm_t_uint8 idx = FETCH (); @@ -1064,7 +1188,7 @@ VM_DEFINE_INSTRUCTION (61, free_boxed_ref, "free-boxed-ref", 1, 0, 1) NEXT; } -VM_DEFINE_INSTRUCTION (62, free_boxed_set, "free-boxed-set", 1, 1, 0) +VM_DEFINE_INSTRUCTION (68, free_boxed_set, "free-boxed-set", 1, 1, 0) { SCM v, val; scm_t_uint8 idx = FETCH (); @@ -1076,7 +1200,7 @@ VM_DEFINE_INSTRUCTION (62, free_boxed_set, "free-boxed-set", 1, 1, 0) NEXT; } -VM_DEFINE_INSTRUCTION (63, make_closure, "make-closure", 0, 2, 1) +VM_DEFINE_INSTRUCTION (69, make_closure, "make-closure", 0, 2, 1) { SCM vect; POP (vect); @@ -1087,7 +1211,7 @@ VM_DEFINE_INSTRUCTION (63, make_closure, "make-closure", 0, 2, 1) NEXT; } -VM_DEFINE_INSTRUCTION (64, make_variable, "make-variable", 0, 0, 1) +VM_DEFINE_INSTRUCTION (70, make_variable, "make-variable", 0, 0, 1) { SYNC_BEFORE_GC (); /* fixme underflow */ @@ -1095,7 +1219,7 @@ VM_DEFINE_INSTRUCTION (64, make_variable, "make-variable", 0, 0, 1) NEXT; } -VM_DEFINE_INSTRUCTION (65, fix_closure, "fix-closure", 2, 0, 1) +VM_DEFINE_INSTRUCTION (71, fix_closure, "fix-closure", 2, 0, 1) { SCM x, vect; unsigned int i = FETCH (); @@ -1109,7 +1233,7 @@ VM_DEFINE_INSTRUCTION (65, fix_closure, "fix-closure", 2, 0, 1) NEXT; } -VM_DEFINE_INSTRUCTION (66, define, "define", 0, 0, 2) +VM_DEFINE_INSTRUCTION (72, define, "define", 0, 0, 2) { SCM sym, val; POP (sym); @@ -1121,7 +1245,7 @@ VM_DEFINE_INSTRUCTION (66, define, "define", 0, 0, 2) NEXT; } -VM_DEFINE_INSTRUCTION (67, make_keyword, "make-keyword", 0, 1, 1) +VM_DEFINE_INSTRUCTION (73, make_keyword, "make-keyword", 0, 1, 1) { CHECK_UNDERFLOW (); SYNC_REGISTER (); @@ -1129,7 +1253,7 @@ VM_DEFINE_INSTRUCTION (67, make_keyword, "make-keyword", 0, 1, 1) NEXT; } -VM_DEFINE_INSTRUCTION (68, make_symbol, "make-symbol", 0, 1, 1) +VM_DEFINE_INSTRUCTION (74, make_symbol, "make-symbol", 0, 1, 1) { CHECK_UNDERFLOW (); SYNC_REGISTER (); |