zeroc-ice 3.7.1 → 3.7.6

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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_PYTHON_UTIL_H
 #define SLICE_PYTHON_UTIL_H

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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.
-//
-// **********************************************************************
 
-#include <IceUtil/DisableWarnings.h>
+#include <IceUtil/StringUtil.h>
 #include <IceUtil/Options.h>
 #include <IceUtil/CtrlCHandler.h>
 #include <IceUtil/Mutex.h>
@@ -296,9 +291,9 @@ Slice::Ruby::compile(const vector<string>& argv)
                         out.open(file.c_str());
                         if(!out)
                         {
-                            ostringstream os;
-                            os << "cannot open`" << file << "': " << strerror(errno);
-                            throw FileException(__FILE__, __LINE__, os.str());
+                            ostringstream oss;
+                            oss << "cannot open`" << file << "': " << IceUtilInternal::errorToString(errno);
+                            throw FileException(__FILE__, __LINE__, oss.str());
                         }
                         FileTracker::instance()->addFile(file);
                         //

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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.
-//
-// **********************************************************************
 
 #include <Slice/RubyUtil.h>
 #include <Slice/Checksum.h>
@@ -191,7 +186,16 @@ Slice::Ruby::CodeVisitor::CodeVisitor(Output& out) :
 bool
 Slice::Ruby::CodeVisitor::visitModuleStart(const ModulePtr& p)
 {
-    _out << sp << nl << "module " << fixIdent(p->name(), IdentToUpper);
+    _out << sp << nl << "module ";
+    //
+    // Ensure that Slice top-level modules are defined as top
+    // level modules in Ruby
+    //
+    if(UnitPtr::dynamicCast(p->container()))
+    {
+        _out << "::";
+    }
+    _out << fixIdent(p->name(), IdentToUpper);
     _out.inc();
     return true;
 }
@@ -331,7 +335,6 @@ Slice::Ruby::CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
         //
         // read/write accessors for data members.
         //
