From: Andrea Corallo <andrea_corallo@yahoo.it>
Date: Sun, 11 Aug 2019 17:08:18 +0000 (+0200)
Subject: some renaming
X-Git-Tag: emacs-28.0.90~2727^2~1287
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=757a95906805b1d7fcbe4b536841a7b53ce0c047;p=emacs.git

some renaming
---

diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 98c6e866ad4..38511b74bdf 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -741,7 +741,7 @@ the annotation emission."
     (if (comp-args-p args)
       (cl-loop for i below (comp-args-max args)
                do (cl-incf (comp-sp))
-               do (comp-emit `(setpar ,(comp-slot) ,i)))
+               do (comp-emit `(set-par-to-local ,(comp-slot) ,i)))
       (let ((nonrest (comp-nargs-nonrest args)))
         (comp-emit-narg-prologue args-min nonrest)
         (cl-incf (comp-sp) (1+ nonrest))))
diff --git a/src/comp.c b/src/comp.c
index f77a1740fe3..8a9d98fde51 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -1271,7 +1271,7 @@ emit_limple_insn (Lisp_Object insn)
 				    comp.frame[slot_n],
 				    res);
     }
-  else if (EQ (op, Qsetpar))
+  else if (EQ (op, Qset_par_to_local))
     {
       /* Ex: (setpar #s(comp-mvar 2 0 nil nil nil) 0).  */
       EMACS_UINT slot_n = XFIXNUM (FUNCALL1 (comp-mvar-slot, arg0));
@@ -2475,15 +2475,17 @@ syms_of_comp (void)
   DEFSYM (Qcall, "call");
   DEFSYM (Qcallref, "callref");
   DEFSYM (Qncall, "ncall");
-  DEFSYM (Qsetpar, "setpar");
   DEFSYM (Qsetimm, "setimm");
   DEFSYM (Qreturn, "return");
   DEFSYM (Qcomp_mvar, "comp-mvar");
   DEFSYM (Qcond_jump, "cond-jump");
+  /* Used during prologue emission.  */
+  DEFSYM (Qset_par_to_local, "set-par-to-local");
   DEFSYM (Qset_args_to_local, "set-args-to-local");
   DEFSYM (Qset_rest_args_to_local, "set-rest-args-to-local");
   DEFSYM (Qinc_args, "inc-args");
   DEFSYM (Qcond_jump_narg_leq, "cond-jump-narg-leq");
+  /* Others.  */
   DEFSYM (Qpush_handler, "push-handler");
   DEFSYM (Qpop_handler, "pop-handler");
   DEFSYM (Qcondition_case, "condition-case");