Mercurial > octave-nkf
view libinterp/corefcn/oct-tex-parser.in.yy @ 20569:b70cc4bd8109
begin removal of global error_state variable
* gripes.h, gripes.cc (gripe_library_execution_error): Delete.
* error.cc (warning_state): Delete unused variable.
(reset_error_handler): Don't set warning_state or error_state.
(debug_or_throw_exception): New static function.
(verror): Don't check error_state.
(vmessage): Call debug_or_throw_exception instead of setting
error_state.
(error_1, error_2): Combine into single function, error_1 that prints
error message and ultimately calls debug_or_throw_exception.
(verror, verror_with_cfn, verror_with_id_cfn): Call error_1. Don't
check or set warning_state.
(error): Don't check error_state.
(Flasterror, Flasterr): Adapt to not using error_state.
(interpreter_try): Don't unwind_protect error_state.
* NEWS: Update.
* doc/interpreter/external.txi: Explain octave_execution_exception
instead of error_state for matrix addition example.
* jit-typeinfo.cc (octave_jit_gripe_nan_to_logical_conversion,
octave_jit_ginvalid_index, octave_jit_gindex_range,
octave_jit_paren_scalar, octave_jit_paren_scalar_subsasgn):
Don't catch octave_execution_exception.
* cellfun.cc (Fcellfun): Use exceptions instead of error_state.
* ls-mat-ascii.cc (save_mat_ascii_data): Likewise.
* mex.cc (mexCallMATLAB, mexEvalString): Likewise.
* variables.cc (safe_symbol_lookup): Likewise.
* svd.cc (Fsvd): Eliminate use of error_state.
* __magick_read__.cc (read_file, write_file): Likewise.
* variables.cc (generate_struct_completions): Eliminate use of
obsolete warning_state variable.
* ov-builtin.cc (octave_builtin::do_multi_index_op): Don't catch
octave_execution_exception and call gripe_library_execution_error.
* ov-class.cc (octave_class::reconstruct_exemplar): Eliminate use of
error_state. Catch possible octave_execution_exception in
do_multi_index_op.
* ov-mex-fcn.cc (octave_mex_function::do_multi_index_op): Eliminate
use of error_state. Catch possible octave_execution_exception in
call_mex.
* ov-fcn-handle.cc (octave_fcn_binder::maybe_binder): Eliminate use of
error_state.
* ov-oncleanup.cc (octave_oncleanup::~octave_oncleanup): Eliminate use
of error_state. Propagate possible octave_execution_exception from
do_multi_index_op.
* ov.cc (octave_value::assign, do_binary_op, do_unary_op,
octave_value::do_non_const_unary_op): Don't catch
octave_execution_exception here.
* oct-parse.in.yy (octave_base_parser::finish_colon_expression,
octave_base_parser::finish_array_list): Eliminate use of warning_state
and error_state.
(Feval, Fevalin): Use exceptions instead of error_state.
* pt-eval.cc, pt-eval.h (tree_evaluator::unwind_protect_exception):
New static variable.
* (tree_evaluator::visit_statement): Don't catch
octave_execution_exception here.
(tree_evaluator::visit_try_catch_command,
tree_evaluator::do_unwind_protect_cleanup): Eliminate use of error_state.
(tree_evaluator::visit_unwind_protect_command): Use
unwind_protect_exception to track whether an exception has occurred in
the try block.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 01 Oct 2015 16:18:19 -0400 |
parents | a941a65c7cb8 |
children | e3c0fee87493 |
line wrap: on
line source
/* Copyright (C) 2013-2015 Michael Goffioul This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ %{ #define YYDEBUG 1 #ifdef HAVE_CONFIG_H #include <config.h> #endif #include "txt-eng.h" #include "oct-tex-parser.h" extern int octave_tex_lex (YYSTYPE *, void *); static void yyerror (text_parser_tex& parser, const char *s); #if defined (GNULIB_NAMESPACE) // Calls to the following functions appear in the generated output from // Bison without the namespace tag. Redefine them so we will use them // via the gnulib namespace. #define fclose GNULIB_NAMESPACE::fclose #define fprintf GNULIB_NAMESPACE::fprintf #define malloc GNULIB_NAMESPACE::malloc #endif #define scanner parser.get_scanner () %} %API_PREFIX_DECL% %define api.pure %parse-param { text_parser_tex& parser } %lex-param { void *scanner } %code requires {#include <string>} %union { /* Leaf symbols produced by the scanner */ char ch; double num; int sym; /* Used for string buffering */ std::string* str; /* Objects produced by the parser */ text_element* e_base; text_element_list* e_list; } %token BF IT SL RM %token FONTNAME FONTSIZE %token COLOR COLOR_RGB %token START END SUPER SUB %token<ch> CH %token<num> NUM %token<sym> SYM %type<str> simple_string %type<e_base> string_element symbol_element %type<e_base> superscript_element subscript_element combined_script_element %type<e_base> font_modifier_element fontname_element fontsize_element color_element %type<e_list> string_element_list scoped_string_element_list /* Make sure there's no memory leak on parse error. */ %destructor { } <ch> <num> <sym> %destructor { delete $$; } <*> %nonassoc SCRIPT %nonassoc SUB SUPER %nonassoc STR %nonassoc CH %start string %% simple_string : CH { $$ = new std::string (1, $1); } | simple_string CH { $1->append (1, $2); $$ = $1; } ; symbol_element : SYM { $$ = new text_element_symbol ($1); } ; font_modifier_element : BF { $$ = new text_element_fontstyle (text_element_fontstyle::bold); } | IT { $$ = new text_element_fontstyle (text_element_fontstyle::italic); } | SL { $$ = new text_element_fontstyle (text_element_fontstyle::oblique); } | RM { $$ = new text_element_fontstyle (text_element_fontstyle::normal); } ; fontsize_element : FONTSIZE START NUM END { $$ = new text_element_fontsize ($3); } ; fontname_element : FONTNAME START simple_string END { $$ = new text_element_fontname (*$3); delete $3; } ; color_element : COLOR START simple_string END { $$ = new text_element_color (*$3); delete $3; } | COLOR_RGB START NUM NUM NUM END { $$ = new text_element_color ($3, $4, $5); } ; string_element : simple_string %prec STR { $$ = new text_element_string (*$1); delete $1; } | scoped_string_element_list /* This is just to avoid a warning in bison. */ { $$ = $1; } | symbol_element | font_modifier_element | fontsize_element | fontname_element | color_element | superscript_element %prec SCRIPT | subscript_element %prec SCRIPT | combined_script_element ; superscript_element : SUPER CH { $$ = new text_element_superscript ($2); } | SUPER scoped_string_element_list { $$ = new text_element_superscript ($2); } | SUPER symbol_element { $$ = new text_element_superscript ($2); } ; subscript_element : SUB CH { $$ = new text_element_subscript ($2); } | SUB scoped_string_element_list { $$ = new text_element_subscript ($2); } | SUB symbol_element { $$ = new text_element_subscript ($2); } ; combined_script_element : subscript_element superscript_element { $$ = new text_element_combined ($1, $2); } | superscript_element subscript_element { $$ = new text_element_combined ($1, $2); } ; string_element_list : string_element { $$ = new text_element_list ($1); } | string_element_list string_element { $1->push_back ($2); $$ = $1; } ; scoped_string_element_list : START string_element_list END { $$ = $2; } | START END { $$ = new text_element_list (); } ; string : /* empty */ { parser.set_parse_result (new text_element_string ("")); } | string_element_list { parser.set_parse_result ($1); } ; %% text_element* text_parser_tex::parse (const std::string& s) { octave_tex_debug = 0; if (init_lexer (s)) { result = 0; if (octave_tex_parse (*this) == 0) return result; } return new text_element_string (s); } static void yyerror (text_parser_tex&, const char *s) { fprintf (stderr, "TeX parse error: %s\n", s); }