[lpg-commits] lpg.runtime.cpp/include LexerBasicMap.gi, 1.2, 1.3 LexerVeryBasicMap.gi, 1.1, 1.2

[Robert F. <rmf...@us...>]

Update of /cvsroot/lpg/lpg.runtime.cpp/include
In directory vz-cvs-2.sog:/tmp/cvs-serv10214

Modified Files:
	LexerBasicMap.gi LexerVeryBasicMap.gi 
Log Message:
New versions of the include files that are getting closer to usable for a bootstrapped scanner for the generator

Index: LexerBasicMap.gi
===================================================================
RCS file: /cvsroot/lpg/lpg.runtime.cpp/include/LexerBasicMap.gi,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LexerBasicMap.gi	7 Apr 2011 13:13:11 -0000	1.2
--- LexerBasicMap.gi	28 Apr 2011 22:02:17 -0000	1.3
***************
*** 21,25 ****
              inline void makeToken(int kind)
              {
!                 prsStream_->makeToken(inputChars_, getLeftSpan(), getRightSpan(), kind);
              }
  
--- 21,25 ----
              inline void makeToken(int kind)
              {
!                 tokenStream_->makeToken(&inputFile_, getLeftSpan(), getRightSpan(), kind);
              }
  
***************
*** 35,39 ****
      /.
          $action_class::$action_class(const char* fileName)
!            : LexStream(fileName), lp_(this),
               kwLexer_(new $kw_lexer_class(inputChars_, $exp_class::$_IDENTIFIER))
          {}
--- 35,39 ----
      /.
          $action_class::$action_class(const char* fileName)
!            : CharStream(fileName), lp_(this),
               kwLexer_(new $kw_lexer_class(inputChars_, $exp_class::$_IDENTIFIER))
          {}

Index: LexerVeryBasicMap.gi
===================================================================
RCS file: /cvsroot/lpg/lpg.runtime.cpp/include/LexerVeryBasicMap.gi,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LexerVeryBasicMap.gi	27 Mar 2011 21:27:42 -0000	1.1
--- LexerVeryBasicMap.gi	28 Apr 2011 22:02:17 -0000	1.2
***************
*** 21,25 ****
  
          $action_class::$action_class(const char* fileName)
!            : LexStream(fileName), lp_(this) { }
  
          int $action_class::getKind(int _c)
--- 21,25 ----
  
          $action_class::$action_class(const char* fileName)
!            : CharStream(fileName), lp_(this) { }
  
          int $action_class::getKind(int _c)