zeroc-ice 3.6b1 → 3.6.0

data/ext/ice/mcpp/internal.H

@@ -40,9 +40,7 @@
 
 #include "mcpp_out.h"
 
-#if MCPP_LIB
 #include "mcpp_lib.h"   /* External interface when used as library  */
-#endif
 
 #define EOS             '\0'        /* End of string                */
 #define CHAR_EOF        0           /* Returned by get_ch() on eof  */
@@ -199,7 +197,7 @@
 /* MB_ERROR signals wrong multi-byte character sequence.    */
 #define MB_ERROR        0x8000
 
-#if MCPP_LIB && HOST_COMPILER == GNUC   \
+#if HOST_COMPILER == GNUC   \
         && (SYS_FAMILY == SYS_UNIX && SYSTEM != SYS_CYGWIN)
     /* For GCC 4.* on UNIXes    */
 #pragma GCC visibility push( hidden)    /* Hide these names from outside    */
@@ -236,17 +234,15 @@ typedef struct fileinfo {
         int             sys_header; /* System header file or not    */
         int             include_opt;        /* Specified by -include option */
         const char **   dirp;       /* Include directory the file resides   */
-        const char *    src_dir;    /* Directory of source file     */
+        char *    src_dir;    /* Directory of source file     */
         const char *    real_fname; /* Real file name               */
         const char *    full_fname; /* Real full path list          */
         char *          filename;   /* File/macro name (maybe changed)      */
         char *          buffer;     /* Buffer of current input line */
-#if MCPP_LIB
         /* Save output functions during push/pop of #includes   */
         int (* last_fputc)  ( int c, OUTDEST od);
         int (* last_fputs)  ( const char * s, OUTDEST od);
         int (* last_fprintf)( OUTDEST od, const char * format, ...);
-#endif
 } FILEINFO;
 
 /*
@@ -328,25 +324,10 @@ extern struct std_limits_ {
 /* The boolean flags specified by the execution options.    */
 extern struct option_flags_ {
         int     c;                  /* -C option (keep comments)    */
-        int     k;                  /* -k option (keep white spaces)*/
-        int     z;      /* -z option (no-output of included file)   */
-        int     p;                  /* -P option (no #line output)  */
-        int     q;                  /* -Q option (diag to mcpp.err) */
-        int     v;                  /* -v option (verbose)          */
-        int     trig;               /* -3 option (toggle trigraphs) */
-        int     dig;                /* -2 option (toggle digraphs)  */
-        int     lang_asm;           /* -a option (assembler source) */
-        int     no_source_line;     /* Do not output line in diag.  */
-        int     dollar_in_name;     /* Allow $ in identifiers       */
 } option_flags;
 
-extern int      mcpp_mode;          /* Mode of preprocessing        */
 extern int      stdc_val;           /* Value of __STDC__            */
 extern long     stdc_ver;           /* Value of __STDC_VERSION__    */
-extern long     cplus_val;          /* Value of __cplusplus for C++ */
-extern int      stdc2;      /* cplus_val or (stdc_ver >= 199901L)   */
-extern int      stdc3;      /* (stdc_ver or cplus_val) >= 199901L   */
-extern int      standard;           /* mcpp_mode is STD or POST_STD */
 extern int      std_line_prefix;    /* #line in C source style      */
 extern int      warn_level;         /* Level of warning             */
 extern int      errors;             /* Error counter                */
@@ -354,7 +335,6 @@ extern long     src_line;           /* Current source line number   */
 extern int      wrong_line;         /* Force #line to compiler      */
 extern int      newlines;           /* Count of blank lines         */
 extern int      keep_comments;      /* Don't remove comments        */
-extern int      keep_spaces;        /* Don't remove white spaces    */
 extern int      include_nest;       /* Nesting level of #include    */
 extern const char *     null;       /* "" string for convenience    */
 extern const char **    inc_dirp;   /* Directory of #includer       */
@@ -376,14 +356,10 @@ extern FILE *   fp_err;             /* Diagnostics stream           */
 extern FILE *   fp_debug;           /* Debugging information stream */
 extern int      insert_sep;         /* Inserted token separator flag*/
 extern int      mkdep;              /* Output source file dependency*/
-extern int      mbchar;             /* Encoding of multi-byte char  */
 extern int      mbchk;              /* Possible multi-byte char     */
