zeroc-ice 3.7.1 → 3.7.2

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <IceUtil/DisableWarnings.h>
+#include <IceUtil/StringUtil.h>
 #include <IceUtil/Options.h>
 #include <IceUtil/CtrlCHandler.h>
 #include <IceUtil/Mutex.h>
@@ -296,9 +291,9 @@ Slice::Ruby::compile(const vector<string>& argv)
                         out.open(file.c_str());
                         if(!out)
                         {
-                            ostringstream os;
-                            os << "cannot open`" << file << "': " << strerror(errno);
-                            throw FileException(__FILE__, __LINE__, os.str());
+                            ostringstream oss;
+                            oss << "cannot open`" << file << "': " << IceUtilInternal::errorToString(errno);
+                            throw FileException(__FILE__, __LINE__, oss.str());
                         }
                         FileTracker::instance()->addFile(file);
                         //

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

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

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

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

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

@@ -54,7 +54,7 @@
 #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types.
+ * if you want the limit (max/min) macros for int types. 
  */
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS 1
@@ -71,7 +71,7 @@ typedef uint32_t flex_uint32_t;
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
 typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t;
+typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
 
@@ -188,7 +188,7 @@ extern FILE *slice_in, *slice_out;
 #define EOB_ACT_LAST_MATCH 2
 
     #define YY_LESS_LINENO(n)
-
+    
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
 	do \
@@ -245,7 +245,7 @@ struct yy_buffer_state
 
     int yy_bs_lineno; /**< The line count. */
     int yy_bs_column; /**< The column count. */
-
+    
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
@@ -546,14 +546,9 @@ char *slice_text;
 #line 1 "src/Slice/Scanner.l"
 #line 2 "src/Slice/Scanner.l"
 
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Slice/GrammarUtil.h>  // Before Grammer.h, so that YYSTYPE is defined
 #include <Slice/Grammar.h>
@@ -564,24 +559,19 @@ char *slice_text;
 #include <stdlib.h>
 #include <math.h>
 
-#if defined(_MSC_VER) && defined(ICE_64)
-//
-// '=' : conversion from 'size_t' to 'int', possible loss of data
-// The result of fread() is a size_t and gets inserted into an int
-//
-#   pragma warning( 4 : 4267 )
-//
+#if defined(_MSC_VER)
+// '<' : signed/unsigned mismatch
+#   pragma warning(disable:4018)
 // 'initializing' : conversion from '__int64' to 'int', possible loss of data
-// Puts a pointer-difference into an int
-//
-#   pragma warning( 4 : 4244 )
-#endif
+#   pragma warning(disable:4244)
 
-#if defined(_MSC_VER) && defined(ICE_32)
+#   if defined(ICE_64)
 //
-// '<' : signed/unsigned mismatch
+// '=' : conversion from 'size_t' to 'int', possible loss of data
+// The result of fread() is a size_t and gets inserted into an int
 //
-#   pragma warning( 4 : 4018 )
+#       pragma warning(disable:4267)
+#   endif
 #endif
 
 #if defined(__GNUC__)
@@ -628,7 +618,7 @@ int checkIdentifier(string&);
 
 
 
-#line 631 "src/Slice/Scanner.cpp"
+#line 626 "src/Slice/Scanner.cpp"
 
 #define INITIAL 0
 #define BOMSCAN 1
@@ -690,7 +680,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
@@ -814,11 +804,11 @@ YY_DECL
 	register yy_state_type yy_current_state;
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
+    
+#line 93 "src/Slice/Scanner.l"
 
-#line 98 "src/Slice/Scanner.l"
 