-        DataMemberList members = p->dataMembers();
         if(!members.empty())
         {
             bool prot = p->hasMetaData("protected");
@@ -1221,7 +1224,7 @@ Slice::Ruby::CodeVisitor::writeType(const TypePtr& p)
     if(prx)
     {
         ClassDefPtr def = prx->_class()->definition();
-        if(def->isInterface() || def->allOperations().size() > 0)
+        if(!def || def->isAbstract())
         {
             _out << getAbsolute(prx->_class(), IdentToUpper, "T_") << "Prx";
         }
@@ -1556,14 +1559,9 @@ void
 Slice::Ruby::printHeader(IceUtilInternal::Output& out)
 {
     static const char* header =
-"# **********************************************************************\n"
-"#\n"
-"# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.\n"
 "#\n"
-"# This copy of Ice is licensed to you under the terms described in the\n"
-"# ICE_LICENSE file included in this distribution.\n"
+"# Copyright (c) ZeroC, Inc. All rights reserved.\n"
 "#\n"
-"# **********************************************************************\n"
         ;
 
     out << header;

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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

@@ -1,7 +1,7 @@
 #include <IceUtil/ScannerConfig.h>
-#line 2 "src/Slice/Scanner.cpp"
+#line 1 "src/Slice/Scanner.cpp"
 
-#line 4 "src/Slice/Scanner.cpp"
+#line 3 "src/Slice/Scanner.cpp"
 
 #define  YY_INT_ALIGNED short int
 
@@ -9,11 +9,17 @@
 
 #define yy_create_buffer slice__create_buffer
 #define yy_delete_buffer slice__delete_buffer
-#define yy_flex_debug slice__flex_debug
+#define yy_scan_buffer slice__scan_buffer
+#define yy_scan_string slice__scan_string
+#define yy_scan_bytes slice__scan_bytes
 #define yy_init_buffer slice__init_buffer
 #define yy_flush_buffer slice__flush_buffer
 #define yy_load_buffer_state slice__load_buffer_state
 #define yy_switch_to_buffer slice__switch_to_buffer
+#define yypush_buffer_state slice_push_buffer_state
+#define yypop_buffer_state slice_pop_buffer_state
+#define yyensure_buffer_stack slice_ensure_buffer_stack
+#define yy_flex_debug slice__flex_debug
 #define yyin slice_in
 #define yyleng slice_leng
 #define yylex slice_lex
@@ -28,12 +34,246 @@
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 37
+#define YY_FLEX_MINOR_VERSION 6
+#define YY_FLEX_SUBMINOR_VERSION 4
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
 
+#ifdef yy_create_buffer
+#define slice__create_buffer_ALREADY_DEFINED
+#else
+#define yy_create_buffer slice__create_buffer
+#endif
+
+#ifdef yy_delete_buffer
+#define slice__delete_buffer_ALREADY_DEFINED
+#else
+#define yy_delete_buffer slice__delete_buffer
+#endif
+
+#ifdef yy_scan_buffer
+#define slice__scan_buffer_ALREADY_DEFINED
+#else
+#define yy_scan_buffer slice__scan_buffer
+#endif
+
+#ifdef yy_scan_string
+#define slice__scan_string_ALREADY_DEFINED
+#else
+#define yy_scan_string slice__scan_string
+#endif
+
+#ifdef yy_scan_bytes
+#define slice__scan_bytes_ALREADY_DEFINED
+#else
+#define yy_scan_bytes slice__scan_bytes
+#endif
+
+#ifdef yy_init_buffer
+#define slice__init_buffer_ALREADY_DEFINED
+#else
+#define yy_init_buffer slice__init_buffer
+#endif
+
+#ifdef yy_flush_buffer
+#define slice__flush_buffer_ALREADY_DEFINED
+#else
+#define yy_flush_buffer slice__flush_buffer
+#endif
+
+#ifdef yy_load_buffer_state
+#define slice__load_buffer_state_ALREADY_DEFINED
+#else
+#define yy_load_buffer_state slice__load_buffer_state
+#endif
+
+#ifdef yy_switch_to_buffer
+#define slice__switch_to_buffer_ALREADY_DEFINED
+#else
+#define yy_switch_to_buffer slice__switch_to_buffer
+#endif
+
+#ifdef yypush_buffer_state
+#define slice_push_buffer_state_ALREADY_DEFINED
+#else
+#define yypush_buffer_state slice_push_buffer_state
+#endif
+
+#ifdef yypop_buffer_state
+#define slice_pop_buffer_state_ALREADY_DEFINED
+#else
+#define yypop_buffer_state slice_pop_buffer_state
+#endif
+
+#ifdef yyensure_buffer_stack
+#define slice_ensure_buffer_stack_ALREADY_DEFINED
+#else
+#define yyensure_buffer_stack slice_ensure_buffer_stack
+#endif
+
+#ifdef yylex
+#define slice_lex_ALREADY_DEFINED
+#else
+#define yylex slice_lex
+#endif
+
+#ifdef yyrestart
+#define slice_restart_ALREADY_DEFINED
+#else
+#define yyrestart slice_restart
+#endif
+
+#ifdef yylex_init
+#define slice_lex_init_ALREADY_DEFINED
+#else
+#define yylex_init slice_lex_init
+#endif
+
+#ifdef yylex_init_extra
+#define slice_lex_init_extra_ALREADY_DEFINED
+#else
+#define yylex_init_extra slice_lex_init_extra
+#endif
+
+#ifdef yylex_destroy
+#define slice_lex_destroy_ALREADY_DEFINED
+#else
+#define yylex_destroy slice_lex_destroy
+#endif
+
+#ifdef yyget_debug
+#define slice_get_debug_ALREADY_DEFINED
+#else
+#define yyget_debug slice_get_debug
+#endif
+
+#ifdef yyset_debug
+#define slice_set_debug_ALREADY_DEFINED
+#else
+#define yyset_debug slice_set_debug
+#endif
+
+#ifdef yyget_extra
+#define slice_get_extra_ALREADY_DEFINED
+#else
+#define yyget_extra slice_get_extra
+#endif
+
+#ifdef yyset_extra
+#define slice_set_extra_ALREADY_DEFINED
+#else
+#define yyset_extra slice_set_extra
+#endif
+
+#ifdef yyget_in
+#define slice_get_in_ALREADY_DEFINED
+#else
+#define yyget_in slice_get_in
+#endif
+
+#ifdef yyset_in
+#define slice_set_in_ALREADY_DEFINED
+#else
+#define yyset_in slice_set_in
+#endif
+
+#ifdef yyget_out
+#define slice_get_out_ALREADY_DEFINED
+#else
+#define yyget_out slice_get_out
+#endif
+
+#ifdef yyset_out
+#define slice_set_out_ALREADY_DEFINED
+#else
+#define yyset_out slice_set_out
+#endif
+
+#ifdef yyget_leng
+#define slice_get_leng_ALREADY_DEFINED
+#else
+#define yyget_leng slice_get_leng
+#endif
+
+#ifdef yyget_text
+#define slice_get_text_ALREADY_DEFINED
+#else
+#define yyget_text slice_get_text
+#endif
+
+#ifdef yyget_lineno
+#define slice_get_lineno_ALREADY_DEFINED
+#else
+#define yyget_lineno slice_get_lineno
+#endif
+
+#ifdef yyset_lineno
+#define slice_set_lineno_ALREADY_DEFINED
+#else
+#define yyset_lineno slice_set_lineno
+#endif
+
+#ifdef yywrap
+#define slice_wrap_ALREADY_DEFINED
+#else
+#define yywrap slice_wrap
+#endif
+
+#ifdef yyalloc
+#define slice_alloc_ALREADY_DEFINED
+#else
+#define yyalloc slice_alloc
+#endif
+
+#ifdef yyrealloc
+#define slice_realloc_ALREADY_DEFINED
+#else
+#define yyrealloc slice_realloc
+#endif
+
+#ifdef yyfree
+#define slice_free_ALREADY_DEFINED
+#else
+#define yyfree slice_free
+#endif
+
+#ifdef yytext
+#define slice_text_ALREADY_DEFINED
+#else
+#define yytext slice_text
+#endif
+
+#ifdef yyleng
+#define slice_leng_ALREADY_DEFINED
+#else
+#define yyleng slice_leng
+#endif
+
+#ifdef yyin
+#define slice_in_ALREADY_DEFINED
+#else
+#define yyin slice_in
+#endif
+
+#ifdef yyout
+#define slice_out_ALREADY_DEFINED
+#else
+#define yyout slice_out
+#endif
+
+#ifdef yy_flex_debug
+#define slice__flex_debug_ALREADY_DEFINED
+#else
+#define yy_flex_debug slice__flex_debug
+#endif
+
+#ifdef yylineno
+#define slice_lineno_ALREADY_DEFINED
+#else
+#define yylineno slice_lineno
+#endif
+
 /* First, we deal with  platform-specific or compiler-specific issues. */
 
 /* begin standard C headers. */
@@ -54,7 +294,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 +311,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;
 
@@ -104,65 +344,61 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
+#ifndef SIZE_MAX
+#define SIZE_MAX               (~(size_t)0)
+#endif
+
 #endif /* ! C99 */
 
 #endif /* ! FLEXINT_H */
 
-#ifdef __cplusplus
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
+/* begin standard C++ headers. */
 
-#else	/* ! __cplusplus */
-
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
-
-#define YY_USE_CONST
-
-#endif	/* defined (__STDC__) */
-#endif	/* ! __cplusplus */
-
-#ifdef YY_USE_CONST
+/* TODO: this is always defined, so inline it */
 #define yyconst const
+
+#if defined(__GNUC__) && __GNUC__ >= 3
+#define yynoreturn __attribute__((__noreturn__))
 #else
-#define yyconst
+#define yynoreturn
 #endif
 
 /* Returned upon end-of-file. */
 #define YY_NULL 0
 
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
+/* Promotes a possibly negative, possibly signed char to an
+ *   integer in range [0..255] for use as an array index.
  */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+#define YY_SC_TO_UI(c) ((YY_CHAR) (c))
 
 /* Enter a start condition.  This macro really ought to take a parameter,
  * but we do it the disgusting crufty way forced on us by the ()-less
  * definition of BEGIN.
  */
 #define BEGIN (yy_start) = 1 + 2 *
-
 /* Translate the current start state into a value that can be later handed
  * to BEGIN to return to the state.  The YYSTATE alias is for lex
  * compatibility.
  */
 #define YY_START (((yy_start) - 1) / 2)
 #define YYSTATE YY_START
-
 /* Action number for EOF rule of a given start state. */
 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
 /* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE slice_restart(slice_in  )
-
+#define YY_NEW_FILE yyrestart( yyin  )
 #define YY_END_OF_BUFFER_CHAR 0
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
 #define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
 #endif
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -179,30 +415,30 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
 typedef size_t yy_size_t;
 #endif
 
-extern yy_size_t slice_leng;
+extern int yyleng;
 
-extern FILE *slice_in, *slice_out;
+extern FILE *yyin, *yyout;
 
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
-
+    
     #define YY_LESS_LINENO(n)
-
+    #define YY_LINENO_REWIND_TO(ptr)
+    
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
 	do \
 		{ \
-		/* Undo effects of setting up slice_text. */ \
+		/* Undo effects of setting up yytext. */ \
         int yyless_macro_arg = (n); \
         YY_LESS_LINENO(yyless_macro_arg);\
 		*yy_cp = (yy_hold_char); \
 		YY_RESTORE_YY_MORE_OFFSET \
 		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up slice_text again */ \
+		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
 		} \
 	while ( 0 )
-
 #define unput(c) yyunput( c, (yytext_ptr)  )
 
 #ifndef YY_STRUCT_YY_BUFFER_STATE
@@ -217,12 +453,12 @@ struct yy_buffer_state
 	/* Size of input buffer in bytes, not including room for EOB
 	 * characters.
 	 */
-	yy_size_t yy_buf_size;
+	int yy_buf_size;
 
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
 	 */
-	yy_size_t yy_n_chars;
+	int yy_n_chars;
 
 	/* Whether we "own" the buffer - i.e., we know we created it,
 	 * and can realloc() it to grow it, and should free() it to
@@ -262,8 +498,8 @@ struct yy_buffer_state
 	 * possible backing-up.
 	 *
 	 * When we actually see the EOF, we change the status to "new"
-	 * (via slice_restart()), so that the user can continue scanning by
-	 * just pointing slice_in at a new input file.
+	 * (via yyrestart()), so that the user can continue scanning by
+	 * just pointing yyin at a new input file.
 	 */
 #define YY_BUFFER_EOF_PENDING 2
 
@@ -273,7 +509,7 @@ struct yy_buffer_state
 /* Stack of input buffers. */
 static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
 static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
@@ -284,106 +520,101 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 #define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
                           ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
                           : NULL)
-
 /* Same as previous macro, but useful when we know that the buffer stack is not
  * NULL or when we need an lvalue. For internal use only.
  */
 #define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
 
-/* yy_hold_char holds the character lost when slice_text is formed. */
+/* yy_hold_char holds the character lost when yytext is formed. */
 static char yy_hold_char;
-static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
-yy_size_t slice_leng;
+static int yy_n_chars;		/* number of characters read into yy_ch_buf */
+int yyleng;
 
 /* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
+static char *yy_c_buf_p = NULL;
 static int yy_init = 0;		/* whether we need to initialize */
 static int yy_start = 0;	/* start state number */
 
-/* Flag which is used to allow slice_wrap()'s to do buffer switches
- * instead of setting up a fresh slice_in.  A bit of a hack ...
+/* Flag which is used to allow yywrap()'s to do buffer switches
+ * instead of setting up a fresh yyin.  A bit of a hack ...
  */
 static int yy_did_buffer_switch_on_eof;
 
-void slice_restart (FILE *input_file  );
-void slice__switch_to_buffer (YY_BUFFER_STATE new_buffer  );
-YY_BUFFER_STATE slice__create_buffer (FILE *file,int size  );
-void slice__delete_buffer (YY_BUFFER_STATE b  );
-void slice__flush_buffer (YY_BUFFER_STATE b  );
-void slice_push_buffer_state (YY_BUFFER_STATE new_buffer  );
-void slice_pop_buffer_state (void );
+void yyrestart ( FILE *input_file  );
+void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size  );
+void yy_delete_buffer ( YY_BUFFER_STATE b  );
+void yy_flush_buffer ( YY_BUFFER_STATE b  );
+void yypush_buffer_state ( YY_BUFFER_STATE new_buffer  );
+void yypop_buffer_state ( void );
 