-extern int      bsl_in_mbchar;      /* 2nd byte of mbchar has '\\'  */
-extern int      bsl_need_escape;/* '\\' in mbchar should be escaped */
 extern int      mcpp_debug;         /* Class of debug information   */
-extern long     in_asm;             /* In #asm - #endasm block      */
 extern jmp_buf  error_exit;         /* Exit on fatal error          */
-extern char *   cur_fullname;       /* Full name of current source  */
+extern const char *   cur_fullname;       /* Full name of current source  */
 extern short *  char_type;          /* Character classifier         */
 extern char *   workp;              /* Free space in work[]         */
 extern char * const     work_end;   /* End of work[] buffer         */
@@ -432,7 +408,7 @@ extern VAL_SIGN *   eval_num( const char * nump);
 extern char *   (* expand_macro)( DEFBUF * defp, char * out, char * out_end
         , LINE_COL line_col, int * pragma_op);
                 /* Expand a macro completely    */
-extern void     expand_init( int compat, int strict_ansi);
+extern void     expand_init( int compat);
                 /* Initialize expand_macro()    */
 extern DEFBUF * is_macro( char ** cp);
                 /* The sequence is a macro call?*/
@@ -440,14 +416,10 @@ extern DEFBUF * is_macro( char ** cp);
 /* mbchar.c     */
 extern size_t   (* mb_read)( int c1, char ** in_pp, char ** out_pp);
                 /* Read mbchar sequence         */
-extern const char *     set_encoding( char * name, char * env, int pragma);
-                /* Multi-byte char encoding     */
-extern void     mb_init( void);
+extern void     mb_init();
                 /* Initialize mbchar variables  */
 extern uexpr_t  mb_eval( char ** seq_pp);
                 /* Evaluate mbchar in #if       */
-extern int      last_is_mbchar( const char * in, int len);
-                /* The line ends with MBCHAR ?  */
 
 /* support.c    */
 extern int      get_unexpandable( int c, int diag);
@@ -460,18 +432,12 @@ extern int      scan_token( int c, char ** out_pp, char * out_end);
                 /* Get the next token           */
 extern char *   scan_quote( int delim, char * out, char * out_end, int diag);
                 /* Scan a quoted literal        */
-extern int      id_operator( const char * name);
-                /* Check identifier-like ops    */
 extern void     expanding( const char * name, int to_be_freed);
                 /* Save macro name expanding    */
 extern void     clear_exp_mac( void);
                 /* Clear expanding macro infs   */
 extern int      get_ch( void);
                 /* Get the next char from input */
-extern int      cnv_trigraph( char * in);
-                /* Do trigraph replacement      */
-extern int      cnv_digraph( char * in);
-                /* Convert digraphs to usual tok*/
 extern void     unget_ch( void);
                 /* Push back the char to input  */
 extern FILEINFO *   unget_string( const char * text, const char * name);
@@ -488,7 +454,11 @@ extern char *   (xrealloc)( char * ptr, size_t size);
 extern LINE_COL *   get_src_location( LINE_COL * p_line_col);
                 /* Get location on source file  */
 extern void     cfatal( const char * format, const char * arg1, long arg2
-        , const char * arg3);
+        , const char * arg3)
+#ifdef __clang__
+         __attribute__((analyzer_noreturn))
+#endif
+         ;
                 /* Print a fatal error and exit */
 extern void     cerror( const char * format, const char * arg1, long arg2
         , const char * arg3);
@@ -524,8 +494,6 @@ extern void     sharp( FILEINFO * sharp_file, int marker);
                 /* Output # line number         */
 extern void     do_pragma( void);
                 /* Process #pragma directive    */
-extern void     put_asm( void);
-                /* Putout an asm code line      */
 extern void     do_old( void);
                 /* Process older directives     */
 extern void     at_end( void);
@@ -537,7 +505,6 @@ extern char *   stpcpy( char * dest, const char * src);
                 /* Non-Standard library function*/
 #endif
 
-#if MCPP_LIB    /* Setting to use mcpp as a subroutine  */
 /* directive.c  */
 extern void     clear_symtable( void);
                 /* Free all macro definitions   */
@@ -557,7 +524,6 @@ extern void     init_system( void);
 #if HOST_COMPILER == GNUC && (SYS_FAMILY == SYS_UNIX && SYSTEM != SYS_CYGWIN)
 #pragma GCC visibility pop
 #endif
