Mercurial > hg > octave-nkf

diff libinterp/parse-tree/lex.ll @ 16280:0dc6731fc0da classdef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid eat_continuation in classdef branch * lex.ll (octave_lexer::handle_superclass_identifier, octave_lexer::handle_meta_identifier): Don't strip trailing whitespace from yytext since the pattern no longer allows it. Don't call eat_continuation.
author John W. Eaton <jwe@octave.org>
date Mon, 11 Mar 2013 15:36:46 -0400
parents ea78011f66bf
children 82ff1c5bbff0
line wrap: on
line diff
--- a/libinterp/parse-tree/lex.ll
+++ b/libinterp/parse-tree/lex.ll
@@ -2462,14 +2462,7 @@
 int
 octave_lexer::handle_superclass_identifier (void)
 {
-  char *yytxt = flex_yytext ();
-  int c = yytxt[flex_yyleng()-1];
-
-  std::string meth = strip_trailing_whitespace (yytxt);
-
-  int cont_is_spc = eat_continuation ();
-
-  int spc_gobbled = (cont_is_spc || c == ' ' || c == '\t');
+  std::string meth = flex_yytext ();
 
   size_t pos = meth.find ("@");
   std::string cls = meth.substr (pos + 1);
@@ -2502,14 +2495,7 @@
 int
 octave_lexer::handle_meta_identifier (void)
 {
-  char *yytxt = flex_yytext ();
-  int c = yytxt[flex_yyleng()-1];
-
-  std::string cls = strip_trailing_whitespace (yytxt).substr (1);
-
-  int cont_is_spc = eat_continuation ();
-
-  int spc_gobbled = (cont_is_spc || c == ' ' || c == '\t');
+  std::string cls = std::string(flex_yytext ()).substr (1);
 
   std::string pkg;
   size_t pos = cls.find (".");