Mercurial > octave-nkf
view libinterp/corefcn/oct-tex-parser.in.yy @ 20574:dd6345fd8a97
use exceptions for better invalid index error reporting (bug #45957)
* lo-array-gripes.h, lo-array-gripes.cc (index_exception):
New base class for indexing errors.
(invalid_index, out_of_range): New classes.
(gripe_index_out_of_range): New overloaded function.
(gripe_invalid_index): New overloaded functions.
Delete version with no arguments.
(gripe_invalid_assignment_size, gripe_assignment_dimension_mismatch):
Delete.
Change uses of gripe functions as needed.
* Cell.cc (Cell::index, Cell::assign, Cell::delete_elements): Use
exceptions to collect error info about and handle indexing errors.
* data.cc (Fnth_element, do_accumarray_sum, F__accumarray_sum__,
do_accumarray_minmax, do_accumarray_minmax_fun, F__accumdim_sum__):
Likewise.
* oct-map.cc (octave_map::index, octave_map::assign,
octave_map::delete_elements): Likewise.
* sparse.cc (Fsparse): Likewise.
* sub2ind.cc (Fsub2ind, Find2sub): Likewise. New tests.
* utils.cc (dims_to_numel): Likewise.
* ov-base-diag.cc (octave_base_diag<DMT, MT>::do_index_op,
octave_base_diag<DMT, MT>::subsasgn): Likewise.
* ov-base-mat.cc (octave_base_matrix<MT>::subsref,
octave_base_matrix<MT>::assign): Likewise.
* ov-base-sparse.cc (octave_base_sparse<T>::do_index_op,
octave_base_sparse<T>::assign,
octave_base_sparse<MT>::delete_elements): Likewise.
* ov-classdef.cc (cdef_object_array::subsref,
cdef_object_array::subsasgn): Likewise.
* ov-java.cc (make_java_index): Likewise.
* ov-perm.cc (octave_perm_matrix::do_index_op): Likewise.
* ov-range.cc (octave_range::do_index_op): Likewise.
* ov-re-diag.cc (octave_diag_matrix::do_index_op): Likewise.
* ov-str-mat.cc (octave_char_matrix_str::do_index_op_internal): Likewise.
* pt-assign.cc (tree_simple_assignment::rvalue1): Likewise.
* pt-idx.cc (tree_index_expression::rvalue,
tree_index_expression::lvalue): Likewise.
* Array-util.cc (sub2ind): Likewise.
* toplev.cc (main_loop): Also catch unhandled index_exception
exceptions.
* ov-base.cc (octave_base_value::index_vector): Improve error message.
* ov-re-sparse.cc (octave_sparse_matrix::index_vector): Likewise.
* ov-complex.cc (complex_index): New class.
(gripe_complex_index): New function.
(octave_complex::index_vector): Use it.
* pt-id.h, pt-id.cc (tree_identifier::is_variable,
tree_black_hole::is_variable): Now const.
* pt-idx.cc (final_index_error): New static function.
(tree_index_expression::rvalue, tree_index_expression::lvalue):
Use it.
* index.tst: New tests.
author | Lachlan Andrew <lachlanbis@gmail.com> |
---|---|
date | Fri, 02 Oct 2015 15:07:37 -0400 |
parents | e3c0fee87493 |
children |
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 %type<e_base> 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 { $$ = $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); }