-#endif
 
 #if HOST_HAVE_STPCPY && !defined(stpcpy)
 extern char *   stpcpy( char * dest, const char * src);

data/ext/ice/mcpp/main.c

@@ -35,12 +35,8 @@
  * The post-preprocessing routines are also placed here.
  */
 
-#if PREPROCESSED                /* Use "pre-preprocessed" header    */
-#include    "mcpp.H"
-#else
 #include    "system.H"
 #include    "internal.H"
-#endif
 
     /* Function pointer to expand_macro() functions.    */
     char *   (*expand_macro)( DEFBUF * defp, char * out, char * out_end
@@ -49,36 +45,12 @@
     /* The boolean flags specified by the execution options.    */
     struct option_flags_    option_flags = {
         FALSE,          /* c:   -C (keep comments)                  */
-        FALSE,          /* k:   -k (keep horizontal white spaces)   */
-        FALSE,          /* z:   -z (no output of included files)    */
-        FALSE,          /* p:   -P (no #line output)                */
-        FALSE,          /* q:   -Q (output diagnosis to mcpp.err)   */
-        FALSE,          /* v:   -v (verbose, affects macro notification)    */
-        TRIGRAPHS_INIT, /* trig:    -3 (toggle trigraphs)           */
-        DIGRAPHS_INIT,  /* dig: -2 (toggle digraphs recognition)    */
-        /*
-         * lang_asm allows the following non-standard features.
-         * 1. #non-directive.
-         * 2. <newline> in a string-literal.
-         * 3. invalid pp-token generated by ## operator.
-         * lang_asm is not available in POST_STD mode.
-         * When COMPILER == GNUC, -x assembler-with-cpp or -lang-asm options
-         * are used instead of -a.
-         */
-        FALSE,          /* lang_asm:    -a (assembler source)       */
-        FALSE           /* no_source_line:  -j (no source line in diag)     */
     };
 
     int     mcpp_mode = STD;        /* Mode of preprocessing        */
 
-    long    cplus_val = 0L;         /* Value of __cplusplus for C++ */
     long    stdc_ver = 0L;          /* Value of __STDC_VERSION__    */
     int     stdc_val = 0;           /* Value of __STDC__            */
-    int     stdc2;              /* cplus_val || stdc_ver >= 199901L */
-    int     stdc3;              /* cplus_val >= 199901L || stdc_ver >= 199901L.
-        (cplus_val >= 199901L) specifies compatible mode to C99 (extended
-        feature of this preprocessor)   */
-    int     standard = TRUE;    /* TRUE, if mcpp_mode is STD or POST_STD    */
     int     std_line_prefix = STD_LINE_PREFIX;
             /* Output line and file information in C source style   */
 
@@ -110,9 +82,8 @@
     const char **   inc_dirp;       /* Directory of #includer       */
     const char *    cur_fname;      /* Current source file name     */
                 /* cur_fname is not rewritten by #line directive    */
-    char *      cur_fullname;
+    const char *      cur_fullname;
         /* Full path of current source file (i.e. infile->full_fname)       */
-    int         no_source_line;     /* Do not output line in diag.  */
     char        identifier[ IDMAX + IDMAX/8];       /* Current identifier   */
     int         mcpp_debug = 0;     /* != 0 if debugging now        */
 
@@ -126,7 +97,6 @@
     int     in_getarg = FALSE;      /* TRUE collecting macro arguments      */
     int     in_include = FALSE;     /* TRUE scanning #include line  */
     int     in_if = FALSE;  /* TRUE scanning #if and in non-skipped expr.   */
-    long    in_asm = 0L;    /* Starting line of #asm - #endasm block*/
 
 /*
  *   macro_line is set to the line number of start of a macro call while
@@ -213,10 +183,7 @@
     FILE *  fp_debug;               /* Debugging information stream */
 
 /* Variables on multi-byte character encodings. */
-    int     mbchar = MBCHAR;        /* Encoding of multi-byte char  */
     int     mbchk;  /* Character type of possible multi-byte char   */
-    int     bsl_in_mbchar;  /* 2nd byte of mbchar possibly has '\\' */
-    int     bsl_need_escape;    /* '\\' in MBCHAR should be escaped */
     /* Function pointer to mb_read_*() functions.   */
     size_t  (*mb_read)( int c1, char ** in_pp, char ** out_pp);
 
@@ -257,13 +224,8 @@
  */
 static int      src_col = 0;        /* Column number of source line */
 
-#define MBCHAR_IS_ESCAPE_FREE   (SJIS_IS_ESCAPE_FREE && \
-            BIGFIVE_IS_ESCAPE_FREE && ISO2022_JP_IS_ESCAPE_FREE)
-
-#if MCPP_LIB
 static void     init_main( void);
                 /* Initialize static variables      */
