zeroc-ice 3.7.11 → 3.8.1

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

@@ -1,12 +1,25 @@
-#include <IceUtil/ScannerConfig.h>
 #line 1 "src/Slice/Scanner.cpp"
+// Copyright (c) ZeroC, Inc.
 
-#line 3 "src/Slice/Scanner.cpp"
+#include "../Ice/ScannerConfig.h"
+#include <cstdint>
 
-#define  YY_INT_ALIGNED short int
+// Clang detects unreachable code in the generated scanner, so we disable the warning.
+#if defined(__clang__)
+#    pragma clang diagnostic ignored "-Wunreachable-code"
+#endif
+
+// NOLINTBEGIN
+
+#line 14 "src/Slice/Scanner.cpp"
+
+#define  YY_INT_ALIGNED long int
 
 /* A lexical scanner generated by flex */
 
+/* %not-for-header */
+/* %if-c-only */
+/* %if-not-reentrant */
 #define yy_create_buffer slice__create_buffer
 #define yy_delete_buffer slice__delete_buffer
 #define yy_scan_buffer slice__scan_buffer
@@ -32,6 +45,10 @@
 #define yyrealloc slice_realloc
 #define yyfree slice_free
 
+/* %endif */
+/* %endif */
+/* %ok-for-header */
+
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 6
@@ -40,6 +57,10 @@
 #define FLEX_BETA
 #endif
 
+/* %if-c++-only */
+/* %endif */
+
+/* %if-c-only */
 #ifdef yy_create_buffer
 #define slice__create_buffer_ALREADY_DEFINED
 #else
@@ -220,6 +241,32 @@
 #define yywrap slice_wrap
 #endif
 
+/* %endif */
+
+#ifdef yyget_lval
+#define slice_get_lval_ALREADY_DEFINED
+#else
+#define yyget_lval slice_get_lval
+#endif
+
+#ifdef yyset_lval
+#define slice_set_lval_ALREADY_DEFINED
+#else
+#define yyset_lval slice_set_lval
+#endif
+
+#ifdef yyget_lloc
+#define slice_get_lloc_ALREADY_DEFINED
+#else
+#define yyget_lloc slice_get_lloc
+#endif
+
+#ifdef yyset_lloc
+#define slice_set_lloc_ALREADY_DEFINED
+#else
+#define yyset_lloc slice_set_lloc
+#endif
+
 #ifdef yyalloc
 #define slice_alloc_ALREADY_DEFINED
 #else
@@ -238,6 +285,8 @@
 #define yyfree slice_free
 #endif
 
+/* %if-c-only */
+
 #ifdef yytext
 #define slice_text_ALREADY_DEFINED
 #else
@@ -274,16 +323,23 @@
 #define yylineno slice_lineno
 #endif
 
+/* %endif */
+
 /* First, we deal with  platform-specific or compiler-specific issues. */
 
 /* begin standard C headers. */
+/* %if-c-only */
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
+/* %endif */
 
+/* %if-tables-serialization */
+/* %endif */
 /* end standard C headers. */
 
+/* %if-c-or-c++ */
 /* flex integer type definitions */
 
 #ifndef FLEXINT_H
@@ -352,7 +408,11 @@ typedef unsigned int flex_uint32_t;
 
 #endif /* ! FLEXINT_H */
 
+/* %endif */
+
 /* begin standard C++ headers. */
+/* %if-c++-only */
+/* %endif */
 
 /* TODO: this is always defined, so inline it */
 #define yyconst const
@@ -363,13 +423,24 @@ typedef unsigned int flex_uint32_t;
 #define yynoreturn
 #endif
 
+/* %not-for-header */
 /* Returned upon end-of-file. */
 #define YY_NULL 0
+/* %ok-for-header */
 
+/* %not-for-header */
 /* 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) ((YY_CHAR) (c))
+/* %ok-for-header */
+
+/* %if-reentrant */
+/* %endif */
+
+/* %if-not-reentrant */
+
+/* %endif */
 
 /* 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
@@ -415,9 +486,15 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
 typedef size_t yy_size_t;
 #endif
 
+/* %if-not-reentrant */
 extern int yyleng;
+/* %endif */
 
+/* %if-c-only */
+/* %if-not-reentrant */
 extern FILE *yyin, *yyout;
+/* %endif */
+/* %endif */
 
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
@@ -445,7 +522,12 @@ extern FILE *yyin, *yyout;
 #define YY_STRUCT_YY_BUFFER_STATE
 struct yy_buffer_state
 	{
+/* %if-c-only */
 	FILE *yy_input_file;
+/* %endif */
+
+/* %if-c++-only */
+/* %endif */
 
 	char *yy_ch_buf;		/* input buffer */
 	char *yy_buf_pos;		/* current position in input buffer */
@@ -506,10 +588,18 @@ struct yy_buffer_state
 	};
 #endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
+/* %if-c-only Standard (non-C++) definition */
+/* %not-for-header */
+/* %if-not-reentrant */
+
 /* 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 = NULL; /**< Stack as an array. */
+/* %endif */
+/* %ok-for-header */
+
+/* %endif */
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
@@ -525,6 +615,10 @@ static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */
  */
 #define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
 
+/* %if-c-only Standard (non-C++) definition */
+
+/* %if-not-reentrant */
+/* %not-for-header */
 /* yy_hold_char holds the character lost when yytext is formed. */
 static char yy_hold_char;
 static int yy_n_chars;		/* number of characters read into yy_ch_buf */
@@ -539,6 +633,9 @@ static int yy_start = 0;	/* start state number */
  * instead of setting up a fresh yyin.  A bit of a hack ...
  */
 static int yy_did_buffer_switch_on_eof;
+/* %ok-for-header */
+
+/* %endif */
 
 void yyrestart ( FILE *input_file  );
 void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer  );
@@ -557,6 +654,8 @@ 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  );
 
+/* %endif */
+
 void *yyalloc ( yy_size_t  );
 void *yyrealloc ( void *, yy_size_t  );
 void yyfree ( void *  );
@@ -582,10 +681,13 @@ void yyfree ( void *  );
 	}
 #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
 
+/* %% [1.0] yytext/yyin/yyout/yy_state_type/yylineno etc. def's & init go here */
 /* Begin user sect3 */
 
 #define slice_wrap() (/*CONSTCOND*/1)
 #define YY_SKIP_YYWRAP
+
+#define FLEX_DEBUG
 typedef flex_uint8_t YY_CHAR;
 
 FILE *yyin = NULL, *yyout = NULL;
@@ -601,22 +703,32 @@ extern char *yytext;
 #endif
 #define yytext_ptr yytext
 
+/* %% [1.5] DFA */
+
+/* %if-c-only Standard (non-C++) definition */
+
 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  );
 
+/* %endif */
+
 /* Done after the current pattern has been matched and before the
  * corresponding action - sets up yytext.
  */
 #define YY_DO_BEFORE_ACTION \
 	(yytext_ptr) = yy_bp; \
-	yyleng = (int) (yy_cp - yy_bp); \
+/* %% [2.0] code to fiddle yytext and yyleng for yymore() goes here \ */\
+	(yytext_ptr) -= (yy_more_len); \
+	yyleng = (int) (yy_cp - (yytext_ptr)); \
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
+/* %% [3.0] code to copy yytext_ptr to yytext[] goes here, if %array \ */\
 	(yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 19
-#define YY_END_OF_BUFFER 20
+/* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */
+#define YY_NUM_RULES 51
+#define YY_END_OF_BUFFER 52
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -624,16 +736,32 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static const flex_int16_t yy_accept[76] =
+static const flex_int32_t yy_accept[220] =
     {   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
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,   52,   49,   45,   46,   45,   50,
+        1,   50,   50,   50,   19,   19,   50,   44,   35,   50,
+       49,   45,   45,   29,   26,   26,   27,   25,   26,   26,
+       26,   49,   33,   45,   34,   33,   33,   45,   29,   42,
+       39,   37,   38,   42,   40,   42,   29,   51,   15,    3,
+        3,   18,    3,   17,    3,    3,   45,   46,    0,   19,
+       19,   20,   24,   22,   20,   19,    0,    0,    0,    0,
+       43,   44,    0,   44,    0,   36,   44,    0,   45,   29,
+       29,   31,    0,   26,   26,   27,   28,   22,   26,   26,
+
+       26,   26,   26,    0,   33,   24,   22,   33,   31,   33,
+       42,   39,   24,   22,   41,   42,   31,   42,    3,    3,
+        3,    3,   16,    4,    5,    8,    6,   14,    2,    7,
+       13,   10,    3,    3,    3,    3,    3,    0,   20,    0,
+       22,   21,    0,   20,   19,   47,    0,    0,   22,   21,
+       26,   26,   48,   33,   22,   21,   33,   33,   42,   22,
+       21,   42,   42,    3,    3,    3,    8,   14,   14,    0,
+       13,   13,    9,    3,    3,    0,   20,   23,   21,    0,
+        0,   21,   26,   26,   23,   21,   33,   23,   21,   42,
+        3,    3,    8,   14,    2,   13,    9,    3,    0,   32,
+
+       30,   26,   26,   26,   30,   30,   14,   13,    3,    0,
+       26,   14,   11,    3,   14,   14,   14,   12,    0
     } ;
 
 static const YY_CHAR yy_ec[256] =
@@ -641,270 +769,568 @@ static const YY_CHAR yy_ec[256] =
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         4,    4,    4,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    2,    1,    5,    6,    1,    1,    1,    1,    7,
-        1,    8,    9,    1,   10,   11,   12,   13,   14,   14,
-       14,   14,   14,   14,   14,   15,   15,   16,    1,    1,
-        1,    1,    1,    1,   17,   17,   17,   17,   18,   19,
-       20,   20,   20,   20,   20,   20,   20,   20,   20,   20,
-       20,   20,   20,   20,   20,   20,   20,   20,   20,   20,
-       21,   22,   23,    1,   20,    1,   17,   17,   17,   17,
-
-       24,   19,   20,   20,   25,   20,   20,   26,   20,   27,
-       20,   20,   20,   20,   20,   20,   20,   20,   20,   28,
-       20,   20,    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,    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,    1,    1,   29,    1,    1,    1,
-       30,    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,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,   31,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1
+        1,    5,    6,    7,    8,    6,    6,    6,    9,   10,
+        6,   11,   12,   13,   14,   15,   16,   17,   18,   18,
+       18,   18,   18,   18,   18,   19,   19,   20,    6,    6,
+        6,    6,   21,    6,   22,   22,   22,   22,   23,   24,
+       25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
+       25,   25,   25,   25,   26,   25,   25,   25,   25,   25,
+       27,   28,   29,    6,   30,    6,   31,   31,   22,   22,
+
+       32,   33,   25,   25,   34,   25,   25,   35,   25,   36,
+       25,   25,   25,   37,   25,   37,   38,   37,   25,   39,
+       25,   25,    6,    6,    6,    6,   40,   41,   41,   41,
+       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
+       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
+       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
+       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
+       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
+       41,   41,   41,   41,   41,   41,   42,   41,   41,   41,
+       43,   41,   41,   41,   41,   41,   41,   41,   41,   41,
+
+       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
+       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
+       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
+       41,   41,   41,   41,   41,   41,   41,   41,   44,   41,
+       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
+       41,   41,   41,   41,   41
     } ;
 
-static const YY_CHAR yy_meta[32] =
+static const YY_CHAR yy_meta[45] =
     {   0,
-        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
+        1,    2,    3,    2,    2,    4,    5,    4,    4,    6,
+        7,    4,    8,    4,    4,    9,   10,   10,   10,    6,
+        4,   11,   11,   11,   12,   12,    4,   13,    8,   14,
+       11,   11,   11,   12,   12,   12,   12,   12,   12,    1,
+        4,    4,    4,    4
     } ;
 
-static const flex_int16_t yy_base[87] =
+static const flex_int32_t yy_base[252] =
     {   0,
-        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
+        0,   43,   50,   65,   75,   90,  501,   55,   80,  123,
+      166,  209,  253,  293,  544, 1343,   45,  536,   54, 1343,
+     1343,   85,   70,   94,  319,   97,  513,  357,  496,    0,
+      480,  128,  133,  140,    0,   60,  518,  500,   97,  142,
+      146,  463,    0,   70, 1343,  106,  462,  172,  183,    0,
+      500, 1343, 1343,  107,  469,  451,  188, 1343, 1343,  150,
+      105, 1343,  187,  379,  222,  417,  182,  480,  143,    0,
+      214,  436,  465,  450,    0,  244,  222,    0,  435,  240,
+     1343,  468,  438,    0,    0, 1343,    0,  414,  266,  247,
+      270,  297,  417,    0,  192,  399, 1343,  167,  275,  305,
+
+      330,  301,  364,  347,    0,  361,  323,  321,  351,  320,
+        0,  327,  306,  495, 1343,  269,  361,  270,  339,  117,
+      217,  524, 1343, 1343, 1343,  191, 1343,  548,  250, 1343,
+      571,    0,  379,  609,  643,  409,  348,  425, 1343,    0,
+        0,    0,  267,  375,    0, 1343,  306,  237,  240,  224,
+      324,  184, 1343,  445,  399,  427,    0,  179,  677,  477,
+      505,    0,  168,  706,  473,  513,  230,  730,    0,  171,
+      753,    0,    0,  460,  353,  273,  518, 1343,    0,  185,
+      140,  155,  142,  124,    0,  436,  102,    0,  525,   79,
+      369,  614, 1343,  776,   69,  799, 1343,  487,   83, 1343,
+
+      138,  384,    0,  404,  418,  428,  822,  845,  490,  541,
+      615,  868, 1343,  620,  891,  914,  937, 1343, 1343,  976,
+      990, 1004, 1018, 1031, 1035, 1049, 1063, 1077, 1090, 1104,
+     1118,  335, 1132, 1146, 1160, 1174,  414, 1188, 1202, 1216,
+     1230, 1244, 1258, 1272, 1286, 1300,   59,   34,  435, 1314,
+     1328
     } ;
 
