diff options
Diffstat (limited to 'xsd/xsd/type-map/lexer.hxx')
| -rw-r--r-- | xsd/xsd/type-map/lexer.hxx | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/xsd/xsd/type-map/lexer.hxx b/xsd/xsd/type-map/lexer.hxx index 923c85f..0d3af42 100644 --- a/xsd/xsd/type-map/lexer.hxx +++ b/xsd/xsd/type-map/lexer.hxx @@ -1,6 +1,5 @@ // file : xsd/type-map/lexer.hxx -// author : Boris Kolpackov <boris@codesynthesis.com> -// copyright : Copyright (c) 2007-2010 Code Synthesis Tools CC +// copyright : Copyright (c) 2007-2014 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_TYPE_MAP_LEXER_HXX @@ -9,13 +8,10 @@ #include <locale> #include <iosfwd> -#include <cult/types.hxx> +#include <types.hxx> namespace TypeMap { - using namespace Cult::Types; - typedef WideString String; - class Lexer { public: @@ -29,7 +25,7 @@ namespace TypeMap eos }; - Token (Type type, String const& lexeme, UnsignedLong line) + Token (Type type, String const& lexeme, size_t line) : type_ (type), lexeme_ (lexeme), line_ (line) { } @@ -46,7 +42,7 @@ namespace TypeMap return lexeme_; } - UnsignedLong + size_t line () const { return line_; @@ -55,7 +51,7 @@ namespace TypeMap private: Type type_; String lexeme_; - UnsignedLong line_; + size_t line_; }; Lexer (std::istream&, String const& path); @@ -69,12 +65,11 @@ namespace TypeMap std::locale locale_; std::istream& is_; String path_; - UnsignedLong line_; + size_t line_; String held_lexeme_; - Boolean comment_; + bool comment_; }; } #endif // XSD_TYPE_MAP_LEXER_HXX - |