-static void slice_ensure_buffer_stack (void );
-static void slice__load_buffer_state (void );
-static void slice__init_buffer (YY_BUFFER_STATE b,FILE *file  );
+static void yyensure_buffer_stack ( void );
+static void yy_load_buffer_state ( void );
+static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file  );
+#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER )
 
-#define YY_FLUSH_BUFFER slice__flush_buffer(YY_CURRENT_BUFFER )
+YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size  );
+YY_BUFFER_STATE yy_scan_string ( const char *yy_str  );
+YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len  );
 
-YY_BUFFER_STATE slice__scan_buffer (char *base,yy_size_t size  );
-YY_BUFFER_STATE slice__scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE slice__scan_bytes (yyconst char *bytes,yy_size_t len  );
-
-void *slice_alloc (yy_size_t  );
-void *slice_realloc (void *,yy_size_t  );
-void slice_free (void *  );
-
-#define yy_new_buffer slice__create_buffer
+void *yyalloc ( yy_size_t  );
+void *yyrealloc ( void *, yy_size_t  );
+void yyfree ( void *  );
 
+#define yy_new_buffer yy_create_buffer
 #define yy_set_interactive(is_interactive) \
 	{ \
 	if ( ! YY_CURRENT_BUFFER ){ \
-        slice_ensure_buffer_stack (); \
+        yyensure_buffer_stack (); \
 		YY_CURRENT_BUFFER_LVALUE =    \
-            slice__create_buffer(slice_in,YY_BUF_SIZE ); \
+            yy_create_buffer( yyin, YY_BUF_SIZE ); \
 	} \
 	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
 	}
-
 #define yy_set_bol(at_bol) \
 	{ \
 	if ( ! YY_CURRENT_BUFFER ){\
-        slice_ensure_buffer_stack (); \
+        yyensure_buffer_stack (); \
 		YY_CURRENT_BUFFER_LVALUE =    \
-            slice__create_buffer(slice_in,YY_BUF_SIZE ); \
+            yy_create_buffer( yyin, YY_BUF_SIZE ); \
 	} \
 	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
 	}
-
 #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
 
 /* Begin user sect3 */
 
-#define slice_wrap() 1
+#define slice_wrap() (/*CONSTCOND*/1)
 #define YY_SKIP_YYWRAP
+typedef flex_uint8_t YY_CHAR;
 
-typedef unsigned char YY_CHAR;
-
-FILE *slice_in = (FILE *) 0, *slice_out = (FILE *) 0;
+FILE *yyin = NULL, *yyout = NULL;
 
 typedef int yy_state_type;
 
-extern int slice_lineno;
-
-int slice_lineno = 1;
+extern int yylineno;
+int yylineno = 1;
 
-extern char *slice_text;
-#define yytext_ptr slice_text
+extern char *yytext;
+#ifdef yytext_ptr
+#undef yytext_ptr
+#endif
+#define yytext_ptr yytext
 
-static yy_state_type yy_get_previous_state (void );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
-static int yy_get_next_buffer (void );
-static void yy_fatal_error (yyconst char msg[]  );
+static yy_state_type yy_get_previous_state ( void );
+static yy_state_type yy_try_NUL_trans ( yy_state_type current_state  );
+static int yy_get_next_buffer ( void );
+static void yynoreturn yy_fatal_error ( const char* msg  );
 
 /* Done after the current pattern has been matched and before the
- * corresponding action - sets up slice_text.
+ * corresponding action - sets up yytext.
  */
 #define YY_DO_BEFORE_ACTION \
 	(yytext_ptr) = yy_bp; \
-	slice_leng = (size_t) (yy_cp - yy_bp); \
+	yyleng = (int) (yy_cp - yy_bp); \
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
-
 #define YY_NUM_RULES 19
 #define YY_END_OF_BUFFER 20
 /* This struct is not used in this scanner,
@@ -393,7 +624,7 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_accept[76] =
+static const flex_int16_t yy_accept[76] =
     {   0,
         0,    0,    0,    0,    0,    0,   20,   18,   16,   16,
        13,   18,   18,   18,   14,   14,   18,   12,    7,   18,
@@ -405,7 +636,7 @@ static yyconst flex_int16_t yy_accept[76] =
         0,    0,    0,    4,    0
     } ;
 
-static yyconst flex_int32_t yy_ec[256] =
+static const YY_CHAR yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         4,    4,    4,    1,    1,    1,    1,    1,    1,    1,
@@ -437,7 +668,7 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int32_t yy_meta[32] =
+static const YY_CHAR yy_meta[32] =
     {   0,
         1,    2,    3,    1,    1,    1,    1,    1,    4,    4,
         1,    1,    5,    5,    5,    1,    6,    6,    6,    7,
@@ -445,7 +676,7 @@ static yyconst flex_int32_t yy_meta[32] =
         1
     } ;
 
-static yyconst flex_int16_t yy_base[87] =
+static const flex_int16_t yy_base[87] =
     {   0,
         0,  140,    0,   26,    0,  139,  137,  197,  197,  197,
       197,   22,   25,   33,   47,   35,  120,   74,  114,    0,
@@ -458,7 +689,7 @@ static yyconst flex_int16_t yy_base[87] =
       155,  160,  168,  175,  180,  188
     } ;
 
-static yyconst flex_int16_t yy_def[87] =
+static const flex_int16_t yy_def[87] =
     {   0,
        75,    1,    1,    1,    1,    1,   75,   75,   75,   75,
        75,   75,   75,   75,   75,   15,   75,   75,   75,   76,
@@ -471,7 +702,7 @@ static yyconst flex_int16_t yy_def[87] =
        75,   75,   75,   75,   75,   75
     } ;
 
-static yyconst flex_int16_t yy_nxt[229] =
+static const 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,
@@ -500,7 +731,7 @@ static yyconst flex_int16_t yy_nxt[229] =
        75,   75,   75,   75,   75,   75,   75,   75
     } ;
 
-static yyconst flex_int16_t yy_chk[229] =
+static const 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,
@@ -532,8 +763,8 @@ static yyconst flex_int16_t yy_chk[229] =
 static yy_state_type yy_last_accepting_state;
 static char *yy_last_accepting_cpos;
 
-extern int slice__flex_debug;
-int slice__flex_debug = 0;
+extern int yy_flex_debug;
+int yy_flex_debug = 0;
 
 /* The intent behind this definition is that it'll catch
  * any uses of REJECT which flex missed.
@@ -542,18 +773,13 @@ int slice__flex_debug = 0;
 #define yymore() yymore_used_but_not_detected
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
-char *slice_text;
+char *yytext;
 #line 1 "src/Slice/Scanner.l"
 #line 2 "src/Slice/Scanner.l"
 
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 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 +790,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
@@ -626,9 +855,9 @@ int checkIdentifier(string&);
 
 #define YY_USER_INIT initScanner();
 
+#line 857 "src/Slice/Scanner.cpp"
 
-
-#line 631 "src/Slice/Scanner.cpp"
+#line 859 "src/Slice/Scanner.cpp"
 
 #define INITIAL 0
 #define BOMSCAN 1
@@ -646,36 +875,36 @@ int checkIdentifier(string&);
 #define YY_EXTRA_TYPE void *
 #endif
 
-static int yy_init_globals (void );
+static int yy_init_globals ( void );
 
 /* Accessor methods to globals.
    These are made visible to non-reentrant scanners for convenience. */
 
-int slice_lex_destroy (void );
+int yylex_destroy ( void );
 
-int slice_get_debug (void );
+int yyget_debug ( void );
 
-void slice_set_debug (int debug_flag  );
+void yyset_debug ( int debug_flag  );
 
-YY_EXTRA_TYPE slice_get_extra (void );
+YY_EXTRA_TYPE yyget_extra ( void );
 
-void slice_set_extra (YY_EXTRA_TYPE user_defined  );
+void yyset_extra ( YY_EXTRA_TYPE user_defined  );
 