-static const flex_int16_t yy_def[87] =
+static const flex_int32_t yy_def[252] =
     {   0,
-       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
+      219,    1,  220,  220,  220,  220,    1,    1,  221,  221,
+      222,  222,  223,  223,  219,  219,  219,  219,  219,  219,
+      219,  219,  219,  219,  219,  219,  219,  224,  219,  225,
+      219,  219,  219,  219,  226,  226,  219,  219,  226,  226,
+      226,  219,  227,  219,  219,  227,  227,  219,  227,  228,
+      219,  219,  219,  228,  219,  228,  228,  219,  219,  229,
+      229,  219,  229,  230,  229,  229,  219,  219,  219,   25,
+      219,  219,  219,  231,   72,  219,  219,  232,  225,  219,
+      219,  224,  219,   82,  225,  219,   82,  219,  219,  219,
+      219,  219,  219,  226,  226,  219,  219,  233,  226,  226,
+
+      226,  226,  226,  219,  227,  227,  234,  227,  227,  227,
+      228,  219,  228,  235,  219,  228,  228,  228,  229,  229,
+      229,  236,  219,  219,  219,  219,  219,  219,  219,  219,
+      219,  237,  229,  229,  229,  229,  229,  219,  219,  238,
+      231,  239,  219,  219,  232,  219,  219,  219,  233,  240,
+      226,  226,  219,  241,  234,  242,  227,  227,  243,  235,
+      244,  228,  228,  245,  236,  246,  219,  219,  247,  219,
+      219,  248,  249,  229,  229,  219,  219,  219,  239,  250,
+      219,  240,  251,  226,  227,  242,  227,  228,  244,  228,
+      229,  246,  219,  219,  219,  219,  219,  229,  250,  219,
+
+      219,  251,  226,  226,  227,  228,  219,  219,  229,  219,
+      226,  219,  219,  229,  219,  219,  219,  219,    0,  219,
+      219,  219,  219,  219,  219,  219,  219,  219,  219,  219,
+      219,  219,  219,  219,  219,  219,  219,  219,  219,  219,
+      219,  219,  219,  219,  219,  219,  219,  219,  219,  219,
+      219
     } ;
 
-static const flex_int16_t yy_nxt[229] =
+static const flex_int32_t yy_nxt[1388] =
     {   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,   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
+       16,   17,   18,   17,   19,   20,   21,   20,   20,   20,
+       20,   22,   20,   22,   23,   24,   25,   26,   26,   27,
+       20,   28,   28,   28,   28,   28,   29,   30,   20,   28,
+       28,   28,   28,   28,   28,   28,   28,   28,   28,   20,
+       16,   16,   16,   31,   32,  172,   67,   33,   67,   67,
+       34,   36,   37,   36,   36,   67,   32,   67,   67,   33,
+       38,   95,   34,   95,   95,   39,   40,   37,   36,   40,
+      169,   67,   41,   67,   67,   38,   36,   37,   36,   36,
+       39,   44,   45,   44,   44,   38,   72,   72,   72,  200,
+       39,   40,   37,   36,   40,   46,  170,   41,   42,   69,
+
+       38,   70,   71,   71,   73,   39,  219,   73,  219,   74,
+      206,   75,   98,   71,   71,   71,  106,  113,  219,   77,
+      219,  107,  114,   47,   48,   45,   44,   48,   77,   89,
+       49,   67,   89,  205,   89,   90,   67,   89,   46,  210,
+       90,   91,  210,   99,   91,   95,   99,  101,  203,  100,
+      101,   67,  199,   67,  119,  204,   92,   92,   92,   72,
+       72,   72,  102,  102,  102,  179,   47,   44,   51,   44,
+       44,  201,   52,   89,   93,   67,   89,  141,   53,   90,
+      103,   54,  150,   67,   91,   67,   67,   91,  219,   91,
+      219,  200,   91,   95,   55,   95,   95,  121,  195,  109,
+
+      109,  109,  122,  190,  117,  117,  117,  167,  167,   56,
+       48,   51,   44,   48,  187,   52,   57,  110,  219,  184,
+      219,   53,  118,   89,   54,   67,  133,  164,   75,  134,
+       71,   71,   71,  143,  179,  143,   77,   55,  144,  144,
+      144,   80,   80,   80,   80,   77,  193,  193,   91,   81,
+      141,   91,   56,   58,   44,   59,   44,   60,   75,   62,
+       76,   76,   71,   92,   92,   92,   77,   89,   63,   67,
+       89,   91,  181,   90,   91,   77,   99,  170,   95,   99,
+       64,   93,  100,  144,  144,  144,   92,   92,   92,  177,
+      177,  177,   58,   58,   48,   59,   44,   65,  147,   62,
+
+       66,  147,  151,  163,   93,  151,  101,  147,   63,  101,
+      147,  162,  180,   92,   92,   92,  159,  102,  102,  102,
+       64,  102,  102,  102,  141,  151,  141,  141,  151,  112,
+      183,  101,   58,   75,  101,   76,   76,   71,  156,  103,
+       67,   77,   67,  119,  145,  145,  102,  102,  102,  219,
+       77,  219,  147,  158,  219,  147,  219,   78,   80,   80,
+       80,   80,  147,  157,  103,  147,   81,  109,  109,  109,
+      219,  154,  219,   82,   82,   82,   83,  117,  117,  117,
+       89,  175,   67,  133,   85,  124,  134,  125,  198,  153,
+      203,  144,  144,  144,  199,  126,  126,  152,  139,  127,
+
+      141,   96,  141,  141,  128,  211,  129,  139,  211,  130,
+      147,  130,  219,  174,  130,  130,  131,  132,   91,  210,
+      219,  135,  210,  173,  173,  136,  136,  136,  179,  210,
+      179,  179,  210,  136,  136,  136,  176,  179,  176,  179,
+      179,  177,  177,  177,  197,  197,  178,  178,  178,  178,
+      148,  137,   72,   72,   72,  105,  146,   79,  138,  139,
+      105,  147,   85,  219,  174,  142,  180,  138,  139,   80,
+       80,   80,   80,  141,  141,  140,  141,   81,  141,  141,
+      141,  141,   68,  141,   82,   82,   82,   83,  219,  141,
+      219,  210,  116,  219,  214,   85,  141,  115,  141,  141,
+
+      141,  141,  112,  108,  104,  141,  179,  141,  179,  179,
+      161,  179,  141,  179,  179,   97,  179,  179,  209,  179,
+       96,   88,   86,  141,  141,  141,  179,  141,  179,  179,
+      141,  179,   79,  179,  177,  177,  177,  179,   68,  166,
+      179,  139,  210,  219,   42,  210,  219,  219,  219,  219,
+      139,  141,  179,  179,  219,  219,  219,   92,   92,   92,
+      219,  219,  219,  141,  168,  168,  168,  219,  219,  168,
+      168,  168,  169,  169,  219,  219,  219,  219,  168,  168,
+      168,  169,  169,  169,  169,  169,  169,  171,  171,  171,
+      219,  219,  171,  171,  171,  172,  172,  219,  219,  219,
+
+      219,  171,  171,  171,  172,  172,  172,  172,  172,  172,
+       91,  219,  219,  135,  179,  179,  211,  179,  219,  211,
+      179,  210,  219,  219,  214,  136,  136,  136,  219,  219,
+      219,  102,  102,  102,  219,  219,  136,  136,  136,  219,
+      219,  179,  219,  137,   91,  219,  219,  135,  219,  219,
+      219,  219,  219,  179,  219,  219,  219,  219,  219,  136,
+      136,  136,  219,  219,  219,  219,  219,  219,  219,  219,
+      219,  219,  219,  219,  219,  219,  219,  137,  178,  178,
+      178,  178,  219,  178,  219,  219,  219,  111,  219,  178,
+      219,  219,  111,  219,  219,  219,  219,  219,  219,  219,
+
+      219,  219,  219,  219,  219,  178,  178,  178,  178,  178,
+      219,  219,  178,  219,  219,  219,  120,  219,  219,  219,
+      219,  120,  219,  219,  219,  219,  219,  219,  219,  219,
+      219,  219,  219,  178,  219,  219,  219,  219,  219,  219,
+      219,  219,  219,  219,  219,  178,  194,  194,  194,  219,
+      219,  194,  194,  194,  169,  169,  219,  219,  219,  219,
+      194,  194,  194,  169,  169,  169,  169,  169,  169,  196,
+      196,  196,  219,  219,  196,  196,  196,  172,  172,  219,
+      219,  219,  219,  196,  196,  196,  172,  172,  172,  172,
+      172,  172,  207,  207,  207,  219,  219,  207,  207,  207,
+
+      169,  169,  219,  219,  219,  219,  207,  207,  207,  169,
+      169,  169,  169,  169,  169,  208,  208,  208,  219,  219,
+      208,  208,  208,  172,  172,  219,  219,  219,  219,  208,
+      208,  208,  172,  172,  172,  172,  172,  172,  212,  212,
+      212,  219,  219,  212,  212,  212,  169,  169,  219,  219,
+      219,  219,  212,  212,  212,  169,  169,  169,  169,  169,
+      169,  213,  213,  213,  219,  219,  213,  213,  213,  172,
+      172,  219,  219,  219,  219,  213,  213,  213,  172,  172,
+      172,  172,  172,  172,  215,  215,  215,  219,  219,  215,
+      215,  215,  169,  169,  219,  219,  219,  219,  215,  215,
+
+      215,  169,  169,  169,  169,  169,  169,  216,  216,  216,
+      219,  219,  216,  216,  216,  169,  169,  219,  219,  219,
+      219,  216,  216,  216,  169,  169,  169,  169,  169,  169,
+      217,  217,  217,  219,  219,  217,  217,  217,  169,  169,
+      219,  219,  219,  219,  217,  217,  217,  169,  169,  169,
+      169,  169,  169,  218,  218,  218,  219,  219,  218,  218,
+      218,  169,  169,  219,  219,  219,  219,  218,  218,  218,
+      169,  169,  169,  169,  169,  169,   35,   35,   35,   35,
+       35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
+       43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+
+       43,   43,   43,   43,   50,   50,   50,   50,   50,   50,
+       50,   50,   50,   50,   50,   50,   50,   50,   61,   61,
+       61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
+       61,   61,   84,   84,  219,  219,   84,  219,  219,  219,
+       84,   84,   84,   84,   84,   87,   87,  219,   87,   94,
+       94,  219,   94,   94,   94,  219,   94,   94,   94,   94,
+       94,   94,   94,  105,  219,  219,  105,  105,  105,  105,
+      105,  105,  105,  105,  105,  105,  105,  111,  219,  219,
+      111,  219,  111,  111,  219,  111,  111,  111,  111,  111,
+      111,  120,  219,  120,  219,  120,  120,  120,  120,  120,
+
+      120,  120,  219,  120,  123,  123,  219,  123,  123,  123,
+      123,  123,  123,  123,  123,  123,  123,  123,  141,  141,
+      219,  141,  141,  141,  141,  141,  141,  141,  141,  141,
+      141,  141,  149,  149,  219,  149,  149,  149,  149,  149,
+      149,  149,  149,  149,  149,  149,  155,  155,  219,  155,
+      155,  155,  155,  155,  155,  155,  155,  155,  155,  155,
+      160,  160,  219,  160,  160,  160,  160,  160,  160,  160,
+      160,  160,  160,  160,  165,  165,  219,  165,  165,  165,
+      165,  165,  165,  165,  165,  165,  165,  165,  178,  178,
+      178,  178,  178,  178,  219,  178,  219,  178,  178,  178,
+
+      178,  178,  179,  179,  219,  179,  179,  179,  179,  179,
+      179,  179,  179,  179,  179,  179,  182,  182,  219,  182,
+      182,  182,  182,  182,  182,  182,  182,  182,  182,  182,
+      185,  185,  185,  185,  185,  185,  185,  185,  185,  185,
+      185,  185,  185,  185,  186,  186,  219,  186,  186,  186,
+      186,  186,  186,  186,  186,  186,  186,  186,  188,  188,
+      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
+      188,  188,  189,  189,  219,  189,  189,  189,  189,  189,
+      189,  189,  189,  189,  189,  189,  191,  191,  191,  191,
+      191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
+
+      192,  192,  219,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  199,  199,  219,  199,  199,  199,
+      199,  199,  199,  199,  199,  199,  199,  199,  202,  202,
+      219,  202,  202,  202,  202,  202,  202,  202,  202,  202,
+      202,  202,   15,  219,  219,  219,  219,  219,  219,  219,
+      219,  219,  219,  219,  219,  219,  219,  219,  219,  219,
+      219,  219,  219,  219,  219,  219,  219,  219,  219,  219,
+      219,  219,  219,  219,  219,  219,  219,  219,  219,  219,
+      219,  219,  219,  219,  219,  219,  219
     } ;
 
