zeroc-ice 3.6b1 → 3.6.0

data/ext/ice/mcpp/config.h

@@ -0,0 +1,89 @@
+// **********************************************************************
+//
+// Copyright (c) 2015 ZeroC, Inc. All rights reserved.
+//
+// **********************************************************************
+
+// Simplified and reduced version of config.h, with support for Windows,
+// OS X and Linux.
+
+#define COMPILER INDEPENDENT
+
+// Windows support for MSC and MINGW
+#if defined(_WIN32)
+
+#define HOST_COMPILER MSC
+#define HOST_SYSTEM SYS_WIN
+#define SYSTEM SYS_WIN
+#define OBJEXT "obj"
+
+#elif defined(__APPLE__)
+
+/* Define if the cases of file name are folded. */
+#define FNAME_FOLD 1
+
+/* Define to 1 if the system has the type `intmax_t'. */
+#define HAVE_INTMAX_T 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if the system has the type `long long'. */
+#define HAVE_LONG_LONG 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the `stpcpy' function. */
+#define HAVE_STPCPY 1
+
+/* Define the host compiler. */
+#define HOST_COMPILER GNUC
+
+/* Define the host system. */
+#define HOST_SYSTEM SYS_MAC
+
+/* Define printf length modifier for the longest integer. */
+#define LL_FORM "j"
+
+/* Define the suffix of object file. */
+#define OBJEXT "o"
+
+/* Define the target system. */
+#define SYSTEM SYS_MAC
+
+#else
+
+// Linux.
+
+/* Define to 1 if the system has the type `intmax_t'. */
+#define HAVE_INTMAX_T 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if the system has the type `long long'. */
+#define HAVE_LONG_LONG 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the `stpcpy' function. */
+#define HAVE_STPCPY 1
+
+/* Define the host compiler. */
+#define HOST_COMPILER GNUC
+
+/* Define the host system. */
+#define HOST_SYSTEM SYS_LINUX
+
+/* Define printf length modifier for the longest integer. */
+#define LL_FORM "j"
+
+/* Define the suffix of object file. */
+#define OBJEXT "o"
+
+/* Define the target system. */
+#define SYSTEM SYS_LINUX
+
+#endif

data/ext/ice/mcpp/configed.H

@@ -56,15 +56,6 @@
 #define COMPILER_FAMILY     (COMPILER & 0xF0)
 #define HOST_SYS_FAMILY     (HOST_SYSTEM & 0xF000)
 
-/* Default MBCHAR (multi-byte character) encoding.  */
-#define EUC_JP          0x10    /* Extended UNIX code of JIS X 0208 */
-#define GB2312          0x20    /* EUC-like encoding of Chinese GB 2312-80  */
-#define KSC5601         0x30    /* EUC-like encoding of Korean KS C 5601    */
-#define SJIS            0x80    /* Shift-JIS encoding of JIS X 0208 */
-#define BIGFIVE         0x90    /* Encoding of Taiwanese Big Five   */
-#define ISO2022_JP      0x100   /* ISO-2022-JP (ISO-2022-JP1) encoding      */
-#define UTF8            0x1000  /* UTF-8 encoding           */
-
 /*
  * MBCHAR means multi-byte character encoding.
  * MBCHAR means the default encoding, and you can change the encoding by
@@ -138,88 +129,13 @@
 #define CURRENT             1
 #define SOURCE              2
 
-#if     SYS_FAMILY == SYS_UNIX
-#define SYSTEM_OLD          "unix"
-#define SYSTEM_STD1         "__unix"
-#define SYSTEM_STD2         "__unix__"
-#endif
-
-#if     SYSTEM == SYS_FREEBSD
-#define SYSTEM_EXT          "__FreeBSD__"
-#endif
-
-#if     SYSTEM == SYS_LINUX
-#define SYSTEM_EXT          "__linux__"
-#endif
-
-#if     SYSTEM == SYS_MAC
-#define SYSTEM_EXT          "__APPLE__"
-#endif
-
-#if     SYSTEM == SYS_CYGWIN
-#define SYSTEM_EXT          "__CYGWIN__"
-#if     defined (__CYGWIN64__)
-#define SYSTEM_EXT2         "__CYGWIN64__"
-#else
-#define SYSTEM_EXT2         "__CYGWIN32__"
-#endif
-#ifndef MBCHAR
-#define MBCHAR              SJIS
-#endif
-#endif
-
-#if     SYSTEM == SYS_MINGW
-#define SYSTEM_EXT          "__MINGW__"
-#if     defined (__MINGW64__)
-#define SYSTEM_EXT2         "__MINGW64__"
-#else
-#define SYSTEM_EXT2         "__MINGW32__"
-#endif
-#ifndef MBCHAR
-#define MBCHAR              SJIS
-#endif
-#endif
-
-#if     SYS_FAMILY == SYS_UNIX
-#ifndef MBCHAR
-#define MBCHAR              EUC_JP      /* UTF8 if you like */
-#endif
-#endif
-
-#if     COMPILER == GNUC
-#define COMPILER_EXT        "__GNUC__"
-#define COMPILER_EXT_VAL    GCC_MAJOR_VERSION
-#define COMPILER_EXT2       "__GNUC_MINOR__"
-#define COMPILER_EXT2_VAL   GCC_MINOR_VERSION
-#define COMPILER_CPLUS      "__GNUG__"
-#define COMPILER_CPLUS_VAL  GCC_MAJOR_VERSION
-#ifndef ENV_C_INCLUDE_DIR
-#define ENV_C_INCLUDE_DIR   "C_INCLUDE_PATH"
-#define ENV_CPLUS_INCLUDE_DIR   "CPLUS_INCLUDE_PATH"
-#endif
-/*
- * __SIZE_TYPE__, __PTRDIFF_TYPE__ and __WCHAR_TYPE__ are the predefines of
- * GCC and undocumented in GCC 2.
- * On GCC V.3.*, V.4.*, these macros are known by mcpp_g*_predef_*.h files.
- */
-#if     __GNUC__ == 2
-#define COMPILER_SP1        "__SIZE_TYPE__"
-#define COMPILER_SP2        "__PTRDIFF_TYPE__"
-#define COMPILER_SP3        "__WCHAR_TYPE__"
-#endif
-
-#define CMP_NAME            "GCC"
-#endif  /* COMPILER == GNUC */
+#define MBCHAR              UTF8
 
 #if     COMPILER == INDEPENDENT
 /* specifications of compiler-independent-build */
 #define LINE_PREFIX         "#line "
 #define STD_LINE_PREFIX     TRUE    /* Output #line by C source format      */