-#endif
 static void     init_defines( void);
                 /* Predefine macros                 */
 static void     mcpp_main( void);
@@ -276,64 +238,37 @@ static char *   de_stringize( char * in, char * out);
                 /* "De-stringize" for _Pragma() op. */
 static void     putout( char * out);
                 /* May concatenate adjacent string  */
-#if COMPILER != GNUC && COMPILER != MSC
 static void     devide_line( char * out);
                 /* Devide long line for compiler    */
-#endif
 static void     put_a_line( char * out);
                 /* Put out the processed line       */
-#if ! HAVE_DIGRAPHS || ! MBCHAR_IS_ESCAPE_FREE
-static int      post_preproc( char * out);
-                /* Post-preprocess for older comps  */
-#if ! HAVE_DIGRAPHS
-static char *   conv_a_digraph( char * cp);
-                /* Convert a digraph in place       */
-#endif
-#if ! MBCHAR_IS_ESCAPE_FREE
-static char *   esc_mbchar( char * str, char * str_end);
-                /* Double \ as 2nd byte of SJIS     */
-#endif
-#endif
-
-
-#if MCPP_LIB
 static void     init_main( void)
 /* Initialize global variables on re-entering.  */
 {
     mcpp_mode = STD;
-    cplus_val = stdc_ver = 0L;
+    stdc_ver = 0L;
     stdc_val = 0;
-    standard = TRUE;
     std_line_prefix = STD_LINE_PREFIX;
     errors = src_col = 0;
     warn_level = -1;
     infile = NULL;
     in_directive = in_define = in_getarg = in_include = in_if = FALSE;
-    src_line = macro_line = in_asm = 0L;
+    src_line = macro_line = 0L;
     mcpp_debug = mkdep = no_output = keep_comments = keep_spaces = 0;
     include_nest = 0;
     insert_sep = NO_SEP;
-    mbchar = MBCHAR;
     ifptr = ifstack;
     ifstack[0].stat = WAS_COMPILING;
     ifstack[0].ifline = ifstack[0].elseline = 0L;
     std_limits.str_len = NBUFF;
     std_limits.id_len = IDMAX;
     std_limits.n_mac_pars =  NMACPARS;
-    option_flags.c = option_flags.k = option_flags.z = option_flags.p
-            = option_flags.q = option_flags.v = option_flags.lang_asm
-            = option_flags.no_source_line = option_flags.dollar_in_name
-            = FALSE;
-    option_flags.trig = TRIGRAPHS_INIT;
-    option_flags.dig = DIGRAPHS_INIT;
+    option_flags.c = FALSE;
     sh_file = NULL;
     sh_line = 0;
 }
 
 int     mcpp_lib_main
-#else
-int     main
-#endif
 (
     int argc,
     char ** argv
@@ -348,14 +283,12 @@ int     main
         goto  fatal_error_exit;
     }
 
-#if MCPP_LIB
     /* Initialize global and static variables.  */
     init_main();
     init_directive();
     init_eval();
     init_support();
     init_system();
-#endif
 
     fp_in = stdin;
     fp_out = stdout;
@@ -369,7 +302,7 @@ int     main
     inc_dirp = &null;   /* Initialize to current (null) directory   */
     cur_fname = cur_fullname = "(predefined)";  /* For predefined macros    */
     init_defines();                         /* Predefine macros     */
-    mb_init();      /* Should be initialized prior to get options   */
+    mb_init(TRUE);      /* Should be initialized prior to get options   */
     do_options( argc, argv, &in_file, &out_file);   /* Command line options */
 
     /* Open input file, "-" means stdin.    */