-static const flex_int16_t yy_chk[229] =
+static const flex_int32_t yy_chk[1388] =
     {   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,   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
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    2,  248,   17,    2,   17,   17,
+        2,    3,    3,    3,    3,   19,    8,   19,   19,    8,
+        3,   36,    8,   36,   36,    3,    4,    4,    4,    4,
+      247,   44,    4,   44,   44,    4,    5,    5,    5,    5,
+        4,    9,    9,    9,    9,    5,   23,   23,   23,  199,
+        5,    6,    6,    6,    6,    9,  195,    6,    8,   22,
+
+        6,   22,   22,   22,   24,    6,   61,   39,   61,   24,
+      190,   26,   39,   26,   26,   26,   46,   54,  120,   26,
+      120,   46,   54,    9,   10,   10,   10,   10,   26,   32,
+       10,   32,   32,  187,   33,   32,   33,   33,   10,  201,
+       33,   34,  201,   40,   34,   40,   40,   41,  183,   40,
+       41,   60,  183,   60,   60,  184,   34,   34,   34,   69,
+       69,   69,   41,   41,   41,  182,   10,   11,   11,   11,
+       11,  181,   11,   48,   34,   48,   48,   98,   11,   48,
+       41,   11,   98,   67,   49,   67,   67,   49,   63,   57,
+       63,  180,   57,   95,   11,   95,   95,   63,  170,   49,
+
+       49,   49,   63,  163,   57,   57,   57,  126,  126,   11,
+       12,   12,   12,   12,  158,   12,   12,   49,  121,  152,
+      121,   12,   57,   65,   12,   65,   65,  121,   71,   65,
+       71,   71,   71,   77,  150,   77,   71,   12,   77,   77,
+       77,   80,   80,   80,   80,   71,  167,  167,   90,   80,
+      149,   90,   12,   13,   13,   13,   13,   13,   76,   13,
+       76,   76,   76,   90,   90,   90,   76,   89,   13,   89,
+       89,   91,  148,   89,   91,   76,   99,  129,   99,   99,
+       13,   90,   99,  143,  143,  143,   91,   91,   91,  176,
+      176,  176,   13,   14,   14,   14,   14,   14,   92,   14,
+
+       14,   92,  102,  118,   91,  102,  100,  147,   14,  100,
+      147,  116,  147,   92,   92,   92,  113,  102,  102,  102,
+       14,  100,  100,  100,  107,  151,  107,  107,  151,  112,
+      151,  101,   14,   25,  101,   25,   25,   25,  107,  100,
+      119,   25,  119,  119,  232,  232,  101,  101,  101,  137,
+       25,  137,  109,  110,  175,  109,  175,   25,   28,   28,
+       28,   28,  117,  108,  101,  117,   28,  109,  109,  109,
+      191,  106,  191,   28,   28,   28,   28,  117,  117,  117,
+      133,  137,  133,  133,   28,   64,  133,   64,  175,  104,
+      202,  144,  144,  144,  202,   64,   64,  103,  144,   64,
+
+      155,   96,  155,  155,   64,  204,   64,  144,  204,   64,
+      136,   64,  136,  136,   64,   64,   64,   64,   66,  205,
+       66,   66,  205,  237,  237,  136,  136,  136,  156,  206,
+      156,  156,  206,   66,   66,   66,  138,  186,  138,  186,
+      186,  138,  138,  138,  249,  249,  154,  154,  154,  154,
+       93,   66,   72,   72,   72,  154,   88,   83,   72,   72,
+      154,  174,   79,  174,  174,   74,  174,   72,   72,   82,
+       82,   82,   82,  165,  165,   73,  165,   82,  160,  165,
+      160,  160,   68,  160,   82,   82,   82,   82,  198,  160,
+      198,  209,   56,  209,  209,   82,  114,   55,  114,  114,
+
+      165,  114,   51,   47,   42,  160,  161,  114,  161,  161,
+      114,  161,  165,  166,  166,   38,  166,  161,  198,  166,
+       37,   31,   29,  114,  122,  122,  189,  122,  189,  189,
+      122,  189,   27,  161,  177,  177,  177,  189,   18,  122,
+      166,  177,  210,   15,    7,  210,    0,    0,    0,    0,
+      177,  122,  166,  189,    0,    0,    0,  210,  210,  210,
+        0,    0,    0,  122,  128,  128,  128,    0,    0,  128,
+      128,  128,  128,  128,    0,    0,    0,    0,  128,  128,
+      128,  128,  128,  128,  128,  128,  128,  131,  131,  131,
+        0,    0,  131,  131,  131,  131,  131,    0,    0,    0,
+
+        0,  131,  131,  131,  131,  131,  131,  131,  131,  131,
+      134,    0,  134,  134,  192,  192,  211,  192,    0,  211,
+      192,  214,    0,  214,  214,  134,  134,  134,    0,    0,
+        0,  211,  211,  211,    0,    0,  214,  214,  214,    0,
+        0,  192,    0,  134,  135,    0,  135,  135,    0,    0,
+        0,    0,    0,  192,    0,    0,    0,    0,    0,  135,
+      135,  135,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  135,  159,  159,
+      159,  159,    0,  159,    0,    0,    0,  159,    0,  159,
+        0,    0,  159,    0,    0,    0,    0,    0,    0,    0,
+
+        0,    0,    0,    0,    0,  159,  164,  164,  164,  164,
+        0,    0,  164,    0,    0,    0,  164,    0,    0,    0,
+        0,  164,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,  164,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,  164,  168,  168,  168,    0,
+        0,  168,  168,  168,  168,  168,    0,    0,    0,    0,
+      168,  168,  168,  168,  168,  168,  168,  168,  168,  171,
+      171,  171,    0,    0,  171,  171,  171,  171,  171,    0,
+        0,    0,    0,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  194,  194,  194,    0,    0,  194,  194,  194,
+
+      194,  194,    0,    0,    0,    0,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  196,  196,  196,    0,    0,
+      196,  196,  196,  196,  196,    0,    0,    0,    0,  196,
+      196,  196,  196,  196,  196,  196,  196,  196,  207,  207,
+      207,    0,    0,  207,  207,  207,  207,  207,    0,    0,
+        0,    0,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  208,  208,  208,    0,    0,  208,  208,  208,  208,
+      208,    0,    0,    0,    0,  208,  208,  208,  208,  208,
+      208,  208,  208,  208,  212,  212,  212,    0,    0,  212,
+      212,  212,  212,  212,    0,    0,    0,    0,  212,  212,
+
+      212,  212,  212,  212,  212,  212,  212,  215,  215,  215,
+        0,    0,  215,  215,  215,  215,  215,    0,    0,    0,
+        0,  215,  215,  215,  215,  215,  215,  215,  215,  215,
+      216,  216,  216,    0,    0,  216,  216,  216,  216,  216,
+        0,    0,    0,    0,  216,  216,  216,  216,  216,  216,
+      216,  216,  216,  217,  217,  217,    0,    0,  217,  217,
+      217,  217,  217,    0,    0,    0,    0,  217,  217,  217,
+      217,  217,  217,  217,  217,  217,  220,  220,  220,  220,
+      220,  220,  220,  220,  220,  220,  220,  220,  220,  220,
+      221,  221,  221,  221,  221,  221,  221,  221,  221,  221,
+
+      221,  221,  221,  221,  222,  222,  222,  222,  222,  222,
+      222,  222,  222,  222,  222,  222,  222,  222,  223,  223,
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+      223,  223,  224,  224,    0,    0,  224,    0,    0,    0,
+      224,  224,  224,  224,  224,  225,  225,    0,  225,  226,
+      226,    0,  226,  226,  226,    0,  226,  226,  226,  226,
+      226,  226,  226,  227,    0,    0,  227,  227,  227,  227,
+      227,  227,  227,  227,  227,  227,  227,  228,    0,    0,
+      228,    0,  228,  228,    0,  228,  228,  228,  228,  228,
+      228,  229,    0,  229,    0,  229,  229,  229,  229,  229,
+
+      229,  229,    0,  229,  230,  230,    0,  230,  230,  230,
+      230,  230,  230,  230,  230,  230,  230,  230,  231,  231,
+        0,  231,  231,  231,  231,  231,  231,  231,  231,  231,
+      231,  231,  233,  233,    0,  233,  233,  233,  233,  233,
+      233,  233,  233,  233,  233,  233,  234,  234,    0,  234,
+      234,  234,  234,  234,  234,  234,  234,  234,  234,  234,
+      235,  235,    0,  235,  235,  235,  235,  235,  235,  235,
+      235,  235,  235,  235,  236,  236,    0,  236,  236,  236,
+      236,  236,  236,  236,  236,  236,  236,  236,  238,  238,
+      238,  238,  238,  238,    0,  238,    0,  238,  238,  238,
+
+      238,  238,  239,  239,    0,  239,  239,  239,  239,  239,
+      239,  239,  239,  239,  239,  239,  240,  240,    0,  240,
+      240,  240,  240,  240,  240,  240,  240,  240,  240,  240,
+      241,  241,  241,  241,  241,  241,  241,  241,  241,  241,
+      241,  241,  241,  241,  242,  242,    0,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  243,  243,
+      243,  243,  243,  243,  243,  243,  243,  243,  243,  243,
+      243,  243,  244,  244,    0,  244,  244,  244,  244,  244,
+      244,  244,  244,  244,  244,  244,  245,  245,  245,  245,
+      245,  245,  245,  245,  245,  245,  245,  245,  245,  245,
+
+      246,  246,    0,  246,  246,  246,  246,  246,  246,  246,
+      246,  246,  246,  246,  250,  250,    0,  250,  250,  250,
+      250,  250,  250,  250,  250,  250,  250,  250,  251,  251,
+        0,  251,  251,  251,  251,  251,  251,  251,  251,  251,
+      251,  251,  219,  219,  219,  219,  219,  219,  219,  219,
+      219,  219,  219,  219,  219,  219,  219,  219,  219,  219,
+      219,  219,  219,  219,  219,  219,  219,  219,  219,  219,
+      219,  219,  219,  219,  219,  219,  219,  219,  219,  219,
+      219,  219,  219,  219,  219,  219,  219
     } ;
 
 static yy_state_type yy_last_accepting_state;
 static char *yy_last_accepting_cpos;
 
 extern int yy_flex_debug;
-int yy_flex_debug = 0;
+int yy_flex_debug = 1;
+
+static const flex_int32_t yy_rule_linenum[51] =
+    {   0,
+      130,  144,  145,  152,  153,  154,  161,  180,  193,  203,
+      210,  211,  223,  224,  232,  243,  253,  261,  279,  302,
+      330,  335,  339,  344,  350,  351,  356,  362,  387,  392,
+      398,  399,  414,  419,  427,  432,  438,  448,  453,  457,
+      462,  468,  481,  514,  524,  527,  541,  542,  548,  562
+    } ;
 
 /* The intent behind this definition is that it'll catch
  * any uses of REJECT which flex missed.
  */
 #define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
+static int yy_more_flag = 0;
+static int yy_more_len = 0;
+#define yymore() ((yy_more_flag) = 1)
+#define YY_MORE_ADJ (yy_more_len)
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
 #line 1 "src/Slice/Scanner.l"
-#line 2 "src/Slice/Scanner.l"
-
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#include <Slice/GrammarUtil.h>  // Before Grammer.h, so that YYSTYPE is defined
-#include <Slice/Grammar.h>
-#include <IceUtil/InputUtil.h>
-
-#include <iomanip>
-
-#include <stdlib.h>
-#include <math.h>
-
-#if defined(_MSC_VER)
-// '<' : signed/unsigned mismatch
-#   pragma warning(disable:4018)
-// 'initializing' : conversion from '__int64' to 'int', possible loss of data
-#   pragma warning(disable:4244)
 
-#   if 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(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
+#line 17 "src/Slice/Scanner.l"
 
-#ifdef _MSC_VER
-#   ifdef slice_wrap
-#      undef slice_wrap
-#      define slice_wrap() 1
-#   endif
-#   define YY_NO_UNISTD_H
-#endif
+#include "GrammarUtil.h"
+#include "Grammar.h"
 
-#ifdef __SUNPRO_CC
-#   ifdef slice_wrap
-#      undef slice_wrap
-#      define slice_wrap() 1
-#   endif
-#   ifdef ICE_64
-#       pragma error_messages(off,truncwarn)
-#   endif
-#endif
+#include <iostream>
+#include <cstdlib>
+#include <cmath>
 
 using namespace std;
 using namespace Slice;
 
 namespace Slice
 {
+    // Definitions for the case-insensitive keyword-token map.
+    using StringTokenMap = map<string, int>;
+    StringTokenMap keywordMap;
 
-//
-// Definitions for the case-insensitive keyword-token map.
-//
-typedef std::map<std::string, int> StringTokenMap;
-static StringTokenMap keywordMap;
+    int checkKeyword(string& identifier);
+    int checkIsScoped(const string& identifier);
+}
 
-void initScanner();
-int checkKeyword(string&);
-int checkIdentifier(string&);
+// Stores the scanner's current column position. Flex also automatically
+// generates 'yylineno', which stores the scanner's current line number.
+int yycolno = 0;
+// Stores a copy of the filename that the scanner is currently scanning.
+string yyfilename;
 
+namespace
+{
+    void nextLine(int count = 1);
+    int scanPosition(const char* s);
+    void setLocation(TokenContext* location);
+    void startLocation(TokenContext* location);
+    void endLocation(TokenContext* location);
+
+    void initScanner();
+    void preAction();
+    void pushState(int newState);
+    void popState();
+
+    void yynoreturn fatalError(const char* msg);
 }
 
+// Override some of the functions flex auto-generates with our own implementations.
 #define YY_USER_INIT initScanner();