-FILE *slice_get_in (void );
+FILE *yyget_in ( void );
 
-void slice_set_in  (FILE * in_str  );
+void yyset_in  ( FILE * _in_str  );
 
-FILE *slice_get_out (void );
+FILE *yyget_out ( void );
 
-void slice_set_out  (FILE * out_str  );
+void yyset_out  ( FILE * _out_str  );
 
-yy_size_t slice_get_leng (void );
+			int yyget_leng ( void );
 
-char *slice_get_text (void );
+char *yyget_text ( void );
 
-int slice_get_lineno (void );
+int yyget_lineno ( void );
 
-void slice_set_lineno (int line_number  );
+void yyset_lineno ( int _line_number  );
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -683,35 +912,43 @@ void slice_set_lineno (int line_number  );
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int slice_wrap (void );
+extern "C" int yywrap ( void );
 #else
-extern int slice_wrap (void );
+extern int yywrap ( void );
 #endif
 #endif
 
-    static void yyunput (int c,char *buf_ptr  );
+#ifndef YY_NO_UNPUT
+    
+    static void yyunput ( int c, char *buf_ptr  );
+    
+#endif
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
+static void yy_flex_strncpy ( char *, const char *, int );
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
+static int yy_flex_strlen ( const char * );
 #endif
 
 #ifndef YY_NO_INPUT
-
 #ifdef __cplusplus
-static int yyinput (void );
+static int yyinput ( void );
 #else
-static int input (void );
+static int input ( void );
 #endif
 
 #endif
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
 #define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -719,7 +956,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO do { if (fwrite( slice_text, slice_leng, 1, slice_out )) {} } while (0)
+#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -730,20 +967,20 @@ static int input (void );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		size_t n; \
+		int n; \
 		for ( n = 0; n < max_size && \
-			     (c = getc( slice_in )) != EOF && c != '\n'; ++n ) \
+			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
 		if ( c == '\n' ) \
 			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( slice_in ) ) \
+		if ( c == EOF && ferror( yyin ) ) \
 			YY_FATAL_ERROR( "input in flex scanner failed" ); \
 		result = n; \
 		} \
 	else \
 		{ \
 		errno=0; \
-		while ( (result = fread(buf, 1, max_size, slice_in))==0 && ferror(slice_in)) \
+		while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \
 			{ \
 			if( errno != EINTR) \
 				{ \
@@ -751,7 +988,7 @@ static int input (void );
 				break; \
 				} \
 			errno=0; \
-			clearerr(slice_in); \
+			clearerr(yyin); \
 			} \
 		}\
 \
@@ -784,12 +1021,12 @@ static int input (void );
 #ifndef YY_DECL
 #define YY_DECL_IS_OURS 1
 
-extern int slice_lex (void);
+extern int yylex (void);
 
-#define YY_DECL int slice_lex (void)
+#define YY_DECL int yylex (void)
 #endif /* !YY_DECL */
 
-/* Code executed at the beginning of each rule, after slice_text and slice_leng
+/* Code executed at the beginning of each rule, after yytext and yyleng
  * have been set up.
  */
 #ifndef YY_USER_ACTION
@@ -798,28 +1035,23 @@ extern int slice_lex (void);
 
 /* Code executed at the end of each rule. */
 #ifndef YY_BREAK
-#define YY_BREAK break;
+#define YY_BREAK /*LINTED*/break;
 #endif
 
 #define YY_RULE_SETUP \
-	if ( slice_leng > 0 ) \
+	if ( yyleng > 0 ) \
 		YY_CURRENT_BUFFER_LVALUE->yy_at_bol = \
