zeroc-ice 3.7.0 → 3.7.5

data/ext/ice/cpp/src/Slice/RubyUtil.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef SLICE_RUBY_UTIL_H
 #define SLICE_RUBY_UTIL_H

data/ext/ice/cpp/src/Slice/Scanner.cpp

@@ -54,7 +54,7 @@
 #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types.
+ * if you want the limit (max/min) macros for int types. 
  */
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS 1
@@ -71,7 +71,7 @@ typedef uint32_t flex_uint32_t;
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
 typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t;
+typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
 
@@ -188,7 +188,7 @@ extern FILE *slice_in, *slice_out;
 #define EOB_ACT_LAST_MATCH 2
 
     #define YY_LESS_LINENO(n)
-
+    
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
 	do \
@@ -245,7 +245,7 @@ struct yy_buffer_state
 
     int yy_bs_lineno; /**< The line count. */
     int yy_bs_column; /**< The column count. */
-
+    
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
@@ -384,8 +384,8 @@ static void yy_fatal_error (yyconst char msg[]  );
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 20
-#define YY_END_OF_BUFFER 21
+#define YY_NUM_RULES 19
+#define YY_END_OF_BUFFER 20
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -393,16 +393,16 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_accept[73] =
+static yyconst flex_int16_t yy_accept[76] =
     {   0,
-        0,    0,    0,    0,    0,    0,   21,   19,   17,   17,
-       14,   19,   19,   19,   15,   15,   19,   13,    8,   19,
-        9,   19,   19,    0,   15,   15,   16,    6,    5,   16,
-       15,    0,    0,    7,    0,   12,   13,   10,   13,   11,
-        0,    0,    0,    0,    0,   16,    0,   16,   15,    0,
-        1,    0,   18,    0,   16,    0,    0,    0,    0,    0,
-        0,    2,    0,    0,    0,    3,    0,    0,    0,    0,
-        4,    0
+        0,    0,    0,    0,    0,    0,   20,   18,   16,   16,
+       13,   18,   18,   18,   14,   14,   18,   12,    7,   18,
+        8,   18,   18,    0,   14,   14,   15,    6,    5,   15,
+       14,    0,    0,    0,    0,   11,   12,    0,   12,    0,
+        9,   12,   10,    0,    0,    0,    0,    0,   15,    0,
+       15,   14,    0,    1,    0,   17,    0,   15,    0,    0,
+        0,    0,    0,    0,    2,    0,    0,    0,    3,    0,
+        0,    0,    0,    4,    0
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -439,94 +439,94 @@ static yyconst flex_int32_t yy_ec[256] =
 
 static yyconst flex_int32_t yy_meta[32] =
     {   0,
-        1,    2,    3,    4,    1,    1,    4,    1,    5,    5,
-        1,    1,    6,    6,    6,    1,    7,    7,    7,    8,
-        1,    1,    1,    7,    8,    9,    8,    8,    1,    1,
+        1,    2,    3,    1,    1,    1,    1,    1,    4,    4,
+        1,    1,    5,    5,    5,    1,    6,    6,    6,    7,
+        1,    1,    1,    6,    7,    8,    7,    7,    1,    1,
         1
     } ;
 
-static yyconst flex_int16_t yy_base[85] =
+static yyconst flex_int16_t yy_base[87] =
     {   0,
-        0,  185,    0,   26,    0,  184,  189,  192,  192,  192,
-      192,   22,   25,   33,   47,   35,  153,   40,  147,    0,
-      121,   44,  114,   37,    0,    0,   63,  192,  192,    0,
-      107,   44,    0,  192,   65,  192,   81,  192,    0,  192,
-       53,   71,  109,  102,   80,  192,   78,   81,    0,   96,
-      192,  104,  192,   89,   92,  125,   97,  111,   83,   78,
-       63,  192,   95,  110,  112,  192,   59,   54,   53,   31,
-      192,  192,  116,  119,  127,  132,  133,  139,  141,  147,
-      156,  164,  170,  179
+        0,  140,    0,   26,    0,  139,  137,  197,  197,  197,
+      197,   22,   25,   33,   47,   35,  120,   74,  114,    0,
+      111,   40,  104,   37,    0,    0,   90,  197,  197,    0,
+      104,   34,    0,   97,   52,  197,    0,   99,    0,    0,
+      197,    0,  197,   44,   65,   88,   77,   63,  197,   69,
+       97,    0,  115,  197,   79,  197,  108,  111,   92,   71,
+       81,   82,   72,   66,  197,  125,   77,  126,  197,   59,
+       48,   44,   31,  197,  197,  135,  142,  147,  148,  153,
+      155,  160,  168,  175,  180,  188
     } ;
 
-static yyconst flex_int16_t yy_def[85] =
+static yyconst flex_int16_t yy_def[87] =
     {   0,
-       72,    1,    1,    1,    1,    1,   72,   72,   72,   72,
-       72,   72,   72,   72,   72,   15,   72,   73,   72,   74,
-       72,   75,   72,   72,   15,   16,   72,   72,   72,   27,
-       15,   76,   77,   72,   72,   72,   73,   72,   37,   72,
-       75,   78,   72,   72,   79,   72,   72,   72,   77,   72,
-       72,   72,   72,   72,   72,   80,   72,   80,   81,   72,
-       81,   72,   72,   82,   72,   72,   83,   83,   84,   84,
-       72,    0,   72,   72,   72,   72,   72,   72,   72,   72,
-       72,   72,   72,   72
+       75,    1,    1,    1,    1,    1,   75,   75,   75,   75,
+       75,   75,   75,   75,   75,   15,   75,   75,   75,   76,
+       75,   77,   75,   75,   15,   16,   75,   75,   75,   27,
+       15,   78,   79,   76,   75,   75,   18,   75,   18,   76,
+       75,   18,   75,   77,   80,   75,   75,   81,   75,   75,
+       75,   79,   75,   75,   75,   75,   75,   75,   82,   75,
+       82,   83,   75,   83,   75,   75,   84,   75,   75,   85,
+       85,   86,   86,   75,    0,   75,   75,   75,   75,   75,
+       75,   75,   75,   75,   75,   75
     } ;
 
-static yyconst flex_int16_t yy_nxt[224] =
+static yyconst flex_int16_t yy_nxt[229] =
     {   0,
         8,    9,   10,    9,   11,    8,    8,    8,   12,   12,
        13,   14,   15,   16,   16,   17,   18,   18,   18,   18,
        19,   20,   21,   18,   18,   18,   18,   18,    8,    8,
-        8,   22,   24,   71,   25,   26,   26,   27,   27,   27,
-       28,   35,   35,   35,   29,   41,   36,   26,   26,   27,
-       27,   27,   47,   47,   41,   71,   23,   30,   69,   31,
-       31,   26,   72,   69,   32,   62,   35,   35,   35,   43,
-       32,   36,   50,   51,   33,   27,   27,   27,   43,   63,
-       45,   46,   35,   35,   35,   62,   45,   36,   54,   54,
-       48,   48,   48,   48,   48,   48,   63,   50,   51,   46,
-
-       56,   55,   55,   55,   55,   55,   55,   64,   64,   64,
-       46,   65,   66,   65,   66,   59,   67,   37,   37,   37,
-       60,   37,   37,   37,   37,   39,   39,   39,   42,   59,
-       57,   53,   42,   52,   72,   42,   48,   48,   49,   49,
-       42,   42,   44,   40,   42,   55,   55,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   61,   61,   61,   61,
-       61,   61,   61,   61,   61,   64,   64,   38,   34,   64,
-       68,   68,   68,   68,   68,   68,   68,   68,   68,   70,
-       70,   70,   70,   70,   70,   70,   70,   70,   72,   22,
-       22,    7,   72,   72,   72,   72,   72,   72,   72,   72,
-
-       72,   72,   72,   72,   72,   72,   72,   72,   72,   72,
-       72,   72,   72,   72,   72,   72,   72,   72,   72,   72,
-       72,   72,   72
+        8,   22,   24,   74,   25,   26,   26,   27,   27,   27,
+       28,   44,   50,   50,   29,   44,   74,   26,   26,   27,
+       27,   27,   72,   35,   35,   35,   23,   30,   36,   31,
+       31,   26,   75,   72,   32,   46,   53,   54,   65,   46,
+       32,   57,   57,   66,   33,   35,   35,   35,   68,   69,
+       36,   51,   51,   51,   65,   62,   37,   37,   37,   38,
+       39,   39,   39,   39,   63,   40,   62,   39,   39,   39,
+
+       39,   39,   27,   27,   27,   60,   56,   48,   49,   51,
+       51,   51,   55,   48,   34,   49,   53,   54,   40,   59,
+       58,   58,   58,   58,   58,   58,   66,   68,   69,   49,
+       70,   75,   47,   43,   41,   34,   75,   67,   67,   67,
+       42,   42,   42,   45,   22,   22,   45,   75,   75,   45,
+       51,   51,   52,   52,   45,   45,   75,   45,   58,   58,
+       61,   61,   61,   61,   61,   61,   61,   61,   64,   64,
+       64,   64,   64,   64,   64,   64,   67,   67,   75,   67,
+       71,   71,   71,   71,   71,   71,   71,   71,   73,   73,
+       73,   73,   73,   73,   73,   73,    7,   75,   75,   75,
+
+       75,   75,   75,   75,   75,   75,   75,   75,   75,   75,
+       75,   75,   75,   75,   75,   75,   75,   75,   75,   75,
+       75,   75,   75,   75,   75,   75,   75,   75
     } ;
 
-static yyconst flex_int16_t yy_chk[224] =
+static yyconst flex_int16_t yy_chk[229] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    4,   12,   70,   12,   12,   12,   13,   13,   13,
-       14,   18,   18,   18,   14,   22,   18,   16,   16,   24,
-       24,   24,   32,   32,   41,   69,    4,   15,   68,   15,
-       15,   15,   16,   67,   15,   61,   35,   35,   35,   22,
-       15,   35,   42,   42,   15,   27,   27,   27,   41,   60,
-       27,   27,   37,   37,   37,   59,   27,   37,   45,   45,
-       47,   47,   47,   48,   48,   48,   63,   50,   50,   48,
-
-       50,   54,   54,   54,   55,   55,   55,   63,   63,   63,
-       55,   64,   64,   65,   65,   58,   65,   73,   73,   73,
-       57,   73,   73,   73,   73,   74,   74,   74,   75,   56,
-       52,   44,   75,   43,   31,   75,   76,   76,   77,   77,
-       78,   78,   23,   21,   78,   79,   79,   80,   80,   80,
-       80,   80,   80,   80,   80,   80,   81,   81,   81,   81,
-       81,   81,   81,   81,   81,   82,   82,   19,   17,   82,
-       83,   83,   83,   83,   83,   83,   83,   83,   83,   84,
-       84,   84,   84,   84,   84,   84,   84,   84,    7,    6,
-        2,   72,   72,   72,   72,   72,   72,   72,   72,   72,
-
-       72,   72,   72,   72,   72,   72,   72,   72,   72,   72,
-       72,   72,   72,   72,   72,   72,   72,   72,   72,   72,
-       72,   72,   72
+        1,    4,   12,   73,   12,   12,   12,   13,   13,   13,
+       14,   22,   32,   32,   14,   44,   72,   16,   16,   24,
+       24,   24,   71,   35,   35,   35,    4,   15,   35,   15,
+       15,   15,   16,   70,   15,   22,   45,   45,   64,   44,
+       15,   48,   48,   63,   15,   18,   18,   18,   67,   67,
+       18,   50,   50,   50,   62,   61,   18,   18,   18,   18,
+       18,   18,   18,   18,   60,   18,   59,   18,   18,   18,
+
+       18,   18,   27,   27,   27,   55,   47,   27,   27,   51,
+       51,   51,   46,   27,   38,   51,   53,   53,   34,   53,
+       57,   57,   57,   58,   58,   58,   66,   68,   68,   58,
+       68,   31,   23,   21,   19,   17,    7,   66,   66,   66,
+       76,   76,   76,   77,    6,    2,   77,    0,    0,   77,
+       78,   78,   79,   79,   80,   80,    0,   80,   81,   81,
+       82,   82,   82,   82,   82,   82,   82,   82,   83,   83,
+       83,   83,   83,   83,   83,   83,   84,   84,    0,   84,
+       85,   85,   85,   85,   85,   85,   85,   85,   86,   86,
+       86,   86,   86,   86,   86,   86,   75,   75,   75,   75,
+
+       75,   75,   75,   75,   75,   75,   75,   75,   75,   75,
+       75,   75,   75,   75,   75,   75,   75,   75,   75,   75,
+       75,   75,   75,   75,   75,   75,   75,   75
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -546,14 +546,9 @@ char *slice_text;
 #line 1 "src/Slice/Scanner.l"
 #line 2 "src/Slice/Scanner.l"
 
-// **********************************************************************
-//
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// **********************************************************************
 
 #include <Slice/GrammarUtil.h>  // Before Grammer.h, so that YYSTYPE is defined
 #include <Slice/Grammar.h>
@@ -564,30 +559,33 @@ char *slice_text;
 #include <stdlib.h>
 #include <math.h>
 
-#if defined(_MSC_VER) && defined(ICE_64)
-//
-// '=' : conversion from 'size_t' to 'int', possible loss of data
-// The result of fread() is a size_t and gets inserted into an int
-//
-#   pragma warning( 4 : 4267 )
-//
+#if defined(_MSC_VER)
+// '<' : signed/unsigned mismatch
+#   pragma warning(disable:4018)
 // 'initializing' : conversion from '__int64' to 'int', possible loss of data
-// Puts a pointer-difference into an int
-//
-#   pragma warning( 4 : 4244 )
-#endif
+#   pragma warning(disable:4244)
 
-#if defined(_MSC_VER) && defined(ICE_32)
+#   if defined(ICE_64)
 //
-// '<' : signed/unsigned mismatch
+// '=' : conversion from 'size_t' to 'int', possible loss of data
+// The result of fread() is a size_t and gets inserted into an int
 //
-#   pragma warning( 4 : 4018 )
+#       pragma warning(disable:4267)
+#   endif
 #endif
 
 #if defined(__GNUC__)
 #   pragma GCC diagnostic ignored "-Wsign-compare"
 #endif
 
+//
+// Avoid clang conversion warnings
+//
+#if defined(__clang__)
+#   pragma clang diagnostic ignored "-Wconversion"
+#   pragma clang diagnostic ignored "-Wsign-conversion"
+#endif
+
 #ifdef _MSC_VER
 #   ifdef slice_wrap
 #      undef slice_wrap
@@ -620,6 +618,7 @@ static StringTokenMap keywordMap;
 
 void initScanner();
 int checkKeyword(string&);
+int checkIdentifier(string&);
 
 }
 
