diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog.MELT | 4 | ||||
| -rw-r--r-- | gcc/melt/warmelt-normal.melt | 25 | ||||
| -rw-r--r-- | gcc/run-basilys.h | 1 |
3 files changed, 21 insertions, 9 deletions
diff --git a/gcc/ChangeLog.MELT b/gcc/ChangeLog.MELT index ce340a0929b..a82e9bf105a 100644 --- a/gcc/ChangeLog.MELT +++ b/gcc/ChangeLog.MELT @@ -1,4 +1,8 @@ 2009-06-17 Basile Starynkevitch <basile@starynkevitch.net> + * run-basilys.h: don't include compiler-probe.h. + * melt/warmelt-normal.melt: more stuff in normexp_funmatchexpr. + +2009-06-17 Basile Starynkevitch <basile@starynkevitch.net> [pretty printing made more similar to trunk by renaming bufstream field as stream] * tree-pretty-print.c (maybe_init_pretty_print): renmad bufstream diff --git a/gcc/melt/warmelt-normal.melt b/gcc/melt/warmelt-normal.melt index 27f9b5e862f..890debc4b9d 100644 --- a/gcc/melt/warmelt-normal.melt +++ b/gcc/melt/warmelt-normal.melt @@ -1524,17 +1524,26 @@ (assert_msg "check nctxt" (is_a ncx class_normcontext)) (let ( (sloc (unsafe_get_field :src_loc recv)) (sfmat (unsafe_get_field :sfmatx_fmatcher recv)) + (sfbind (unsafe_get_field :sfmatx_fmatbind recv)) (sargs (unsafe_get_field :sfmatx_args recv)) ) (assert_msg "check sfmat" (is_a sfmat class_funmatcher)) - (multicall - (nargs nbind) - (normalize_tuple sargs env ncx sloc) - (debug_msg nargs "normexp_funmatchexpr nargs") - (debug_msg recv "@$@unimplemented normexp_funmatchexpr recv") - (assert_msg "@$@unimplemented normexp_funmatchexpr" ()) - (compile_warning "@$@unimplemented normexp_funmatchexpr" ()) -))) + (assert_msg "check sfbind" (is_a sfbind class_any_binding)) + (debug_msg sfbind "normexp_funmatchexpr sfbind") + (let ( (fmatsym (unsafe_get_field :binder sfbind)) ) + (assert_msg "check fmatsym" (is_a fmatsym class_symbol)) + (assert_msg "check good sfbind" (== sfbind (find_env env fmatsym))) + (let ( (nfmat (normal_exp fmatsym env ncx psloc)) ) + (debug_msg nfmat "normexp_funmatchexpr nfmat") + ;; should create a binding to hold the nfmat's fmatch_applyf field + (multicall + (nargs nbind) + (normalize_tuple sargs env ncx sloc) + (debug_msg nargs "normexp_funmatchexpr nargs") + (debug_msg recv "@$@unimplemented normexp_funmatchexpr recv") + (assert_msg "@$@unimplemented normexp_funmatchexpr" ()) + (compile_warning "@$@unimplemented normexp_funmatchexpr" ()) + ))))) (install_method class_src_funmatchexpr normal_exp normexp_funmatchexpr) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/gcc/run-basilys.h b/gcc/run-basilys.h index 002b474f739..1f5c9561047 100644 --- a/gcc/run-basilys.h +++ b/gcc/run-basilys.h @@ -61,7 +61,6 @@ Boston, MA 02110-1301, USA. */ /* basilys or MELT specific includes */ -#include "compiler-probe.h" #if HAVE_PARMAPOLY |