zeroc-ice 3.6.5 → 3.7.0

data/ext/ice/cpp/{include → src}/Slice/RubyUtil.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -21,7 +21,7 @@ namespace Ruby
 //
 // Generate Ruby code for a translation unit.
 //
-SLICE_API void generate(const Slice::UnitPtr&, bool, bool, const std::vector<std::string>&, IceUtilInternal::Output&);
+void generate(const Slice::UnitPtr&, bool, bool, const std::vector<std::string>&, IceUtilInternal::Output&);
 
 //
 // Check the given identifier against Ruby's list of reserved words. If it matches
@@ -33,20 +33,20 @@ enum IdentStyle
     IdentToUpper, // Mapped identifier must begin with an upper-case letter.
     IdentToLower  // Mapped identifier must begin with a lower-case letter.
 };
-SLICE_API std::string fixIdent(const std::string&, IdentStyle);
+std::string fixIdent(const std::string&, IdentStyle);
 
 //
 // Get the fully-qualified name of the given definition. If a prefix is provided,
 // it is prepended to the definition's unqualified name.
 //
-SLICE_API std::string getAbsolute(const Slice::ContainedPtr&, IdentStyle, const std::string& = std::string());
+std::string getAbsolute(const Slice::ContainedPtr&, IdentStyle, const std::string& = std::string());
 
 //
 // Emit a comment header.
 //
-SLICE_API void printHeader(IceUtilInternal::Output&);
+void printHeader(IceUtilInternal::Output&);
 
-SLICE_API int compile(const std::vector<std::string>&);
+int compile(const std::vector<std::string>&);
 
 }
 }

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

@@ -1,7 +1,7 @@
 #include <IceUtil/ScannerConfig.h>
-#line 2 "lex.yy.c"
+#line 2 "src/Slice/Scanner.cpp"
 
-#line 4 "lex.yy.c"
+#line 4 "src/Slice/Scanner.cpp"
 
 #define  YY_INT_ALIGNED short int
 
@@ -29,7 +29,7 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 39
+#define YY_FLEX_SUBMINOR_VERSION 37
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -54,7 +54,7 @@
 #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types. 
+ * if you want the limit (max/min) macros for int types.
  */
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS 1
@@ -71,7 +71,7 @@ typedef uint32_t flex_uint32_t;
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
 typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t; 
+typedef unsigned char flex_uint8_t;
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
 
@@ -162,15 +162,7 @@ typedef unsigned int flex_uint32_t;
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k.
- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
- * Ditto for the __ia64__ case accordingly.
- */
-#define YY_BUF_SIZE 32768
-#else
 #define YY_BUF_SIZE 16384
-#endif /* __ia64__ */
 #endif
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -196,8 +188,7 @@ extern FILE *slice_in, *slice_out;
 #define EOB_ACT_LAST_MATCH 2
 
     #define YY_LESS_LINENO(n)
-    #define YY_LINENO_REWIND_TO(ptr)
-    
+
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
 	do \
@@ -254,7 +245,7 @@ struct yy_buffer_state
 
     int yy_bs_lineno; /**< The line count. */
     int yy_bs_column; /**< The column count. */
-    
+
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
@@ -552,19 +543,19 @@ int slice__flex_debug = 0;
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *slice_text;
-#line 1 "Scanner.l"
-#line 2 "Scanner.l"
+#line 1 "src/Slice/Scanner.l"
+#line 2 "src/Slice/Scanner.l"
 
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
-#include <Slice/GrammarUtil.h>	// Before Grammer.h, so that YYSTYPE is defined
+#include <Slice/GrammarUtil.h>  // Before Grammer.h, so that YYSTYPE is defined
 #include <Slice/Grammar.h>
 #include <IceUtil/InputUtil.h>
 
@@ -593,6 +584,10 @@ char *slice_text;
 #   pragma warning( 4 : 4018 )
 #endif
 