-
-#line 821 "src/Slice/Scanner.cpp"
+#line 816 "src/Slice/Scanner.cpp"
 
 	if ( !(yy_init) )
 		{
@@ -903,7 +893,7 @@ case 1:
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up slice_text again */
 YY_RULE_SETUP
-#line 100 "src/Slice/Scanner.l"
+#line 95 "src/Slice/Scanner.l"
 {
     if(unit->scanPosition(slice_text))
     {
@@ -917,7 +907,7 @@ case 2:
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up slice_text again */
 YY_RULE_SETUP
-#line 107 "src/Slice/Scanner.l"
+#line 102 "src/Slice/Scanner.l"
 {
     if(unit->scanPosition(slice_text))
     {
@@ -930,7 +920,7 @@ case 3:
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up slice_text again */
 YY_RULE_SETUP
-#line 114 "src/Slice/Scanner.l"
+#line 109 "src/Slice/Scanner.l"
 {
     if(unit->scanPosition(slice_text))
     {
@@ -944,7 +934,7 @@ case 4:
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up slice_text again */
 YY_RULE_SETUP
-#line 121 "src/Slice/Scanner.l"
+#line 116 "src/Slice/Scanner.l"
 {
     if(unit->scanPosition(slice_text))
     {
@@ -954,7 +944,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 128 "src/Slice/Scanner.l"
+#line 123 "src/Slice/Scanner.l"
 {
     // C++-style comment
     BEGIN(MAINSCAN);
@@ -972,7 +962,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 143 "src/Slice/Scanner.l"
+#line 138 "src/Slice/Scanner.l"
 {
     // C-style comment
     BEGIN(MAINSCAN);
@@ -1016,7 +1006,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 184 "src/Slice/Scanner.l"
+#line 179 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     return ICE_METADATA_OPEN;
@@ -1024,7 +1014,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 189 "src/Slice/Scanner.l"
+#line 184 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     return ICE_METADATA_CLOSE;
@@ -1032,7 +1022,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 194 "src/Slice/Scanner.l"
+#line 189 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     return ICE_GLOBAL_METADATA_OPEN;
@@ -1040,7 +1030,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 199 "src/Slice/Scanner.l"
+#line 194 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     return ICE_GLOBAL_METADATA_CLOSE;
@@ -1049,7 +1039,7 @@ YY_RULE_SETUP
 case 11:
 /* rule 11 can match eol */
 YY_RULE_SETUP
-#line 204 "src/Slice/Scanner.l"
+#line 199 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     StringTokPtr ident = new StringTok;
@@ -1086,7 +1076,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 238 "src/Slice/Scanner.l"
+#line 233 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     StringTokPtr ident = new StringTok;
@@ -1097,15 +1087,15 @@ YY_RULE_SETUP
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 246 "src/Slice/Scanner.l"
+#line 241 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     StringTokPtr str = new StringTok;
     str->literal = "\"";
     while(true)
     {
-        char c = static_cast<char>(yyinput());
-        str->literal += c;
+        int c = yyinput();
+        str->literal += static_cast<char>(c);
         if(c == '"')
         {
             break;
@@ -1115,15 +1105,15 @@ YY_RULE_SETUP
             unit->error("EOF in string");
             break;
         }
-        else if(static_cast<unsigned char>(c) < 32 || c == 127)
+        else if(c < 32 || c == 127)
         {
             unit->error("a string literal can only contain printable ASCII characters and non-ASCII characters");
             break;
         }
         else if(c == '\\')
         {
-            char next = static_cast<char>(yyinput());
-            str->literal += next;
+            int next = yyinput();
+            str->literal += static_cast<char>(next);
             switch(next)
             {
                 case '\\':
@@ -1139,7 +1129,7 @@ YY_RULE_SETUP
                 case '\'':
                 case '?':
                 {
-                    str->v += next;
+                    str->v += static_cast<char>(next);
                     break;
                 }
                 case 'a':
@@ -1193,16 +1183,16 @@ YY_RULE_SETUP
                 {
                     static string octalDigits = "01234567";
                     string escape;
-                    escape += next;
+                    escape += static_cast<char>(next);
                     for(int i = 0; i < 2; ++i)
                     {
-                        next = static_cast<char>(yyinput());
-                        if(octalDigits.find_first_of(next) == string::npos)
+                        next = yyinput();
+                        if(octalDigits.find_first_of(static_cast<char>(next)) == string::npos)
                         {
                             unput(next);
                             break;
                         }
-                        escape += next;
+                        escape += static_cast<char>(next);
                     }
                     str->literal += escape;
                     IceUtil::Int64 value = IceUtilInternal::strToInt64(escape.c_str(), 0, 8);
@@ -1217,15 +1207,15 @@ YY_RULE_SETUP
                 case 'x':
                 {
                     string escape = "";
-                    next = static_cast<char>(yyinput());
+                    next = yyinput();
 
                     //
                     // Unlike C++, we limit hex escape sequences to 2 hex digits
                     //
-                    while(isxdigit(next) && escape.length() < 2)
+                    while(isxdigit(static_cast<char>(next)) && escape.length() < 2)
                     {
-                        escape += next;
-                        next = static_cast<char>(yyinput());
+                        escape += static_cast<char>(next);
+                        next = yyinput();
                     }
                     unput(next);
 
@@ -1249,18 +1239,19 @@ YY_RULE_SETUP
                 case 'U':
                 {
                     string escape = "";
-                    char c = next;
+                    c = next;
                     int size = (c == 'u') ? 4 : 8;
                     while(size > 0)
                     {
-                        next = static_cast<char>(yyinput());
-                        if(!isxdigit(static_cast<unsigned char>(next)))
+                        next = yyinput();
+                        if(!isxdigit(next))
                         {
-                            unit->error(string("unknown escape sequence in string literal: `\\") + c + escape + next + "'");
+                            unit->error(string("unknown escape sequence in string literal: `\\") +
+                                               static_cast<char>(c) + escape + static_cast<char>(next) + "'");
                             unput(next);
                             break;
                         }
-                        escape += next;
+                        escape += static_cast<char>(next);
                         --size;
                     }
 
@@ -1270,19 +1261,20 @@ YY_RULE_SETUP
                         IceUtil::Int64 codePoint = IceUtilInternal::strToInt64(escape.c_str(), 0, 16);
                         if(codePoint >= 0xd800 && codePoint <= 0xdfff)
                         {
-                            unit->error(string("a universal character name cannot designate a surrogate: `\\") + c + escape + "'");
+                            unit->error(string("a universal character name cannot designate a surrogate: `\\") +
+                                               static_cast<char>(c) + escape + "'");
                         }
                     }
 
                     str->literal += escape;
-                    str->v += string("\\") + c + escape;
+                    str->v += string("\\") + static_cast<char>(c) + escape;
                     break;
                 }
 
                 default:
                 {
                     ostringstream os;
-                    os << "unknown escape sequence `\\" << next << "'";
+                    os << "unknown escape sequence `\\" << static_cast<char>(next) << "'";
                     unit->warning(All, os.str());
 
                     // Escape the \ in this unknown escape sequence
@@ -1294,7 +1286,7 @@ YY_RULE_SETUP
         }
         else
         {
-            str->v += c;
+            str->v += static_cast<char>(c);
         }
     }
     *yylvalp = str;
@@ -1303,7 +1295,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 449 "src/Slice/Scanner.l"
+#line 446 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     IntegerTokPtr itp = new IntegerTok;
@@ -1322,7 +1314,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 465 "src/Slice/Scanner.l"
+#line 462 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     errno = 0;
@@ -1356,7 +1348,7 @@ YY_RULE_SETUP
 case 16:
 /* rule 16 can match eol */
 YY_RULE_SETUP
-#line 495 "src/Slice/Scanner.l"
+#line 492 "src/Slice/Scanner.l"
 {
     // Ignore white-space
 
@@ -1372,7 +1364,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 508 "src/Slice/Scanner.l"
+#line 505 "src/Slice/Scanner.l"
 {
     // Ignore UTF-8 BOM, rule only active when parsing start of file.
 
@@ -1381,7 +1373,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 514 "src/Slice/Scanner.l"
+#line 511 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     if(slice_text[0] < 32 || slice_text[0] > 126)
@@ -1400,10 +1392,10 @@ YY_RULE_SETUP
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 530 "src/Slice/Scanner.l"
+#line 527 "src/Slice/Scanner.l"
 ECHO;
 	YY_BREAK
-#line 1406 "src/Slice/Scanner.cpp"
+#line 1403 "src/Slice/Scanner.cpp"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(BOMSCAN):
 case YY_STATE_EOF(MAINSCAN):
@@ -1684,7 +1676,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();
 
@@ -1739,7 +1731,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 */
@@ -1782,7 +1774,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 )
@@ -1851,12 +1843,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 =
@@ -1869,11 +1861,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();
@@ -1913,13 +1905,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()" );
@@ -1942,11 +1934,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;
 
@@ -1967,7 +1959,7 @@ static void slice__load_buffer_state  (void)
 
 {
 	int oerrno = errno;
-
+    
 	slice__flush_buffer(b );
 
 	b->yy_input_file = file;
@@ -1983,13 +1975,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 )
 {
@@ -2018,7 +2010,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 )
 {
@@ -2048,7 +2040,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)
 {
@@ -2072,7 +2064,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
@@ -2085,9 +2077,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;
@@ -2115,13 +2107,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 )
@@ -2150,14 +2142,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) );
 }
 
@@ -2165,7 +2157,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 )
@@ -2174,7 +2166,7 @@ YY_BUFFER_STATE slice__scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_
 	char *buf;
 	yy_size_t n;
 	int i;
-
+    
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
 	buf = (char *) slice_alloc(n  );
@@ -2228,16 +2220,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)
 {
@@ -2245,7 +2237,7 @@ FILE *slice_get_in  (void)
 }
 
 /** Get the output stream.
- *
+ * 
  */
 FILE *slice_get_out  (void)
 {
@@ -2253,7 +2245,7 @@ FILE *slice_get_out  (void)
 }
 
 /** Get the length of the current token.
- *
+ * 
  */
 yy_size_t slice_get_leng  (void)
 {
@@ -2261,7 +2253,7 @@ yy_size_t slice_get_leng  (void)
 }
 
 /** Get the current token.
- *
+ * 
  */
 
 char *slice_get_text  (void)
@@ -2271,18 +2263,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 )
@@ -2336,7 +2328,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  );
@@ -2403,7 +2395,7 @@ void slice_free (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 530 "src/Slice/Scanner.l"
+#line 527 "src/Slice/Scanner.l"