-#define HAVE_DIGRAPHS       TRUE    /* Output digraphs as it is     */
 #define SEARCH_INIT         SOURCE  /* Include directory relative to source */
-#define SJIS_IS_ESCAPE_FREE         TRUE    /* Do not treat SJIS specially  */
-#define BIGFIVE_IS_ESCAPE_FREE      TRUE    /* Do not treat specially       */
-#define ISO2022_JP_IS_ESCAPE_FREE   TRUE    /* Do not treat specially       */
 #define TARGET_HAVE_LONG_LONG       TRUE    /* dummy    */
 #define STDC_VERSION        199409L /* Initial value of __STDC_VERSION__    */
 #endif
@@ -228,41 +144,6 @@
  * defaults
  */
 
-#ifdef  SYSTEM_EXT
-#ifndef SYSTEM_EXT_VAL
-#define SYSTEM_EXT_VAL      "1"
-#endif
-#endif
-#ifdef  SYSTEM_EXT2
-#ifndef SYSTEM_EXT2_VAL
-#define SYSTEM_EXT2_VAL     "1"
-#endif
-#endif
-#ifdef  COMPILER_STD1
-#ifndef COMPILER_STD1_VAL
-#define COMPILER_STD1_VAL   "1"
-#endif
-#endif
-#ifdef  COMPILER_STD2
-#ifndef COMPILER_STD2_VAL
-#define COMPILER_STD2_VAL   "1"
-#endif
-#endif
-#ifdef  COMPILER_EXT
-#ifndef COMPILER_EXT_VAL
-#define COMPILER_EXT_VAL    "1"
-#endif
-#endif
-#ifdef  COMPILER_EXT2
-#ifndef COMPILER_EXT2_VAL
-#define COMPILER_EXT2_VAL   "1"
-#endif
-#endif
-#ifdef  COMPILER_CPLUS
-#ifndef COMPILER_CPLUS_VAL
-#define COMPILER_CPLUS_VAL  "1"
-#endif
-#endif
 
 #ifndef ENV_C_INCLUDE_DIR
 #define ENV_C_INCLUDE_DIR   "INCLUDE"
@@ -315,32 +196,6 @@
 #define LONGMAX             LONG_MAX
 #define ULONGMAX            ULONG_MAX
 
-/*
- * Define MBCHAR (multi-byte character encoding) to SJIS, EUC_JP or other.
- */
-#ifndef MBCHAR
-#define MBCHAR              0
-#endif
-
-/*
- * SJIS_IS_ESCAPE_FREE means the compiler does not escape '0x5c' ('\\') in
- * shift-JIS encoded multi-byte character.  SJIS_IS_ESCAPE_FREE == FALSE 
- * enables cpp to insert * '\\' before '\\' of the 2nd byte of SJIS code in
- * literal.  This insertion is for the compiler-proper which can't recognize
- * SJIS literal.
- * BIGFIVE_IS_ESCAPE_FREE means similar case on BIGFIVE encoding.
- * ISO2022_JP_IS_ESCAPE_FREE means similar case on ISO2022_JP encoding.
- */
-#ifndef SJIS_IS_ESCAPE_FREE
-#define SJIS_IS_ESCAPE_FREE     FALSE   /* or TRUE following your compiler  */
-#endif
-#ifndef BIGFIVE_IS_ESCAPE_FREE
-#define BIGFIVE_IS_ESCAPE_FREE  FALSE   /* or TRUE following your compiler  */
-#endif
-#ifndef ISO2022_JP_IS_ESCAPE_FREE
-#define ISO2022_JP_IS_ESCAPE_FREE   FALSE   /* or TRUE following compiler   */
-#endif
-
 /*
  *      P A R T   2     Configurations for host-compiler.
  *

data/ext/ice/mcpp/directive.c

@@ -35,12 +35,8 @@
  * are placed here.
  */
 
-#if PREPROCESSED
-#include    "mcpp.H"
-#else
 #include    "system.H"
 #include    "internal.H"
-#endif
 
 static int      do_if( int hash, const char * directive_name);
                 /* #if, #elif, #ifdef, #ifndef      */
@@ -58,8 +54,6 @@ static char *   def_stringization( char * repl_cur);
                 /* Define stringization     */
 static char *   mgtoken_save( const char * macroname);
                 /* Prefix DEF_MAGIC to macro name in repl-text      */
-static char *   str_parm_scan( char * string_end);
-                /* Scan the parameter in quote      */
 static void     do_undef( void);
                 /* Process #undef directive         */
 static void     dump_repl( const DEFBUF * dp, FILE * fp, int gcc2_va);
@@ -79,9 +73,6 @@ static void     dump_repl( const DEFBUF * dp, FILE * fp, int gcc2_va);
 #define L_undef         ('u' ^ ('d' << 1))
 #define L_line          ('l' ^ ('n' << 1))
 #define L_include       ('i' ^ ('c' << 1))
-#if COMPILER == GNUC
-#define L_include_next  ('i' ^ ('c' << 1) ^ ('_' << 1))
-#endif
 #if SYSTEM == SYS_MAC
 #define L_import        ('i' ^ ('p' << 1))
 #endif
@@ -121,27 +112,13 @@ void    directive( void)
     if (c == '\n')                              /* 'null' directive */
         goto  ret;
     token_type = scan_token( c, (workp = work_buf, &workp), work_end);
