[Emacs-diffs] Changes to emacs/src/ccl.c,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/02/07 04:11:06

Index: ccl.c
===================================================================
RCS file: /sources/emacs/emacs/src/ccl.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- ccl.c       1 Feb 2008 16:00:46 -0000       1.106
+++ ccl.c       7 Feb 2008 04:11:04 -0000       1.107
@@ -1825,7 +1825,7 @@
 
          val = Fget (XCAR (contents), XCDR (contents));
          if (NATNUMP (val))
-           AREF (result, i) = val;
+           ASET (result, i, val);
          else
            unresolved = 1;
          continue;
@@ -1840,17 +1840,17 @@
 
          val = Fget (contents, Qtranslation_table_id);
          if (NATNUMP (val))
-           AREF (result, i) = val;
+           ASET (result, i, val);
          else
            {
              val = Fget (contents, Qcode_conversion_map_id);
              if (NATNUMP (val))
-               AREF (result, i) = val;
+               ASET (result, i, val);
              else
                {
                  val = Fget (contents, Qccl_program_idx);
                  if (NATNUMP (val))
-                   AREF (result, i) = val;
+                   ASET (result, i, val);
                  else
                    unresolved = 1;
                }
@@ -1900,8 +1900,8 @@
       val = resolve_symbol_ccl_program (AREF (slot, 1));
       if (! VECTORP (val))
        return Qnil;
-      AREF (slot, 1) = val;
-      AREF (slot, 2) = Qt;
+      ASET (slot, 1, val);
+      ASET (slot, 2, Qt);
     }
   return AREF (slot, 1);
 }
@@ -2039,7 +2039,7 @@
     error ("Error in CCL program at %dth code", ccl.ic);
 
   for (i = 0; i < 8; i++)
-    XSETINT (AREF (reg, i), ccl.reg[i]);
+    ASET (reg, i, make_number (ccl.reg[i]));
   return Qnil;
 }
 
@@ -2097,7 +2097,7 @@
   for (i = 0; i < 8; i++)
     {
       if (NILP (AREF (status, i)))
-       XSETINT (AREF (status, i), 0);
+       ASET (status, i, make_number (0));
       if (INTEGERP (AREF (status, i)))
        ccl.reg[i] = XINT (AREF (status, i));
     }
@@ -2311,7 +2311,7 @@
   index = make_number (i);
   Fput (symbol, Qcode_conversion_map, map);
   Fput (symbol, Qcode_conversion_map_id, index);
-  AREF (Vcode_conversion_map_vector, i) = Fcons (symbol, map);
+  ASET (Vcode_conversion_map_vector, i, Fcons (symbol, map));
   return index;
 }