+#define YY_USER_ACTION preAction();
+#define YY_FATAL_ERROR(msg) fatalError(msg);
+
+#line 1260 "src/Slice/Scanner.cpp"
+#line 68 "src/Slice/Scanner.l"
+  /* Changes the default prefix of 'yy' to 'slice_' for functions and variables in the generated code. */
+  /* Instructs flex to not suppress any warnings when generating the scanner. */
+  /* Instructs flex to generate a scanner that supports verbose outputting (debug mode). */
+  /* By default flex will 'default match' any text it encounters that doesn't match any specified rules. This
+   * option disables default-matching (it throws 'scanner jammed' instead) to make grammar holes more obvious. */
+  /* Directs flex to generate a scanner tailored for use by bison, and that supports bison's token location mechanism.
+   * These options change the signature of the main lexing function, which must match the one declared in Grammar.y */
+  /* Enables the use of flex's built in start-condition state stack. */
+  /* Ensures flex generates a scanner that supports reading 8-bit characters. */
+  /* Directs flex to generate lookup tables that are better aligned in memory to
+   * improve access speeds, even if this means allocating larger tables. */
+  /* Enables batching for improved performance. */
+  /* Directs flex to store matched text as 'char *' instead of char arrays, for improved performance. */
+  /* Disables the scanner's interactive modes for improved performance. */
+  /* Disables the generation of functions we don't use to reduce clutter, and possibly improve performance. */
+#define YY_NO_INPUT 1
+  /* List of start-condition states the scanner can be in. This lets the scanning be context dependent. */
+
 
-#line 857 "src/Slice/Scanner.cpp"
 
-#line 859 "src/Slice/Scanner.cpp"
+
+
+
+  /* The scanner also has a built in 'INITIAL' start-condition state, which is the state the scanner is initialized in.
+   * We use it solely to check for and consume any BOMs at the start of files. See Bug 3140. */
+#line 1287 "src/Slice/Scanner.cpp"
 
 #define INITIAL 0
-#define BOMSCAN 1
-#define MAINSCAN 2
+#define C_COMMENT 1
+#define C_DOC_COMMENT 2
+#define SLICE 3
+#define PREPROCESS 4
+#define METADATA 5
+#define STRING_LITERAL 6
 
 #ifndef YY_NO_UNISTD_H
 /* Special case for "unistd.h", since it is non-ANSI. We include it way
  * down here because we want the user's section 1 to have been scanned first.
  * The user has a chance to override it with an option.
  */
+/* %if-c-only */
 #include <unistd.h>
+/* %endif */
+/* %if-c++-only */
+/* %endif */
 #endif
 
 #ifndef YY_EXTRA_TYPE
 #define YY_EXTRA_TYPE void *
 #endif
 
+/* %if-c-only Reentrant structure and macros (non-C++). */
+/* %if-reentrant */
+/* %if-c-only */
+
 static int yy_init_globals ( void );
 
+/* %endif */
+/* %if-reentrant */
+/* %endif */
+/* %endif End reentrant structures and macros. */
+
 /* Accessor methods to globals.
    These are made visible to non-reentrant scanners for convenience. */
 
 int yylex_destroy ( void );
 
-int yyget_debug ( void );
-
-void yyset_debug ( int debug_flag  );
-
-YY_EXTRA_TYPE yyget_extra ( void );
-
-void yyset_extra ( YY_EXTRA_TYPE user_defined  );
-
-FILE *yyget_in ( void );
-
-void yyset_in  ( FILE * _in_str  );
-
-FILE *yyget_out ( void );
-
-void yyset_out  ( FILE * _out_str  );
+/* %if-bison-bridge */
 
-			int yyget_leng ( void );
+void yyset_lval ( YYSTYPE * yylval_param  );
 
-char *yyget_text ( void );
-
-int yyget_lineno ( void );
-
-void yyset_lineno ( int _line_number  );
+/* %endif */
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -918,11 +1344,13 @@ extern int yywrap ( void );
 #endif
 #endif
 
+/* %not-for-header */
 #ifndef YY_NO_UNPUT
     
-    static void yyunput ( int c, char *buf_ptr  );
-    
 #endif
+/* %ok-for-header */
+
+/* %endif */
 
 #ifndef yytext_ptr
 static void yy_flex_strncpy ( char *, const char *, int );
@@ -933,14 +1361,32 @@ static int yy_flex_strlen ( const char * );
 #endif
 
 #ifndef YY_NO_INPUT
+/* %if-c-only Standard (non-C++) definition */
+/* %not-for-header */
 #ifdef __cplusplus
 static int yyinput ( void );
 #else
 static int input ( void );
 #endif
+/* %ok-for-header */
 
+/* %endif */
 #endif
 
+/* %if-c-only */
+
+        static int yy_start_stack_ptr = 0;
+        static int yy_start_stack_depth = 0;
+        static int *yy_start_stack = NULL;
+    
+    static void yy_push_state ( int _new_state );
+    
+    static void yy_pop_state ( void );
+    
+    static int yy_top_state ( void );
+    
+/* %endif */
+
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
 #ifdef __ia64__
@@ -953,10 +1399,14 @@ static int input ( void );
 
 /* Copy whatever the last rule matched to the standard output. */
 #ifndef ECHO
+/* %if-c-only Standard (non-C++) definition */
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
 #define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0)
+/* %endif */
+/* %if-c++-only C++ definition */
+/* %endif */
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -964,6 +1414,7 @@ static int input ( void );
  */
 #ifndef YY_INPUT
 #define YY_INPUT(buf,result,max_size) \
+/* %% [5.0] fread()/read() definition of YY_INPUT goes here unless we're doing C++ \ */\
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
@@ -992,6 +1443,8 @@ static int input ( void );
 			} \
 		}\
 \
+/* %if-c++-only C++ definition \ */\
+/* %endif */
 
 #endif
 
@@ -1010,20 +1463,39 @@ static int input ( void );
 
 /* Report a fatal error. */
 #ifndef YY_FATAL_ERROR
+/* %if-c-only */
 #define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
+/* %endif */
+/* %if-c++-only */
+/* %endif */
 #endif
 
+/* %if-tables-serialization structures and prototypes */
+/* %not-for-header */
+/* %ok-for-header */
+
+/* %not-for-header */
+/* %tables-yydmap generated elements */
+/* %endif */
 /* end tables serialization structures and prototypes */
 
+/* %ok-for-header */
+
 /* Default declaration of generated scanner - a define so the user can
  * easily add parameters.
  */
 #ifndef YY_DECL
 #define YY_DECL_IS_OURS 1
+/* %if-c-only Standard (non-C++) definition */
 
-extern int yylex (void);
+extern int yylex \
+               (YYSTYPE * yylval_param, YYLTYPE * yylloc_param );
 
-#define YY_DECL int yylex (void)
+#define YY_DECL int yylex \
+               (YYSTYPE * yylval_param, YYLTYPE * yylloc_param )
+/* %endif */
+/* %if-c++-only C++ definition */
+/* %endif */
 #endif /* !YY_DECL */
 
 /* Code executed at the beginning of each rule, after yytext and yyleng
@@ -1038,12 +1510,14 @@ extern int yylex (void);
 #define YY_BREAK /*LINTED*/break;
 #endif
 
+/* %% [6.0] YY_RULE_SETUP definition goes here */
 #define YY_RULE_SETUP \
 	if ( yyleng > 0 ) \
 		YY_CURRENT_BUFFER_LVALUE->yy_at_bol = \
 				(yytext[yyleng - 1] == '\n'); \
 	YY_USER_ACTION
 
+/* %not-for-header */
 /** The main scanner function which does all the work.
  */
 YY_DECL
@@ -1052,6 +1526,14 @@ YY_DECL
 	char *yy_cp, *yy_bp;
 	int yy_act;
     
