[COMMITTED] pkl: rename PVM instruction sseti to ssetc

[Jose E. Marchesi]

2021-12-26  Jose E. Marchesi  <jemarch@gnu.org>

        * libpoke/pkl-asm.pks (ssetc): Renamed from sseti.
        * libpoke/pkl-asm.c (pkl_asm_insn_ssetc): Likewise.
        (pkl_asm_insn): Likewise.
        * libpoke/pkl-insn.def: Likewise.
        * libpoke/pkl-gen.c (pkl_gen_pr_ass_stmt): Likewise.
---
 ChangeLog            |  8 ++++++++
 libpoke/pkl-asm.c    | 10 +++++-----
 libpoke/pkl-asm.pks  |  6 +++---
 libpoke/pkl-gen.c    |  2 +-
 libpoke/pkl-insn.def |  2 +-
 5 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a1c9aa06..f269a7b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2021-12-26  Jose E. Marchesi  <jemarch@gnu.org>
 
+       * libpoke/pkl-asm.pks (ssetc): Renamed from sseti.
+       * libpoke/pkl-asm.c (pkl_asm_insn_ssetc): Likewise.
+       (pkl_asm_insn): Likewise.
+       * libpoke/pkl-insn.def: Likewise.
+       * libpoke/pkl-gen.c (pkl_gen_pr_ass_stmt): Likewise.
+
+2021-12-26  Jose E. Marchesi  <jemarch@gnu.org>
+
        * libpoke/pkl-ops.def: Entry for PKL_AST_OP_EXCOND.
        * libpoke/pkl-lex.l: Recognize `?!' as EXCOND.
        * libpoke/pkl-tab.y (EXCOND): New token.
diff --git a/libpoke/pkl-asm.c b/libpoke/pkl-asm.c
index 6d438d95..22874b19 100644
--- a/libpoke/pkl-asm.c
+++ b/libpoke/pkl-asm.c
@@ -955,7 +955,7 @@ pkl_asm_insn_cmp (pkl_asm pasm,
     assert (0);
 }
 
-/* Macro-instruction: SSETI struct_type
+/* Macro-instruction: SSETC struct_type
    ( SCT STR VAL -- SCT )
 
    Given a struct, a string containing the name of a struct element,
@@ -965,9 +965,9 @@ pkl_asm_insn_cmp (pkl_asm pasm,
    operation is aborted and PVM_E_CONSTRAINT is raised.  */
 
 static void
-pkl_asm_insn_sseti (pkl_asm pasm, pkl_ast_node struct_type)
+pkl_asm_insn_ssetc (pkl_asm pasm, pkl_ast_node struct_type)
 {
-  RAS_MACRO_SSETI (struct_type);
+  RAS_MACRO_SSETC (struct_type);
 }
 
 /* Macro-instruction: ACONC array_elem_type
@@ -1628,7 +1628,7 @@ pkl_asm_insn (pkl_asm pasm, enum pkl_asm_insn insn, ...)
         case PKL_INSN_AFILL:
           pkl_asm_insn_afill (pasm);
           break;
-        case PKL_INSN_SSETI:
+        case PKL_INSN_SSETC:
           {
             pkl_ast_node struct_type;
 
@@ -1636,7 +1636,7 @@ pkl_asm_insn (pkl_asm pasm, enum pkl_asm_insn insn, ...)
             struct_type = va_arg (valist, pkl_ast_node);
             va_end (valist);
 
-            pkl_asm_insn_sseti (pasm, struct_type);
+            pkl_asm_insn_ssetc (pasm, struct_type);
             break;
           }
         case PKL_INSN_MACRO:
diff --git a/libpoke/pkl-asm.pks b/libpoke/pkl-asm.pks
index b25da144..aee8825e 100644
--- a/libpoke/pkl-asm.pks
+++ b/libpoke/pkl-asm.pks
@@ -327,10 +327,10 @@
         popf 1
         .end
 
-;;; SSETI @struct_type
+;;; SSETC @struct_type
 ;;; ( SCT STR VAL -- SCT )
 ;;;
-;;; SSET with data integrity.
+;;; Checked SSET with data integrity.
 ;;;
 ;;; Given a struct, a string containing the name of a struct element,
 ;;; and a value, set the value to the referred element.
@@ -339,7 +339,7 @@
 ;;; data stored in the struct (for example, a constraint expresssion
 ;;; fails) then the operation is aborted and PVM_E_CONSTRAINT is raised.
 
-        .macro sseti @struct_type
+        .macro ssetc @struct_type
         ;; First, save the previous value of the referred field
         ;; and also the field name.
         nrot                    ; VAL SCT STR
diff --git a/libpoke/pkl-gen.c b/libpoke/pkl-gen.c
index a334b88c..30cc698f 100644
--- a/libpoke/pkl-gen.c
+++ b/libpoke/pkl-gen.c
@@ -990,7 +990,7 @@ PKL_PHASE_BEGIN_HANDLER (pkl_gen_pr_ass_stmt)
         /* Strict value: set with integriy.  */
         pkl_asm_insn (PKL_GEN_ASM, PKL_INSN_DROP);
         pkl_asm_insn (PKL_GEN_ASM, PKL_INSN_ROT);
-        pkl_asm_insn (PKL_GEN_ASM, PKL_INSN_SSETI, struct_type);
+        pkl_asm_insn (PKL_GEN_ASM, PKL_INSN_SSETC, struct_type);
 
         pkl_asm_insn (PKL_GEN_ASM, PKL_INSN_BA, label2);
         pkl_asm_label (PKL_GEN_ASM, label1);
diff --git a/libpoke/pkl-insn.def b/libpoke/pkl-insn.def
index db3b9838..b7886ee1 100644
--- a/libpoke/pkl-insn.def
+++ b/libpoke/pkl-insn.def
@@ -534,7 +534,7 @@ PKL_DEF_INSN(PKL_INSN_AFILL,"","afill")
 
 /* Struct macro-instructions.  */
 
-PKL_DEF_INSN(PKL_INSN_SSETI,"a","sseti")
+PKL_DEF_INSN(PKL_INSN_SSETC,"a","ssetc")
 
 /* Offset macro-instructions.  */
 
-- 
2.11.0