-				(slice_text[slice_leng - 1] == '\n'); \
+				(yytext[yyleng - 1] == '\n'); \
 	YY_USER_ACTION
 
 /** The main scanner function which does all the work.
  */
 YY_DECL
 {
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
-
-#line 98 "src/Slice/Scanner.l"
-
-
-#line 821 "src/Slice/Scanner.cpp"
-
+	yy_state_type yy_current_state;
+	char *yy_cp, *yy_bp;
+	int yy_act;
+    
 	if ( !(yy_init) )
 		{
 		(yy_init) = 1;
@@ -831,26 +1063,32 @@ YY_DECL
 		if ( ! (yy_start) )
 			(yy_start) = 1;	/* first start state */
 
-		if ( ! slice_in )
-			slice_in = stdin;
+		if ( ! yyin )
+			yyin = stdin;
 
-		if ( ! slice_out )
-			slice_out = stdout;
+		if ( ! yyout )
+			yyout = stdout;
 
 		if ( ! YY_CURRENT_BUFFER ) {
-			slice_ensure_buffer_stack ();
+			yyensure_buffer_stack ();
 			YY_CURRENT_BUFFER_LVALUE =
-				slice__create_buffer(slice_in,YY_BUF_SIZE );
+				yy_create_buffer( yyin, YY_BUF_SIZE );
 		}
 
-		slice__load_buffer_state( );
+		yy_load_buffer_state(  );
 		}
 
-	while ( 1 )		/* loops until end-of-file is reached */
+	{
+#line 96 "src/Slice/Scanner.l"
+
+
+#line 1084 "src/Slice/Scanner.cpp"
+
+	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
 		yy_cp = (yy_c_buf_p);
 
-		/* Support of slice_text. */
+		/* Support of yytext. */
 		*yy_cp = (yy_hold_char);
 
 		/* yy_bp points to the position in yy_ch_buf of the start of
@@ -863,7 +1101,7 @@ YY_DECL
 yy_match:
 		do
 			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
 			if ( yy_accept[yy_current_state] )
 				{
 				(yy_last_accepting_state) = yy_current_state;
@@ -873,9 +1111,9 @@ yy_match:
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
 				if ( yy_current_state >= 76 )
-					yy_c = yy_meta[(unsigned int) yy_c];
+					yy_c = yy_meta[yy_c];
 				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+			yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 			++yy_cp;
 			}
 		while ( yy_current_state != 75 );
@@ -899,13 +1137,13 @@ do_action:	/* This label is used only to access EOF actions. */
 			goto yy_find_action;
 
 case 1:
-*yy_cp = (yy_hold_char); /* undo effects of setting up slice_text */
+*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
 (yy_c_buf_p) = yy_cp -= 1;
-YY_DO_BEFORE_ACTION; /* set up slice_text again */
+YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 100 "src/Slice/Scanner.l"
+#line 98 "src/Slice/Scanner.l"
 {
-    if(unit->scanPosition(slice_text))
+    if(unit->scanPosition(yytext))
     {
         BEGIN(BOMSCAN);
     }
@@ -913,26 +1151,27 @@ YY_RULE_SETUP
 	YY_BREAK
 case 2:
 /* rule 2 can match eol */
-*yy_cp = (yy_hold_char); /* undo effects of setting up slice_text */
+*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+YY_LINENO_REWIND_TO(yy_cp - 1);
 (yy_c_buf_p) = yy_cp -= 1;
-YY_DO_BEFORE_ACTION; /* set up slice_text again */
+YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 107 "src/Slice/Scanner.l"
+#line 105 "src/Slice/Scanner.l"
 {
-    if(unit->scanPosition(slice_text))
+    if(unit->scanPosition(yytext))
     {
         BEGIN(BOMSCAN);
     }
 }
 	YY_BREAK
 case 3:
-*yy_cp = (yy_hold_char); /* undo effects of setting up slice_text */
+*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
 (yy_c_buf_p) = yy_cp -= 1;
-YY_DO_BEFORE_ACTION; /* set up slice_text again */
+YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 114 "src/Slice/Scanner.l"
+#line 112 "src/Slice/Scanner.l"
 {
-    if(unit->scanPosition(slice_text))
+    if(unit->scanPosition(yytext))
     {
         BEGIN(BOMSCAN);
     }
@@ -940,13 +1179,14 @@ YY_RULE_SETUP
 	YY_BREAK
 case 4:
 /* rule 4 can match eol */
-*yy_cp = (yy_hold_char); /* undo effects of setting up slice_text */
+*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+YY_LINENO_REWIND_TO(yy_cp - 1);
 (yy_c_buf_p) = yy_cp -= 1;
-YY_DO_BEFORE_ACTION; /* set up slice_text again */
+YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 121 "src/Slice/Scanner.l"
+#line 119 "src/Slice/Scanner.l"
 {
-    if(unit->scanPosition(slice_text))
+    if(unit->scanPosition(yytext))
     {
         BEGIN(BOMSCAN);
     }
@@ -954,7 +1194,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 128 "src/Slice/Scanner.l"
+#line 126 "src/Slice/Scanner.l"
 {
     // C++-style comment
     BEGIN(MAINSCAN);
@@ -972,11 +1212,11 @@ YY_RULE_SETUP
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 143 "src/Slice/Scanner.l"
+#line 141 "src/Slice/Scanner.l"
 {
     // C-style comment
     BEGIN(MAINSCAN);
-    string comment = slice_text + 2;
+    string comment = yytext + 2;
     while(true)
     {
         int c = yyinput();
@@ -1016,7 +1256,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 184 "src/Slice/Scanner.l"
+#line 182 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     return ICE_METADATA_OPEN;
@@ -1024,7 +1264,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 189 "src/Slice/Scanner.l"
+#line 187 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     return ICE_METADATA_CLOSE;
@@ -1032,7 +1272,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 194 "src/Slice/Scanner.l"
+#line 192 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     return ICE_GLOBAL_METADATA_OPEN;
@@ -1040,7 +1280,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 199 "src/Slice/Scanner.l"
+#line 197 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     return ICE_GLOBAL_METADATA_CLOSE;
@@ -1049,14 +1289,14 @@ YY_RULE_SETUP
 case 11:
 /* rule 11 can match eol */
 YY_RULE_SETUP
-#line 204 "src/Slice/Scanner.l"
+#line 202 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     StringTokPtr ident = new StringTok;
-    ident->v = *slice_text == '\\' ? slice_text + 1 : slice_text;
+    ident->v = *yytext == '\\' ? yytext + 1 : yytext;
     ident->v.erase(ident->v.find_first_of(" \t\v\n\r\f("));
     *yylvalp = ident;
-    if(*slice_text == '\\')
+    if(*yytext == '\\')
     {
         if(checkIdentifier(ident->v) == ICE_SCOPED_IDENTIFIER)
         {
@@ -1086,26 +1326,26 @@ YY_RULE_SETUP
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 238 "src/Slice/Scanner.l"
+#line 236 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     StringTokPtr ident = new StringTok;
-    ident->v = *slice_text == '\\' ? slice_text + 1 : slice_text;
+    ident->v = *yytext == '\\' ? yytext + 1 : yytext;
     *yylvalp = ident;
-    return *slice_text == '\\' ? checkIdentifier(ident->v) : checkKeyword(ident->v);
+    return *yytext == '\\' ? checkIdentifier(ident->v) : checkKeyword(ident->v);
 }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 246 "src/Slice/Scanner.l"
+#line 244 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     StringTokPtr str = new StringTok;
     str->literal = "\"";
     while(true)
     {
-        char c = static_cast<char>(yyinput());
-        str->literal += c;
+        int c = yyinput();
+        str->literal += static_cast<char>(c);
         if(c == '"')
         {
             break;
@@ -1115,15 +1355,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 '\\':
@@ -1139,7 +1379,7 @@ YY_RULE_SETUP
                 case '\'':
                 case '?':
                 {
-                    str->v += next;
+                    str->v += static_cast<char>(next);
                     break;
                 }
                 case 'a':
@@ -1193,16 +1433,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);
@@ -1217,15 +1457,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);
 
@@ -1249,18 +1489,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;
                     }
 
@@ -1270,19 +1511,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
@@ -1294,7 +1536,7 @@ YY_RULE_SETUP
         }
         else
         {
-            str->v += c;
+            str->v += static_cast<char>(c);
         }
     }
     *yylvalp = str;
@@ -1307,13 +1549,13 @@ YY_RULE_SETUP
 {
     BEGIN(MAINSCAN);
     IntegerTokPtr itp = new IntegerTok;
-    itp->literal = string(slice_text);
+    itp->literal = string(yytext);
     *yylvalp = itp;
-    if(!IceUtilInternal::stringToInt64(string(slice_text), itp->v))
+    if(!IceUtilInternal::stringToInt64(string(yytext), itp->v))
     {
         assert(itp->v != 0);
         string msg = "integer constant `";
-        msg += slice_text;
+        msg += yytext;
         msg += "' out of range";
         unit->error(msg);
     }
@@ -1328,7 +1570,7 @@ YY_RULE_SETUP
     errno = 0;
     FloatingTokPtr ftp = new FloatingTok;
     *yylvalp = ftp;
-    string literal(slice_text);
+    string literal(yytext);
     ftp->literal = literal;
     char lastChar = literal[literal.size() - 1];
     if(lastChar == 'f' || lastChar == 'F')
@@ -1339,14 +1581,14 @@ YY_RULE_SETUP
     if((ftp->v == HUGE_VAL || ftp->v == -HUGE_VAL) && errno == ERANGE)
     {
         string msg = "floating-point constant `";
-        msg += slice_text;
+        msg += yytext;
         msg += "' too large (overflow)";
         unit->error(msg);
     }
     else if(ftp->v == 0 && errno == ERANGE)
     {
         string msg = "floating-point constant `";
-        msg += slice_text;
+        msg += yytext;
         msg += "' too small (underflow)";
     unit->error(msg);
     }
@@ -1364,7 +1606,7 @@ YY_RULE_SETUP
     {
         BEGIN(MAINSCAN);
     }
-    if(slice_text[0] == '\n')
+    if(yytext[0] == '\n')
     {
         unit->nextLine();
     }
@@ -1384,18 +1626,18 @@ YY_RULE_SETUP
 #line 514 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
-    if(slice_text[0] < 32 || slice_text[0] > 126)
+    if(yytext[0] < 32 || yytext[0] > 126)
     {
         stringstream s;
         s << "illegal input character: '\\";
         s.width(3);
         s.fill('0');
-        s << oct << static_cast<int>(static_cast<unsigned char>(slice_text[0]));
+        s << oct << static_cast<int>(static_cast<unsigned char>(yytext[0]));
         s << "'";
         unit->error(s.str());
         return BAD_CHAR;
     }
-    return slice_text[0];
+    return yytext[0];
 }
 	YY_BREAK
 case 19:
@@ -1403,7 +1645,7 @@ YY_RULE_SETUP
 #line 530 "src/Slice/Scanner.l"
 ECHO;
 	YY_BREAK
-#line 1406 "src/Slice/Scanner.cpp"
+#line 1647 "src/Slice/Scanner.cpp"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(BOMSCAN):
 case YY_STATE_EOF(MAINSCAN):
@@ -1422,15 +1664,15 @@ case YY_STATE_EOF(MAINSCAN):
 			{
 			/* We're scanning a new file or input source.  It's
 			 * possible that this happened because the user
-			 * just pointed slice_in at a new source and called
-			 * slice_lex().  If so, then we have to assure
+			 * just pointed yyin at a new source and called
+			 * yylex().  If so, then we have to assure
 			 * consistency between YY_CURRENT_BUFFER and our
 			 * globals.  Here is the right place to do so, because
 			 * this is the first action (other than possibly a
 			 * back-up) that will match for the new input source.
 			 */
 			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-			YY_CURRENT_BUFFER_LVALUE->yy_input_file = slice_in;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
 			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
 			}
 
@@ -1484,11 +1726,11 @@ case YY_STATE_EOF(MAINSCAN):
 				{
 				(yy_did_buffer_switch_on_eof) = 0;
 
-				if ( slice_wrap( ) )
+				if ( yywrap(  ) )
 					{
 					/* Note: because we've taken care in
 					 * yy_get_next_buffer() to have set up
-					 * slice_text, we can now set up
+					 * yytext, we can now set up
 					 * yy_c_buf_p so that if some total
 					 * hoser (like flex itself) wants to
 					 * call the scanner after we return the
@@ -1537,7 +1779,8 @@ case YY_STATE_EOF(MAINSCAN):
 			"fatal flex scanner internal error--no action found" );
 	} /* end of action switch */
 		} /* end of scanning one token */
-} /* end of slice_lex */
+	} /* end of user's declarations */
+} /* end of yylex */
 
 /* yy_get_next_buffer - try to read in a new buffer
  *
@@ -1548,9 +1791,9 @@ case YY_STATE_EOF(MAINSCAN):
  */
 static int yy_get_next_buffer (void)
 {
-    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = (yytext_ptr);
-	register int number_to_move, i;
+    	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	char *source = (yytext_ptr);
+	int number_to_move, i;
 	int ret_val;
 
 	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
@@ -1579,7 +1822,7 @@ static int yy_get_next_buffer (void)
 	/* Try to read more data. */
 
 	/* First move last chars to start of buffer. */
-	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1);
 
 	for ( i = 0; i < number_to_move; ++i )
 		*(dest++) = *(source++);
@@ -1592,7 +1835,7 @@ static int yy_get_next_buffer (void)
 
 	else
 		{
-			yy_size_t num_to_read =
+			int num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
@@ -1606,7 +1849,7 @@ static int yy_get_next_buffer (void)
 
 			if ( b->yy_is_our_buffer )
 				{
-				yy_size_t new_size = b->yy_buf_size * 2;
+				int new_size = b->yy_buf_size * 2;
 
 				if ( new_size <= 0 )
 					b->yy_buf_size += b->yy_buf_size / 8;
@@ -1615,11 +1858,12 @@ static int yy_get_next_buffer (void)
 
 				b->yy_ch_buf = (char *)
 					/* Include room in for 2 EOB chars. */
-					slice_realloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+					yyrealloc( (void *) b->yy_ch_buf,
+							 (yy_size_t) (b->yy_buf_size + 2)  );
 				}
 			else
 				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = 0;
+				b->yy_ch_buf = NULL;
 
 			if ( ! b->yy_ch_buf )
 				YY_FATAL_ERROR(
@@ -1647,7 +1891,7 @@ static int yy_get_next_buffer (void)
 		if ( number_to_move == YY_MORE_ADJ )
 			{
 			ret_val = EOB_ACT_END_OF_FILE;
-			slice_restart(slice_in  );
+			yyrestart( yyin  );
 			}
 
 		else
@@ -1661,12 +1905,15 @@ static int yy_get_next_buffer (void)
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
-	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+	if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
 		/* Extend the array by 50%, plus the number we really need. */
-		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
-		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) slice_realloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc(
+			(void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size  );
 		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
 			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+		/* "- 2" to take care of EOB's */
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2);
 	}
 
 	(yy_n_chars) += number_to_move;
@@ -1682,15 +1929,15 @@ static int yy_get_next_buffer (void)
 
     static yy_state_type yy_get_previous_state (void)
 {
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
-
+	yy_state_type yy_current_state;
+	char *yy_cp;
+    
 	yy_current_state = (yy_start);
 	yy_current_state += YY_AT_BOL();
 
 	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
 		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
 		if ( yy_accept[yy_current_state] )
 			{
 			(yy_last_accepting_state) = yy_current_state;
@@ -1700,9 +1947,9 @@ static int yy_get_next_buffer (void)
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
 			if ( yy_current_state >= 76 )
-				yy_c = yy_meta[(unsigned int) yy_c];
+				yy_c = yy_meta[yy_c];
 			}
-		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 		}
 
 	return yy_current_state;
@@ -1715,10 +1962,10 @@ static int yy_get_next_buffer (void)
  */
     static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
 {
-	register int yy_is_jam;
-    	register char *yy_cp = (yy_c_buf_p);
+	int yy_is_jam;
+    	char *yy_cp = (yy_c_buf_p);
 
-	register YY_CHAR yy_c = 1;
+	YY_CHAR yy_c = 1;
 	if ( yy_accept[yy_current_state] )
 		{
 		(yy_last_accepting_state) = yy_current_state;
@@ -1728,30 +1975,32 @@ static int yy_get_next_buffer (void)
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
 		if ( yy_current_state >= 76 )
-			yy_c = yy_meta[(unsigned int) yy_c];
+			yy_c = yy_meta[yy_c];
 		}
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 	yy_is_jam = (yy_current_state == 75);
 
 		return yy_is_jam ? 0 : yy_current_state;
 }
 
-    static void yyunput (int c, register char * yy_bp )
-{
-	register char *yy_cp;
+#ifndef YY_NO_UNPUT
 
+    static void yyunput (int c, char * yy_bp )
+{
+	char *yy_cp;
+    
     yy_cp = (yy_c_buf_p);
 
-	/* undo effects of setting up slice_text */
+	/* undo effects of setting up yytext */
 	*yy_cp = (yy_hold_char);
 
 	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		register yy_size_t number_to_move = (yy_n_chars) + 2;
-		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+		int number_to_move = (yy_n_chars) + 2;
+		char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
 					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
-		register char *source =
+		char *source =
 				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
 
 		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
@@ -1760,7 +2009,7 @@ static int yy_get_next_buffer (void)
 		yy_cp += (int) (dest - source);
 		yy_bp += (int) (dest - source);
 		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
-			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+			(yy_n_chars) = (int) YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
 
 		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 			YY_FATAL_ERROR( "flex scanner push-back overflow" );
@@ -1773,6 +2022,8 @@ static int yy_get_next_buffer (void)
 	(yy_c_buf_p) = yy_cp;
 }
 
+#endif
+
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
     static int yyinput (void)
@@ -1782,7 +2033,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 )
@@ -1797,7 +2048,7 @@ static int yy_get_next_buffer (void)
 
 		else
 			{ /* need more input */
-			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+			int offset = (int) ((yy_c_buf_p) - (yytext_ptr));
 			++(yy_c_buf_p);
 
 			switch ( yy_get_next_buffer(  ) )
@@ -1814,14 +2065,14 @@ static int yy_get_next_buffer (void)
 					 */
 
 					/* Reset buffer status. */
-					slice_restart(slice_in );
+					yyrestart( yyin );
 
 					/*FALLTHROUGH*/
 
 				case EOB_ACT_END_OF_FILE:
 					{
-					if ( slice_wrap( ) )
-						return EOF;
+					if ( yywrap(  ) )
+						return 0;
 
 					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
@@ -1840,7 +2091,7 @@ static int yy_get_next_buffer (void)
 		}
 
 	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
-	*(yy_c_buf_p) = '\0';	/* preserve slice_text */
+	*(yy_c_buf_p) = '\0';	/* preserve yytext */
 	(yy_hold_char) = *++(yy_c_buf_p);
 
 	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = (c == '\n');
@@ -1851,35 +2102,35 @@ 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 )
+    void yyrestart  (FILE * input_file )
 {
-
+    
 	if ( ! YY_CURRENT_BUFFER ){
-        slice_ensure_buffer_stack ();
+        yyensure_buffer_stack ();
 		YY_CURRENT_BUFFER_LVALUE =
-            slice__create_buffer(slice_in,YY_BUF_SIZE );
+            yy_create_buffer( yyin, YY_BUF_SIZE );
 	}
 
-	slice__init_buffer(YY_CURRENT_BUFFER,input_file );
-	slice__load_buffer_state( );
+	yy_init_buffer( YY_CURRENT_BUFFER, input_file );
+	yy_load_buffer_state(  );
 }
 
 /** Switch to a different input buffer.
  * @param new_buffer The new input buffer.
- *
+ * 
  */
-    void slice__switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
 {
-
+    
 	/* TODO. We should be able to replace this entire function body
 	 * with
-	 *		slice_pop_buffer_state();
-	 *		slice_push_buffer_state(new_buffer);
+	 *		yypop_buffer_state();
+	 *		yypush_buffer_state(new_buffer);
      */
-	slice_ensure_buffer_stack ();
+	yyensure_buffer_stack ();
 	if ( YY_CURRENT_BUFFER == new_buffer )
 		return;
 
@@ -1892,61 +2143,61 @@ static int yy_get_next_buffer (void)
 		}
 
 	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-	slice__load_buffer_state( );
+	yy_load_buffer_state(  );
 
 	/* We don't actually know whether we did this switch during
-	 * EOF (slice_wrap()) processing, but the only time this flag
-	 * is looked at is after slice_wrap() is called, so it's safe
+	 * EOF (yywrap()) processing, but the only time this flag
+	 * is looked at is after yywrap() is called, so it's safe
 	 * to go ahead and always set it.
 	 */
 	(yy_did_buffer_switch_on_eof) = 1;
 }
 
-static void slice__load_buffer_state  (void)
+static void yy_load_buffer_state  (void)
 {
     	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
 	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
-	slice_in = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
 	(yy_hold_char) = *(yy_c_buf_p);
 }
 
 /** 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 yy_create_buffer  (FILE * file, int  size )
 {
 	YY_BUFFER_STATE b;
-
-	b = (YY_BUFFER_STATE) slice_alloc(sizeof( struct yy_buffer_state )  );
+    
+	b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state )  );
 	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in slice__create_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
 	b->yy_buf_size = size;
 
 	/* yy_ch_buf has to be 2 characters longer than the size given because
 	 * we need to put in 2 end-of-buffer characters.
 	 */
-	b->yy_ch_buf = (char *) slice_alloc(b->yy_buf_size + 2  );
+	b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2)  );
 	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in slice__create_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
 	b->yy_is_our_buffer = 1;
 
-	slice__init_buffer(b,file );
+	yy_init_buffer( b, file );
 
 	return b;
 }
 
 /** Destroy the buffer.
- * @param b a buffer created with slice__create_buffer()
- *
+ * @param b a buffer created with yy_create_buffer()
+ * 
  */