@@ -627,7 +626,7 @@ int checkKeyword(string&);
 
 
 
-#line 630 "src/Slice/Scanner.cpp"
+#line 626 "src/Slice/Scanner.cpp"
 
 #define INITIAL 0
 #define BOMSCAN 1
@@ -689,7 +688,7 @@ extern int slice_wrap (void );
 #endif
 
     static void yyunput (int c,char *buf_ptr  );
-
+    
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char *,yyconst char *,int );
 #endif
@@ -813,11 +812,11 @@ YY_DECL
 	register yy_state_type yy_current_state;
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
-
-#line 97 "src/Slice/Scanner.l"
+    
+#line 93 "src/Slice/Scanner.l"
 
 
-#line 820 "src/Slice/Scanner.cpp"
+#line 816 "src/Slice/Scanner.cpp"
 
 	if ( !(yy_init) )
 		{
@@ -871,13 +870,13 @@ yy_match:
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 73 )
+				if ( yy_current_state >= 76 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
-		while ( yy_current_state != 72 );
+		while ( yy_current_state != 75 );
 		yy_cp = (yy_last_accepting_cpos);
 		yy_current_state = (yy_last_accepting_state);
 
@@ -902,7 +901,7 @@ case 1:
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up slice_text again */
 YY_RULE_SETUP
-#line 99 "src/Slice/Scanner.l"
+#line 95 "src/Slice/Scanner.l"
 {
     if(unit->scanPosition(slice_text))
     {
@@ -916,7 +915,7 @@ case 2:
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up slice_text again */
 YY_RULE_SETUP
-#line 106 "src/Slice/Scanner.l"
+#line 102 "src/Slice/Scanner.l"
 {
     if(unit->scanPosition(slice_text))
     {
@@ -929,7 +928,7 @@ case 3:
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up slice_text again */
 YY_RULE_SETUP
-#line 113 "src/Slice/Scanner.l"
+#line 109 "src/Slice/Scanner.l"
 {
     if(unit->scanPosition(slice_text))
     {
@@ -943,7 +942,7 @@ case 4:
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up slice_text again */
 YY_RULE_SETUP
-#line 120 "src/Slice/Scanner.l"
+#line 116 "src/Slice/Scanner.l"
 {
     if(unit->scanPosition(slice_text))
     {
@@ -953,7 +952,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 127 "src/Slice/Scanner.l"
+#line 123 "src/Slice/Scanner.l"
 {
     // C++-style comment
     BEGIN(MAINSCAN);
@@ -971,7 +970,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 142 "src/Slice/Scanner.l"
+#line 138 "src/Slice/Scanner.l"
 {
     // C-style comment
     BEGIN(MAINSCAN);
@@ -1015,48 +1014,40 @@ YY_RULE_SETUP
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 183 "src/Slice/Scanner.l"
-{
-    BEGIN(MAINSCAN);
-    return ICE_SCOPE_DELIMITER;
-}
-	YY_BREAK
-case 8:
-YY_RULE_SETUP
-#line 188 "src/Slice/Scanner.l"
+#line 179 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     return ICE_METADATA_OPEN;
 }
 	YY_BREAK
-case 9:
+case 8:
 YY_RULE_SETUP
-#line 193 "src/Slice/Scanner.l"
+#line 184 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     return ICE_METADATA_CLOSE;
 }
 	YY_BREAK
-case 10:
+case 9:
 YY_RULE_SETUP
-#line 198 "src/Slice/Scanner.l"
+#line 189 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     return ICE_GLOBAL_METADATA_OPEN;
 }
 	YY_BREAK
-case 11:
+case 10:
 YY_RULE_SETUP
-#line 203 "src/Slice/Scanner.l"
+#line 194 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     return ICE_GLOBAL_METADATA_CLOSE;
 }
 	YY_BREAK
-case 12:
-/* rule 12 can match eol */
+case 11:
+/* rule 11 can match eol */
 YY_RULE_SETUP
-#line 208 "src/Slice/Scanner.l"
+#line 199 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     StringTokPtr ident = new StringTok;
@@ -1065,6 +1056,10 @@ YY_RULE_SETUP
     *yylvalp = ident;
     if(*slice_text == '\\')
     {
+        if(checkIdentifier(ident->v) == ICE_SCOPED_IDENTIFIER)
+        {
+            unit->error("Operation identifiers cannot be scoped: `" + (ident->v) + "'");
+        }
         return ICE_IDENT_OP;
     }
     int st = checkKeyword(ident->v);
@@ -1072,6 +1067,11 @@ YY_RULE_SETUP
     {
         return ICE_IDENT_OP;
     }
+    else if(st == ICE_SCOPED_IDENTIFIER)
+    {
+        unit->error("Operation identifiers cannot be scoped: `" + (ident->v) + "'");
+        return ICE_IDENT_OP;
+    }
     else if(st == ICE_OPTIONAL)
     {
         return ICE_OPTIONAL_OP;
@@ -1082,7 +1082,7 @@ YY_RULE_SETUP
     }
 }
 	YY_BREAK
-case 13:
+case 12:
 YY_RULE_SETUP
 #line 233 "src/Slice/Scanner.l"
 {
@@ -1090,20 +1090,20 @@ YY_RULE_SETUP
     StringTokPtr ident = new StringTok;
     ident->v = *slice_text == '\\' ? slice_text + 1 : slice_text;
     *yylvalp = ident;
-    return *slice_text == '\\' ? ICE_IDENTIFIER : checkKeyword(ident->v);
+    return *slice_text == '\\' ? checkIdentifier(ident->v) : checkKeyword(ident->v);
 }
 	YY_BREAK
-case 14:
+case 13:
 YY_RULE_SETUP
 #line 241 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     StringTokPtr str = new StringTok;
     str->literal = "\"";
-     while(true)
+    while(true)
     {
-        char c = static_cast<char>(yyinput());
-        str->literal += c;
+        int c = yyinput();
+        str->literal += static_cast<char>(c);
         if(c == '"')
         {
             break;
@@ -1113,15 +1113,15 @@ YY_RULE_SETUP
             unit->error("EOF in string");
             break;
         }
-        else if(static_cast<unsigned char>(c) < 32 || c == 127)
+        else if(c < 32 || c == 127)
         {
             unit->error("a string literal can only contain printable ASCII characters and non-ASCII characters");
             break;
         }
         else if(c == '\\')
         {
-            char next = static_cast<char>(yyinput());
-            str->literal += next;
+            int next = yyinput();
+            str->literal += static_cast<char>(next);
             switch(next)
             {
                 case '\\':
@@ -1137,7 +1137,7 @@ YY_RULE_SETUP
                 case '\'':
                 case '?':
                 {
-                    str->v += next;
+                    str->v += static_cast<char>(next);
                     break;
                 }
                 case 'a':
@@ -1191,16 +1191,16 @@ YY_RULE_SETUP
                 {
                     static string octalDigits = "01234567";
                     string escape;
-                    escape += next;
+                    escape += static_cast<char>(next);
                     for(int i = 0; i < 2; ++i)
                     {
-                        next = static_cast<char>(yyinput());
-                        if(octalDigits.find_first_of(next) == string::npos)
+                        next = yyinput();
+                        if(octalDigits.find_first_of(static_cast<char>(next)) == string::npos)
                         {
                             unput(next);
                             break;
                         }
-                        escape += next;
+                        escape += static_cast<char>(next);
                     }
                     str->literal += escape;
                     IceUtil::Int64 value = IceUtilInternal::strToInt64(escape.c_str(), 0, 8);
@@ -1215,15 +1215,15 @@ YY_RULE_SETUP
                 case 'x':
                 {
                     string escape = "";
-                    next = static_cast<char>(yyinput());
+                    next = yyinput();
 
                     //
                     // Unlike C++, we limit hex escape sequences to 2 hex digits
                     //
-                    while(isxdigit(next) && escape.length() < 2)
+                    while(isxdigit(static_cast<char>(next)) && escape.length() < 2)
                     {
-                        escape += next;
-                        next = static_cast<char>(yyinput());
+                        escape += static_cast<char>(next);
+                        next = yyinput();
                     }
                     unput(next);
 
@@ -1247,18 +1247,19 @@ YY_RULE_SETUP
                 case 'U':
                 {
                     string escape = "";
-                    char c = next;
+                    c = next;
                     int size = (c == 'u') ? 4 : 8;
                     while(size > 0)
                     {
-                        next = static_cast<char>(yyinput());
-                        if(!isxdigit(static_cast<unsigned char>(next)))
+                        next = yyinput();
+                        if(!isxdigit(next))
                         {
-                            unit->error(string("unknown escape sequence in string literal: `\\") + c + escape + next + "'");
+                            unit->error(string("unknown escape sequence in string literal: `\\") +
+                                               static_cast<char>(c) + escape + static_cast<char>(next) + "'");
                             unput(next);
                             break;
                         }
-                        escape += next;
+                        escape += static_cast<char>(next);
                         --size;
                     }
 
@@ -1268,19 +1269,20 @@ YY_RULE_SETUP
                         IceUtil::Int64 codePoint = IceUtilInternal::strToInt64(escape.c_str(), 0, 16);
                         if(codePoint >= 0xd800 && codePoint <= 0xdfff)
                         {
-                            unit->error(string("a universal character name cannot designate a surrogate: `\\") + c + escape + "'");
+                            unit->error(string("a universal character name cannot designate a surrogate: `\\") +
+                                               static_cast<char>(c) + escape + "'");
                         }
                     }
 
                     str->literal += escape;
-                    str->v += string("\\") + c + escape;
+                    str->v += string("\\") + static_cast<char>(c) + escape;
                     break;
                 }
 
                 default:
                 {
                     ostringstream os;
-                    os << "unknown escape sequence `\\" << next << "'";
+                    os << "unknown escape sequence `\\" << static_cast<char>(next) << "'";
                     unit->warning(All, os.str());
 
                     // Escape the \ in this unknown escape sequence
@@ -1292,16 +1294,16 @@ YY_RULE_SETUP
         }
         else
         {
-            str->v += c;
+            str->v += static_cast<char>(c);
         }
     }
     *yylvalp = str;
     return ICE_STRING_LITERAL;
 }
 	YY_BREAK
-case 15:
+case 14:
 YY_RULE_SETUP
-#line 444 "src/Slice/Scanner.l"
+#line 446 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     IntegerTokPtr itp = new IntegerTok;
@@ -1318,9 +1320,9 @@ YY_RULE_SETUP
     return ICE_INTEGER_LITERAL;
 }
 	YY_BREAK
-case 16:
+case 15:
 YY_RULE_SETUP
-#line 460 "src/Slice/Scanner.l"
+#line 462 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     errno = 0;
@@ -1351,10 +1353,10 @@ YY_RULE_SETUP
     return ICE_FLOATING_POINT_LITERAL;
 }
 	YY_BREAK
-case 17:
-/* rule 17 can match eol */
+case 16:
+/* rule 16 can match eol */
 YY_RULE_SETUP
-#line 490 "src/Slice/Scanner.l"
+#line 492 "src/Slice/Scanner.l"
 {
     // Ignore white-space
 
@@ -1368,18 +1370,18 @@ YY_RULE_SETUP
     }
 }
 	YY_BREAK
-case 18:
+case 17:
 YY_RULE_SETUP
-#line 503 "src/Slice/Scanner.l"
+#line 505 "src/Slice/Scanner.l"
 {
     // Ignore UTF-8 BOM, rule only active when parsing start of file.
 
     BEGIN(MAINSCAN);
 }
 	YY_BREAK
-case 19:
+case 18:
 YY_RULE_SETUP
-#line 509 "src/Slice/Scanner.l"
+#line 511 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     if(slice_text[0] < 32 || slice_text[0] > 126)
@@ -1396,12 +1398,12 @@ YY_RULE_SETUP
     return slice_text[0];
 }
 	YY_BREAK
-case 20:
+case 19:
 YY_RULE_SETUP
-#line 525 "src/Slice/Scanner.l"
+#line 527 "src/Slice/Scanner.l"
 ECHO;
 	YY_BREAK
-#line 1404 "src/Slice/Scanner.cpp"
+#line 1403 "src/Slice/Scanner.cpp"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(BOMSCAN):
 case YY_STATE_EOF(MAINSCAN):
@@ -1682,7 +1684,7 @@ static int yy_get_next_buffer (void)
 {
 	register yy_state_type yy_current_state;
 	register char *yy_cp;
-
+    
 	yy_current_state = (yy_start);
 	yy_current_state += YY_AT_BOL();
 
@@ -1697,7 +1699,7 @@ static int yy_get_next_buffer (void)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 73 )
+			if ( yy_current_state >= 76 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1725,11 +1727,11 @@ static int yy_get_next_buffer (void)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 73 )
+		if ( yy_current_state >= 76 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 72);
+	yy_is_jam = (yy_current_state == 75);
 
 		return yy_is_jam ? 0 : yy_current_state;
 }
@@ -1737,7 +1739,7 @@ static int yy_get_next_buffer (void)
     static void yyunput (int c, register char * yy_bp )
 {
 	register char *yy_cp;
-
+    
     yy_cp = (yy_c_buf_p);
 
 	/* undo effects of setting up slice_text */
@@ -1780,7 +1782,7 @@ static int yy_get_next_buffer (void)
 
 {
 	int c;
-
+    
 	*(yy_c_buf_p) = (yy_hold_char);
 
 	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
@@ -1849,12 +1851,12 @@ static int yy_get_next_buffer (void)
 
 /** Immediately switch to a different input stream.
  * @param input_file A readable stream.
- *
+ * 
  * @note This function does not reset the start condition to @c INITIAL .
  */
     void slice_restart  (FILE * input_file )
 {
-
+    
 	if ( ! YY_CURRENT_BUFFER ){
         slice_ensure_buffer_stack ();
 		YY_CURRENT_BUFFER_LVALUE =
@@ -1867,11 +1869,11 @@ static int yy_get_next_buffer (void)
 
 /** Switch to a different input buffer.
  * @param new_buffer The new input buffer.
- *
+ * 
  */
     void slice__switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
 {
-
+    
 	/* TODO. We should be able to replace this entire function body
 	 * with
 	 *		slice_pop_buffer_state();
@@ -1911,13 +1913,13 @@ static void slice__load_buffer_state  (void)
 /** Allocate and initialize an input buffer state.
  * @param file A readable stream.
  * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- *
+ * 
  * @return the allocated buffer state.
  */
     YY_BUFFER_STATE slice__create_buffer  (FILE * file, int  size )
 {
 	YY_BUFFER_STATE b;
-
+    
 	b = (YY_BUFFER_STATE) slice_alloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in slice__create_buffer()" );
@@ -1940,11 +1942,11 @@ static void slice__load_buffer_state  (void)
 
 /** Destroy the buffer.
  * @param b a buffer created with slice__create_buffer()
- *
+ * 
  */
     void slice__delete_buffer (YY_BUFFER_STATE  b )
 {
-
+    
 	if ( ! b )
 		return;
 
@@ -1965,7 +1967,7 @@ static void slice__load_buffer_state  (void)
 
 {
 	int oerrno = errno;
-
+    
 	slice__flush_buffer(b );
 
 	b->yy_input_file = file;
@@ -1981,13 +1983,13 @@ static void slice__load_buffer_state  (void)
     }
 
         b->yy_is_interactive = 0;
-
+    
 	errno = oerrno;
 }
 
 /** Discard all buffered characters. On the next scan, YY_INPUT will be called.
  * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- *
+ * 
  */
     void slice__flush_buffer (YY_BUFFER_STATE  b )
 {
@@ -2016,7 +2018,7 @@ static void slice__load_buffer_state  (void)
  *  the current state. This function will allocate the stack
  *  if necessary.
  *  @param new_buffer The new state.
- *
+ *  
  */
 void slice_push_buffer_state (YY_BUFFER_STATE new_buffer )
 {
@@ -2046,7 +2048,7 @@ void slice_push_buffer_state (YY_BUFFER_STATE new_buffer )
 
 /** Removes and deletes the top of the stack, if present.
  *  The next element becomes the new top.
- *
+ *  
  */
 void slice_pop_buffer_state (void)
 {
@@ -2070,7 +2072,7 @@ void slice_pop_buffer_state (void)
 static void slice_ensure_buffer_stack (void)
 {
 	yy_size_t num_to_alloc;
-
+    
 	if (!(yy_buffer_stack)) {
 
 		/* First allocation is just for 2 elements, since we don't know if this
@@ -2083,9 +2085,9 @@ static void slice_ensure_buffer_stack (void)
 								);
 		if ( ! (yy_buffer_stack) )
 			YY_FATAL_ERROR( "out of dynamic memory in slice_ensure_buffer_stack()" );
-
+								  
 		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-
+				
 		(yy_buffer_stack_max) = num_to_alloc;
 		(yy_buffer_stack_top) = 0;
 		return;
@@ -2113,13 +2115,13 @@ static void slice_ensure_buffer_stack (void)
 /** Setup the input buffer state to scan directly from a user-specified character buffer.
  * @param base the character buffer
  * @param size the size in bytes of the character buffer
- *
- * @return the newly allocated buffer state object.
+ * 
+ * @return the newly allocated buffer state object. 
  */
 YY_BUFFER_STATE slice__scan_buffer  (char * base, yy_size_t  size )
 {
 	YY_BUFFER_STATE b;
-
+    
 	if ( size < 2 ||
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
@@ -2148,14 +2150,14 @@ YY_BUFFER_STATE slice__scan_buffer  (char * base, yy_size_t  size )
 /** Setup the input buffer state to scan a string. The next call to slice_lex() will
  * scan from a @e copy of @a str.
  * @param yystr a NUL-terminated string to scan
- *
+ * 
  * @return the newly allocated buffer state object.
  * @note If you want to scan bytes that may contain NUL values, then use
  *       slice__scan_bytes() instead.
  */
 YY_BUFFER_STATE slice__scan_string (yyconst char * yystr )
 {
-
+    
 	return slice__scan_bytes(yystr,strlen(yystr) );
 }
 
@@ -2163,7 +2165,7 @@ YY_BUFFER_STATE slice__scan_string (yyconst char * yystr )
  * scan from a @e copy of @a bytes.
  * @param yybytes the byte buffer to scan
  * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
- *
+ * 
  * @return the newly allocated buffer state object.
  */
 YY_BUFFER_STATE slice__scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
@@ -2172,7 +2174,7 @@ YY_BUFFER_STATE slice__scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_
 	char *buf;
 	yy_size_t n;
 	int i;
-
+    
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
 	buf = (char *) slice_alloc(n  );
@@ -2226,16 +2228,16 @@ static void yy_fatal_error (yyconst char* msg )
 /* Accessor  methods (get/set functions) to struct members. */
 
 /** Get the current line number.
- *
+ * 
  */
 int slice_get_lineno  (void)
 {
-
+        
     return slice_lineno;
 }
 
 /** Get the input stream.
- *
+ * 
  */
 FILE *slice_get_in  (void)
 {
@@ -2243,7 +2245,7 @@ FILE *slice_get_in  (void)
 }
 
 /** Get the output stream.
- *
+ * 
  */
 FILE *slice_get_out  (void)
 {
@@ -2251,7 +2253,7 @@ FILE *slice_get_out  (void)
 }
 
 /** Get the length of the current token.
- *
+ * 
  */
 yy_size_t slice_get_leng  (void)
 {
@@ -2259,7 +2261,7 @@ yy_size_t slice_get_leng  (void)
 }
 
 /** Get the current token.
- *
+ * 
  */
 
 char *slice_get_text  (void)
@@ -2269,18 +2271,18 @@ char *slice_get_text  (void)
 
 /** Set the current line number.
  * @param line_number
- *
+ * 
  */
 void slice_set_lineno (int  line_number )
 {
-
+    
     slice_lineno = line_number;
 }
 
 /** Set the input stream. This does not discard the current
  * input buffer.
  * @param in_str A readable stream.
- *
+ * 
  * @see slice__switch_to_buffer
  */
 void slice_set_in (FILE *  in_str )
@@ -2334,7 +2336,7 @@ static int yy_init_globals (void)
 /* slice_lex_destroy is for both reentrant and non-reentrant scanners. */
 int slice_lex_destroy  (void)
 {
-
+    
     /* Pop the buffer stack, destroying each element. */
 	while(YY_CURRENT_BUFFER){
 		slice__delete_buffer(YY_CURRENT_BUFFER  );
@@ -2401,7 +2403,7 @@ void slice_free (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 525 "src/Slice/Scanner.l"
+#line 527 "src/Slice/Scanner.l"
 
 
 
@@ -2469,7 +2471,84 @@ checkKeyword(string& id)
         }
         return pos->second;
     }
-    return ICE_IDENTIFIER;
+    return checkIdentifier(id);
+}
+
+//
+// Checks an identifier for any illegal syntax and
+// determines whether it's scoped. If it is, this
+// returns a scoped identifier token; otherwise this
+// returns a normal identifier token.
+//
+
+int checkIdentifier(string& id)
+{
+    // check whether the identifier is scoped
+    size_t scopeIndex = id.rfind("::");
+    bool isScoped = scopeIndex != string::npos;
+    string name;
+    if(isScoped)
+    {
+        name = id.substr(scopeIndex + 2); // Only check the unscoped identifier for syntax
+    }
+    else
+    {
+        name = id;
+    }
+
+    // check the identifier for reserved suffixes
+    static const string suffixBlacklist[] = { "Helper", "Holder", "Prx", "Ptr" };
+    for(size_t i = 0; i < sizeof(suffixBlacklist) / sizeof(*suffixBlacklist); ++i)
+    {
+        if(name.find(suffixBlacklist[i], name.size() - suffixBlacklist[i].size()) != string::npos)
+        {
+            unit->error("illegal identifier `" + name + "': `" + suffixBlacklist[i] + "' suffix is reserved");
+        }
+    }
+
+    // check the identifier for illegal underscores
+    size_t index = name.find('_');
+    if(index == 0)
+    {
+        unit->error("illegal leading underscore in identifier `" + name + "'");
+    }
+    else if(name.rfind('_') == (name.size() - 1))
+    {
+        unit->error("illegal trailing underscore in identifier `" + name + "'");
+    }
+    else if(name.find("__") != string::npos)
+    {
+        unit->error("illegal double underscore in identifier `" + name + "'");
+    }
+    else if(index != string::npos && unit->currentIncludeLevel() == 0 && !unit->allowUnderscore())
+    {
+        DefinitionContextPtr dc = unit->currentDefinitionContext();
+        assert(dc);
+        if(dc->findMetaData("underscore") != "underscore") // no 'underscore' file metadata
+        {
+            unit->error("illegal underscore in identifier `" + name + "'");
+        }
+    }
+
+    // Check the identifier for illegal ice prefixes
+    if(unit->currentIncludeLevel() == 0 && !unit->allowIcePrefix() && name.size() > 2)
+    {
+        DefinitionContextPtr dc = unit->currentDefinitionContext();
+        assert(dc);
+        if(dc->findMetaData("ice-prefix") != "ice-prefix") // no 'ice-prefix' metadata
+        {
+            string prefix3;
+            prefix3 += ::tolower(static_cast<unsigned char>(name[0]));
+            prefix3 += ::tolower(static_cast<unsigned char>(name[1]));
+            prefix3 += ::tolower(static_cast<unsigned char>(name[2]));
+            if(prefix3 == "ice")
+            {
+                unit->error("illegal identifier `" + name + "': `" + name.substr(0, 3) + "' prefix is reserved");
+            }
+        }
+    }
+
+    return isScoped ? ICE_SCOPED_IDENTIFIER : ICE_IDENTIFIER;
 }
 
 }