preproc.c: merge from preproc-rewrite branch

pptok.dat: merge from preproc-rewrite branch
macros.pl: merge from preproc-rewrite branch
version: changed to 2.10rc2

macros.pl

@@ -57,12 +57,14 @@ sub charcify(@) {
 	if ($o < 32 || $o > 126 || $c eq '"' || $c eq "\\") {
 	    $l .= sprintf("%3d,", $o);
 	} else {
+	    $c =~ s/\'/\\'/;	# << sanitize single quote. 
 	    $l .= "\'".$c."\',";
 	}
     }
     return $l;
 }
 
+
 #
 # Generate macros.c
 #

pptok.dat

@@ -50,20 +50,25 @@
 %arg
 %assign
 %clear
+%comment
 %define
 %defstr
 %deftok
 %depend
 %elif*
 %else
+%endcomment
 %endif
 %endm
 %endmacro
 %endrep
+%endwhile
 %error
 %exitmacro
 %exitrep
+%exitwhile
 %fatal
+%final
 %iassign
 %idefine
 %idefstr
@@ -92,4 +97,5 @@
 %unmacro
 %use
 %warning
+%while*
 %xdefine

version

@@ -1 +1 @@
-2.10rc1
+2.10rc2