-    void slice__delete_buffer (YY_BUFFER_STATE  b )
+    void yy_delete_buffer (YY_BUFFER_STATE  b )
 {
-
+    
 	if ( ! b )
 		return;
 
@@ -1954,27 +2205,27 @@ static void slice__load_buffer_state  (void)
 		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
 
 	if ( b->yy_is_our_buffer )
-		slice_free((void *) b->yy_ch_buf  );
+		yyfree( (void *) b->yy_ch_buf  );
 
-	slice_free((void *) b  );
+	yyfree( (void *) b  );
 }
 
 /* Initializes or reinitializes a buffer.
  * This function is sometimes called more than once on the same buffer,
- * such as during a slice_restart() or at EOF.
+ * such as during a yyrestart() or at EOF.
  */
-    static void slice__init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
 
 {
 	int oerrno = errno;
-
-	slice__flush_buffer(b );
+    
+	yy_flush_buffer( b );
 
 	b->yy_input_file = file;
 	b->yy_fill_buffer = 1;
 
-    /* If b is the current buffer, then slice__init_buffer was _probably_
-     * called from slice_restart() or through yy_get_next_buffer.
+    /* If b is the current buffer, then yy_init_buffer was _probably_
+     * called from yyrestart() or through yy_get_next_buffer.
      * In that case, we don't want to reset the lineno or column.
      */
     if (b != YY_CURRENT_BUFFER){
@@ -1983,15 +2234,15 @@ 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 )
+    void yy_flush_buffer (YY_BUFFER_STATE  b )
 {
     	if ( ! b )
 		return;
@@ -2011,23 +2262,23 @@ static void slice__load_buffer_state  (void)
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
 	if ( b == YY_CURRENT_BUFFER )
-		slice__load_buffer_state( );
+		yy_load_buffer_state(  );
 }
 
 /** Pushes the new state onto the stack. The new state becomes
  *  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 )
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
 {
     	if (new_buffer == NULL)
 		return;
 
-	slice_ensure_buffer_stack();
+	yyensure_buffer_stack();
 
-	/* This block is copied from slice__switch_to_buffer. */
+	/* This block is copied from yy_switch_to_buffer. */
 	if ( YY_CURRENT_BUFFER )
 		{
 		/* Flush out information for old buffer. */
@@ -2041,27 +2292,27 @@ void slice_push_buffer_state (YY_BUFFER_STATE new_buffer )
 		(yy_buffer_stack_top)++;
 	YY_CURRENT_BUFFER_LVALUE = new_buffer;
 
-	/* copied from slice__switch_to_buffer. */
-	slice__load_buffer_state( );
+	/* copied from yy_switch_to_buffer. */
+	yy_load_buffer_state(  );
 	(yy_did_buffer_switch_on_eof) = 1;
 }
 
 /** Removes and deletes the top of the stack, if present.
  *  The next element becomes the new top.
- *
+ *  
  */
-void slice_pop_buffer_state (void)
+void yypop_buffer_state (void)
 {
     	if (!YY_CURRENT_BUFFER)
 		return;
 
-	slice__delete_buffer(YY_CURRENT_BUFFER );
+	yy_delete_buffer(YY_CURRENT_BUFFER );
 	YY_CURRENT_BUFFER_LVALUE = NULL;
 	if ((yy_buffer_stack_top) > 0)
 		--(yy_buffer_stack_top);
 
 	if (YY_CURRENT_BUFFER) {
-		slice__load_buffer_state( );
+		yy_load_buffer_state(  );
 		(yy_did_buffer_switch_on_eof) = 1;
 	}
 }
@@ -2069,22 +2320,22 @@ void slice_pop_buffer_state (void)
 /* Allocates the stack if it does not exist.
  *  Guarantees space for at least one push.
  */
-static void slice_ensure_buffer_stack (void)
+static void yyensure_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
 		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
 		 * immediate realloc on the next call.
          */
-		num_to_alloc = 1;
-		(yy_buffer_stack) = (struct yy_buffer_state**)slice_alloc
+      num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */
+		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
 								(num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
 		if ( ! (yy_buffer_stack) )
-			YY_FATAL_ERROR( "out of dynamic memory in slice_ensure_buffer_stack()" );
+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
 
 		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
 
@@ -2096,15 +2347,15 @@ static void slice_ensure_buffer_stack (void)
 	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
 
 		/* Increase the buffer to prepare for a possible push. */
-		int grow_size = 8 /* arbitrary grow size */;
+		yy_size_t grow_size = 8 /* arbitrary grow size */;
 
 		num_to_alloc = (yy_buffer_stack_max) + grow_size;
-		(yy_buffer_stack) = (struct yy_buffer_state**)slice_realloc
+		(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
 								((yy_buffer_stack),
 								num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
 		if ( ! (yy_buffer_stack) )
-			YY_FATAL_ERROR( "out of dynamic memory in slice_ensure_buffer_stack()" );
+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
 
 		/* zero only the new slots.*/
 		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
@@ -2115,80 +2366,80 @@ 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.
  */
-YY_BUFFER_STATE slice__scan_buffer  (char * base, yy_size_t  size )
+YY_BUFFER_STATE yy_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 )
 		/* They forgot to leave room for the EOB's. */
-		return 0;
+		return NULL;
 
-	b = (YY_BUFFER_STATE) slice_alloc(sizeof( struct yy_buffer_state )  );
+	b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state )  );
 	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in slice__scan_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
 
-	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+	b->yy_buf_size = (int) (size - 2);	/* "- 2" to take care of EOB's */
 	b->yy_buf_pos = b->yy_ch_buf = base;
 	b->yy_is_our_buffer = 0;
-	b->yy_input_file = 0;
+	b->yy_input_file = NULL;
 	b->yy_n_chars = b->yy_buf_size;
 	b->yy_is_interactive = 0;
 	b->yy_at_bol = 1;
 	b->yy_fill_buffer = 0;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	slice__switch_to_buffer(b  );
+	yy_switch_to_buffer( b  );
 
 	return b;
 }
 