+#if defined(__GNUC__)
+#   pragma GCC diagnostic ignored "-Wsign-compare"
+#endif
+
 #ifdef _MSC_VER
 #   ifdef slice_wrap
 #      undef slice_wrap
@@ -607,7 +602,7 @@ char *slice_text;
 #      define slice_wrap() 1
 #   endif
 #   ifdef ICE_64
-#       pragma error_messages(off,truncwarn)      
+#       pragma error_messages(off,truncwarn)
 #   endif
 #endif
 
@@ -620,7 +615,7 @@ namespace Slice
 //
 // Definitions for the case-insensitive keyword-token map.
 //
-typedef std::map<std::string, int, Slice::CICompare> StringTokenMap;
+typedef std::map<std::string, int> StringTokenMap;
 static StringTokenMap keywordMap;
 
 void initScanner();
@@ -628,11 +623,11 @@ int checkKeyword(string&);
 
 }
 
-#define	YY_USER_INIT initScanner();
+#define YY_USER_INIT initScanner();
 
 
 
-#line 635 "lex.yy.c"
+#line 630 "src/Slice/Scanner.cpp"
 
 #define INITIAL 0
 #define BOMSCAN 1
@@ -694,7 +689,7 @@ extern int slice_wrap (void );
 #endif
 
     static void yyunput (int c,char *buf_ptr  );
-    
+
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char *,yyconst char *,int );
 #endif
@@ -715,12 +710,7 @@ static int input (void );
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k */
-#define YY_READ_BUF_SIZE 16384
-#else
 #define YY_READ_BUF_SIZE 8192
-#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -823,7 +813,12 @@ YY_DECL
 	register yy_state_type yy_current_state;
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
-    
+
+#line 97 "src/Slice/Scanner.l"
+
+
+#line 820 "src/Slice/Scanner.cpp"
+
 	if ( !(yy_init) )
 		{
 		(yy_init) = 1;
@@ -850,12 +845,6 @@ YY_DECL
 		slice__load_buffer_state( );
 		}
 