+        YYSTYPE * yylval;
+    
+        YYLTYPE * yylloc;
+    
+    yylval = yylval_param;
+
+    yylloc = yylloc_param;
+
 	if ( !(yy_init) )
 		{
 		(yy_init) = 1;
@@ -1064,10 +1546,18 @@ YY_DECL
 			(yy_start) = 1;	/* first start state */
 
 		if ( ! yyin )
+/* %if-c-only */
 			yyin = stdin;
+/* %endif */
+/* %if-c++-only */
+/* %endif */
 
 		if ( ! yyout )
+/* %if-c-only */
 			yyout = stdout;
+/* %endif */
+/* %if-c++-only */
+/* %endif */
 
 		if ( ! YY_CURRENT_BUFFER ) {
 			yyensure_buffer_stack ();
@@ -1079,13 +1569,23 @@ YY_DECL
 		}
 
 	{
-#line 96 "src/Slice/Scanner.l"
+/* %% [7.0] user's declarations go here */
+#line 126 "src/Slice/Scanner.l"
 
 
-#line 1084 "src/Slice/Scanner.cpp"
+  /* ========== Literals ========== */
+  /* Matches the start of a double-quoted string literal. */
+#line 1578 "src/Slice/Scanner.cpp"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
+/* %% [8.0] yymore()-related code goes here */
+		(yy_more_len) = 0;
+		if ( (yy_more_flag) )
+			{
+			(yy_more_len) = (int) ((yy_c_buf_p) - (yytext_ptr));
+			(yy_more_flag) = 0;
+			}
 		yy_cp = (yy_c_buf_p);
 
 		/* Support of yytext. */
@@ -1096,6 +1596,7 @@ YY_DECL
 		 */
 		yy_bp = yy_cp;
 
+/* %% [9.0] code to set up and find next match goes here */
 		yy_current_state = (yy_start);
 		yy_current_state += YY_AT_BOL();
 yy_match:
@@ -1110,25 +1611,46 @@ 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 >= 76 )
+				if ( yy_current_state >= 220 )
 					yy_c = yy_meta[yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 			++yy_cp;
 			}
-		while ( yy_current_state != 75 );
+		while ( yy_current_state != 219 );
 		yy_cp = (yy_last_accepting_cpos);
 		yy_current_state = (yy_last_accepting_state);
 
 yy_find_action:
+/* %% [10.0] code to find the action number goes here */
 		yy_act = yy_accept[yy_current_state];
 
 		YY_DO_BEFORE_ACTION;
 
+/* %% [11.0] code for yylineno update goes here */
+
 do_action:	/* This label is used only to access EOF actions. */
 
+/* %% [12.0] debug code goes here */
+		if ( yy_flex_debug )
+			{
+			if ( yy_act == 0 )
+				fprintf( stderr, "--scanner backing up\n" );
+			else if ( yy_act < 51 )
+				fprintf( stderr, "--accepting rule at line %ld (\"%s\")\n",
+				         (long)yy_rule_linenum[yy_act], yytext );
+			else if ( yy_act == 51 )
+				fprintf( stderr, "--accepting default rule (\"%s\")\n",
+				         yytext );
+			else if ( yy_act == 52 )
+				fprintf( stderr, "--(end of buffer or a NUL)\n" );
+			else
+				fprintf( stderr, "--EOF (start condition %d)\n", YY_START );
+			}
+
 		switch ( yy_act )
 	{ /* beginning of action switch */
+/* %% [13.0] actions go here */
 			case 0: /* must back up */
 			/* undo the effects of YY_DO_BEFORE_ACTION */
 			*yy_cp = (yy_hold_char);
@@ -1137,518 +1659,599 @@ 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 yytext */
-(yy_c_buf_p) = yy_cp -= 1;
-YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 98 "src/Slice/Scanner.l"
+#line 130 "src/Slice/Scanner.l"
 {
-    if(unit->scanPosition(yytext))
-    {
-        BEGIN(BOMSCAN);
-    }
+    pushState(STRING_LITERAL);
+    startLocation(yylloc);
+
+    StringTokPtr str = make_shared<StringTok>();
+    str->literal = "\"";
+    *yylval = str;
 }
 	YY_BREAK
+/* Matches a single escaped backslash, or as many characters as it can,
+   * except backslashes, new-lines, double quotes, and non-printable ASCII characters. */
+/* Matches Escaped backslashes and any other valid string characters. Invalid characters are
+   * new-lines, non-printable ASCII characters, and double-quotes. */
 case 2:
-/* rule 2 can match eol */
-*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 yytext again */
+#line 145 "src/Slice/Scanner.l"
+case 3:
 YY_RULE_SETUP
-#line 105 "src/Slice/Scanner.l"
+#line 145 "src/Slice/Scanner.l"
 {
-    if(unit->scanPosition(yytext))
-    {
-        BEGIN(BOMSCAN);
-    }
+    StringTokPtr str = dynamic_pointer_cast<StringTok>(*yylval);
+    str->literal += yytext;
+    str->v += yytext;
 }
 	YY_BREAK
-case 3:
-*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
-(yy_c_buf_p) = yy_cp -= 1;
-YY_DO_BEFORE_ACTION; /* set up yytext again */
+/* Matches an escaped double-quote, single-quote, or question mark. */
+case 4:
+#line 153 "src/Slice/Scanner.l"
+case 5:
+#line 154 "src/Slice/Scanner.l"
+case 6:
 YY_RULE_SETUP
-#line 112 "src/Slice/Scanner.l"
+#line 154 "src/Slice/Scanner.l"
 {
-    if(unit->scanPosition(yytext))
-    {
-        BEGIN(BOMSCAN);
-    }
+    StringTokPtr str = dynamic_pointer_cast<StringTok>(*yylval);
+    str->literal += yytext;
+    str->v += yytext[1];
 }
 	YY_BREAK
-case 4:
-/* rule 4 can match eol */
-*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 yytext again */
+/* Matches an ANSI-C escape code pattern. */
+case 7:
 YY_RULE_SETUP
-#line 119 "src/Slice/Scanner.l"
+#line 161 "src/Slice/Scanner.l"
 {
-    if(unit->scanPosition(yytext))
+    StringTokPtr str = dynamic_pointer_cast<StringTok>(*yylval);
+    char ansiCode;
+    switch(yytext[1])
     {
-        BEGIN(BOMSCAN);
+        case 'a': ansiCode = '\a'; break;
+        case 'b': ansiCode = '\b'; break;
+        case 'f': ansiCode = '\f'; break;
+        case 'n': ansiCode = '\n'; break;
+        case 'r': ansiCode = '\r'; break;
+        case 't': ansiCode = '\t'; break;
+        case 'v': ansiCode = '\v'; break;
+        default: ansiCode = '\0'; assert(false);
     }
+    str->literal += yytext;
+    str->v += ansiCode;
 }
 	YY_BREAK
-case 5:
+/* Matches an escaped octal value. Octal literals are limited to a max of 3 digits. */
+case 8:
 YY_RULE_SETUP
-#line 126 "src/Slice/Scanner.l"
+#line 180 "src/Slice/Scanner.l"
 {
-    // C++-style comment
-    BEGIN(MAINSCAN);
-    int c;
-    do
+    int64_t value = std::stoll((yytext + 1), nullptr, 8);
+    if (value > 255)
     {
-        c = yyinput();
-        if(c == '\n')
-        {
-            unit->nextLine();
-        }
+        currentUnit->error("octal escape sequence out of range: '\\" + string(yytext + 1) + "'");
     }
-    while(c != '\n' && c != EOF);
+
+    StringTokPtr str = dynamic_pointer_cast<StringTok>(*yylval);
+    str->literal += yytext;
+    str->v += static_cast<char>(value);
 }
 	YY_BREAK
-case 6:
+/* Matches an escaped hexadecimal value. Hexadecimal literals are limited to a max of 2 digits. */
+case 9:
 YY_RULE_SETUP
-#line 141 "src/Slice/Scanner.l"
+#line 193 "src/Slice/Scanner.l"
 {
-    // C-style comment
-    BEGIN(MAINSCAN);
-    string comment = yytext + 2;
-    while(true)
-    {
-        int c = yyinput();
-        if(c == '\n')
-        {
-            comment += static_cast<char>(c);
-            unit->nextLine();
-        }
-        else if(c == '*')
-        {
-            int next = yyinput();
-            if(next == '/')
-            {
-                break;
-            }
-            else
-            {
-                comment += static_cast<char>(c);
-                unput(next);
-            }
-        }
-        else if(c == EOF)
-        {
-            unit->warning(All, "EOF in comment");
-            break;
-        }
-        else
-        {
-            comment += static_cast<char>(c);
-        }
-    }
-    if(!comment.empty() && comment[0] == '*')
-    {
-        unit->setComment(comment);
-    }
+    int64_t value = std::stoll((yytext + 2), nullptr, 16);
+    assert(value <= 255);
+
+    StringTokPtr str = dynamic_pointer_cast<StringTok>(*yylval);
+    str->literal += yytext;
+    str->v += static_cast<char>(value);
 }
 	YY_BREAK
-case 7:
+/* Matches an empty hexadecimal escape value. */
+case 10:
 YY_RULE_SETUP
-#line 182 "src/Slice/Scanner.l"
+#line 203 "src/Slice/Scanner.l"
 {
-    BEGIN(MAINSCAN);
-    return ICE_METADATA_OPEN;
+    currentUnit->error("no hex digit in hex escape sequence");
+    StringTokPtr str = dynamic_pointer_cast<StringTok>(*yylval);
+    str->literal += yytext;
 }
 	YY_BREAK
-case 8:
+/* Matches a 4-char or 8-char size universal character code. */
+case 11:
+#line 211 "src/Slice/Scanner.l"
+case 12:
 YY_RULE_SETUP
-#line 187 "src/Slice/Scanner.l"
+#line 211 "src/Slice/Scanner.l"
 {
-    BEGIN(MAINSCAN);
-    return ICE_METADATA_CLOSE;
+    int64_t codePoint = std::stoll((yytext + 2), nullptr, 16);
+    if (codePoint <= 0xdfff && codePoint >= 0xd800)
+    {
+        currentUnit->error("a universal character name cannot designate a surrogate: '" + string(yytext) + "'");
+    }
+    StringTokPtr str = dynamic_pointer_cast<StringTok>(*yylval);
+    str->literal += yytext;
+    str->v += yytext;
 }
 	YY_BREAK
-case 9:
+/* Matches a universal character code that isn't the correct size, or uses incorrect characters. */
+case 13:
+#line 224 "src/Slice/Scanner.l"
+case 14:
 YY_RULE_SETUP
-#line 192 "src/Slice/Scanner.l"
+#line 224 "src/Slice/Scanner.l"
 {
-    BEGIN(MAINSCAN);
-    return ICE_GLOBAL_METADATA_OPEN;
+    currentUnit->error("unknown escape sequence in string literal: '" + string(yytext) + "'");
+    StringTokPtr str = dynamic_pointer_cast<StringTok>(*yylval);
+    str->literal += yytext;
+    str->v += yytext;
 }
 	YY_BREAK
-case 10:
+/* Matches an unescaped newline in a string literal, and issues an error. */
+case 15:
+/* rule 15 can match eol */
 YY_RULE_SETUP
-#line 197 "src/Slice/Scanner.l"
+#line 232 "src/Slice/Scanner.l"
 {
-    BEGIN(MAINSCAN);
-    return ICE_GLOBAL_METADATA_CLOSE;
+    popState();
+    endLocation(yylloc);
+    nextLine();
+
+    currentUnit->error("encountered un-escaped EOL while scanning a string literal.");
+    return ICE_STRING_LITERAL;
 }
 	YY_BREAK
-case 11:
-/* rule 11 can match eol */
+/* Matches an unknown escape value. This rule has a lower priority than all the other escape rules because
+   * it only matches 2 characters (the lowest any match), and it's beneath the others. */
+case 16:
 YY_RULE_SETUP
-#line 202 "src/Slice/Scanner.l"
+#line 243 "src/Slice/Scanner.l"
 {
-    BEGIN(MAINSCAN);
-    StringTokPtr ident = new StringTok;
-    ident->v = *yytext == '\\' ? yytext + 1 : yytext;
-    ident->v.erase(ident->v.find_first_of(" \t\v\n\r\f("));
-    *yylvalp = ident;
-    if(*yytext == '\\')
-    {
-        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);
-    if(st == ICE_IDENTIFIER)
-    {
-        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;
-    }
-    else
-    {
-        return ICE_KEYWORD_OP;
-    }
+    currentUnit->warning(All, "unknown escape sequence in string literal: '" + string{yytext} + "'");
+
+    StringTokPtr str = dynamic_pointer_cast<StringTok>(*yylval);
+    // Escape the entire sequence.
+    str->literal += yytext;
+    str->v += "\\" + string(yytext);
 }
 	YY_BREAK
-case 12:
+/* Matches a dangling backslash, with nothing to escape. This rule is mostly included for grammar completeness. */
+case 17:
 YY_RULE_SETUP
-#line 236 "src/Slice/Scanner.l"
+#line 253 "src/Slice/Scanner.l"
 {
-    BEGIN(MAINSCAN);
-    StringTokPtr ident = new StringTok;
-    ident->v = *yytext == '\\' ? yytext + 1 : yytext;
-    *yylvalp = ident;
-    return *yytext == '\\' ? checkIdentifier(ident->v) : checkKeyword(ident->v);
+    currentUnit->warning(All, "dangling backslash in string literal");
+    StringTokPtr str = dynamic_pointer_cast<StringTok>(*yylval);
+    str->literal += yytext;
 }
 	YY_BREAK
-case 13:
+/* Matches the end of a double-quoted string literal, but only while scanning a string literal. Flex always prefers
+   * to match the longest string it can, so quotes preceeded with a literal '\' will match the rules above this one. */
+case 18:
 YY_RULE_SETUP
-#line 244 "src/Slice/Scanner.l"
+#line 261 "src/Slice/Scanner.l"
 {
-    BEGIN(MAINSCAN);
-    StringTokPtr str = new StringTok;
-    str->literal = "\"";
-    while(true)
-    {
-        int c = yyinput();
-        str->literal += static_cast<char>(c);
-        if(c == '"')
-        {
-            break;
-        }
-        else if(c == EOF)
-        {
-            unit->error("EOF in string");
-            break;
-        }
-        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 == '\\')
-        {
-            int next = yyinput();
-            str->literal += static_cast<char>(next);
-            switch(next)
-            {
-                case '\\':
-                {
-                    //
-                    // add extra escape to our internal string
-                    //
-                    str->v += '\\';
-                    str->v += '\\';
-                    break;
-                }
-                case '"':
-                case '\'':
-                case '?':
-                {
-                    str->v += static_cast<char>(next);
-                    break;
-                }
-                case 'a':
-                {
-                    str->v += '\a';
-                    break;
-                }
-                case 'b':
-                {
-                    str->v += '\b';
-                    break;
-                }
-                case 'f':
-                {
-                    str->v += '\f';
-                    break;
-                }
-                case 'n':
-                {
-                    str->v += '\n';
-                    break;
-                }
-                case 'r':
-                {
-                    str->v += '\r';
-                    break;
-                }
-                case 't':
-                {
-                    str->v += '\t';
-                    break;
-                }
-                case 'v':
-                {
-                    str->v += '\v';
-                    break;
-                }
-
-                //
-                // Octal value \nnn limited to three octal digits but terminate at the first character
-                // that is not a valid octal digit if encountered sooner.
-                //
-                case '0':
-                case '1':
-                case '2':
-                case '3':
-                case '4':
-                case '5':
-                case '6':
-                case '7':
-                {
-                    static string octalDigits = "01234567";
-                    string escape;
-                    escape += static_cast<char>(next);
-                    for(int i = 0; i < 2; ++i)
-                    {
-                        next = yyinput();
-                        if(octalDigits.find_first_of(static_cast<char>(next)) == string::npos)
-                        {
-                            unput(next);
-                            break;
-                        }
-                        escape += static_cast<char>(next);
-                    }
-                    str->literal += escape;
-                    IceUtil::Int64 value = IceUtilInternal::strToInt64(escape.c_str(), 0, 8);
-                    if(value > 255)
-                    {
-                        unit->error(string("octal escape sequence out of range: `\\") + escape + "'");
-                    }
-                    str->v += static_cast<char>(value);
-                    break;
-                }
-
-                case 'x':
-                {
-                    string escape = "";
-                    next = yyinput();
-
-                    //
-                    // Unlike C++, we limit hex escape sequences to 2 hex digits
-                    //
-                    while(isxdigit(static_cast<char>(next)) && escape.length() < 2)
-                    {
-                        escape += static_cast<char>(next);
-                        next = yyinput();
-                    }
-                    unput(next);
-
-                    if(escape.length() == 0)
-                    {
-                        unit->error("no hex digit in hex escape sequence");
-                    }
-
-                    str->literal += escape;
-                    IceUtil::Int64 value = IceUtilInternal::strToInt64(escape.c_str(), 0, 16);
-
-                    assert(value >= 0 && value <= 255);
-                    str->v += static_cast<char>(value);
-                    break;
-                }
+    popState();
+    endLocation(yylloc);
 
-                //
-                // Universal character name
-                //
-                case 'u':
-                case 'U':
-                {
-                    string escape = "";
-                    c = next;
-                    int size = (c == 'u') ? 4 : 8;
-                    while(size > 0)
-                    {
-                        next = yyinput();
-                        if(!isxdigit(next))
-                        {
-                            unit->error(string("unknown escape sequence in string literal: `\\") +
-                                               static_cast<char>(c) + escape + static_cast<char>(next) + "'");
-                            unput(next);
-                            break;
-                        }
-                        escape += static_cast<char>(next);
-                        --size;
-                    }
-
-                    if(size == 0)
-                    {
-                        // All digits read, check value
-                        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: `\\") +
-                                               static_cast<char>(c) + escape + "'");
-                        }
-                    }
-
-                    str->literal += escape;
-                    str->v += string("\\") + static_cast<char>(c) + escape;
-                    break;
-                }
+    StringTokPtr str = dynamic_pointer_cast<StringTok>(*yylval);
+    str->literal += yytext;
+    return ICE_STRING_LITERAL;
+}
+	YY_BREAK
+/* Matches EOF, but only while scanning a string literal. */
+case YY_STATE_EOF(STRING_LITERAL):
+#line 271 "src/Slice/Scanner.l"
+{
+    popState();
+    endLocation(yylloc);
 
-                default:
-                {
-                    ostringstream os;
-                    os << "unknown escape sequence `\\" << static_cast<char>(next) << "'";
-                    unit->warning(All, os.str());
-
-                    // Escape the \ in this unknown escape sequence
-                    str->v += '\\';
-                    str->v += '\\';
-                    unput(next);
-                }
-            }
-        }
-        else
-        {
-            str->v += static_cast<char>(c);
-        }
-    }
-    *yylvalp = str;
+    currentUnit->error("encountered EOF while scanning a string literal");
     return ICE_STRING_LITERAL;
 }
 	YY_BREAK
-case 14:
+case 19:
 YY_RULE_SETUP
-#line 449 "src/Slice/Scanner.l"
+#line 279 "src/Slice/Scanner.l"
 {
-    BEGIN(MAINSCAN);
-    IntegerTokPtr itp = new IntegerTok;
+    setLocation(yylloc);
+
+    IntegerTokPtr itp = make_shared<IntegerTok>();
     itp->literal = string(yytext);
-    *yylvalp = itp;
-    if(!IceUtilInternal::stringToInt64(string(yytext), itp->v))
+    *yylval = itp;
+    try
+    {
+        itp->v = std::stoll(string(yytext), nullptr, 0);
+    }
+    catch (const std::out_of_range&)
     {
-        assert(itp->v != 0);
-        string msg = "integer constant `";
-        msg += yytext;
-        msg += "' out of range";
-        unit->error(msg);
+        currentUnit->error("integer constant '" + string(yytext) + "' out of range");
+        itp->v = INT64_MAX;
+    }
+    catch (const std::invalid_argument&)
+    {
+        currentUnit->error("invalid integer constant '" + string(yytext) + "'");
+        itp->v = INT64_MAX;
     }
     return ICE_INTEGER_LITERAL;
 }
 	YY_BREAK
-case 15:
+case 20:
 YY_RULE_SETUP
-#line 465 "src/Slice/Scanner.l"
+#line 302 "src/Slice/Scanner.l"
 {
-    BEGIN(MAINSCAN);
+    setLocation(yylloc);
+
     errno = 0;
-    FloatingTokPtr ftp = new FloatingTok;
-    *yylvalp = ftp;
+    FloatingTokPtr ftp = make_shared<FloatingTok>();
+    *yylval = ftp;
     string literal(yytext);
     ftp->literal = literal;
     char lastChar = literal[literal.size() - 1];
-    if(lastChar == 'f' || lastChar == 'F')
+    if (lastChar == 'f' || lastChar == 'F')
     {
         literal = literal.substr(0, literal.size() - 1);    // Clobber trailing 'f' or 'F' suffix
     }
-    ftp->v = strtod(literal.c_str(), 0);
-    if((ftp->v == HUGE_VAL || ftp->v == -HUGE_VAL) && errno == ERANGE)
+    ftp->v = strtod(literal.c_str(), nullptr);
+    if ((ftp->v == HUGE_VAL || ftp->v == -HUGE_VAL) && errno == ERANGE)
     {
-        string msg = "floating-point constant `";
-        msg += yytext;
-        msg += "' too large (overflow)";
-        unit->error(msg);
+        currentUnit->error("floating-point constant '" + string{yytext} + "' too large (overflow)");
     }
-    else if(ftp->v == 0 && errno == ERANGE)
+    else if (ftp->v == 0 && errno == ERANGE)
     {
-        string msg = "floating-point constant `";
-        msg += yytext;
-        msg += "' too small (underflow)";
-    unit->error(msg);
+        currentUnit->error("floating-point constant '" + string{yytext} + "' too small (underflow)");
     }
     return ICE_FLOATING_POINT_LITERAL;
 }
 	YY_BREAK
-case 16:
-/* rule 16 can match eol */
+/* ========== Comments ========== */
+/* Matches and records a triple-slash style doc-comment. */
+case 21:
 YY_RULE_SETUP
-#line 495 "src/Slice/Scanner.l"
+#line 330 "src/Slice/Scanner.l"
 {
-    // Ignore white-space
-
-    if(unit->currentLine() != 0)
-    {
-        BEGIN(MAINSCAN);
-    }
-    if(yytext[0] == '\n')
-    {
-        unit->nextLine();
-    }
+    currentUnit->appendToDocComment(yytext + 3);
 }
 	YY_BREAK
-case 17:
+/* Matches and consumes a C++ style comment. */
+case 22:
 YY_RULE_SETUP
-#line 508 "src/Slice/Scanner.l"
-{
-    // Ignore UTF-8 BOM, rule only active when parsing start of file.
+#line 335 "src/Slice/Scanner.l"
+{}
+	YY_BREAK
+/* Matches the start of a C style doc-comment, and switches the scanner to the C_DOC_COMMENT state.
+   * Specifically we match a forward slash and 2 stars when they are _not_ followed by either a '/' or '*' character. */
+case 23:
+/* rule 23 can match eol */
+*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+YY_LINENO_REWIND_TO(yy_bp + 3);
+(yy_c_buf_p) = yy_cp = yy_bp + 3;
+YY_DO_BEFORE_ACTION; /* set up yytext again */
+YY_RULE_SETUP
+#line 339 "src/Slice/Scanner.l"
+{
+    pushState(C_DOC_COMMENT);
+}
+	YY_BREAK
+/* Matches the start of a C style comment, and switches the scanner to the C_COMMENT state. */
+case 24:
+YY_RULE_SETUP
+#line 344 "src/Slice/Scanner.l"
+{
+    pushState(C_COMMENT);
+}
+	YY_BREAK
+/* Matches any character except for newlines and adds them to the comments. '*' are matched one at a time to ensure
+   * Flex scans '* /' correctly. Flex prioritizes longer matches over shorter ones, so '* /' will match before '*'. */
+case 25:
+#line 351 "src/Slice/Scanner.l"
+case 26:
+YY_RULE_SETUP
+#line 351 "src/Slice/Scanner.l"
+{
+    yymore();
+}
+	YY_BREAK
+/* Matches as many newlines as are available and adds them to the comment, after incrementing the line count. */
+case 27:
+/* rule 27 can match eol */
+YY_RULE_SETUP
+#line 356 "src/Slice/Scanner.l"
+{
+    nextLine(yyleng);
+    yymore();
+}
+	YY_BREAK
+/* Matches the end of a C style comment, and reverts the scanner state to what it previously was. */
+case 28:
+YY_RULE_SETUP
+#line 362 "src/Slice/Scanner.l"
+{
+    string comment(yytext);
+    // The last 2 characters are the '*/' matched by this rule.
+    if (YY_START == C_DOC_COMMENT)
+    {
+        currentUnit->setDocComment(comment.substr(0, yyleng - 2));
+    }
 
-    BEGIN(MAINSCAN);
+    popState();
 }
 	YY_BREAK
-case 18:
+/* Handles reaching EOF while scanning a C style comment by issuing a warning but continuing normally. */
+case YY_STATE_EOF(C_COMMENT):
+case YY_STATE_EOF(C_DOC_COMMENT):
+#line 374 "src/Slice/Scanner.l"
+{
+    currentUnit->error("encountered EOF while scanning a comment");
+    if (YY_START == C_DOC_COMMENT)
+    {
+        currentUnit->setDocComment(yytext);
+    }
+
+    popState();
+}
+	YY_BREAK
+/* ========== Preprocessor Statements ========== */
+/* Matches the empty preprocessor directive. */
+case 29:
 YY_RULE_SETUP
-#line 514 "src/Slice/Scanner.l"
+#line 387 "src/Slice/Scanner.l"
+{
+    pushState(PREPROCESS);
+}
+	YY_BREAK
+/* Matches a line preprocessor directive, but missing a line number. */
+case 30:
+YY_RULE_SETUP
+#line 392 "src/Slice/Scanner.l"
+{
+    pushState(PREPROCESS);
+    currentUnit->error("missing line number in line preprocessor directive");
+}
+	YY_BREAK
+/* Matches a line preprocessor directive (optionally with a file specified afterwards). */
+case 31:
+#line 399 "src/Slice/Scanner.l"
+case 32:
+YY_RULE_SETUP
+#line 399 "src/Slice/Scanner.l"
+{
+    int includeAction = scanPosition(yytext);
+    if (yylineno == 0 || includeAction == 1) // Push: Indicated the scanner has started scanning a new file.
+    {
+        pushState(INITIAL);
+    }
+    else if (includeAction == 2) // Pop: Indicates the scanner has completed scanning a file.
+    {
+        popState();
+    }
+    pushState(PREPROCESS);
+}
+	YY_BREAK
+/* Matches any non white-space character. This is a catch-all to report any invalid characters
+   * found while scanning a preprocessor directive. */
+case 33:
+YY_RULE_SETUP
+#line 414 "src/Slice/Scanner.l"
+{
+    currentUnit->error("encountered unexpected token while scanning preprocessor directive: '" + string(yytext) + "'");
+}
+	YY_BREAK
+/* Matches a new-line character or EOF. This signals the end of the preprocessor statement. */
+case 34:
+/* rule 34 can match eol */
+#line 420 "src/Slice/Scanner.l"
+YY_RULE_SETUP
+case YY_STATE_EOF(PREPROCESS):
+#line 420 "src/Slice/Scanner.l"
+{
+    popState();
+    nextLine();
+}
+	YY_BREAK
+/* ========== Metadata ========== */
+case 35:
+YY_RULE_SETUP
+#line 427 "src/Slice/Scanner.l"
+{
+    pushState(METADATA);
+    return ICE_METADATA_OPEN;
+}
+	YY_BREAK
+case 36:
+YY_RULE_SETUP
+#line 432 "src/Slice/Scanner.l"
+{
+    pushState(METADATA);
+    return ICE_FILE_METADATA_OPEN;
+}
+	YY_BREAK
+/* Matches the start of a metadata string, then switches the scanner into STRING_LITERAL mode. */
+case 37:
+YY_RULE_SETUP
+#line 438 "src/Slice/Scanner.l"
+{
+    pushState(STRING_LITERAL);
+    startLocation(yylloc);
+
+    StringTokPtr str = make_shared<StringTok>();
+    str->literal = "\"";
+    *yylval = str;
+}
+	YY_BREAK
+/* Matches commas between string literals in quoted metadata and forwards them to the parser. */
+case 38:
+YY_RULE_SETUP
+#line 448 "src/Slice/Scanner.l"
+{
+    return yytext[0];
+}
+	YY_BREAK
+/* Matches and consumes newlines in between metadata after incrementing the line count. */
+case 39:
+/* rule 39 can match eol */
+YY_RULE_SETUP
+#line 453 "src/Slice/Scanner.l"
+{
+    nextLine(yyleng);
+}
+	YY_BREAK
+case 40:
+YY_RULE_SETUP
+#line 457 "src/Slice/Scanner.l"
+{
+    popState();
+    return ICE_METADATA_CLOSE;
+}
+	YY_BREAK
+case 41:
+YY_RULE_SETUP
+#line 462 "src/Slice/Scanner.l"
+{
+    popState();
+    return ICE_FILE_METADATA_CLOSE;
+}
+	YY_BREAK
+/* Matches any characters not matched by another metadata rule (except whitespace), and reports an error. */
+case 42:
+YY_RULE_SETUP
+#line 468 "src/Slice/Scanner.l"
+{
+    ostringstream msg;
+    msg << "invalid tokens in metadata: '" << yytext << "' (maybe you forgot to wrap it in quotes?)";
+    currentUnit->error(msg.str());
+
+    StringTokPtr str = make_shared<StringTok>();
+    str->literal = yytext;
+    *yylval = str;
+    return ICE_STRING_LITERAL;
+}
+	YY_BREAK
+/* ========== Identifiers and Keywords ========== */
+case 43:
+/* rule 43 can match eol */
+YY_RULE_SETUP
+#line 481 "src/Slice/Scanner.l"
 {
-    BEGIN(MAINSCAN);
-    if(yytext[0] < 32 || yytext[0] > 126)
+    StringTokPtr ident = make_shared<StringTok>();
+    ident->v = *yytext == '\\' ? yytext + 1 : yytext;
+    ident->v.erase(ident->v.find_first_of(" \t\v\n\r\f("));
+    *yylval = ident;
+    if (*yytext == '\\')
+    {
+        if (checkIsScoped(ident->v) == ICE_SCOPED_IDENTIFIER)
+        {
+            currentUnit->error("Operation identifiers cannot be scoped: '" + (ident->v) + "'");
+        }
+        return ICE_IDENT_OPEN;
+    }
+    int st = checkKeyword(ident->v);
+    if (st == ICE_IDENTIFIER)
+    {
+        return ICE_IDENT_OPEN;
+    }
+    else if (st == ICE_SCOPED_IDENTIFIER)
+    {
+        currentUnit->error("Operation identifiers cannot be scoped: '" + (ident->v) + "'");
+        return ICE_IDENT_OPEN;
+    }
+    else if (st == ICE_OPTIONAL)
     {
-        stringstream s;
-        s << "illegal input character: '\\";
-        s.width(3);
-        s.fill('0');
-        s << oct << static_cast<int>(static_cast<unsigned char>(yytext[0]));
-        s << "'";
-        unit->error(s.str());
-        return BAD_CHAR;
+        return ICE_OPTIONAL_OPEN;
     }
+    else
+    {
+        return ICE_KEYWORD_OPEN;
+    }
+}
+	YY_BREAK
+case 44:
+YY_RULE_SETUP
+#line 514 "src/Slice/Scanner.l"
+{
+    StringTokPtr ident = make_shared<StringTok>();
+    ident->v = *yytext == '\\' ? yytext + 1 : yytext;
+    *yylval = ident;
+    return *yytext == '\\' ? checkIsScoped(ident->v) : checkKeyword(ident->v);
+}
+	YY_BREAK
+/* ========== Whitespace ========== */
+/* Matches and consumes any whitespace, except for newlines. */
+case 45:
+YY_RULE_SETUP
+#line 524 "src/Slice/Scanner.l"
+{}
+	YY_BREAK
+/* Matches and consumes newlines, but only when the scanner isn't in a sub-scanner. */
+case 46:
+/* rule 46 can match eol */
+YY_RULE_SETUP
+#line 527 "src/Slice/Scanner.l"
+{
+    nextLine(yyleng);
+}
+	YY_BREAK
+/* ========== Others ========== */
+/* Handles UTF-8 BOMs.
+   * The scanner has a special 'INITIAL' state, which it enters whenever it hits the start of a file.
+   * This occurs when parsing initially begins, but also when we see the start of an '#include'd file.
+   * As soon as the scanner sees a token, it will transition into a more specific state: SLICE, METADATA, etc.
+   * depending on what token it sees.
+   *
+   * Since BOMs are only allowed at the beginning of files, we only allow them in this 'INITIAL' state.
+   * If we see a BOM in any other state, we emit an error and throw it away. */
+case 47:
+YY_RULE_SETUP
+#line 541 "src/Slice/Scanner.l"
+{ /* do nothing */ }
+	YY_BREAK
+case 48:
+YY_RULE_SETUP
+#line 542 "src/Slice/Scanner.l"
+{
+    currentUnit->error("encountered unexpected UTF-8 BOM in input; BOMs can only appear at the beginning of files");
+}
+	YY_BREAK
+/* Matches invalid characters, one at a time to make this the 2nd lowest priority rule. All printable ASCII
+   * characters are valid (those between 32 and 127 inclusively), anything outside this range is invalid. */
+case 49:
+/* rule 49 can match eol */
+YY_RULE_SETUP
+#line 548 "src/Slice/Scanner.l"
+{
+    stringstream s;
+    s << "illegal input character: '\\";
+    s.width(3);
+    s.fill('0');
+    s << oct << static_cast<int>(static_cast<unsigned char>(yytext[0]));
+    s << "'";
+
+    currentUnit->error(s.str());
+    return BAD_TOKEN;
+}
+	YY_BREAK
+/* Matches any valid character (except newlines) not matched by another rule and fowards it to the parser.
+   * This is the lowest priority rule in the scanner, and is only active while not in a sub-scanner. */
+case 50:
+YY_RULE_SETUP
+#line 562 "src/Slice/Scanner.l"
+{
+    setLocation(yylloc);
     return yytext[0];
 }
 	YY_BREAK
-case 19:
+case 51:
 YY_RULE_SETUP
-#line 530 "src/Slice/Scanner.l"
-ECHO;
+#line 567 "src/Slice/Scanner.l"
+YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 1647 "src/Slice/Scanner.cpp"
+#line 2251 "src/Slice/Scanner.cpp"
 case YY_STATE_EOF(INITIAL):
-case YY_STATE_EOF(BOMSCAN):
-case YY_STATE_EOF(MAINSCAN):
+case YY_STATE_EOF(SLICE):
+case YY_STATE_EOF(METADATA):
 	yyterminate();
 
 	case YY_END_OF_BUFFER:
@@ -1672,7 +2275,11 @@ case YY_STATE_EOF(MAINSCAN):
 			 * back-up) that will match for the new input source.
 			 */
 			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+/* %if-c-only */
 			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
+/* %endif */
+/* %if-c++-only */
+/* %endif */
 			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
 			}
 
@@ -1714,6 +2321,7 @@ case YY_STATE_EOF(MAINSCAN):
 
 			else
 				{
+/* %% [14.0] code to do back-up for compressed tables and set up yy_cp goes here */
 				yy_cp = (yy_last_accepting_cpos);
 				yy_current_state = (yy_last_accepting_state);
 				goto yy_find_action;
@@ -1781,6 +2389,13 @@ case YY_STATE_EOF(MAINSCAN):
 		} /* end of scanning one token */
 	} /* end of user's declarations */
 } /* end of yylex */