-/** Setup the input buffer state to scan a string. The next call to slice_lex() will
+/** Setup the input buffer state to scan a string. The next call to yylex() 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_scan_bytes() instead.
  */
-YY_BUFFER_STATE slice__scan_string (yyconst char * yystr )
+YY_BUFFER_STATE yy_scan_string (const char * yystr )
 {
-
-	return slice__scan_bytes(yystr,strlen(yystr) );
+    
+	return yy_scan_bytes( yystr, (int) strlen(yystr) );
 }
 
-/** Setup the input buffer state to scan the given bytes. The next call to slice_lex() will
+/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
  * 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 )
+YY_BUFFER_STATE yy_scan_bytes  (const char * yybytes, int  _yybytes_len )
 {
 	YY_BUFFER_STATE b;
 	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  );
+	n = (yy_size_t) (_yybytes_len + 2);
+	buf = (char *) yyalloc( n  );
 	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in slice__scan_bytes()" );
+		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
 
 	for ( i = 0; i < _yybytes_len; ++i )
 		buf[i] = yybytes[i];
 
 	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
 
-	b = slice__scan_buffer(buf,n );
+	b = yy_scan_buffer( buf, n );
 	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in slice__scan_bytes()" );
+		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
 
 	/* It's okay to grow etc. this buffer, and we should throw it
 	 * away when we're done.
@@ -2202,9 +2453,9 @@ YY_BUFFER_STATE slice__scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_
 #define YY_EXIT_FAILURE 2
 #endif
 
-static void yy_fatal_error (yyconst char* msg )
+static void yynoreturn yy_fatal_error (const char* msg )
 {
-    	(void) fprintf( stderr, "%s\n", msg );
+			fprintf( stderr, "%s\n", msg );
 	exit( YY_EXIT_FAILURE );
 }
 
@@ -2214,142 +2465,142 @@ static void yy_fatal_error (yyconst char* msg )
 #define yyless(n) \
 	do \
 		{ \
-		/* Undo effects of setting up slice_text. */ \
+		/* Undo effects of setting up yytext. */ \
         int yyless_macro_arg = (n); \
         YY_LESS_LINENO(yyless_macro_arg);\
