diff options
Diffstat (limited to 'boost/wave/cpplexer/re2clex/scanner.hpp')
| -rw-r--r-- | boost/wave/cpplexer/re2clex/scanner.hpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/boost/wave/cpplexer/re2clex/scanner.hpp b/boost/wave/cpplexer/re2clex/scanner.hpp index 1c696cf69b..a2c36f99b6 100644 --- a/boost/wave/cpplexer/re2clex/scanner.hpp +++ b/boost/wave/cpplexer/re2clex/scanner.hpp @@ -4,8 +4,8 @@ http://www.boost.org/ Copyright (c) 2001 Daniel C. Nuffer. - Copyright (c) 2001-2012 Hartmut Kaiser. - Distributed under the Boost Software License, Version 1.0. (See accompanying + Copyright (c) 2001-2012 Hartmut Kaiser. + Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ @@ -28,7 +28,7 @@ namespace re2clex { struct Scanner; typedef unsigned char uchar; -typedef int (* ReportErrorProc)(struct Scanner const *, int errorcode, +typedef int (* ReportErrorProc)(struct Scanner const *, int errorcode, char const *, ...); typedef struct Scanner { @@ -37,7 +37,7 @@ typedef struct Scanner { uchar* last; /* end (one past last char) of input buffer */ uchar* bot; /* beginning of the current buffer */ uchar* top; /* top of the current buffer */ - uchar* eof; /* when we read in the last buffer, will point 1 past the + uchar* eof; /* when we read in the last buffer, will point 1 past the end of the file, otherwise 0 */ uchar* tok; /* points to the beginning of the current token */ uchar* ptr; /* used for YYMARKER - saves backtracking info */ @@ -45,10 +45,10 @@ typedef struct Scanner { uchar* lim; /* used for YYLIMIT - points to the end of the buffer */ /* (lim == top) except for the last buffer, it points to the end of the input (lim == eof - 1) */ - unsigned int line; /* current line being lex'ed */ - unsigned int column; /* current token start column position */ - unsigned int curr_column; /* current column position */ - ReportErrorProc error_proc; /* must be != 0, this function is called to + std::size_t line; /* current line being lex'ed */ + std::size_t column; /* current token start column position */ + std::size_t curr_column; /* current column position */ + ReportErrorProc error_proc; /* must be != 0, this function is called to report an error */ char const *file_name; /* name of the lex'ed file */ aq_queue eol_offsets; |