+/* %ok-for-header */
+
+/* %if-c++-only */
+/* %not-for-header */
+/* %ok-for-header */
+
+/* %endif */
 
 /* yy_get_next_buffer - try to read in a new buffer
  *
@@ -1789,7 +2404,11 @@ case YY_STATE_EOF(MAINSCAN):
  *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
  *	EOB_ACT_END_OF_FILE - end of file
  */
+/* %if-c-only */
 static int yy_get_next_buffer (void)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
 {
     	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
 	char *source = (yytext_ptr);
@@ -1927,16 +2546,23 @@ static int yy_get_next_buffer (void)
 
 /* yy_get_previous_state - get the state just before the EOB char was reached */
 
+/* %if-c-only */
+/* %not-for-header */
     static yy_state_type yy_get_previous_state (void)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
 {
 	yy_state_type yy_current_state;
 	char *yy_cp;
     
+/* %% [15.0] code to get the start state into yy_current_state goes here */
 	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 )
 		{
+/* %% [16.0] code to find the next state goes here */
 		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
 		if ( yy_accept[yy_current_state] )
 			{
@@ -1946,7 +2572,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 >= 76 )
+			if ( yy_current_state >= 220 )
 				yy_c = yy_meta[yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -1960,10 +2586,15 @@ static int yy_get_next_buffer (void)
  * synopsis
  *	next_state = yy_try_NUL_trans( current_state );
  */
+/* %if-c-only */
     static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+/* %endif */
+/* %if-c++-only */
+/* %endif */
 {
 	int yy_is_jam;
-    	char *yy_cp = (yy_c_buf_p);
+    /* %% [17.0] code to find the next state, and perhaps do backing up, goes here */
+	char *yy_cp = (yy_c_buf_p);
 
 	YY_CHAR yy_c = 1;
 	if ( yy_accept[yy_current_state] )
@@ -1974,56 +2605,22 @@ 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 >= 76 )
+		if ( yy_current_state >= 220 )
 			yy_c = yy_meta[yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-	yy_is_jam = (yy_current_state == 75);
+	yy_is_jam = (yy_current_state == 219);
 
 		return yy_is_jam ? 0 : yy_current_state;
 }
 
 #ifndef YY_NO_UNPUT
+/* %if-c-only */
 
-    static void yyunput (int c, char * yy_bp )
-{
-	char *yy_cp;
-    
-    yy_cp = (yy_c_buf_p);
-
-	/* 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. */
-		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];
-		char *source =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
-
-		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
-			*--dest = *--source;
-
-		yy_cp += (int) (dest - source);
-		yy_bp += (int) (dest - source);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
-			(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" );
-		}
-
-	*--yy_cp = (char) c;
-
-	(yytext_ptr) = yy_bp;
-	(yy_hold_char) = *yy_cp;
-	(yy_c_buf_p) = yy_cp;
-}
-
+/* %endif */
 #endif
 
+/* %if-c-only */
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
     static int yyinput (void)
@@ -2031,6 +2628,9 @@ static int yy_get_next_buffer (void)
     static int input  (void)
 #endif
 
+/* %endif */
+/* %if-c++-only */
+/* %endif */
 {
 	int c;
     
@@ -2094,18 +2694,25 @@ static int yy_get_next_buffer (void)
 	*(yy_c_buf_p) = '\0';	/* preserve yytext */
 	(yy_hold_char) = *++(yy_c_buf_p);
 
+/* %% [19.0] update BOL and yylineno */
 	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = (c == '\n');
 
 	return c;
 }
+/* %if-c-only */
 #endif	/* ifndef YY_NO_INPUT */
+/* %endif */
 
 /** 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 .
  */
+/* %if-c-only */
     void yyrestart  (FILE * input_file )
+/* %endif */
+/* %if-c++-only */
+/* %endif */
 {
     
 	if ( ! YY_CURRENT_BUFFER ){
@@ -2118,11 +2725,18 @@ static int yy_get_next_buffer (void)
 	yy_load_buffer_state(  );
 }
 
+/* %if-c++-only */
+/* %endif */
+
 /** Switch to a different input buffer.
  * @param new_buffer The new input buffer.
  * 
  */
+/* %if-c-only */
     void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+/* %endif */
+/* %if-c++-only */
+/* %endif */
 {
     
 	/* TODO. We should be able to replace this entire function body
@@ -2153,11 +2767,19 @@ static int yy_get_next_buffer (void)
 	(yy_did_buffer_switch_on_eof) = 1;
 }
 
+/* %if-c-only */
 static void yy_load_buffer_state  (void)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
 {
     	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
 	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+/* %if-c-only */
 	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+/* %endif */
+/* %if-c++-only */
+/* %endif */
 	(yy_hold_char) = *(yy_c_buf_p);
 }
 
@@ -2167,7 +2789,11 @@ static void yy_load_buffer_state  (void)
  * 
  * @return the allocated buffer state.
  */
+/* %if-c-only */
     YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
+/* %endif */
+/* %if-c++-only */
+/* %endif */
 {
 	YY_BUFFER_STATE b;
     
@@ -2191,11 +2817,18 @@ static void yy_load_buffer_state  (void)
 	return b;
 }
 
+/* %if-c++-only */
+/* %endif */
+
 /** Destroy the buffer.
  * @param b a buffer created with yy_create_buffer()
  * 
  */
+/* %if-c-only */
     void yy_delete_buffer (YY_BUFFER_STATE  b )
+/* %endif */
+/* %if-c++-only */
+/* %endif */
 {
     
 	if ( ! b )
@@ -2214,14 +2847,22 @@ static void yy_load_buffer_state  (void)
  * This function is sometimes called more than once on the same buffer,
  * such as during a yyrestart() or at EOF.
  */
+/* %if-c-only */
     static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+/* %endif */
+/* %if-c++-only */
+/* %endif */
 
 {
 	int oerrno = errno;
     
 	yy_flush_buffer( b );
 
+/* %if-c-only */
 	b->yy_input_file = file;
+/* %endif */
+/* %if-c++-only */
+/* %endif */
 	b->yy_fill_buffer = 1;
 
     /* If b is the current buffer, then yy_init_buffer was _probably_
@@ -2233,8 +2874,13 @@ static void yy_load_buffer_state  (void)
         b->yy_bs_column = 0;
     }
 
+/* %if-c-only */
+
         b->yy_is_interactive = 0;
     
+/* %endif */
+/* %if-c++-only */
+/* %endif */
 	errno = oerrno;
 }
 
@@ -2242,7 +2888,11 @@ static void yy_load_buffer_state  (void)
  * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
  * 
  */
+/* %if-c-only */
     void yy_flush_buffer (YY_BUFFER_STATE  b )
+/* %endif */
+/* %if-c++-only */
+/* %endif */
 {
     	if ( ! b )
 		return;
@@ -2265,13 +2915,18 @@ static void yy_load_buffer_state  (void)
 		yy_load_buffer_state(  );
 }
 
+/* %if-c-or-c++ */
 /** 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.
  *  
  */
+/* %if-c-only */
 void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
+/* %endif */
+/* %if-c++-only */
+/* %endif */
 {
     	if (new_buffer == NULL)
 		return;
@@ -2296,12 +2951,18 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
 	yy_load_buffer_state(  );
 	(yy_did_buffer_switch_on_eof) = 1;
 }
+/* %endif */
 
+/* %if-c-or-c++ */
 /** Removes and deletes the top of the stack, if present.
  *  The next element becomes the new top.
  *  
  */
+/* %if-c-only */
 void yypop_buffer_state (void)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
 {
     	if (!YY_CURRENT_BUFFER)
 		return;
@@ -2316,11 +2977,17 @@ void yypop_buffer_state (void)
 		(yy_did_buffer_switch_on_eof) = 1;
 	}
 }
+/* %endif */
 
+/* %if-c-or-c++ */
 /* Allocates the stack if it does not exist.
  *  Guarantees space for at least one push.
  */
+/* %if-c-only */
 static void yyensure_buffer_stack (void)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
 {
 	yy_size_t num_to_alloc;
     
@@ -2362,102 +3029,71 @@ static void yyensure_buffer_stack (void)
 		(yy_buffer_stack_max) = num_to_alloc;
 	}
 }
+/* %endif */
 
-/** 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 yy_scan_buffer  (char * base, yy_size_t  size )
+/* %if-c-only */
+    static void yy_push_state (int  _new_state )
+/* %endif */
+/* %if-c++-only */
+/* %endif */
 {
-	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 NULL;
-
-	b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state )  );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
-
-	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 = 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;
+    	if ( (yy_start_stack_ptr) >= (yy_start_stack_depth) )
+		{
+		yy_size_t new_size;
 
-	yy_switch_to_buffer( b  );
+		(yy_start_stack_depth) += YY_START_STACK_INCR;
+		new_size = (yy_size_t) (yy_start_stack_depth) * sizeof( int );
 
-	return b;
-}
+		if ( ! (yy_start_stack) )
+			(yy_start_stack) = (int *) yyalloc( new_size  );
 
-/** 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
- *       yy_scan_bytes() instead.
- */
-YY_BUFFER_STATE yy_scan_string (const char * yystr )
-{
-    
-	return yy_scan_bytes( yystr, (int) strlen(yystr) );
-}
+		else
+			(yy_start_stack) = (int *) yyrealloc(
+					(void *) (yy_start_stack), new_size  );
 
-/** 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 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 = (yy_size_t) (_yybytes_len + 2);
-	buf = (char *) yyalloc( n  );
-	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
+		if ( ! (yy_start_stack) )
+			YY_FATAL_ERROR( "out of memory expanding start-condition stack" );
+		}
 
-	for ( i = 0; i < _yybytes_len; ++i )
-		buf[i] = yybytes[i];
+	(yy_start_stack)[(yy_start_stack_ptr)++] = YY_START;
 
-	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+	BEGIN(_new_state);
+}
 
-	b = yy_scan_buffer( buf, n );
-	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
+/* %if-c-only */
+    static void yy_pop_state  (void)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+    	if ( --(yy_start_stack_ptr) < 0 )
+		YY_FATAL_ERROR( "start-condition stack underflow" );
 
-	/* It's okay to grow etc. this buffer, and we should throw it
-	 * away when we're done.
-	 */
-	b->yy_is_our_buffer = 1;
+	BEGIN((yy_start_stack)[(yy_start_stack_ptr)]);
+}
 
-	return b;
+/* %if-c-only */
+    static int yy_top_state  (void)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+    	return (yy_start_stack)[(yy_start_stack_ptr) - 1];
 }
 
 #ifndef YY_EXIT_FAILURE
 #define YY_EXIT_FAILURE 2
 #endif
 