-    if (in_asm && (token_type != NAM
-            || (! str_eq( identifier, "asm")
-                && ! str_eq( identifier, "endasm"))))
-        /* In #asm block, ignore #anything other than #asm or #endasm       */
-        goto  skip_line;
     if (token_type != NAM) {
-        if (mcpp_mode == OLD_PREP && token_type == NUM) {   /* # 123 [fname]*/
-            strcpy( identifier, "line");
-        } else {
-            if (compiling) {
-                if (option_flags.lang_asm) {
-                    if (warn_level & 1)
-                        cwarn( illeg_dir, work_buf, 0L, NULL);
-                } else {
-                    cerror( illeg_dir, work_buf, 0L, NULL);
-                }
-            } else if (warn_level & 8) {
-                cwarn( illeg_dir, work_buf, 0L, in_skipped);
-            }
-            goto  skip_line;
+        if (compiling) {
+            cerror( illeg_dir, work_buf, 0L, NULL);
+        } else if (warn_level & 8) {
+            cwarn( illeg_dir, work_buf, 0L, in_skipped);
         }
+        goto  skip_line;
     }
     hash = (identifier[ 1] == EOS) ? identifier[ 0]
             : (identifier[ 0] ^ (identifier[ 2] << 1));
@@ -160,9 +137,6 @@ void    directive( void)
     case L_undef:   tp = "undef";   break;
     case L_line:    tp = "line";    break;
     case L_include: tp = "include"; break;
-#if COMPILER == GNUC
-    case L_include_next:    tp = "include_next";    break;
-#endif
 #if SYSTEM == SYS_MAC
     case L_import:  tp = "import";  break;
 #endif
@@ -179,11 +153,6 @@ void    directive( void)
     if (! compiling) {                      /* Not compiling now    */
         switch (hash) {
         case L_elif :
-            if (! standard) {
-                if (warn_level & 8)
-                    do_old();               /* Unknown directive    */
-                goto  skip_line;            /* Skip the line        */
-            }   /* Else fall through    */
         case L_else :       /* Test the #if's nest, if 0, compile   */
         case L_endif:                       /* Un-nest #if          */
             break;
@@ -192,7 +161,7 @@ void    directive( void)
         case L_ifndef   :                   /*   we must nest #if's.*/
             if (&ifstack[ BLK_NEST] < ++ifptr)
                 goto  if_nest_err;
-            if (standard && (warn_level & 8)
+            if ((warn_level & 8)
                     && &ifstack[ std_limits.blk_nest + 1] == ifptr)
                 cwarn( many_nesting, NULL, (long) std_limits.blk_nest
                         , in_skipped);
@@ -216,7 +185,7 @@ void    directive( void)
     case L_ifndef:
         if (&ifstack[ BLK_NEST] < ++ifptr)
             goto  if_nest_err;
-        if (standard && (warn_level & 4) &&
+        if ((warn_level & 4) &&
                 &ifstack[ std_limits.blk_nest + 1] == ifptr)
             cwarn( many_nesting, NULL , (long) std_limits.blk_nest, NULL);
         ifptr->stat = WAS_COMPILING;
@@ -224,10 +193,6 @@ void    directive( void)
         goto  ifdo;
 
     case L_elif:
-        if (! standard) {
-            do_old();               /* Unrecognized directive       */
-            break;
-        }
         if (ifptr == &ifstack[0])
             goto  nest_err;
         if (ifptr == infile->initif) {
@@ -258,10 +223,7 @@ ifdo:
         if (ifptr == &ifstack[0])
             goto  nest_err;
         if (ifptr == infile->initif) {
-            if (standard)
-                goto  in_file_nest_err;
-            else if (warn_level & 1)
-                cwarn( not_in_section, NULL, 0L, NULL);
+            goto  in_file_nest_err;
         }
         if (ifptr->stat & ELSE_SEEN)
             goto  else_seen_err;
@@ -284,10 +246,7 @@ ifdo:
         if (ifptr == &ifstack[0])
             goto  nest_err;
         if (ifptr <= infile->initif) {
-            if (standard)
-                goto  in_file_nest_err;
-            else if (warn_level & 1)
-                cwarn( not_in_section, NULL, 0L, NULL);
+            goto  in_file_nest_err;
         }
         if (! compiling && (ifptr->stat & WAS_COMPILING))
             wrong_line = TRUE;
@@ -327,18 +286,10 @@ ifdo:
         break;
 
     case L_error:
-        if (! standard) {
-            do_old();               /* Unrecognized directive       */
-            break;
-        }
         cerror( infile->buffer, NULL, 0L, NULL);            /* _E_  */
         break;
 
     case L_pragma:
-        if (! standard) {
-            do_old();               /* Unrecognized directive       */
-            break;
-        }
         do_pragma();
         newlines = -1;              /* Do not putout excessive '\n' */
         break;
@@ -354,42 +305,19 @@ ifdo:
     case L_define   :
     case L_line     :
         goto  skip_line;    /* To prevent duplicate error message   */
-#if COMPILER == GNUC
-    case L_include_next  :
-        if (file != infile)             /* File has been included   */
-            newlines = -1;
-#endif
 #if SYSTEM == SYS_MAC
     case L_import   :
         if (file != infile)             /* File has been included   */
             newlines = -1;
 #endif
     case L_error    :
-        if (standard)
-            goto  skip_line;
-        /* Else fall through    */
+        goto  skip_line;
     case L_include  :
     case L_pragma   :
-        if (standard)
-            break;          /* Already read over the line           */
-        /* Else fall through    */
+        break;          /* Already read over the line           */
     default :               /* L_else, L_endif, L_undef, etc.       */
-        if (mcpp_mode == OLD_PREP) {
-        /*
-         * Ignore the rest of the #directive line so you can write
-         *          #if     foo
-         *          #endif  foo
-         */
-            ;
-        } else if (skip_ws() != '\n') {
-#if COMPILER == GNUC
-            if (standard && hash != L_endif)
-#else
-            if (standard)
-#endif
-                cerror( excess, infile->bptr-1, 0L, NULL);
-            else if (warn_level & 1)
-                cwarn( excess, infile->bptr-1, 0L, NULL);
+        if (skip_ws() != '\n') {
+            cerror( excess, infile->bptr-1, 0L, NULL);
         }
         skip_nl();
     }
@@ -414,7 +342,6 @@ if_nest_err:
 ret:
     in_directive = FALSE;
     keep_comments = option_flags.c && compiling && !no_output;
-    keep_spaces = option_flags.k && compiling;
        /* keep_spaces is on for #define line even if no_output is TRUE  */
     if (! wrong_line)
         newlines++;
@@ -514,32 +441,23 @@ static long do_line( void)
         return  -1L;                /* Line number is not changed   */
     }
 
-    if (standard) {
-        token_type = get_unexpandable( c, FALSE);
-        if (macro_line == MACRO_ERROR)      /* Unterminated macro   */
-            return  -1L;                    /*   already diagnosed. */
-        if (token_type == NO_TOKEN) /* Macro expanded to 0 token    */
-            goto  no_num;
-        if (token_type != NUM)
-            goto  illeg_num;
-    } else if (scan_token( c, (workp = work_buf, &workp), work_end) != NUM) {
+    token_type = get_unexpandable( c, FALSE);
+    if (macro_line == MACRO_ERROR)      /* Unterminated macro   */
+        return  -1L;                    /*   already diagnosed. */
+    if (token_type == NO_TOKEN) /* Macro expanded to 0 token    */
+        goto  no_num;
+    if (token_type != NUM)
         goto  illeg_num;
-    }
     for (workp = work_buf; *workp != EOS; workp++) {
         if (! isdigit( *workp & UCHARMAX)) {
-            if (standard) {
-                cerror( not_digits, work_buf, 0L, NULL);
-                return  -1L;
-            } else if (warn_level & 1) {
-                cwarn( not_digits, work_buf, 0L, NULL);
-            }
+            cerror( not_digits, work_buf, 0L, NULL);
+            return  -1L;
         }
     }
     valp = eval_num( work_buf);             /* Evaluate number      */
     if (valp->sign == VAL_ERROR) {  /* Error diagnosed by eval_num()*/
         return  -1;
-    } else if (standard
-            && (std_limits.line_num < valp->val || valp->val <= 0L)) {
+    } else if ((std_limits.line_num < valp->val || valp->val <= 0L)) {
         if (valp->val < LINE99LIMIT && valp->val > 0L) {
             if (warn_level & 1)
                 cwarn( out_of_range, work_buf, std_limits.line_num, NULL);
@@ -549,53 +467,25 @@ static long do_line( void)
         }
     }
 
-    if (standard) {
-        token_type = get_unexpandable( skip_ws(), FALSE);
-        if (macro_line == MACRO_ERROR)
-            return  -1L;
-        if (token_type != STR) {
-            if (token_type == NO_TOKEN) {   /* Filename is absent   */
-                return  (long) valp->val;
-            } else {    /* Expanded macro should be a quoted string */
-                goto  not_fname;
-            }
-        }
-    } else {
-        if ((c = skip_ws()) == '\n') {
-            unget_ch();
+    token_type = get_unexpandable( skip_ws(), FALSE);
+    if (macro_line == MACRO_ERROR)
+        return  -1L;
+    if (token_type != STR) {
+        if (token_type == NO_TOKEN) {   /* Filename is absent   */
             return  (long) valp->val;
-        }
-        if (scan_token( c, (workp = work_buf, &workp), work_end) != STR)
+        } else {    /* Expanded macro should be a quoted string */
             goto  not_fname;
+        }
     }
-#if COMPILER == GNUC
-    if (memcmp( workp - 3, "//", 2) == 0) { /* "/cur-dir//"         */
-        save = infile->filename;    /* Do not change the file name  */
-    } else
-#endif
     {
         *(workp - 1) = EOS;                 /* Ignore right '"'     */
         save = save_string( &work_buf[ 1]); /* Ignore left '"'      */
     }
 
-    if (standard) {
-        if (get_unexpandable( skip_ws(), FALSE) != NO_TOKEN) {
-            cerror( excess, work_buf, 0L, NULL);
-            free( save);
-            return  -1L;
-        }
-    } else if (mcpp_mode == OLD_PREP) {
-        skip_nl();
-        unget_ch();
-    } else if ((c = skip_ws()) == '\n') {
-        unget_ch();
-    } else {
-        if (warn_level & 1) {
-            scan_token( c, (workp = work_buf, &workp), work_end);
-            cwarn( excess, work_buf, 0, NULL);
-        }
-        skip_nl();
-        unget_ch();
+    if (get_unexpandable( skip_ws(), FALSE) != NO_TOKEN) {
+        cerror( excess, work_buf, 0L, NULL);
+        free( save);
+        return  -1L;
     }
 
     if (infile->filename)
@@ -641,9 +531,6 @@ static char *   token_p;            /* Pointer to the token scanned */
 static char *   repl_base;          /* Base of buffer for repl-text */
 static char *   repl_end;           /* End of buffer for repl-text  */
 static const char * const   no_ident = "No identifier";     /* _E_  */
-#if COMPILER == GNUC
-static int      gcc2_va_arg;        /* GCC2-spec variadic macro     */
-#endif
 
 DEFBUF *    do_define(
     int     ignore_redef,       /* Do not redefine   */
@@ -718,43 +605,29 @@ DEFBUF *    do_define(
         prevp = look_prev( identifier, &cmp);
                 /* Find place in the macro list to insert the definition    */
         defp = *prevp;
-        if (standard) {
-            if (cmp || defp->push) {    /* Not known or 'pushed' macro      */
-                if (str_eq( identifier, "defined")
-                        || ((stdc_val || cplus_val)
-                            &&  str_eq( identifier, "__VA_ARGS__"))) {
-                    cerror(
-            "\"%s\" shouldn't be defined", identifier, 0L, NULL);   /* _E_  */
-                    return  NULL;
-                }
-                redefined = FALSE;          /* Quite new definition */
-            } else {                        /* It's known:          */
-                if (ignore_redef)
-                    return  defp;
-                dnargs = (defp->nargs == DEF_NOARGS_STANDARD
-                            || defp->nargs == DEF_NOARGS_PREDEF
-                            || defp->nargs == DEF_NOARGS_PREDEF_OLD) 
-                        ? DEF_NOARGS : defp->nargs;
-                if (dnargs <= DEF_NOARGS_DYNAMIC    /* __FILE__ and such    */
-                        || dnargs == DEF_PRAGMA /* _Pragma() pseudo-macro   */
-                        ) {
-                    cerror( predef, identifier, 0L, NULL);
-                    return  NULL;
-                } else {
-                    redefined = TRUE;       /* Remember this fact   */
-                }
+        if (cmp || defp->push) {    /* Not known or 'pushed' macro      */
+            if (str_eq( identifier, "defined")
+                    || ((stdc_val)
+                        &&  str_eq( identifier, "__VA_ARGS__"))) {
+                cerror(
+        "\"%s\" shouldn't be defined", identifier, 0L, NULL);   /* _E_  */
+                return  NULL;
             }
-        } else {
-            if (cmp) {
-                redefined = FALSE;          /* Quite new definition */
-            } else {                        /* It's known:          */
-                if (ignore_redef)
-                    return  defp;
-                dnargs = (defp->nargs == DEF_NOARGS_STANDARD 
-                            || defp->nargs == DEF_NOARGS_PREDEF
-                            || defp->nargs == DEF_NOARGS_PREDEF_OLD) 
-                        ? DEF_NOARGS : defp->nargs;
-                redefined = TRUE;
+            redefined = FALSE;          /* Quite new definition */
+        } else {                        /* It's known:          */
+            if (ignore_redef)
+                return  defp;
+            dnargs = (defp->nargs == DEF_NOARGS_STANDARD
+                        || defp->nargs == DEF_NOARGS_PREDEF
+                        || defp->nargs == DEF_NOARGS_PREDEF_OLD) 
+                    ? DEF_NOARGS : defp->nargs;
+            if (dnargs <= DEF_NOARGS_DYNAMIC    /* __FILE__ and such    */
+                    || dnargs == DEF_PRAGMA /* _Pragma() pseudo-macro   */
+                    ) {
+                cerror( predef, identifier, 0L, NULL);
+                return  NULL;
+            } else {
+                redefined = TRUE;       /* Remember this fact   */
             }
         }
     }
@@ -782,14 +655,13 @@ DEFBUF *    do_define(
     in_define = FALSE;
     if (redefined) {
         if (dnargs != nargs || ! str_eq( defp->repl, repl_list)
-                || (mcpp_mode == STD && ! str_eq( defp->parmnames, work_buf))
+                || (! str_eq( defp->parmnames, work_buf))
                 ) {             /* Warn if differently redefined    */
             if (warn_level & 1) {
                 cwarn(
             "The macro is redefined", NULL, 0L, NULL);      /* _W1_ */
-                if (! option_flags.no_source_line)
-                    dump_a_def( "    previously macro", defp, FALSE, TRUE
-                            , fp_err);
+                dump_a_def( "    previously macro", defp, FALSE, TRUE
+                        , fp_err);
             }
         } else {                        /* Identical redefinition   */
             return  defp;
@@ -813,11 +685,6 @@ DEFBUF *    do_define(
                 , e_line_col.line, e_line_col.col);
         wrong_line = TRUE;                      /* Need #line later */
     }
-    if (mcpp_mode == STD && cplus_val && id_operator( macroname)
-            && (warn_level & 1))
-        /* These are operators, not identifiers, in C++98   */
-        cwarn( "\"%s\" is defined as macro", macroname      /* _W1_ */
-                , 0L, NULL);
     return  defp;
 }
 
@@ -842,9 +709,6 @@ static int  get_parm( void)
 
     parms[ 0].name = workp = work_buf;
     work_buf[ 0] = EOS;
-#if COMPILER == GNUC
-    gcc2_va_arg = FALSE;
-#endif
 
     /* POST_STD mode    */
     insert_sep = NO_SEP;    /* Clear the inserted token separator   */
@@ -870,7 +734,7 @@ static int  get_parm( void)
                 } else if (c == ',' || c == ')') {
                     cerror( "Empty parameter", NULL, 0L, NULL);     /* _E_  */
                     return  FALSE;
-                } else if (standard && (stdc_val || cplus_val)
+                } else if ((stdc_val)
                         && token_type == OPE && openum == OP_ELL) {
                     /*
                      * Enable variable argument macro which is a feature of
@@ -889,7 +753,7 @@ static int  get_parm( void)
                     return  FALSE;          /* Bad parameter syntax */
                 }
             }
-            if (standard && (stdc_val || cplus_val)
+            if ((stdc_val)
                     && str_eq( identifier, "__VA_ARGS__")) {
                 cerror( illeg_parm, parms[ nargs].name, 0L, NULL);
                 return  FALSE;
@@ -908,22 +772,6 @@ static int  get_parm( void)
 
         *--workp = EOS;                     /* Remove excessive ',' */
         if (c != ')') {                     /* Must end at )        */
-#if COMPILER == GNUC
-            /* Handle GCC2 variadic params like par...  */
-            char *  tp = workp;
-            if (mcpp_mode == STD
-                    &&(token_type = scan_token( c, &workp, work_end)) == OPE
-                    && openum == OP_ELL) {
-                if ((c = skip_ws()) != ')') {
-                    cerror( misplaced_ellip, NULL, 0L, NULL);
-                    return  FALSE;
-                }
-                *tp = EOS;                  /* Remove "..."         */
-                nargs |= VA_ARGS;
-                gcc2_va_arg = TRUE;
-                goto  ret;
-            }
-#endif
             unget_ch();                     /* Push back '\n'       */
             cerror(
         "Missing \",\" or \")\" in parameter list \"(%s\""  /* _E_  */
@@ -975,27 +823,21 @@ static int  get_repl(
 
     *repl_cur = EOS;
     token_p = NULL;
-    if (mcpp_mode == STD) {
-        c = get_ch();
-        unget_ch();
-        if (((char_type[ c] & SPA) == 0) && (nargs < 0) && (warn_level & 1))
-            cwarn( "No space between macro name \"%s\" and repl-text"/* _W1_ */
-                , macroname, 0L, NULL);
-    }
+    c = get_ch();
+    unget_ch();
+    if (((char_type[ c] & SPA) == 0) && (nargs < 0) && (warn_level & 1))
+        cwarn( "No space between macro name \"%s\" and repl-text"/* _W1_ */
+            , macroname, 0L, NULL);
     c = skip_ws();                          /* Get to the body      */
 
     while (c != '\n') {
-        if (standard) {
-            prev_prev_token = prev_token;
-            prev_token = token_p;
-        }
+        prev_prev_token = prev_token;
+        prev_token = token_p;
         token_p = repl_cur;                 /* Remember the pointer */
         token_type = scan_token( c, &repl_cur, repl_end);
 
         switch (token_type) {
         case OPE:                   /* Operator or punctuator       */
-            if (! standard)
-                break;
             switch (openum) {
             case OP_CAT:                    /* ##                   */
                 if (prev_token == NULL) {
@@ -1041,17 +883,8 @@ static int  get_repl(
          */
             temp = is_formal( identifier, TRUE);
             if (temp == NULL) {             /* Not a parameter name */
-                if (! standard)
-                    break;
-                if ((stdc_val || cplus_val)
+                if ((stdc_val)
                             && str_eq( identifier, "__VA_ARGS__")) {
-#if COMPILER == GNUC
-                    if (gcc2_va_arg) {
-        cerror( "\"%s\" cannot be used in GCC2-spec variadic macro" /* _E_  */
-                            , identifier, 0L, NULL);
-                        return  FALSE;
-                    }
-#endif
                     cerror( "\"%s\" without corresponding \"...\""  /* _E_  */
                             , identifier, 0L, NULL);
                     return  FALSE;
@@ -1060,36 +893,13 @@ static int  get_repl(
                     repl_cur = temp;        /* Macro name           */
             } else {                        /* Parameter name       */
                 repl_cur = temp;
-#if COMPILER == GNUC
-                if (mcpp_mode == STD && (nargs & VA_ARGS)
-                        && *(repl_cur - 1) == (nargs & ~AVA_ARGS)) {
-                    if (! str_eq( identifier, "__VA_ARGS__")
-                            && (warn_level & 2))
-                        cwarn(
-                            "GCC2-spec variadic macro is defined"   /* _W2_ */
-                                    , NULL, 0L, NULL);
-                    if (prev_token && *prev_token == CAT
-                            && prev_prev_token && *prev_prev_token == ',')
-                        /* ", ## __VA_ARGS__" is sequence peculiar  */
-                        /* to GCC3-spec variadic macro.             */
-                        /* Or ", ## last_arg" is sequence peculiar  */
-                        /* to GCC2-spec variadic macro.             */
-                        nargs |= GVA_ARGS;
-                        /* Mark as sequence peculiar to GCC         */
-                        /* This will be warned at expansion time    */
-                }
-#endif
             }
             break;
 
         case STR:                           /* String in mac. body  */
         case CHR:                           /* Character constant   */
-            if (mcpp_mode == OLD_PREP)
-                repl_cur = str_parm_scan( repl_cur);
             break;
         case SEP:
-            if (mcpp_mode == OLD_PREP && c == COM_SEP)
-                repl_cur--;                 /* Skip comment now     */
             break;
         default:                            /* Any token as it is   */
             break;
@@ -1108,18 +918,16 @@ static int  get_repl(
     *repl_cur = EOS;                        /* Terminate work       */
 
     unget_ch();                             /* For syntax check     */
-    if (standard) {
-        if (token_p && *token_p == CAT) {
-            cerror( "No token after ##", NULL, 0L, NULL);   /* _E_  */
-            return  FALSE;
-        }
-        if (multi_cats && (warn_level & 4))
-            cwarn( multiple_cats, NULL, 0L, NULL);
-        if ((nargs & VA_ARGS) && stdc_ver < 199901L && (warn_level & 2))
-            /* Variable arg macro is the spec of C99, not C90 nor C++98     */
-            cwarn( "Variable argument macro is defined",    /* _W2_ */
-                    NULL, 0L, NULL);
+    if (token_p && *token_p == CAT) {
+        cerror( "No token after ##", NULL, 0L, NULL);   /* _E_  */
+        return  FALSE;
     }
+    if (multi_cats && (warn_level & 4))
+        cwarn( multiple_cats, NULL, 0L, NULL);
+    if ((nargs & VA_ARGS) && stdc_ver < 199901L && (warn_level & 2))
+        /* Variable arg macro is the spec of C99, not C90 nor C++98     */
+        cwarn( "Variable argument macro is defined",    /* _W2_ */
+                NULL, 0L, NULL);
 
     return  TRUE;
 }
@@ -1146,14 +954,10 @@ static char *   is_formal(
         if ((len == parm.len
                 /* Note: parms[].name are comma separated  */
                     && memcmp( name, parm.name, parm.len) == 0)
-                || (standard && (nargs & VA_ARGS)
+                || ((nargs & VA_ARGS)
                     && i == (nargs & ~AVA_ARGS) - 1 && conv
                     && str_eq( name, va_arg))) {    /* __VA_ARGS__  */
                                             /* If it's known        */
-#if COMPILER == GNUC
-            if (gcc2_va_arg && str_eq( name, va_arg))
-                return  NULL;               /* GCC2 variadic macro  */
-#endif
             if (conv) {
                 repl_cur = token_p;         /* Overwrite on the name*/
                 *repl_cur++ = MAC_PARM;     /* Save the signal      */
@@ -1217,40 +1021,6 @@ static char *   mgtoken_save( const char * macroname)
     }
 }
 
-static char *   str_parm_scan( char * string_end)
-/*
- * String parameter scan.
- * This code -- if enabled -- recognizes a formal parameter in a string
- * literal or in a character constant.
- *      #define foo(bar, v) printf("%bar\n", v)
- *      foo( d, i)
- * expands to:
- *      printf("%d\n", i)
- * str_parm_scan() return the advanced pointer into the replacement text.
- * This has been superceded by # stringizing and string concatenation.
- * This routine is called only in OLD_PREP mode.
- */
-{
-    int     delim;
-    int     c;
-    char *  tp;
-    char *  wp;             /* Pointer into the quoted literal  */
-
-    delim = *token_p;
-    unget_string( ++token_p, NULL);
-    /* Pseudo-token-parsing in a string literal */
-    wp = token_p;
-    while ((c = get_ch()) != delim) {
-        token_p = wp;
-        if (scan_token( c, &wp, string_end) != NAM)
-            continue;
-        if ((tp = is_formal( token_p, TRUE)) != NULL)
-            wp = tp;
-    }
-    *wp++ = delim;
-    return  wp;
-}
-
 static void do_undef( void)
 /*
  * Remove the symbol from the defined list.
@@ -1274,21 +1044,19 @@ static void do_undef( void)
             if (warn_level & 8)
                 cwarn( "\"%s\" wasn't defined"              /* _W8_ */
                         , identifier, 0L, NULL);
-        } else if (standard && (defp->nargs <= DEF_NOARGS_STANDARD
+        } else if ((defp->nargs <= DEF_NOARGS_STANDARD
                                                 /* Standard predef  */
                     || defp->nargs == DEF_PRAGMA)) {
                                         /* _Pragma() pseudo-macro   */
             cerror( "\"%s\" shouldn't be undefined"         /* _E_  */
                     , identifier, 0L, NULL);
-        } else if (standard) {
+        } else {
             c = skip_ws();
             unget_ch();
             if (c != '\n')                      /* Trailing junk    */
                 return;
             else
                 undefine( identifier);
-        } else {
-            undefine( identifier);
         }
     }
 }
@@ -1304,13 +1072,11 @@ static void do_undef( void)
 static DEFBUF *     symtab[ SBSIZE];
 static long         num_of_macro = 0;
 
-#if MCPP_LIB
 void    init_directive( void)
 /* Initialize static variables. */
 {
     num_of_macro = 0;
 }
-#endif
 
 DEFBUF *    look_id( const char * name)
 /*
@@ -1323,10 +1089,7 @@ DEFBUF *    look_id( const char * name)
 
     prevp = look_prev( name, &cmp);
 
-    if (standard)
-        return ((cmp == 0 && (*prevp)->push == 0) ? *prevp : NULL);
-    else
-        return ((cmp == 0) ? *prevp : NULL);
+    return ((cmp == 0 && (*prevp)->push == 0) ? *prevp : NULL);
 }
 
 DEFBUF **   look_prev(
@@ -1412,14 +1175,11 @@ DEFBUF *    install_macro(
         cfatal( "Bug: Illegal macro installation of \"%s\"" /* _F_  */
                 , name, 0L, NULL);      /* Use "" instead of NULL   */
     s_name = strlen( name);
-    if (mcpp_mode == STD)
-        s_parmnames = strlen( parmnames) + 1;
-    else
-        s_parmnames = 0;
+    s_parmnames = strlen( parmnames) + 1;
     s_repl = strlen( repl) + 1;
     dp = (DEFBUF *)
         xmalloc( sizeof (DEFBUF) + s_name + s_parmnames + s_repl);
-    if (cmp || (standard && (*prevp)->push)) {  /* New definition   */
+    if (cmp || ((*prevp)->push)) {  /* New definition   */
         dp->link = defp;                /* Insert to linked list    */
         *prevp = dp;
     } else {                            /* Redefinition             */
@@ -1428,21 +1188,16 @@ DEFBUF *    install_macro(
         free( defp);
     }
     dp->nargs = predefine ? predefine : numargs;
-    if (standard) {
-        dp->push = 0;
-        dp->parmnames = (char *)dp + sizeof (DEFBUF) + s_name;
-        dp->repl = dp->parmnames + s_parmnames;
-        if (mcpp_mode == STD)
-            memcpy( dp->parmnames, parmnames, s_parmnames);
-    } else {
-        dp->repl = (char *)dp + sizeof (DEFBUF) + s_name;
-    }
+    dp->push = 0;
+    dp->parmnames = (char *)dp + sizeof (DEFBUF) + s_name;
+    dp->repl = dp->parmnames + s_parmnames;
+    memcpy( dp->parmnames, parmnames, s_parmnames);
     memcpy( dp->name, name, s_name + 1);
     memcpy( dp->repl, repl, s_repl);
     /* Remember where the macro is defined  */
     dp->fname = cur_fullname;   /* Full-path-list of current file   */
     dp->mline = src_line;
-    if (standard && cmp && ++num_of_macro == std_limits.n_macro + 1
+    if (cmp && ++num_of_macro == std_limits.n_macro + 1
             && std_limits.n_macro && (warn_level & 4))
         /* '&& std_limits.n_macro' to avoid warning before initialization   */
         cwarn( "More than %.0s%ld macros defined"           /* _W4_ */
@@ -1468,7 +1223,7 @@ int undefine(
     dp = *prevp;                        /* Definition to delete     */
     if (cmp || dp->nargs <= DEF_NOARGS_STANDARD)
         return  FALSE;      /* Not defined or Standard predefined   */
-    if (standard && dp->push)
+    if (dp->push)
         return  FALSE;                  /* 'Pushed' macro           */
     *prevp = dp->link;          /* Link the previous and the next   */
     if ((mcpp_debug & MACRO_CALL) && dp->mline) {
@@ -1477,8 +1232,7 @@ int undefine(
         wrong_line = TRUE;
     }
     free( dp);                          /* Delete the definition    */
-    if (standard)
-        num_of_macro--;
+    num_of_macro--;
     return  TRUE;
 }
 
@@ -1500,54 +1254,34 @@ static void dump_repl(
     for (cp = dp->repl; (c = *cp++ & UCHARMAX) != EOS; ) {
 
         switch (c) {
-        case MAC_PARM:                              /* Parameter    */
+        case MAC_PARM: {                             /* Parameter    */
+            PARM    parm;
             c = (*cp++ & UCHARMAX) - 1;
-            if (standard) {
-                PARM    parm = parms[ c];
-                if ((numargs & VA_ARGS) && c == (numargs & ~AVA_ARGS) - 1) {
-                    mcpp_fputs( gcc2_va ? parm.name : "__VA_ARGS__"
-                            , FP2DEST( fp));
-                    /* gcc2_va is possible only in STD mode */
-                } else {
-                    if (mcpp_mode == STD) {
-                        for (i = 0, cp1 = parm.name; i < parm.len; i++)
-                            mcpp_fputc( *cp1++, FP2DEST( fp));
-                    } else {
-                        mcpp_fputc( 'a' + c % 26, FP2DEST( fp));
-                        if (c > 26)
-                            mcpp_fputc( '0' + c / 26, FP2DEST( fp));
-                    }
-                }
+            parm = parms[ c];
+            if ((numargs & VA_ARGS) && c == (numargs & ~AVA_ARGS) - 1) {
+                mcpp_fputs( gcc2_va ? parm.name : "__VA_ARGS__"
+                        , FP2DEST( fp));
+                /* gcc2_va is possible only in STD mode */
             } else {
-                mcpp_fputc( 'a' + c % 26, FP2DEST( fp));
-                if (c > 26)
-                    mcpp_fputc( '0' + c / 26, FP2DEST( fp));
+                for (i = 0, cp1 = parm.name; i < parm.len; i++)
+                    mcpp_fputc( *cp1++, FP2DEST( fp));
             }
             break;
+        }
         case DEF_MAGIC:
-            if (! standard)
-                mcpp_fputc( c, FP2DEST( fp));
             /* Else skip    */
             break;
         case CAT:
-            if (standard)
-                mcpp_fputs( "##", FP2DEST( fp));
-            else
-                mcpp_fputc( c, FP2DEST( fp));
+            mcpp_fputs( "##", FP2DEST( fp));
             break;
         case ST_QUOTE:
-            if (standard)
-                mcpp_fputs( "#", FP2DEST( fp));
-            else
-                mcpp_fputc( c, FP2DEST( fp));
+            mcpp_fputs( "#", FP2DEST( fp));
             break;
         case COM_SEP:
             /*
              * Though TOK_SEP coincides to COM_SEP, this cannot appear in
              * Standard mode.
              */
-            if (mcpp_mode == OLD_PREP)
-                mcpp_fputs( "/**/", FP2DEST( fp));
             break;
         default:
             mcpp_fputc( c, FP2DEST( fp));
@@ -1583,9 +1317,9 @@ void    dump_a_def(
     int     gcc2_va = FALSE;                /* GCC2-spec variadic   */
     int     i;
 
-    if (standard && numargs == DEF_PRAGMA)  /* _Pragma pseudo-macro */
+    if (numargs == DEF_PRAGMA)  /* _Pragma pseudo-macro */
         return;
-    if ((numargs < CAN_REDEF) || (standard && dp->push))
+    if ((numargs < CAN_REDEF) || (dp->push))
         commented = TRUE;
     else
         commented = FALSE;
@@ -1596,46 +1330,19 @@ void    dump_a_def(
     mcpp_fprintf( FP2DEST( fp), "%s#define %s", commented ? "/* " : "",
             dp->name);                      /* Macro name           */
     if (numargs >= 0) {                     /* Parameter list       */
-        if (mcpp_mode == STD) {
-            const char *    appendix = null;
-            if (! newdef) {
-                /* Make parms[] for dump_repl() */
-                for (i = 0, cp = dp->parmnames; i < numargs;
-                        i++, cp = cp1 + 1) {
-                    if ((cp1 = strchr( cp, ',')) == NULL)   /* The last arg */
-                        parms[ i].len = strlen( cp);
-                    else
-                        parms[ i].len = (size_t) (cp1 - cp);
-                    parms[ i].name = cp;
-                }
-            }
-#if COMPILER == GNUC
-            if ((dp->nargs & VA_ARGS)
-                    && memcmp( parms[ numargs - 1].name, "...", 3) != 0) {
-                appendix = "...";   /* Append ... so as to become 'args...' */
-                gcc2_va = TRUE;
-            }
-#endif
-            mcpp_fprintf( FP2DEST( fp), "(%s%s)", dp->parmnames, appendix);
-        } else {
-            if (newdef) {
-                mcpp_fprintf( FP2DEST( fp), "(%s)", parms[ 0].name);
-            } else if (numargs == 0) {
-                mcpp_fputs( "()", FP2DEST( fp));
-            } else {
-                /* Print parameter list automatically made as:      */
-                /* a, b, c, ..., a0, b0, c0, ..., a1, b1, c1, ...   */
-                mcpp_fputc( '(', FP2DEST( fp));
-                for (i = 0; i < numargs; i++) {     /* Make parameter list  */
-                    mcpp_fputc( 'a' + i % 26, FP2DEST( fp));
-                    if (i >= 26)
-                        mcpp_fputc( '0' + i / 26, FP2DEST( fp));
-                    if (i + 1 < numargs)
-                        mcpp_fputc( ',', FP2DEST( fp));
-                }
-                mcpp_fputc( ')', FP2DEST( fp));
+        const char *    appendix = null;
+        if (! newdef) {
+            /* Make parms[] for dump_repl() */
+            for (i = 0, cp = dp->parmnames; i < numargs;
+                    i++, cp = cp1 + 1) {
+                if ((cp1 = strchr( cp, ',')) == NULL)   /* The last arg */
+                    parms[ i].len = strlen( cp);
+                else
+                    parms[ i].len = (size_t) (cp1 - cp);
+                parms[ i].name = cp;
             }
         }
+        mcpp_fprintf( FP2DEST( fp), "(%s%s)", dp->parmnames, appendix);
     }
     if (*dp->repl) {
         mcpp_fputc( ' ', FP2DEST( fp));
@@ -1676,7 +1383,6 @@ void    dump_def(
     wrong_line = TRUE;               /* Line number is out of sync  */
 }
 
-#if MCPP_LIB
 void    clear_symtable( void)
 /*
  * Free all the macro definitions.
@@ -1695,5 +1401,4 @@ void    clear_symtable( void)
         *symp = NULL;
     }
 }
-#endif