Mercurial > octave
diff libinterp/parse-tree/lex.ll @ 23075:4e3d47dc7e25
move parse tree classes inside octave namespace
* lex.h, lex.ll, oct-parse.in.yy, parse.h, pt-all.h, pt-arg-list.cc,
pt-arg-list.h, pt-array-list.cc, pt-array-list.h, pt-assign.cc,
pt-assign.h, pt-binop.cc, pt-binop.h, pt-bp.cc, pt-bp.h, pt-cbinop.cc,
pt-cbinop.h, pt.cc, pt-cell.cc, pt-cell.h, pt-check.cc, pt-check.h,
pt-classdef.cc, pt-classdef.h, pt-cmd.cc, pt-cmd.h, pt-colon.cc,
pt-colon.h, pt-const.cc, pt-const.h, pt-decl.cc, pt-decl.h,
pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h,
pt-fcn-handle.cc, pt-fcn-handle.h, pt-funcall.cc, pt-funcall.h, pt.h,
pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, pt-jump.cc, pt-jump.h,
pt-loop.cc, pt-loop.h, pt-mat.cc, pt-mat.h, pt-misc.cc, pt-misc.h,
pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-stmt.cc,
pt-stmt.h, pt-unop.cc, pt-unop.h, pt-walk.h, token.cc, token.h:
Move classes and most functions inside octave namespace.
Change all uses.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 19 Jan 2017 23:41:54 -0500 |
| parents | aedc662896a3 |
| children | 95a9d6ffaecc |
line wrap: on
line diff
--- a/libinterp/parse-tree/lex.ll Thu Jan 19 14:47:19 2017 -0500 +++ b/libinterp/parse-tree/lex.ll Thu Jan 19 23:41:54 2017 -0500 @@ -857,10 +857,10 @@ curr_lexer->looking_for_object_index = true; curr_lexer->at_beginning_of_statement = false; - curr_lexer->push_token (new token (DQ_STRING, - curr_lexer->string_text, - curr_lexer->string_line, - curr_lexer->string_column)); + curr_lexer->push_token (new octave::token (DQ_STRING, + curr_lexer->string_text, + curr_lexer->string_line, + curr_lexer->string_column)); curr_lexer->string_text = ""; @@ -878,11 +878,11 @@ if (result > 0xff) { - token *tok - = new token (LEXICAL_ERROR, - "invalid octal escape sequence in character string", - curr_lexer->input_line_number, - curr_lexer->current_input_column); + octave::token *tok + = new octave::token (LEXICAL_ERROR, + "invalid octal escape sequence in character string", + curr_lexer->input_line_number, + curr_lexer->current_input_column); curr_lexer->push_token (tok); @@ -1020,10 +1020,11 @@ <DQ_STRING_START>{NL} { curr_lexer->lexer_debug ("<DQ_STRING_START>{NL}"); - token *tok = new token (LEXICAL_ERROR, - "unterminated character string constant", - curr_lexer->input_line_number, - curr_lexer->current_input_column); + octave::token *tok + = new octave::token (LEXICAL_ERROR, + "unterminated character string constant", + curr_lexer->input_line_number, + curr_lexer->current_input_column); curr_lexer->push_token (tok); @@ -1056,10 +1057,10 @@ curr_lexer->looking_for_object_index = true; curr_lexer->at_beginning_of_statement = false; - curr_lexer->push_token (new token (SQ_STRING, - curr_lexer->string_text, - curr_lexer->string_line, - curr_lexer->string_column)); + curr_lexer->push_token (new octave::token (SQ_STRING, + curr_lexer->string_text, + curr_lexer->string_line, + curr_lexer->string_column)); curr_lexer->string_text = ""; @@ -1077,10 +1078,11 @@ <SQ_STRING_START>{NL} { curr_lexer->lexer_debug ("<SQ_STRING_START>{NL}"); - token *tok = new token (LEXICAL_ERROR, - "unterminated character string constant", - curr_lexer->input_line_number, - curr_lexer->current_input_column); + octave::token *tok + = new octave::token (LEXICAL_ERROR, + "unterminated character string constant", + curr_lexer->input_line_number, + curr_lexer->current_input_column); curr_lexer->push_token (tok); @@ -1368,10 +1370,11 @@ } else if (curr_lexer->nesting_level.is_bracket_or_brace ()) { - token *tok = new token (LEXICAL_ERROR, - "unexpected internal lexer error", - curr_lexer->input_line_number, - curr_lexer->current_input_column); + octave::token *tok + = new octave::token (LEXICAL_ERROR, + "unexpected internal lexer error", + curr_lexer->input_line_number, + curr_lexer->current_input_column); curr_lexer->push_token (tok); @@ -1757,9 +1760,10 @@ << undo_string_escape (static_cast<char> (c)) << "' (ASCII " << c << ")"; - token *tok = new token (LEXICAL_ERROR, buf.str (), - curr_lexer->input_line_number, - curr_lexer->current_input_column); + octave::token *tok + = new octave::token (LEXICAL_ERROR, buf.str (), + curr_lexer->input_line_number, + curr_lexer->current_input_column); curr_lexer->push_token (tok);