@@ -377,11 +310,7 @@ int     main
         if ((fp_in = fopen( in_file, "r")) == NULL) {
             mcpp_fprintf( ERR, "Can't open input file \"%s\".\n", in_file);
             errors++;
-#if MCPP_LIB
             goto  fatal_error_exit;
-#else
-            return( IO_ERROR);
-#endif
         }
     } else {
         in_file = stdin_name;
@@ -391,25 +320,10 @@ int     main
         if ((fp_out = fopen( out_file, "w")) == NULL) {
             mcpp_fprintf( ERR, "Can't open output file \"%s\".\n", out_file);
             errors++;
-#if MCPP_LIB
             goto  fatal_error_exit;
-#else
-            return( IO_ERROR);
-#endif
         }
         fp_debug = fp_out;
     }
-    if (option_flags.q) {                   /* Redirect diagnostics */
-        if ((fp_err = fopen( "mcpp.err", "a")) == NULL) {
-            errors++;
-            mcpp_fprintf( OUT, "Can't open \"mcpp.err\"\n");
-#if MCPP_LIB
-            goto  fatal_error_exit;
-#else
-            return( IO_ERROR);
-#endif
-        }
-    }
     init_sys_macro();       /* Initialize system-specific macros    */
     add_file( fp_in, NULL, in_file, in_file, FALSE);
                                         /* "open" main input file   */
@@ -427,7 +341,6 @@ int     main
     at_end();                       /* Do the final commands        */
 
 fatal_error_exit:
-#if MCPP_LIB
     /* Free malloced memory */
     if (mcpp_debug & MACRO_CALL) {
         if (in_file != stdin_name)
@@ -435,7 +348,6 @@ fatal_error_exit:
     }
     clear_filelist();
     clear_symtable();
-#endif
 
     if (fp_in != stdin)
         fclose( fp_in);
@@ -446,7 +358,7 @@ fatal_error_exit:
 
     if (mcpp_debug & MEMORY)
         print_heap();
