summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gcc/ChangeLog.MELT11
-rw-r--r--gcc/melt-runtime.c4
-rw-r--r--gcc/melt/warmelt-debug.melt4
-rw-r--r--gcc/melt/warmelt-first.melt2
-rw-r--r--gcc/melt/warmelt-genobj.melt30
-rw-r--r--gcc/melt/warmelt-macro.melt8
-rw-r--r--gcc/melt/warmelt-normal.melt23
-rw-r--r--gcc/melt/warmelt-normatch.melt22
-rw-r--r--gcc/melt/warmelt-outobj.melt6
9 files changed, 61 insertions, 49 deletions
diff --git a/gcc/ChangeLog.MELT b/gcc/ChangeLog.MELT
index 1d02dcf9cdd..9a76b5ea6b0 100644
--- a/gcc/ChangeLog.MELT
+++ b/gcc/ChangeLog.MELT
@@ -1,4 +1,15 @@
+2011-06-24 Basile Starynkevitch <basile@starynkevitch.net>
+ * melt-runtime.c: Spell "receive" correctly in comments or
+ strings.
+ * melt/warmelt-first.melt: Ditto.
+ * melt/warmelt-debug.melt: Ditto.
+ * melt/warmelt-macro.melt: Ditto.
+ * melt/warmelt-normal.melt: Ditto.
+ * melt/warmelt-normatch.melt: Ditto.
+ * melt/warmelt-genobj.melt: Ditto.
+ * melt/warmelt-outobj.melt: Ditto.
+
2011-06-22 Pierre Vittet <piervit@pvittet.com>
* melt-runtime.c (load_melt_modules_and_do_mode): load extra
diff --git a/gcc/melt-runtime.c b/gcc/melt-runtime.c
index 6297ff5c9d5..ada7844c2f0 100644
--- a/gcc/melt-runtime.c
+++ b/gcc/melt-runtime.c
@@ -4742,7 +4742,7 @@ meltgc_send (melt_ptr_t recv_p,
MELT_ENTERFRAME macro call below) to be active when the application
for the sending is performed. This should make our call frames'
linked list shorter. To do so, we put the closure to apply and
- the reciever in the two variables below. Yes this is dirty, but
+ the receiver in the two variables below. Yes this is dirty, but
it works!
We should be very careful when modifying this routine */
@@ -4770,7 +4770,7 @@ meltgc_send (melt_ptr_t recv_p,
#define mul_ancv ((struct meltmultiple_st*)(ancv))
recv = recv_p;
selv = sel_p;
- /* the reciever can be null, using DISCR_NULL_RECEIVER */
+ /* the receiver can be null, using DISCR_NULL_RECEIVER */
#ifdef ENABLE_CHECKING
(void) sendnum; /* to use it */
#endif
diff --git a/gcc/melt/warmelt-debug.melt b/gcc/melt/warmelt-debug.melt
index 032a1d8b406..3f5a642b5f6 100644
--- a/gcc/melt/warmelt-debug.melt
+++ b/gcc/melt/warmelt-debug.melt
@@ -123,7 +123,7 @@ $FILENAM and $LINENO}#
)))
;;; selector to output for debugging
-;;; reciever: any object or value
+;;; receiver: any object or value
;;; arguments: the debuginfo (instance of class_debug_information), the depth (long)
(defselector dbg_output class_selector
:formals (recv dbginfo :long depth)
@@ -132,7 +132,7 @@ $FILENAM and $LINENO}#
;;; selector to output again for debugging
-;;; reciever: any object (already output)
+;;; receiver: any object (already output)
;;; arguments: the debuginfo (instance of class_debug_information), the depth (long)
(defselector dbg_outputagain class_selector
:formals (recv dbginfo :long depth)
diff --git a/gcc/melt/warmelt-first.melt b/gcc/melt/warmelt-first.melt
index a763acebf6b..2be088230e5 100644
--- a/gcc/melt/warmelt-first.melt
+++ b/gcc/melt/warmelt-first.melt
@@ -1535,7 +1535,7 @@ $DISCR_NAME_STRING and $DISCR_VERBATIM_STRING.}#
(unsafe_put_fields discr_string :disc_super discr_any_receiver)
(unsafe_put_fields class_root :disc_super discr_any_receiver)
-;;; the discriminant for null reciever (used for sending to nil)
+;;; the discriminant for null receiver (used for sending to nil)
(definstance discr_null_receiver class_discriminant
:doc #{The $DISCR_NULL_RECEIVER is the discriminant of the nil value, handling messages sent to nil.}#
:predef DISCR_NULL_RECEIVER
diff --git a/gcc/melt/warmelt-genobj.melt b/gcc/melt/warmelt-genobj.melt
index 4dbaf7a03cf..5e67acb83a3 100644
--- a/gcc/melt/warmelt-genobj.melt
+++ b/gcc/melt/warmelt-genobj.melt
@@ -364,7 +364,7 @@
(defclass class_objmsend
:super class_objdestinstr
:fields (obmsnd_sel ;selector object (compiled)
- obmsnd_recv ;message reciever (compiled)
+ obmsnd_recv ;message receiver (compiled)
obmsnd_args ;argument tuple (compiled)
))
@@ -603,7 +603,7 @@
(export_synonym class_objblock class_objplainblock)
;;;; selector to generate the declaration of an initial
-;;; reciever some objinielem
+;;; receiver some objinielem
;;; argument strbuf
(defselector output_c_declinit class_selector
:doc #{$OUTPUT_C_DECLINIT is the selector to generate the
@@ -613,14 +613,14 @@ $SBUF.}#
)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; selector to put a destination into an objcode
-;;; reciever: the objcode
+;;; receiver: the objcode
;;; argument: the destination value
-;;; result: the (modified) recieving objcode or its replacement
+;;; result: the (modified) receiving objcode or its replacement
(defselector put_objdest class_selector
)
;;; selector to generate the c code for an object
-;;; reciever: the object to output
+;;; receiver: the object to output
;;; arguments:
;;;; * DECLBUF the stringbuffer for the declarations
;;;; * IMPLBUF the stringbuffer for implementations
@@ -629,14 +629,14 @@ $SBUF.}#
(defselector output_c_code class_selector
:doc #{$OUTPUT_C_CODE is the selector to generate C code. $RECV is
- the reciever, $DECLBUF is the string-buffer for declarations,
+ the receiver, $DECLBUF is the string-buffer for declarations,
$IMPLBUF is the string-buffer for implementations, $DEPTH is the raw
integer depth.}#
:formals (recv declbuf implbuf :long depth)
)
;;;; selector to generate the initial fill of some objinit
-;;; reciever some objinitelem
+;;; receiver some objinitelem
;;; argument a stringbuffer
(defselector output_c_initial_fill class_selector
:doc #{$OUTPUT_C_INITIAL_FILL is the selector to generate the filling of
@@ -647,7 +647,7 @@ $SBUF.}#
)
;;;; selector to generate the predef fill of some objinit
-;;; reciever some objinitelem
+;;; receiver some objinitelem
;;; argument a stringbuffer
(defselector output_c_initial_predef class_selector
:formals (recv sbuf prtrstr :long depth)
@@ -690,7 +690,7 @@ $SBUF.}#
(defun putobjdest_catchall_anydiscr (recv desto)
(debug_msg recv "putobjdest_catchall_anydiscr recv@@ " )
(debug_msg desto "putobjdest_catchall_anydiscr desto@@ " )
- (outcstring_err "* putobjdest unimplemented reciever discriminant ")
+ (outcstring_err "* putobjdest unimplemented receiver discriminant ")
(let ( (discr (discrim recv))
(discrname (unsafe_get_field :named_name discr))
)
@@ -1973,7 +1973,7 @@ $SBUF.}#
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; selector to compile the fill inside a letrec
-;;; reciever: the normalized constructrive binding
+;;; receiver: the normalized constructrive binding
;;; arguments:
;;;; * GCX the code generation context
;;; result = the obj instruction or value
@@ -3110,7 +3110,7 @@ $SBUF.}#
(assert_msg "check bind" (is_a bind class_any_binding))
(assert_msg "check gcx" (is_a gcx class_c_generation_context))
(debug_msg bind "compilobj_any_binding bind")
- (outcstring_err "* compilobj unimplemented reciever binding class ")
+ (outcstring_err "* compilobj unimplemented receiver binding class ")
(let ( (discr (discrim bind)) ) (outstr_err (unsafe_get_field :named_name discr)))
(outnewline_err)
(assert_msg "@@compile_obj should be implemented in anybinding-s subclasses" ()))
@@ -3392,7 +3392,7 @@ $SBUF.}#
(typdesto (unsafe_get_field :obv_type desto))
)
(cond
- ;; special case when reciever is void
+ ;; special case when receiver is void
( (== typrecv ctype_void)
(if (== typdesto ctype_void)
(return recv)
@@ -4804,7 +4804,7 @@ $SBUF.}#
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; selector to compile a matcher
-;; reciever: some indirect instance of class_any_matcher
+;; receiver: some indirect instance of class_any_matcher
;; arguments:
;;; * the match compilation context
;;; * the generation context
@@ -4827,7 +4827,7 @@ $SBUF.}#
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;; selector to compile a tester
-;;;; reciever: the tester
+;;;; receiver: the tester
;;;; first argument: the generator context gcx
;;;; second argument: the tester context tcx
;;;; return values: primary, the objcode or lists; secondary the destination objcode
@@ -4849,7 +4849,7 @@ $SBUF.}#
(assert_msg "check gcx" (is_a gcx class_c_generation_context))
(assert_msg "check tcx" (is_a tcx class_testercompilcontext))
(debug_msg ntester "compiltst_anytester ntester")
- (outcstring_err "* compiltst unimplemented reciever class ")
+ (outcstring_err "* compiltst unimplemented receiver class ")
(let ( (discr (discrim ntester)) ) (outstr_err (unsafe_get_field :named_name discr)))
(outnewline_err)
(assert_msg "@@compile_tester should be implemented in normtesters-s subclasses" ())
diff --git a/gcc/melt/warmelt-macro.melt b/gcc/melt/warmelt-macro.melt
index 9ab8c4f3bf8..263135bc660 100644
--- a/gcc/melt/warmelt-macro.melt
+++ b/gcc/melt/warmelt-macro.melt
@@ -76,11 +76,11 @@ subexpressions. Field $SARGOP_ARGS is the tuple of arguments.}#
(defclass class_source_msend
:doc #{The internal $CLASS_SOURCE_MSEND for message sending abstract
syntax. $MSEND_SELSYMB is the message selector symbol, $MSEND_RECV
- is the reciever, $SARGOP_ARGS is the tuple of arguments.}#
+ is the receiver, $SARGOP_ARGS is the tuple of arguments.}#
:super class_source_argumented_operator
:fields (
msend_selsymb ;the selector symbol
- msend_recv ;the reciever
+ msend_recv ;the receiver
))
;;; source primitive invocation
@@ -927,7 +927,7 @@ $SPAC_OUTARGS are the output sub-patterns.}#
(spair (pair_tail (list_first scont)))
)
(if (not (is_pair spair))
- (error_plain sloc "missing reciever expression in message send"_))
+ (error_plain sloc "missing receiver expression in message passing"_))
(let ( (xrecv (pair_head spair))
(argtup (expand_pairlist_as_tuple (pair_tail spair) env mexpander))
(res (instance class_source_msend
@@ -3199,7 +3199,7 @@ $CLASS_ROOT $CLASS_CLASS $CLASS_FIELD etc.}#)
(let ( (firstf (multiple_nth formals 0)) )
(cond
( (null firstf)
- (error_plain loc ":formals of DEFSELECTOR should have at least one value argument for the reciever"))
+ (error_plain loc ":formals of DEFSELECTOR should have at least one value argument for the receiver"))
( (!= (get_field :fbind_type firstf) ctype_value)
(error_plain loc "first :formals of DEFSELECTOR should be a :value"))
)))
diff --git a/gcc/melt/warmelt-normal.melt b/gcc/melt/warmelt-normal.melt
index 846e22076f5..ca08022f8ee 100644
--- a/gcc/melt/warmelt-normal.melt
+++ b/gcc/melt/warmelt-normal.melt
@@ -102,12 +102,13 @@ body.}#
;;; normal message sending
(defclass class_nrep_msend
- :doc #{The $CLASS_NREP_SEND is for normal message send, with a
-single result. $NSEND_SEL is the normalized selector, $NSEND_RECV
-the normalized reciever, with $NEXPR_ARGS giving the normalized arguments.}#
+ :doc #{The $CLASS_NREP_SEND is for normal message send (or message
+passing), with a single result. $NSEND_SEL is the normalized selector,
+$NSEND_RECV the normalized receiver, with $NEXPR_ARGS giving the
+normalized arguments.}#
:super class_nrep_typed_expression_with_arguments
:fields (nsend_sel ;the normalized selector occurrence
- nsend_recv ;the reciever
+ nsend_recv ;the receiver
))
@@ -774,7 +775,7 @@ routine procedures.}#
;;; the normal_exp selector
;;;;; expected arguments:
-;;; recv = the reciever, eg a sexpr
+;;; recv = the receiver, eg a sexpr
;;; env = the environment
;;; ncx = the normalization context
;;; psloc = (parent) source location
@@ -869,7 +870,7 @@ routine procedures.}#
)
;;; selector to compile a normalized stuff into an object
-;;; reciever: the normalized stuff
+;;; receiver: the normalized stuff
;;; arguments:
;;;; * GCX the code generation context
;;; result = the obj instruction or value
@@ -1840,11 +1841,11 @@ source location.}#
(nrecv nbindrecv)
(normal_exp msrecv env ncx sloc)
(assert_msg "check nbindrecv" (is_list_or_null nbindrecv))
- ;; check that reciever is a value
+ ;; check that receiver is a value
(let ( (ctypr (get_ctype nrecv env)) )
(assert_msg "normexp_msend check ctypr " (is_a ctypr class_ctype))
(if (!= ctypr ctype_value)
- (error_strv sloc "non value reciever for message send of selector"
+ (error_strv sloc "non value receiver for message send of selector"
(unsafe_get_field :named_name selnam)))
)
(multicall
@@ -3768,7 +3769,7 @@ source location.}#
(debug_msg recv "bad_prepare_constructor_binding recv")
(debug_msg symb "bad_prepare_constructor_binding symb")
(error_strv sloc "invalid constructor binding" (get_field :named_name symb))
- (error_strv sloc "reciever unprepared to constructor binding"
+ (error_strv sloc "receiver unprepared to constructor binding"
(get_field :named_name (discrim recv)))
(assert_msg "@$@badmeth_prepare_constructor_binding" ())
)
@@ -3778,7 +3779,7 @@ source location.}#
;;;;;;;;;;;;;;;;
(defselector normal_letrec_constructive class_selector
:doc #{The $NORMAL_LETREC selector applied to: a constructive
- expression $CEXPR for reciever, a symbol $SYMB, a normal
+ expression $CEXPR for receiver, a symbol $SYMB, a normal
constructive binding $CBIND, an environment $ENV, a normal context
$NCX, a location $SLOC}#
:formals (cexpr symb cbind env ncx sloc))
@@ -3788,7 +3789,7 @@ source location.}#
(debug_msg symb "badmeth_normal_letrec_constructive symb")
(debug_msg cbind "badmeth_normal_letrec_constructive cbind")
(error_strv sloc "invalid letrec constructive symbol" (get_field :named_name symb))
- (error_strv sloc "reciever unprepared to normal_letrec_constructive"
+ (error_strv sloc "receiver unprepared to normal_letrec_constructive"
(get_field :named_name (discrim cexpr)))
(assert_msg "@$@badmeth_normal_letrec_constructive" ())
)
diff --git a/gcc/melt/warmelt-normatch.melt b/gcc/melt/warmelt-normatch.melt
index 7a35cbcd173..0a6010b2865 100644
--- a/gcc/melt/warmelt-normatch.melt
+++ b/gcc/melt/warmelt-normatch.melt
@@ -71,7 +71,7 @@ scanning variables.}#
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; selector to scan a pattern
;;; invoked with :
-;;; * the source pattern as reciever
+;;; * the source pattern as receiver
;;; * a parent source location
;;; * a ctype
;;; * a normpatcontext
@@ -82,7 +82,7 @@ scanning variables.}#
;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;
-;;; catch-all for scanning any reciever (by failing)
+;;; catch-all for scanning any receiver (by failing)
(defun scanpat_anyrecv (recv psloc ctyp pcn)
(debug_msg recv "scanpat_anypattern recv")
(assert_msg "check pcn" (is_a pcn class_pattern_context))
@@ -90,7 +90,7 @@ scanning variables.}#
(myclassname (get_field :named_name myclass)) )
(error_strv psloc
"unimplemented scan_pattern for any " myclassname)
- (assert_msg "catchall scan_pattern unimplemented for any reciever" ())
+ (assert_msg "catchall scan_pattern unimplemented for any receiver" ())
))
(install_method discr_any_receiver scan_pattern scanpat_anyrecv)
@@ -411,7 +411,7 @@ scanning variables.}#
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; selector to normalize a pattern
-;;; reciever is the pattern to normalize
+;;; receiver is the pattern to normalize
;;; arguments are
;;; the normal matched stuff
;;; the closure (if any) to handle the newly created stuff -e.g. tester
@@ -685,7 +685,7 @@ scanning variables.}#
;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;
-;;; catch-all for normpat any reciever (by failing)
+;;; catch-all for normpat any receiver (by failing)
(defun normpat_anyrecv (recv nmatch hdler pcn)
(debug_msg recv "normpat_anyrecv recv")
(assert_msg "check pcn" (is_a pcn class_pattern_context))
@@ -2671,18 +2671,18 @@ originating matched data. Field $NRMATD_RANK is a unique rank.}#
;;;;;;;;;;;;;;;;
(defselector scan_subpatterns class_selector
- :doc #{Apply a given function $FUN to the subpatterns of reciever
+ :doc #{Apply a given function $FUN to the subpatterns of receiver
$RECV with extra context $CTX.}#
:formals (recv fun ctx)
)
(defselector scan_step_data class_selector
- :doc #{Given a reciever $STEP, apply a given function $FUN to all
+ :doc #{Given a receiver $STEP, apply a given function $FUN to all
the data of the $STEP with an extra context $CTX.}#
:formals (step fun ctx))
(defselector scan_step_flag class_selector
- :doc #{Given a reciever $STEP, apply a given function $FUN to all
+ :doc #{Given a receiver $STEP, apply a given function $FUN to all
the flags of the $STEP with an extra context $CTX.}#
:formals (step fun ctx))
@@ -3057,7 +3057,7 @@ the flags of the $STEP with an extra context $CTX.}#
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;; the selector to translate a pattern
(defselector translate_pattern class_selector
- :doc #{Translate a pattern into a match step. $RECV is the reciever,
+ :doc #{Translate a pattern into a match step. $RECV is the receiver,
$MDATA is the matched data, $MCASE is the match case, and $SLOC is
the source location. Returns the match step and secundarily the match flag.}#
:formals (recv mdata mcase varmap sloc))
@@ -5162,7 +5162,7 @@ normalized expression.}#
(myclassname (get_field :named_name myclass)) )
(error_strv sloc
"unimplemented normalize_test_matcher for any " myclassname)
- (assert_msg "catchallnormalize_test_matcher unimplemented for any reciever" ())
+ (assert_msg "catchallnormalize_test_matcher unimplemented for any receiver" ())
))
(install_method discr_any_receiver normalize_test_matcher normtestmatch_catchall)
@@ -5173,7 +5173,7 @@ normalized expression.}#
(myclassname (get_field :named_name myclass)) )
(error_strv sloc
"unimplemented normalize_fill_matcher for any " myclassname)
- (assert_msg "catchall normalize_test_matcher unimplemented for any reciever" ())
+ (assert_msg "catchall normalize_test_matcher unimplemented for any receiver" ())
))
(install_method discr_any_receiver normalize_fill_matcher normfillmatch_catchall)
diff --git a/gcc/melt/warmelt-outobj.melt b/gcc/melt/warmelt-outobj.melt
index 20c346765c7..cd60a9244d9 100644
--- a/gcc/melt/warmelt-outobj.melt
+++ b/gcc/melt/warmelt-outobj.melt
@@ -886,7 +886,7 @@
(defun outpucod_anydiscr (any declbuf implbuf :long depth)
;(debug_msg any "outpucod_anydiscr any")
- (outcstring_err "* output_c_code unimplemented reciever discriminator ")
+ (outcstring_err "* output_c_code unimplemented receiver discriminator ")
(let ( (discr (discrim any)) ) (outstr_err (unsafe_get_field :named_name discr)))
(outnewline_err)
(assert_msg "@@ outpucod_anydiscr not able to output" ())
@@ -902,7 +902,7 @@
(defun outpucod_catchall_root (anyr declbuf implbuf :long depth)
(debug_msg anyr "outpucod_catchall_root anyr")
(display_debug_message anyr "outpucod_catchall_root anyr")
- (outcstring_err "* output_c_code unimplemented reciever class ")
+ (outcstring_err "* output_c_code unimplemented receiver class ")
(let ( (discr (discrim anyr)) ) (outstr_err (unsafe_get_field :named_name discr)))
(outnewline_err)
(assert_msg "@@ outpucod_catchall_root not able to output" ())
@@ -2911,7 +2911,7 @@
(lambda (curdest)
(output_c_code curdest declbuf implbuf (get_int boxdepthp1))
(add2sbuf_strconst implbuf " = ")))
- ;; output the send and the reciever
+ ;; output the send and the receiver
(add2sbuf_strconst implbuf " meltgc_send ((melt_ptr_t)(")
(output_c_code orecv declbuf implbuf (+i 1 depth))
(add2sbuf_strconst implbuf "), ((melt_ptr_t)(")
View Lorry Controller Status