[COMMIT] Revert the last change to mule-ccl.c, on Steve Baur's objection

[Aidan Kehoe]

 Ar an seachtú lá is fiche de mí Lúnasa, scríobh SL Baur: 

 > NAK the mule-ccl.c change, it isn't necessary with your change to
 > lisp.h and it makes  ugly code even uglier.  (And it's cargo cult
 > programming.  There must be no side-effects in macros due to
 > multiple evaluation of parameters.  Period.).

Okay, reverted. 

 > The change to lisp.h is OK.
 > 
 > Are we reviewing patches any more before commit?  (Question
 > not a flame).

Commit-and-review is the current state of things. It is rare enough that
people (besides SJT) actually review, though (which is not a good state of
affairs; lots of Mule questions end up with myself and SJT getting cranky
with each other and no-one else injecting sense into the discussion). I tend
to directly commit without submitting patches previously more than most;
other folk tend to post patches and wait a few days before committing. But
there are exceptions in both directions.

APPROVE COMMIT

NOTE: This patch has been committed.

src/ChangeLog addition:

2007-08-28  Aidan Kehoe  <kehoea at parhasard.net>

	* mule-ccl.c (ccl_driver):
	Revert the last change to mule-ccl.c, on objection from SL
	Baur. The change to lisp.h in the same commit sufficed.


XEmacs Trunk source patch:
Diff command:   cvs -q diff -u
Files affected: src/mule-ccl.c
===================================================================
RCS

Index: src/mule-ccl.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mule-ccl.c,v
retrieving revision 1.34
diff -u -r1.34 mule-ccl.c
--- src/mule-ccl.c	2007/08/21 20:32:37	1.34
+++ src/mule-ccl.c	2007/08/28 09:46:04
@@ -1578,7 +1578,7 @@
 		Lisp_Object map, content, attrib, value;
 		int point, size, fin_ic;
 
-		j = XCHAR_OR_INT (ccl_prog[ic]); ic++; /* number of maps. */
+		j = XCHAR_OR_INT (ccl_prog[ic++]); /* number of maps. */
 		fin_ic = ic + j;
 		op = reg[rrr];
 		if ((j > reg[RRR]) && (j >= 0))
@@ -1693,7 +1693,7 @@
 		stack_idx_of_map_multiple = 0;
 
 		map_set_rest_length =
-		  XCHAR_OR_INT (ccl_prog[ic]); ic++; /* number of maps and separators. */
+		  XCHAR_OR_INT (ccl_prog[ic++]); /* number of maps and separators. */
 		fin_ic = ic + map_set_rest_length;
 		op = reg[rrr];
 
@@ -1880,7 +1880,7 @@
 	      {
 		Lisp_Object map, attrib, value, content;
 		int size, point;
-		j = XCHAR_OR_INT (ccl_prog[ic]); ic++;/* map_id */
+		j = XCHAR_OR_INT (ccl_prog[ic++]); /* map_id */
 		op = reg[rrr];
 		if (j >= XVECTOR (Vcode_conversion_map_vector)->size)
 		  {


-- 
On the quay of the little Black Sea port, where the rescued pair came once
more into contact with civilization, Dobrinton was bitten by a dog which was
assumed to be mad, though it may only have been indiscriminating. (Saki)