CPreProcessor,refactor: use unsigned char as the type of unget-buffer

We never store STRING_SYMBOL, CHAR_SYMBOL, and EOF to the
unget-buffer.

The original code was designed before I introduced
charOrStringContents. In the design, STRING_SYMBOL and CHAR_SYMBOL
could be stored to the unget-buffer.

Signed-off-by: Masatake YAMATO <[email protected]>

Author: masatake

Units/parser-cpreprocessor.r/unget-mbyte-string.d/input-3.java

@@ -0,0 +1,2 @@
+a(i"犬猫鼠羊兎鶏牛熊"
+  /* Push back a logger string */

parsers/cpreprocessor.c

@@ -107,9 +107,9 @@ enum eState {
 /*  Defines the current state of the pre-processor.
  */
 typedef struct sUngetBuffer {
-	int *buffer;		/* memory buffer for unget characters */
+	unsigned char *buffer;	  /* memory buffer for unget characters */
 	int size;		/* the current unget buffer size */
-	int *pointer;		/* the current unget char: points in the
+	unsigned char *pointer;	  /* the current unget char: points in the
 						   middle of the buffer */
 	int dataSize;		/* the number of valid unget characters
 						   in the buffer */
@@ -559,7 +559,7 @@ static void ungetBufferUngetc (ungetBuffer *ungetBuffer, const int c, vString *c
 		// no unget data
 		if(!ungetBuffer->buffer)
 		{
-			ungetBuffer->buffer = (int *)eMalloc(8 * sizeof(int));
+			ungetBuffer->buffer = eMalloc(8 * sizeof(*(ungetBuffer->buffer)));
 			ungetBuffer->size = 8;
 		}
 		Assert(ungetBuffer->size > 0);
@@ -578,8 +578,8 @@ static void ungetBufferUngetc (ungetBuffer *ungetBuffer, const int c, vString *c
 	if(ungetBuffer->pointer == ungetBuffer->buffer)
 	{
 		ungetBuffer->size += 8;
-		int * tmp = (int *)eMalloc(ungetBuffer->size * sizeof(int));
-		memcpy(tmp+8,ungetBuffer->pointer,ungetBuffer->dataSize * sizeof(int));
+		unsigned char * tmp = eMalloc(ungetBuffer->size * sizeof(*(ungetBuffer->buffer)));
+		memcpy(tmp+8,ungetBuffer->pointer,ungetBuffer->dataSize * sizeof(*(ungetBuffer->buffer)));
 		eFree(ungetBuffer->buffer);
 		ungetBuffer->buffer = tmp;
 		ungetBuffer->pointer = tmp + 7;
@@ -609,11 +609,12 @@ static void ungetBufferUngetString(ungetBuffer *ungetBuffer, const char * string
 		if(!ungetBuffer->buffer)
 		{
 			ungetBuffer->size = 8 + len;
-			ungetBuffer->buffer = (int *)eMalloc(ungetBuffer->size * sizeof(int));
+			ungetBuffer->buffer = eMalloc(ungetBuffer->size * sizeof(*(ungetBuffer->buffer)));
 		} else if(ungetBuffer->size < len)
 		{
 			ungetBuffer->size = 8 + len;
-			ungetBuffer->buffer = (int *)eRealloc(ungetBuffer->buffer,ungetBuffer->size * sizeof(int));
+			ungetBuffer->buffer = eRealloc(ungetBuffer->buffer,
+										   ungetBuffer->size * sizeof(*(ungetBuffer->buffer)));
 		}
 		ungetBuffer->pointer = ungetBuffer->buffer + ungetBuffer->size - len;
 	} else {
@@ -626,8 +627,8 @@ static void ungetBufferUngetString(ungetBuffer *ungetBuffer, const char * string
 		if(ungetBuffer->size < (ungetBuffer->dataSize + len))
 		{
 			ungetBuffer->size = 8 + len + ungetBuffer->dataSize;
-			int * tmp = (int *)eMalloc(ungetBuffer->size * sizeof(int));
-			memcpy(tmp + 8 + len,ungetBuffer->pointer,ungetBuffer->dataSize * sizeof(int));
+			unsigned char * tmp = eMalloc(ungetBuffer->size * sizeof(*(ungetBuffer->buffer)));
+			memcpy(tmp + 8 + len,ungetBuffer->pointer,ungetBuffer->dataSize * sizeof(*(ungetBuffer->buffer)));
 			eFree(ungetBuffer->buffer);
 			ungetBuffer->buffer = tmp;
 			ungetBuffer->pointer = tmp + 8;
@@ -637,7 +638,7 @@ static void ungetBufferUngetString(ungetBuffer *ungetBuffer, const char * string
 		}
 	}
 
-	int * p = ungetBuffer->pointer;
+	unsigned char* p = ungetBuffer->pointer;
 	const char * s = string;
 	const char * e = string + len;
 
@@ -656,11 +657,6 @@ static int ungetBufferGetcFromUngetBuffer (ungetBuffer *ungetBuffer)
 		Assert(ungetBuffer->dataSize > 0);
 
 		int c = *(ungetBuffer->pointer);
-
-		/* We allow putting only non-negative values to
-		 * the ungetc-buffer. */
-		Assert(c >= 0);
-
 		ungetBuffer->dataSize--;
 		if(ungetBuffer->dataSize > 0)
 			ungetBuffer->pointer++;