-    if (errors > 0 && option_flags.no_source_line == FALSE) {
+    if (errors > 0) {
         mcpp_fprintf( ERR, "%d error%s in preprocessor.\n",
                 errors, (errors == 1) ? "" : "s");
         return  IO_ERROR;
@@ -465,71 +377,7 @@ typedef struct pre_set {
 } PRESET;
 
 static PRESET   preset[] = {
-
-#ifdef  SYSTEM_OLD
-        { SYSTEM_OLD, "1"},
-#endif
-#ifdef  SYSTEM_SP_OLD
-        { SYSTEM_SP_OLD, "1"},
-#endif
-#ifdef  COMPILER_OLD
-        { COMPILER_OLD, "1"},
-#endif
-#ifdef  COMPILER_SP_OLD
-        { COMPILER_SP_OLD, "1"},
-#endif
-
         { NULL, NULL},  /* End of macros beginning with alphabet    */
-
-#ifdef  SYSTEM_STD
-        { SYSTEM_STD, "1"},
-#endif
-#ifdef  SYSTEM_STD1
-        { SYSTEM_STD1, "1"},
-#endif
-#ifdef  SYSTEM_STD2
-        { SYSTEM_STD2, "1"},
-#endif
-
-#ifdef  SYSTEM_EXT
-        { SYSTEM_EXT, SYSTEM_EXT_VAL},
-#endif
-#ifdef  SYSTEM_EXT2
-        { SYSTEM_EXT2, SYSTEM_EXT2_VAL},
-#endif
-#ifdef  SYSTEM_SP_STD
-        { SYSTEM_SP_STD, SYSTEM_SP_STD_VAL},
-#endif
-#ifdef  COMPILER_STD
-        { COMPILER_STD, COMPILER_STD_VAL},
-#endif
-#ifdef  COMPILER_STD1
-        { COMPILER_STD1, COMPILER_STD1_VAL},
-#endif
-#ifdef  COMPILER_STD2
-        { COMPILER_STD2, COMPILER_STD2_VAL},
-#endif
-#ifdef  COMPILER_EXT
-        { COMPILER_EXT, COMPILER_EXT_VAL},
-#endif
-#ifdef  COMPILER_EXT2
-        { COMPILER_EXT2, COMPILER_EXT2_VAL},
-#endif
-#ifdef  COMPILER_SP_STD
-        { COMPILER_SP_STD, COMPILER_SP_STD_VAL},
-#endif
-#ifdef  COMPILER_SP1
-        { COMPILER_SP1, COMPILER_SP1_VAL},
-#endif
-#ifdef  COMPILER_SP2
-        { COMPILER_SP2, COMPILER_SP2_VAL},
-#endif
-#ifdef  COMPILER_SP3
-        { COMPILER_SP3, COMPILER_SP3_VAL},
-#endif
-#ifdef  COMPILER_CPLUS
-        { COMPILER_CPLUS, COMPILER_CPLUS_VAL},
-#endif
         { NULL, NULL},  /* End of macros with value of any integer  */
 };
 
@@ -607,7 +455,6 @@ static void mcpp_main( void)
     LINE_COL    line_col;   /* Location of macro call in source     */
 
     keep_comments = option_flags.c && !no_output;
-    keep_spaces = option_flags.k;       /* Will be turned off if !compiling */
     line_col.col = line_col.line = 0L;
 
     /*
@@ -636,26 +483,11 @@ static void mcpp_main( void)
             }
             if (c == '#') {                 /* Is 1st non-space '#' */
                 directive();                /* Do a #directive      */
-            } else if (mcpp_mode == STD && option_flags.dig && c == '%') {
-                    /* In POST_STD digraphs are already converted   */
-                if (get_ch() == ':') {      /* '%:' i.e. '#'        */
-                    directive();            /* Do a #directive      */
-                } else {
-                    unget_ch();
-                    if (! compiling) {
-                        skip_nl();
-                        newlines++;
-                    } else {
-                        break;
-                    }
-                }
             } else if (c == CHAR_EOF) {     /* End of input         */
                 break;
             } else if (! compiling) {       /* #ifdef false?        */
                 skip_nl();                  /* Skip to newline      */
                 newlines++;                 /* Count it, too.       */
-            } else if (in_asm && ! no_output) { /* In #asm block    */
-                put_asm();                  /* Put out as it is     */
             } else if (c == '\n') {         /* Blank line           */
                 if (keep_comments)
                     mcpp_fputc( '\n', OUT); /* May flush comments   */
@@ -867,25 +699,15 @@ static void putout(
     *out_ptr++ = '\n';                      /* Put out a newline    */
     *out_ptr = EOS;
 
-#if ! MBCHAR_IS_ESCAPE_FREE
-    post_preproc( out);
-#elif   ! HAVE_DIGRAPHS
-    if (mcpp_mode == STD && option_flag.dig)
-        post_preproc( out);
-#endif
     /* Else no post-preprocess  */
-#if COMPILER != GNUC && COMPILER != MSC
     /* GCC and Visual C can accept very long line   */
     len = strlen( out);
     if (len > NWORK - 1)
         devide_line( out);              /* Devide a too long line   */
     else
-#endif
         put_a_line( out);
 }
 
-#if COMPILER != GNUC && COMPILER != MSC
-
 static void devide_line(
     char * out                      /* 'out' is 'output' in actual  */
 )
@@ -944,8 +766,6 @@ static void devide_line(
     sharp( NULL, 0);                        /* Correct line number  */
 }
 
-#endif
-
 static void put_a_line(
     char * out
 )
@@ -970,162 +790,3 @@ static void put_a_line(
     if (mcpp_fputs( out, OUT) == EOF)
         cfatal( "File write error", NULL, 0L, NULL);        /* _F_  */
 }
-
-
-/*
- *      Routines to  P O S T - P R E P R O C E S S
- *
- * 1998/08      created     kmatsui     (revised 1998/09, 2004/02, 2006/07)
- *    Supplementary phase for the older compiler-propers.
- *      1. Convert digraphs to usual tokens.
- *      2. Double '\\' of the second byte of multi-byte characters.
- *    These conversions are done selectively according to the macros defined
- *  in system.H.
- *      1. Digraphs are converted if ! HAVE_DIGRAPHS and digraph recoginition
- *  is enabled by DIGRAPHS_INIT and/or -2 option on execution.
- *      2. '\\' of the second byte of SJIS (BIGFIVE or ISO2022_JP) is doubled
- *  if bsl_need_escape == TRUE.
- */
-
-#if HAVE_DIGRAPHS && MBCHAR_IS_ESCAPE_FREE
-    /* No post_preproc()    */
-#else
-
-static int  post_preproc(
-    char * out
-)
-/*
- * Convert digraphs and double '\\' of the second byte of SJIS (BIGFIVE or
- * ISO2022_JP).
- * Note: Output of -K option embeds macro informations into comments.
- * scan_token() does not recognize comment and parses it as '/', '*', etc.
- */
-{
-#if ! HAVE_DIGRAPHS
-    int     di_count = 0;
-#endif
-    int     token_type;
-    int     c;
-    char *  str;
-    char *  cp = out;
-
-    unget_string( out, NULL);
-    while ((c = get_ch()) != '\n') {    /* Not to read over to next line    */
-        if (char_type[ c] & HSP) {
-            *cp++ = c;
-            continue;
-        }
-        str = cp;
-        token_type = scan_token( c, &cp, out_wend);
-        switch (token_type) {
-#if ! MBCHAR_IS_ESCAPE_FREE
-        case WSTR   :
-        case WCHR   :
-            str++;                          /* Skip prefix 'L'      */
-            /* Fall through */
-        case STR    :
-        case CHR    :
-            if (bsl_need_escape)
-                cp = esc_mbchar( str, cp);
-            break;
-#endif  /* ! MBCHAR_IS_ESCAPE_FREE  */
-#if ! HAVE_DIGRAPHS
-        case OPE    :
-            if (mcpp_mode == STD && (openum & OP_DIGRAPH)) {
-                cp = conv_a_digraph( cp);   /* Convert a digraph    */
-                di_count++;
-            }
-            break;
-#endif
-        }
-    }
-    *cp++ = '\n';
-    *cp = EOS;
-#if ! HAVE_DIGRAPHS
-    if (mcpp_mode == STD && di_count && (warn_level & 16))
-        cwarn( "%.0s%ld digraph(s) converted"           /* _W16_    */
-                , NULL, (long) di_count, NULL);
-#endif
-    return  0;
-}
-
-#endif  /* ! HAVE_DIGRAPHS || ! MBCHAR_IS_ESCAPE_FREE   */
-
-#if ! HAVE_DIGRAPHS
-static char *   conv_a_digraph(
-    char *  cp                      /* The end of the digraph token */
-)
-/*
- * Convert a digraph to usual token in place.
- * This routine is never called in POST_STD mode.
- */
-{
-    cp -= 2;
-    switch (openum) {
-    case OP_LBRACE_D    :
-        *cp++ = '{';
-        break;
-    case OP_RBRACE_D    :
-        *cp++ = '}';
-        break;
-    case OP_LBRCK_D     :
-        *cp++ = '[';
-        break;
-    case OP_RBRCK_D     :
-        *cp++ = ']';
-        break;
-    case OP_SHARP_D     :                       /* Error of source  */
-        *cp++ = '#';
-        break;
-    case OP_DSHARP_D    :                       /* Error of source  */
-        cp -= 2;
-        *cp++ = '#';
-        *cp++ = '#';
-        break;
-    }
-    return  cp;
-}
-#endif  /* ! HAVE_DIGRAPHS  */
-
-#if ! MBCHAR_IS_ESCAPE_FREE
-static char *   esc_mbchar(
-    char *  str,        /* String literal or character constant without 'L' */
-    char *  str_end     /* The end of the token */
-)
-/*
- * Insert \ before the byte of 0x5c('\\') of the SJIS, BIGFIVE or ISO2022_JP
- * multi-byte character code in string literal or character constant.
- * Insert \ also before the byte of 0x22('"') and 0x27('\'') of ISO2022_JP.
- * esc_mbchar() does in-place insertion.
- */
-{
-    char *  cp;
-    int     delim;
-    int     c;
-
-    if (! bsl_need_escape)
-        return  str_end;
-    if ((delim = *str++) == 'L')
-        delim = *str++;                         /* The quote character  */
-    while ((c = *str++ & UCHARMAX) != delim) {
-        if (char_type[ c] & mbchk) {            /* MBCHAR   */
-            cp = str;
-            mb_read( c, &str, (workp = work_buf, &workp));
-            while (cp++ < str) {
-                c = *(cp - 1);
-                if (c == '\\' || c == '"' || c == '\'') {
-                                    /* Insert \ before 0x5c, 0x22, 0x27 */
-                    memmove( cp, cp - 1, (size_t) (str_end - cp) + 2);
-                    *(cp++ - 1) = '\\';
-                    str++;
-                    str_end++;
-                }
-            }
-        } else if (c == '\\' && ! (char_type[ *str & UCHARMAX] & mbchk)) {
-            str++;                              /* Escape sequence      */
-        }
-    }
-    return  str_end;
-}
-#endif  /* ! MBCHAR_IS_ESCAPE_FREE  */
-