-	{
-#line 94 "Scanner.l"
-
-
-#line 857 "lex.yy.c"
-
 	while ( 1 )		/* loops until end-of-file is reached */
 		{
 		yy_cp = (yy_c_buf_p);
@@ -873,7 +862,7 @@ YY_DECL
 yy_match:
 		do
 			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
+			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
 			if ( yy_accept[yy_current_state] )
 				{
 				(yy_last_accepting_state) = yy_current_state;
@@ -913,7 +902,7 @@ case 1:
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up slice_text again */
 YY_RULE_SETUP
-#line 96 "Scanner.l"
+#line 99 "src/Slice/Scanner.l"
 {
     if(unit->scanPosition(slice_text))
     {
@@ -924,11 +913,10 @@ YY_RULE_SETUP
 case 2:
 /* rule 2 can match eol */
 *yy_cp = (yy_hold_char); /* undo effects of setting up slice_text */
-YY_LINENO_REWIND_TO(yy_cp - 1);
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up slice_text again */
 YY_RULE_SETUP
-#line 103 "Scanner.l"
+#line 106 "src/Slice/Scanner.l"
 {
     if(unit->scanPosition(slice_text))
     {
@@ -941,7 +929,7 @@ case 3:
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up slice_text again */
 YY_RULE_SETUP
-#line 110 "Scanner.l"
+#line 113 "src/Slice/Scanner.l"
 {
     if(unit->scanPosition(slice_text))
     {
@@ -952,11 +940,10 @@ YY_RULE_SETUP
 case 4:
 /* rule 4 can match eol */
 *yy_cp = (yy_hold_char); /* undo effects of setting up slice_text */
-YY_LINENO_REWIND_TO(yy_cp - 1);
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up slice_text again */
 YY_RULE_SETUP
-#line 117 "Scanner.l"
+#line 120 "src/Slice/Scanner.l"
 {
     if(unit->scanPosition(slice_text))
     {
@@ -966,69 +953,69 @@ YY_RULE_SETUP
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 124 "Scanner.l"
+#line 127 "src/Slice/Scanner.l"
 {
     // C++-style comment
     BEGIN(MAINSCAN);
     int c;
     do
     {
-	c = yyinput();
-	if(c == '\n')
-	{
-	    unit->nextLine();
-	}
+        c = yyinput();
+        if(c == '\n')
+        {
+            unit->nextLine();
+        }
     }
     while(c != '\n' && c != EOF);
 }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 139 "Scanner.l"
+#line 142 "src/Slice/Scanner.l"
 {
     // C-style comment
     BEGIN(MAINSCAN);
     string comment = slice_text + 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("EOF in comment");
-	    break;
-	}
-	else
-	{
-	    comment += static_cast<char>(c);
-	}
+        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);
+        unit->setComment(comment);
     }
 }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 180 "Scanner.l"
+#line 183 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     return ICE_SCOPE_DELIMITER;
@@ -1036,7 +1023,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 185 "Scanner.l"
+#line 188 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     return ICE_METADATA_OPEN;
@@ -1044,7 +1031,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 190 "Scanner.l"
+#line 193 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     return ICE_METADATA_CLOSE;
@@ -1052,7 +1039,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 195 "Scanner.l"
+#line 198 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     return ICE_GLOBAL_METADATA_OPEN;
@@ -1060,7 +1047,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 200 "Scanner.l"
+#line 203 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     return ICE_GLOBAL_METADATA_CLOSE;
@@ -1069,7 +1056,7 @@ YY_RULE_SETUP
 case 12:
 /* rule 12 can match eol */
 YY_RULE_SETUP
-#line 205 "Scanner.l"
+#line 208 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     StringTokPtr ident = new StringTok;
@@ -1097,7 +1084,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 230 "Scanner.l"
+#line 233 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     StringTokPtr ident = new StringTok;
@@ -1108,12 +1095,12 @@ YY_RULE_SETUP
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 238 "Scanner.l"
+#line 241 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     StringTokPtr str = new StringTok;
     str->literal = "\"";
-    while(true)
+     while(true)
     {
         char c = static_cast<char>(yyinput());
         str->literal += c;
@@ -1126,9 +1113,10 @@ YY_RULE_SETUP
             unit->error("EOF in string");
             break;
         }
-        else if(c == '\n')
+        else if(static_cast<unsigned char>(c) < 32 || c == 127)
         {
-            unit->error("newline in string");
+            unit->error("a string literal can only contain printable ASCII characters and non-ASCII characters");
+            break;
         }
         else if(c == '\\')
         {
@@ -1138,67 +1126,58 @@ YY_RULE_SETUP
             {
                 case '\\':
                 {
+                    //
+                    // add extra escape to our internal string
+                    //
                     str->v += '\\';
                     str->v += '\\';
                     break;
                 }
                 case '"':
                 case '\'':
+                case '?':
                 {
                     str->v += next;
                     break;
                 }
-            
-                case 'n':
-                {
-                    str->v += '\n';
-                    break;
-                }
-            
-                case 'r':
+                case 'a':
                 {
-                    str->v += '\r';
+                    str->v += '\a';
                     break;
                 }
-
-                case 't':
+                case 'b':
                 {
-                    str->v += '\t';
+                    str->v += '\b';
                     break;
                 }
-            
-                case 'v':
+                case 'f':
                 {
-                    str->v += '\v';
+                    str->v += '\f';
                     break;
                 }
-            
-                case 'f':
+                case 'n':
                 {
-                    str->v += '\f';
+                    str->v += '\n';
                     break;
                 }
-
-                case 'a':
+                case 'r':
                 {
-                    str->v += '\a';
+                    str->v += '\r';
                     break;
                 }
-
-                case 'b':
+                case 't':
                 {
-                    str->v += '\b';
+                    str->v += '\t';
                     break;
                 }
-
-                case '?':
+                case 'v':
                 {
-                    str->v += '\?';
+                    str->v += '\v';
                     break;
                 }
 
                 //
-                // Octal value \nnn limited to three octal digits but terminate at the first character 
+                // 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':
@@ -1211,7 +1190,6 @@ YY_RULE_SETUP
                 case '7':
                 {
                     static string octalDigits = "01234567";
-                    IceUtil::Int64 value = 0;
                     string escape;
                     escape += next;
                     for(int i = 0; i < 2; ++i)
@@ -1222,158 +1200,92 @@ YY_RULE_SETUP
                             unput(next);
                             break;
                         }
-                        escape += next;                        
+                        escape += next;
                     }
                     str->literal += escape;
-                    value = IceUtilInternal::strToInt64(escape.c_str(), 0, 8);
-                    
-                    if(value == 0)
-                    {
-                        unit->error("illegal NUL character in string constant");
-                    }
-                    else if(value > 255)
+                    IceUtil::Int64 value = IceUtilInternal::strToInt64(escape.c_str(), 0, 8);
+                    if(value > 255)
                     {
-                        ostringstream os;
-                        os << "octal escape sequence out of range: '\\" << oct << value << "'";
-                        unit->warning(os.str());
+                        unit->error(string("octal escape sequence out of range: `\\") + escape + "'");
                     }
                     str->v += static_cast<char>(value);
                     break;
                 }
+
                 case 'x':
                 {
-                    IceUtil::Int64 value = 0;
                     string escape = "";
-                    while(isxdigit(static_cast<unsigned char>(next = static_cast<char>(yyinput()))))
+                    next = static_cast<char>(yyinput());
+
+                    //
+                    // Unlike C++, we limit hex escape sequences to 2 hex digits
+                    //
+                    while(isxdigit(next) && escape.length() < 2)
                     {
                         escape += next;
+                        next = static_cast<char>(yyinput());
                     }
                     unput(next);
-                    
-                    str->literal += escape;
-                    value = IceUtilInternal::strToInt64(escape.c_str(), 0, 16);
 
-                    if(value == 0)
+                    if(escape.length() == 0)
                     {
-                        unit->error("illegal NUL character in string constant");
-                    }
-                    else if(value > 255)
-                    {
-                        ostringstream os;
-                        os << "hex escape sequence out of range: '\\x" << hex << value << "'";
-                        unit->warning(os.str());
+                        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;
                 }
-        
+
                 //
-                // Universal character name \unnnn code point U+nnnn
+                // Universal character name
                 //
                 case 'u':
+                case 'U':
                 {
-                    IceUtil::Int64 value = 0;
                     string escape = "";
-
-                    for(int i = 0; i < 4; ++i)
+                    char c = next;
+                    int size = (c == 'u') ? 4 : 8;
+                    while(size > 0)
                     {
                         next = static_cast<char>(yyinput());
-                        str->literal += next;
                         if(!isxdigit(static_cast<unsigned char>(next)))
                         {
-                            unit->error("unknown escape sequence in string constant: " + str->literal);
+                            unit->error(string("unknown escape sequence in string literal: `\\") + c + escape + next + "'");
+                            unput(next);
                             break;
                         }
                         escape += next;
-                    }
-                    
-                    value = escape.size() == 4 ? IceUtilInternal::strToInt64(escape.c_str(), 0, 16) : -1;
-
-                    ostringstream os;
-                    os << '\\' << 'u';
-                    os.fill('0');
-                    os.width(4);
-                    os << hex << value;
-                    
-                    if(value == 0)
-                    {
-                        unit->error("illegal NUL character in string constant");
-                    }
-                    
-                    
-                    //
-                    // Determine if a character is a surrogate:
-                    // 
-                    // * High surrogate code point, ranging from 0xd800 to 0xdbff, inclusive
-                    // * Low surrogate code point, ranging from 0xdc00 to 0xdfff, inclusive.
-                    //
-                    else if((value >= 0xd800 && value <= 0xdbff) || (value >= 0xdc00 && value <= 0xdfff))
-                    {
-                        unit->error("unknown escape sequence in string constant: '" + os.str() + "'");
+                        --size;
                     }
 
-                    str->v += os.str();
-                    
-                    break;
-                }
-                
-                case 'U':
-                {
-                    IceUtil::Int64 value = 0;
-                    string escape = "";
-                    
-                    for(int i = 0; i < 8; ++i)
+                    if(size == 0)
                     {
-                        next = static_cast<char>(yyinput());
-                        str->literal += next;
-                        if(!isxdigit(static_cast<unsigned char>(next)))
+                        // All digits read, check value
+                        IceUtil::Int64 codePoint = IceUtilInternal::strToInt64(escape.c_str(), 0, 16);
+                        if(codePoint >= 0xd800 && codePoint <= 0xdfff)
                         {
-
-                            unit->error("unknown escape sequence in string constant: " + str->literal);
-                            break;
+                            unit->error(string("a universal character name cannot designate a surrogate: `\\") + c + escape + "'");
                         }
-                        escape += next;
                     }
-                    
-                    value = escape.size() == 8 ? IceUtilInternal::strToInt64(escape.c_str(), 0, 16) : -1;
 
-                    ostringstream os;
-                    os << '\\' << 'U';
-                    os.fill('0');
-                    os.width(8);
-                    os << hex << value;
-                    
-                    if(value == 0)
-                    {
-                        unit->error("illegal NUL character in string constant");
-                    }
-                    
-                    //
-                    // Determine if a character is a surrogate:
-                    // 
-                    // * High surrogate code point, ranging from 0xd800 to 0xdbff, inclusive
-                    // * Low surrogate code point, ranging from 0xdc00 to 0xdfff, inclusive.
-                    //
-                    else if((value >= 0xd800 && value <= 0xdbff) || (value >= 0xdc00 && value <= 0xdfff))
-                    {
-                        unit->error("unknown escape sequence in string constant: '" + os.str() + "'");
-                    }
-
-                    str->v += os.str();
+                    str->literal += escape;
+                    str->v += string("\\") + c + escape;
                     break;
                 }
 
                 default:
                 {
                     ostringstream os;
-                    os << "unknown escape sequence '\\" << next << "'";
-                    unit->warning(os.str());
-                    //
-                    // We escape the backslack in a unknown escape sequence 
-                    // to keep compativility with 3.6"
-                    //
+                    os << "unknown escape sequence `\\" << next << "'";
+                    unit->warning(All, os.str());
+
+                    // Escape the \ in this unknown escape sequence
+                    str->v += '\\';
                     str->v += '\\';
-                    str->v += c;
                     unput(next);
                 }
             }
@@ -1389,7 +1301,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 515 "Scanner.l"
+#line 444 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     IntegerTokPtr itp = new IntegerTok;
@@ -1397,18 +1309,18 @@ YY_RULE_SETUP
     *yylvalp = itp;
     if(!IceUtilInternal::stringToInt64(string(slice_text), itp->v))
     {
-	assert(itp->v != 0);
-	string msg = "integer constant `";
-	msg += slice_text;
-	msg += "' out of range";
-	unit->error(msg);
+        assert(itp->v != 0);
+        string msg = "integer constant `";
+        msg += slice_text;
+        msg += "' out of range";
+        unit->error(msg);
     }
     return ICE_INTEGER_LITERAL;
 }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 531 "Scanner.l"
+#line 460 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     errno = 0;
@@ -1419,22 +1331,22 @@ YY_RULE_SETUP
     char lastChar = literal[literal.size() - 1];
     if(lastChar == 'f' || lastChar == 'F')
     {
-    	literal = literal.substr(0, literal.size() - 1);	// Clobber trailing 'f' or 'F' suffix
+        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)
     {
-	string msg = "floating-point constant `";
-	msg += slice_text;
-	msg += "' too large (overflow)";
-	unit->error(msg);
+        string msg = "floating-point constant `";
+        msg += slice_text;
+        msg += "' too large (overflow)";
+        unit->error(msg);
     }
     else if(ftp->v == 0 && errno == ERANGE)
     {
-	string msg = "floating-point constant `";
-	msg += slice_text;
-	msg += "' too small (underflow)";
-	unit->error(msg);
+        string msg = "floating-point constant `";
+        msg += slice_text;
+        msg += "' too small (underflow)";
+    unit->error(msg);
     }
     return ICE_FLOATING_POINT_LITERAL;
 }
@@ -1442,54 +1354,54 @@ YY_RULE_SETUP
 case 17:
 /* rule 17 can match eol */
 YY_RULE_SETUP
-#line 561 "Scanner.l"
+#line 490 "src/Slice/Scanner.l"
 {
     // Ignore white-space
-    
+
     if(unit->currentLine() != 0)
     {
         BEGIN(MAINSCAN);
     }
     if(slice_text[0] == '\n')
     {
-	unit->nextLine();
+        unit->nextLine();
     }
 }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 574 "Scanner.l"
+#line 503 "src/Slice/Scanner.l"
 {
     // Ignore UTF-8 BOM, rule only active when parsing start of file.
-    
+
     BEGIN(MAINSCAN);
 }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 580 "Scanner.l"
+#line 509 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     if(slice_text[0] < 32 || slice_text[0] > 126)
     {
-	stringstream s;
-	s << "illegal input character: '\\";
-	s.width(3);
-	s.fill('0');
-	s << oct << static_cast<int>(static_cast<unsigned char>(slice_text[0]));
-	s << "'";
-	unit->error(s.str());
-	return BAD_CHAR;
+        stringstream s;
+        s << "illegal input character: '\\";
+        s.width(3);
+        s.fill('0');
+        s << oct << static_cast<int>(static_cast<unsigned char>(slice_text[0]));
+        s << "'";
+        unit->error(s.str());
+        return BAD_CHAR;
     }
     return slice_text[0];
 }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 596 "Scanner.l"
+#line 525 "src/Slice/Scanner.l"
 ECHO;
 	YY_BREAK
-#line 1491 "lex.yy.c"
+#line 1404 "src/Slice/Scanner.cpp"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(BOMSCAN):
 case YY_STATE_EOF(MAINSCAN):
@@ -1623,7 +1535,6 @@ case YY_STATE_EOF(MAINSCAN):
 			"fatal flex scanner internal error--no action found" );
 	} /* end of action switch */
 		} /* end of scanning one token */
-	} /* end of user's declarations */
 } /* end of slice_lex */
 
 /* yy_get_next_buffer - try to read in a new buffer
@@ -1771,7 +1682,7 @@ static int yy_get_next_buffer (void)
 {
 	register yy_state_type yy_current_state;
 	register char *yy_cp;
-    
+
 	yy_current_state = (yy_start);
 	yy_current_state += YY_AT_BOL();
 
@@ -1826,7 +1737,7 @@ static int yy_get_next_buffer (void)
     static void yyunput (int c, register char * yy_bp )
 {
 	register char *yy_cp;
-    
+
     yy_cp = (yy_c_buf_p);
 
 	/* undo effects of setting up slice_text */