+/* %if-c-only */
 static void yynoreturn yy_fatal_error (const char* msg )
 {
 			fprintf( stderr, "%s\n", msg );
 	exit( YY_EXIT_FAILURE );
 }
+/* %endif */
+/* %if-c++-only */
+/* %endif */
 
 /* Redefine yyless() so it works in section 3 code. */
 
@@ -2478,84 +3114,25 @@ static void yynoreturn yy_fatal_error (const char* msg )
 
 /* Accessor  methods (get/set functions) to struct members. */
 
-/** Get the current line number.
- * 
- */
-int yyget_lineno  (void)
-{
-    
-    return yylineno;
-}
-
-/** Get the input stream.
- * 
- */
-FILE *yyget_in  (void)
-{
-        return yyin;
-}
-
-/** Get the output stream.
- * 
- */
-FILE *yyget_out  (void)
-{
-        return yyout;
-}
-
-/** Get the length of the current token.
- * 
- */
-int yyget_leng  (void)
-{
-        return yyleng;
-}
+/* %if-c-only */
+/* %if-reentrant */
+/* %endif */
 
 /** Get the current token.
  * 
  */
 
-char *yyget_text  (void)
-{
-        return yytext;
-}
+/* %if-reentrant */
+/* %endif */
 
-/** Set the current line number.
- * @param _line_number line number
- * 
- */
-void yyset_lineno (int  _line_number )
-{
-    
-    yylineno = _line_number;
-}
+/* %endif */
 