-		slice_text[slice_leng] = (yy_hold_char); \
-		(yy_c_buf_p) = slice_text + yyless_macro_arg; \
+		yytext[yyleng] = (yy_hold_char); \
+		(yy_c_buf_p) = yytext + yyless_macro_arg; \
 		(yy_hold_char) = *(yy_c_buf_p); \
 		*(yy_c_buf_p) = '\0'; \
-		slice_leng = yyless_macro_arg; \
+		yyleng = yyless_macro_arg; \
 		} \
 	while ( 0 )
 
 /* Accessor  methods (get/set functions) to struct members. */
 
 /** Get the current line number.
- *
+ * 
  */
-int slice_get_lineno  (void)
+int yyget_lineno  (void)
 {
-
-    return slice_lineno;
+    
+    return yylineno;
 }
 
 /** Get the input stream.
- *
+ * 
  */
-FILE *slice_get_in  (void)
+FILE *yyget_in  (void)
 {
-        return slice_in;
+        return yyin;
 }
 
 /** Get the output stream.
- *
+ * 
  */
-FILE *slice_get_out  (void)
+FILE *yyget_out  (void)
 {
-        return slice_out;
+        return yyout;
 }
 
 /** Get the length of the current token.
- *
+ * 
  */
-yy_size_t slice_get_leng  (void)
+int yyget_leng  (void)
 {
-        return slice_leng;
+        return yyleng;
 }
 
 /** Get the current token.
- *
+ * 
  */
 
-char *slice_get_text  (void)
+char *yyget_text  (void)
 {
-        return slice_text;
+        return yytext;
 }
 
 /** Set the current line number.
- * @param line_number
- *
+ * @param _line_number line number
+ * 
  */
-void slice_set_lineno (int  line_number )
+void yyset_lineno (int  _line_number )
 {
-
-    slice_lineno = line_number;
+    
+    yylineno = _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
+ * @param _in_str A readable stream.
+ * 
+ * @see yy_switch_to_buffer
  */
-void slice_set_in (FILE *  in_str )
+void yyset_in (FILE *  _in_str )
 {
-        slice_in = in_str ;
+        yyin = _in_str ;
 }
 
-void slice_set_out (FILE *  out_str )
+void yyset_out (FILE *  _out_str )
 {
-        slice_out = out_str ;
+        yyout = _out_str ;
 }
 
-int slice_get_debug  (void)
+int yyget_debug  (void)
 {
-        return slice__flex_debug;
+        return yy_flex_debug;
 }
 
-void slice_set_debug (int  bdebug )
+void yyset_debug (int  _bdebug )
 {
-        slice__flex_debug = bdebug ;
+        yy_flex_debug = _bdebug ;
 }
 
 static int yy_init_globals (void)
 {
         /* Initialization is the same as for the non-reentrant scanner.
-     * This function is called from slice_lex_destroy(), so don't allocate here.
+     * This function is called from yylex_destroy(), so don't allocate here.
      */
 
-    (yy_buffer_stack) = 0;
+    (yy_buffer_stack) = NULL;
     (yy_buffer_stack_top) = 0;
     (yy_buffer_stack_max) = 0;
-    (yy_c_buf_p) = (char *) 0;
+    (yy_c_buf_p) = NULL;
     (yy_init) = 0;
     (yy_start) = 0;
 
 /* Defined in main.c */
 #ifdef YY_STDINIT
-    slice_in = stdin;
-    slice_out = stdout;
+    yyin = stdin;
+    yyout = stdout;
 #else
-    slice_in = (FILE *) 0;
-    slice_out = (FILE *) 0;
+    yyin = NULL;
+    yyout = NULL;
 #endif
 
     /* For future reference: Set errno on error, since we are called by
-     * slice_lex_init()
+     * yylex_init()
      */
     return 0;
 }
 
-/* slice_lex_destroy is for both reentrant and non-reentrant scanners. */
-int slice_lex_destroy  (void)
+/* yylex_destroy is for both reentrant and non-reentrant scanners. */
+int yylex_destroy  (void)
 {
-
+    
     /* Pop the buffer stack, destroying each element. */
 	while(YY_CURRENT_BUFFER){
-		slice__delete_buffer(YY_CURRENT_BUFFER  );
+		yy_delete_buffer( YY_CURRENT_BUFFER  );
 		YY_CURRENT_BUFFER_LVALUE = NULL;
-		slice_pop_buffer_state();
+		yypop_buffer_state();
 	}
 
 	/* Destroy the stack itself. */
-	slice_free((yy_buffer_stack) );
+	yyfree((yy_buffer_stack) );
 	(yy_buffer_stack) = NULL;
 
     /* Reset the globals. This is important in a non-reentrant scanner so the next time
-     * slice_lex() is called, initialization will occur. */
+     * yylex() is called, initialization will occur. */
     yy_init_globals( );
 
     return 0;
@@ -2360,18 +2611,19 @@ int slice_lex_destroy  (void)
  */
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+static void yy_flex_strncpy (char* s1, const char * s2, int n )
 {
-	register int i;
+		
+	int i;
 	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
 }
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s )
+static int yy_flex_strlen (const char * s )
 {
-	register int n;
+	int n;
 	for ( n = 0; s[n]; ++n )
 		;
 
@@ -2379,13 +2631,14 @@ static int yy_flex_strlen (yyconst char * s )
 }
 #endif
 
-void *slice_alloc (yy_size_t  size )
+void *yyalloc (yy_size_t  size )
 {
-	return (void *) malloc( size );
+			return malloc(size);
 }
 
-void *slice_realloc  (void * ptr, yy_size_t  size )
+void *yyrealloc  (void * ptr, yy_size_t  size )
 {
+		
 	/* The cast to (char *) in the following accommodates both
 	 * implementations that use char* generic pointers, and those
 	 * that use void* generic pointers.  It works with the latter
@@ -2393,12 +2646,12 @@ void *slice_realloc  (void * ptr, yy_size_t  size )
 	 * any pointer type to void*, and deal with argument conversions
 	 * as though doing an assignment.
 	 */
-	return (void *) realloc( (char *) ptr, size );
+	return realloc(ptr, size);
 }
 
-void slice_free (void * ptr )
+void yyfree (void * ptr )
 {
-	free( (char *) ptr );	/* see slice_realloc() for (char *) cast */
+			free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
 }
 
 #define YYTABLES_NAME "yytables"
@@ -2406,7 +2659,6 @@ void slice_free (void * ptr )
 #line 530 "src/Slice/Scanner.l"
 
 
-
 namespace Slice {
 
 //
@@ -2524,7 +2776,7 @@ int checkIdentifier(string& id)
     {
         DefinitionContextPtr dc = unit->currentDefinitionContext();
         assert(dc);
-        if(dc->findMetaData("underscore") != "underscore") // no 'underscore' global metadata
+        if(dc->findMetaData("underscore") != "underscore") // no 'underscore' file metadata
         {
             unit->error("illegal underscore in identifier `" + name + "'");
         }