@@ -1869,7 +1780,7 @@ static int yy_get_next_buffer (void)
 
 {
 	int c;
-    
+
 	*(yy_c_buf_p) = (yy_hold_char);
 
 	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
@@ -1938,12 +1849,12 @@ static int yy_get_next_buffer (void)
 
 /** Immediately switch to a different input stream.
  * @param input_file A readable stream.
- * 
+ *
  * @note This function does not reset the start condition to @c INITIAL .
  */
     void slice_restart  (FILE * input_file )
 {
-    
+
 	if ( ! YY_CURRENT_BUFFER ){
         slice_ensure_buffer_stack ();
 		YY_CURRENT_BUFFER_LVALUE =
@@ -1956,11 +1867,11 @@ static int yy_get_next_buffer (void)
 
 /** Switch to a different input buffer.
  * @param new_buffer The new input buffer.
- * 
+ *
  */
     void slice__switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
 {
-    
+
 	/* TODO. We should be able to replace this entire function body
 	 * with
 	 *		slice_pop_buffer_state();
@@ -2000,13 +1911,13 @@ static void slice__load_buffer_state  (void)
 /** Allocate and initialize an input buffer state.
  * @param file A readable stream.
  * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- * 
+ *
  * @return the allocated buffer state.
  */
     YY_BUFFER_STATE slice__create_buffer  (FILE * file, int  size )
 {
 	YY_BUFFER_STATE b;
-    
+
 	b = (YY_BUFFER_STATE) slice_alloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in slice__create_buffer()" );
@@ -2029,11 +1940,11 @@ static void slice__load_buffer_state  (void)
 
 /** Destroy the buffer.
  * @param b a buffer created with slice__create_buffer()
- * 
+ *
  */
     void slice__delete_buffer (YY_BUFFER_STATE  b )
 {
-    
+
 	if ( ! b )
 		return;
 
@@ -2054,7 +1965,7 @@ static void slice__load_buffer_state  (void)
 
 {
 	int oerrno = errno;
-    
+
 	slice__flush_buffer(b );
 
 	b->yy_input_file = file;
@@ -2070,13 +1981,13 @@ static void slice__load_buffer_state  (void)
     }
 
         b->yy_is_interactive = 0;
-    
+
 	errno = oerrno;
 }
 
 /** Discard all buffered characters. On the next scan, YY_INPUT will be called.
  * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- * 
+ *
  */
     void slice__flush_buffer (YY_BUFFER_STATE  b )
 {
@@ -2105,7 +2016,7 @@ static void slice__load_buffer_state  (void)
  *  the current state. This function will allocate the stack
  *  if necessary.
  *  @param new_buffer The new state.
- *  
+ *
  */
 void slice_push_buffer_state (YY_BUFFER_STATE new_buffer )
 {
@@ -2135,7 +2046,7 @@ void slice_push_buffer_state (YY_BUFFER_STATE new_buffer )
 
 /** Removes and deletes the top of the stack, if present.
  *  The next element becomes the new top.
- *  
+ *
  */
 void slice_pop_buffer_state (void)
 {
@@ -2159,7 +2070,7 @@ void slice_pop_buffer_state (void)
 static void slice_ensure_buffer_stack (void)
 {
 	yy_size_t num_to_alloc;
-    
+
 	if (!(yy_buffer_stack)) {
 
 		/* First allocation is just for 2 elements, since we don't know if this
@@ -2172,9 +2083,9 @@ static void slice_ensure_buffer_stack (void)
 								);
 		if ( ! (yy_buffer_stack) )
 			YY_FATAL_ERROR( "out of dynamic memory in slice_ensure_buffer_stack()" );
-								  
+
 		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-				
+
 		(yy_buffer_stack_max) = num_to_alloc;
 		(yy_buffer_stack_top) = 0;
 		return;
@@ -2202,13 +2113,13 @@ static void slice_ensure_buffer_stack (void)
 /** Setup the input buffer state to scan directly from a user-specified character buffer.
  * @param base the character buffer
  * @param size the size in bytes of the character buffer
- * 
- * @return the newly allocated buffer state object. 
+ *
+ * @return the newly allocated buffer state object.
  */
 YY_BUFFER_STATE slice__scan_buffer  (char * base, yy_size_t  size )
 {
 	YY_BUFFER_STATE b;
-    
+
 	if ( size < 2 ||
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
@@ -2237,14 +2148,14 @@ YY_BUFFER_STATE slice__scan_buffer  (char * base, yy_size_t  size )
 /** Setup the input buffer state to scan a string. The next call to slice_lex() will
  * scan from a @e copy of @a str.
  * @param yystr a NUL-terminated string to scan
- * 
+ *
  * @return the newly allocated buffer state object.
  * @note If you want to scan bytes that may contain NUL values, then use
  *       slice__scan_bytes() instead.
  */
 YY_BUFFER_STATE slice__scan_string (yyconst char * yystr )
 {
-    
+
 	return slice__scan_bytes(yystr,strlen(yystr) );
 }
 
@@ -2252,7 +2163,7 @@ YY_BUFFER_STATE slice__scan_string (yyconst char * yystr )
  * scan from a @e copy of @a bytes.
  * @param yybytes the byte buffer to scan
  * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
- * 
+ *
  * @return the newly allocated buffer state object.
  */
 YY_BUFFER_STATE slice__scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
@@ -2260,8 +2171,8 @@ YY_BUFFER_STATE slice__scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
-	yy_size_t i;
-    
+	int i;
+
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
 	buf = (char *) slice_alloc(n  );
@@ -2315,16 +2226,16 @@ static void yy_fatal_error (yyconst char* msg )
 /* Accessor  methods (get/set functions) to struct members. */
 
 /** Get the current line number.
- * 
+ *
  */
 int slice_get_lineno  (void)
 {
-        
+
     return slice_lineno;
 }
 
 /** Get the input stream.
- * 
+ *
  */
 FILE *slice_get_in  (void)
 {
@@ -2332,7 +2243,7 @@ FILE *slice_get_in  (void)
 }
 
 /** Get the output stream.
- * 
+ *
  */
 FILE *slice_get_out  (void)
 {
@@ -2340,7 +2251,7 @@ FILE *slice_get_out  (void)
 }
 
 /** Get the length of the current token.
- * 
+ *
  */
 yy_size_t slice_get_leng  (void)
 {
@@ -2348,7 +2259,7 @@ yy_size_t slice_get_leng  (void)
 }
 
 /** Get the current token.
- * 
+ *
  */
 
 char *slice_get_text  (void)
@@ -2358,18 +2269,18 @@ char *slice_get_text  (void)
 
 /** Set the current line number.
  * @param line_number
- * 
+ *
  */
 void slice_set_lineno (int  line_number )
 {
-    
+
     slice_lineno = line_number;
 }
 
 /** Set the input stream. This does not discard the current
  * input buffer.
  * @param in_str A readable stream.
- * 
+ *
  * @see slice__switch_to_buffer
  */
 void slice_set_in (FILE *  in_str )
@@ -2423,7 +2334,7 @@ static int yy_init_globals (void)
 /* slice_lex_destroy is for both reentrant and non-reentrant scanners. */
 int slice_lex_destroy  (void)
 {
-    
+
     /* Pop the buffer stack, destroying each element. */
 	while(YY_CURRENT_BUFFER){
 		slice__delete_buffer(YY_CURRENT_BUFFER  );
@@ -2490,7 +2401,7 @@ void slice_free (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 595 "Scanner.l"
+#line 525 "src/Slice/Scanner.l"
 
 
 
@@ -2532,6 +2443,7 @@ initScanner()
     keywordMap["true"] = ICE_TRUE;
     keywordMap["idempotent"] = ICE_IDEMPOTENT;
     keywordMap["optional"] = ICE_OPTIONAL;
+    keywordMap["Value"] = ICE_VALUE;
 }
 
 //
@@ -2547,15 +2459,15 @@ checkKeyword(string& id)
     StringTokenMap::const_iterator pos = keywordMap.find(id);
     if(pos != keywordMap.end())
     {
-    	if(pos->first != id)
-	{
-	    string msg;
-	    msg = "illegal identifier: `" + id + "' differs from keyword `";
-	    msg += pos->first + "' only in capitalization";
-	    unit->error(msg);
-	    id = pos->first;
-	}
-	return pos->second;
+        if(pos->first != id)
+        {
+            string msg;
+            msg = "illegal identifier: `" + id + "' differs from keyword `";
+            msg += pos->first + "' only in capitalization";
+            unit->error(msg);
+            id = pos->first;
+        }
+        return pos->second;
     }
     return ICE_IDENTIFIER;
 }