-/** Set the input stream. This does not discard the current
- * input buffer.
- * @param _in_str A readable stream.
- * 
- * @see yy_switch_to_buffer
- */
-void yyset_in (FILE *  _in_str )
-{
-        yyin = _in_str ;
-}
-
-void yyset_out (FILE *  _out_str )
-{
-        yyout = _out_str ;
-}
-
-int yyget_debug  (void)
-{
-        return yy_flex_debug;
-}
-
-void yyset_debug (int  _bdebug )
-{
-        yy_flex_debug = _bdebug ;
-}
+/* %if-reentrant */
+/* %if-bison-bridge */
+/* %endif */
+/* %endif if-c-only */
 
+/* %if-c-only */
 static int yy_init_globals (void)
 {
         /* Initialization is the same as for the non-reentrant scanner.
@@ -2569,6 +3146,10 @@ static int yy_init_globals (void)
     (yy_init) = 0;
     (yy_start) = 0;
 
+    (yy_start_stack_ptr) = 0;
+    (yy_start_stack_depth) = 0;
+    (yy_start_stack) =  NULL;
+
 /* Defined in main.c */
 #ifdef YY_STDINIT
     yyin = stdin;
@@ -2583,7 +3164,9 @@ static int yy_init_globals (void)
      */
     return 0;
 }
+/* %endif */
 
+/* %if-c-only SNIP! this currently causes conflicts with the c++ scanner */
 /* yylex_destroy is for both reentrant and non-reentrant scanners. */
 int yylex_destroy  (void)
 {
@@ -2599,12 +3182,19 @@ int yylex_destroy  (void)
 	yyfree((yy_buffer_stack) );
 	(yy_buffer_stack) = NULL;
 
+    /* Destroy the start condition stack. */
+        yyfree( (yy_start_stack)  );
+        (yy_start_stack) = NULL;
+
     /* Reset the globals. This is important in a non-reentrant scanner so the next time
      * yylex() is called, initialization will occur. */
     yy_init_globals( );
 
+/* %if-reentrant */
+/* %endif */
     return 0;
 }
+/* %endif */
 
 /*
  * Internal utility routines.
@@ -2654,154 +3244,202 @@ void yyfree (void * ptr )
 			free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
 }
 
+/* %if-tables-serialization definitions */
+/* %define-yytables   The name for this specific scanner's tables. */
 #define YYTABLES_NAME "yytables"
+/* %endif */
+
+/* %ok-for-header */
+
+#line 567 "src/Slice/Scanner.l"
 
-#line 530 "src/Slice/Scanner.l"
-
-
-namespace Slice {
-
-//
-// initScanner() fills the keyword map with all keyword-token pairs.
-//
-
-void
-initScanner()
-{
-    keywordMap["module"] = ICE_MODULE;
-    keywordMap["class"] = ICE_CLASS;
-    keywordMap["interface"] = ICE_INTERFACE;
-    keywordMap["exception"] = ICE_EXCEPTION;
-    keywordMap["struct"] = ICE_STRUCT;
-    keywordMap["sequence"] = ICE_SEQUENCE;
-    keywordMap["dictionary"] = ICE_DICTIONARY;
-    keywordMap["enum"] = ICE_ENUM;
-    keywordMap["out"] = ICE_OUT;
-    keywordMap["extends"] = ICE_EXTENDS;
-    keywordMap["implements"] = ICE_IMPLEMENTS;
-    keywordMap["throws"] = ICE_THROWS;
-    keywordMap["void"] = ICE_VOID;
-    keywordMap["byte"] = ICE_BYTE;
-    keywordMap["bool"] = ICE_BOOL;
-    keywordMap["short"] = ICE_SHORT;
-    keywordMap["int"] = ICE_INT;
-    keywordMap["long"] = ICE_LONG;
-    keywordMap["float"] = ICE_FLOAT;
-    keywordMap["double"] = ICE_DOUBLE;
-    keywordMap["string"] = ICE_STRING;
-    keywordMap["Object"] = ICE_OBJECT;
-    keywordMap["LocalObject"] = ICE_LOCAL_OBJECT;
-    keywordMap["local"] = ICE_LOCAL;
-    keywordMap["const"] = ICE_CONST;
-    keywordMap["false"] = ICE_FALSE;
-    keywordMap["true"] = ICE_TRUE;
-    keywordMap["idempotent"] = ICE_IDEMPOTENT;
-    keywordMap["optional"] = ICE_OPTIONAL;
-    keywordMap["Value"] = ICE_VALUE;
-}
-
-//
-// Check if an identifier looks like a keyword.
-// If the identifier is a keyword, return the
-// corresponding keyword token; otherwise, return
-// an identifier token.
-//
-
-int
-checkKeyword(string& id)
-{
-    StringTokenMap::const_iterator pos = keywordMap.find(id);
-    if(pos != keywordMap.end())
+
+// NOLINTEND
+
+namespace Slice
+{
+    // Check if an identifier looks like a keyword.
+    // If the identifier is a keyword, return the
+    // corresponding keyword token; otherwise, return
+    // an identifier token.
+    int checkKeyword(string& identifier)
     {
-        if(pos->first != id)
+        const auto pos = keywordMap.find(identifier);
+        if (pos != keywordMap.end())
         {
-            string msg;
-            msg = "illegal identifier: `" + id + "' differs from keyword `";
-            msg += pos->first + "' only in capitalization";
-            unit->error(msg);
-            id = pos->first;
+            if (pos->first != identifier)
+            {
+                currentUnit->error(
+                    "illegal identifier: '" + identifier + "' differs from keyword '" + pos->first +
+                    "' only in capitalization");
+                identifier = pos->first;
+            }
+            return pos->second;
         }
-        return pos->second;
+        return checkIsScoped(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)
+    // Checks if an identifier is scoped or not, and returns the corresponding token.
+    int checkIsScoped(const string& identifier)
     {
-        name = id.substr(scopeIndex + 2); // Only check the unscoped identifier for syntax
+        return identifier.find("::") == string::npos ? ICE_IDENTIFIER : ICE_SCOPED_IDENTIFIER;
     }
-    else
+}
+
+namespace
+{
+    void nextLine(int count)
     {
-        name = id;
+        yylineno += count;
+        yycolno = 0;
     }
 
-    // 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)
+    int scanPosition(const char* s)
     {
-        if(name.find(suffixBlacklist[i], name.size() - suffixBlacklist[i].size()) != string::npos)
+        string line(s);
+        // Skip the leading '#', optional 'line', and any whitespace before the line number.
+        string::size_type idx = line.find_first_not_of(" \t\r", (line.find('#') + 1));
+        if (line.find("line", idx) == idx)
         {
-            unit->error("illegal identifier `" + name + "': `" + suffixBlacklist[i] + "' suffix is reserved");
+            idx = line.find_first_not_of(" \t\r", (idx + 4));
         }
+        line.erase(0, idx);
+
+        // Read the line number
+        int newLineNumber = stoi(line.c_str(), &idx) - 1;
+
+        // Scan the remainder of the line for a filename.
+        idx = line.find_first_not_of(" \t\r", idx);
+        line.erase(0, idx);
+
+        int lineTypeCode = 0;
+        if (!line.empty())
+        {
+            if (line[0] == '"')
+            {
+                string::size_type edx = line.rfind('"');
+                if (edx != string::npos)
+                {
+                    line = line.substr(1, edx - 1);
+                }
+                else
+                {
+                    currentUnit->error("mismatched quotations in line directive");
+                    line = line.substr(1);
+                }
+            }
+            lineTypeCode = currentUnit->setCurrentFile(line, newLineNumber);
+            yyfilename = string(line);
+        }
+        yylineno = newLineNumber;
+        return lineTypeCode;
     }
 
-    // check the identifier for illegal underscores
-    size_t index = name.find('_');
-    if(index == 0)
+    void setLocation(TokenContext* location)
     {
-        unit->error("illegal leading underscore in identifier `" + name + "'");
+        startLocation(location);
+        endLocation(location);
     }
-    else if(name.rfind('_') == (name.size() - 1))
+
+    void startLocation(TokenContext* location)
     {
-        unit->error("illegal trailing underscore in identifier `" + name + "'");
+        location->firstLine = yylineno;
+        // The string has already been scanned, so the scanner is positioned at the end of it.
+        location->firstColumn = yycolno - yyleng;
+        location->filename = yyfilename;
     }
-    else if(name.find("__") != string::npos)
+
+    void endLocation(TokenContext* location)
     {
-        unit->error("illegal double underscore in identifier `" + name + "'");
+        location->lastLine = yylineno;
+        location->lastColumn = yycolno;
     }
-    else if(index != string::npos && unit->currentIncludeLevel() == 0 && !unit->allowUnderscore())
+
+    // This function is always called once, right before scanning begins.
+    void initScanner()
     {
-        DefinitionContextPtr dc = unit->currentDefinitionContext();
-        assert(dc);
-        if(dc->findMetaData("underscore") != "underscore") // no 'underscore' file metadata
+        // Ensure the scanner starts at line number 1, column position 0.
+        yylineno = 1;
+
+        keywordMap["module"] = ICE_MODULE;
+        keywordMap["class"] = ICE_CLASS;
+        keywordMap["interface"] = ICE_INTERFACE;
+        keywordMap["exception"] = ICE_EXCEPTION;
+        keywordMap["struct"] = ICE_STRUCT;
+        keywordMap["sequence"] = ICE_SEQUENCE;
+        keywordMap["dictionary"] = ICE_DICTIONARY;
+        keywordMap["enum"] = ICE_ENUM;
+        keywordMap["out"] = ICE_OUT;
+        keywordMap["extends"] = ICE_EXTENDS;
+        keywordMap["throws"] = ICE_THROWS;
+        keywordMap["void"] = ICE_VOID;
+        keywordMap["byte"] = ICE_BYTE;
+        keywordMap["bool"] = ICE_BOOL;
+        keywordMap["short"] = ICE_SHORT;
+        keywordMap["int"] = ICE_INT;
+        keywordMap["long"] = ICE_LONG;
+        keywordMap["float"] = ICE_FLOAT;
+        keywordMap["double"] = ICE_DOUBLE;
+        keywordMap["string"] = ICE_STRING;
+        keywordMap["Object"] = ICE_OBJECT;
+        keywordMap["const"] = ICE_CONST;
+        keywordMap["false"] = ICE_FALSE;
+        keywordMap["true"] = ICE_TRUE;
+        keywordMap["idempotent"] = ICE_IDEMPOTENT;
+        keywordMap["optional"] = ICE_OPTIONAL;
+        keywordMap["Value"] = ICE_VALUE;
+    }
+
+    // This function is always called directly after a match has been made, but directly before it's action block is run.
+    void preAction()
+    {
+        yycolno += yyleng;
+
+        // We only use the 'INITIAL' state to consume BOMs, which can only validly be the first match in a file. This
+        // function being called means a match has already been made, so we switch states since BOMs are no longer valid.
+        if (YY_START == INITIAL)
         {
-            unit->error("illegal underscore in identifier `" + name + "'");
+            BEGIN(SLICE);
         }
     }
 
-    // Check the identifier for illegal ice prefixes
-    if(unit->currentIncludeLevel() == 0 && !unit->allowIcePrefix() && name.size() > 2)
+    void printStateStack()
     {
-        DefinitionContextPtr dc = unit->currentDefinitionContext();
-        assert(dc);
-        if(dc->findMetaData("ice-prefix") != "ice-prefix") // no 'ice-prefix' metadata
+        (void)fprintf(stderr, "current state stack [ " );
+        for (int i = 0; i < yy_start_stack_ptr; i++)
         {
-            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");
-            }
+            (void)fprintf(stderr, "%d ", yy_start_stack[i]);
         }
+        (void)fprintf(stderr, "(%d) ]\n", YY_START);
     }
 
-    return isScoped ? ICE_SCOPED_IDENTIFIER : ICE_IDENTIFIER;
-}
+    void pushState(int newState)
+    {
+        yy_push_state(newState);
+        if (yy_flex_debug)
+        {
+            (void)fprintf(stderr, "--pushed: ");
+            printStateStack();
+        }
+    }
+
+    void popState()
+    {
+        yy_pop_state();
+        if (yy_flex_debug)
+        {
+            (void)fprintf(stderr, "--popped: ");
+            printStateStack();
+        }
+    }
 
+    // This function is called whenever the scanner encounters an unrecoverable error.
+    void yynoreturn fatalError(const char* msg)
+    {
+        cerr << yyfilename << ":" << yylineno << ":" << yycolno << ": fatal error: " << msg << endl
+             << "\tlast matched text: '" << yytext << "'" << endl
+             << "\tlast scanner state: '" << YY_START << "'" << endl;
+        exit(YY_EXIT_FAILURE);
+    }
 }