Mercurial > octave-nkf
diff libinterp/parse-tree/oct-parse.in.yy @ 19628:fe689210525c gui-release
maint: Periodic merge of stable to gui-release.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 20 Jan 2015 10:05:42 -0500 |
| parents | c59745865c7f 446c46af4b42 |
| children | 0e1f5a750d00 |
line wrap: on
line diff
--- a/libinterp/parse-tree/oct-parse.in.yy Mon Jan 19 07:04:12 2015 +0100 +++ b/libinterp/parse-tree/oct-parse.in.yy Tue Jan 20 10:05:42 2015 -0500 @@ -303,31 +303,31 @@ %destructor { } <dummy_type> %destructor { } <> -%destructor { delete $$; } <tree_type> -%destructor { delete $$; } <tree_matrix_type> -%destructor { delete $$; } <tree_cell_type> -%destructor { delete $$; } <tree_expression_type> -%destructor { delete $$; } <tree_constant_type> -%destructor { delete $$; } <tree_fcn_handle_type> -%destructor { delete $$; } <tree_anon_fcn_handle_type> -%destructor { delete $$; } <tree_identifier_type> -%destructor { delete $$; } <tree_index_expression_type> -%destructor { delete $$; } <tree_colon_expression_type> -%destructor { delete $$; } <tree_argument_list_type> -%destructor { delete $$; } <tree_parameter_list_type> -%destructor { delete $$; } <tree_command_type> -%destructor { delete $$; } <tree_if_command_type> -%destructor { delete $$; } <tree_if_clause_type> -%destructor { delete $$; } <tree_if_command_list_type> -%destructor { delete $$; } <tree_switch_command_type> -%destructor { delete $$; } <tree_switch_case_type> -%destructor { delete $$; } <tree_switch_case_list_type> -%destructor { delete $$; } <tree_decl_elt_type> -%destructor { delete $$; } <tree_decl_init_list_type> -%destructor { delete $$; } <tree_decl_command_type> -%destructor { delete $$; } <tree_statement_type> -%destructor { delete $$; } <tree_statement_list_type> -%destructor { delete $$; } <octave_user_function_type> +%destructor { delete $$; } <tree_type> +%destructor { delete $$; } <tree_matrix_type> +%destructor { delete $$; } <tree_cell_type> +%destructor { delete $$; } <tree_expression_type> +%destructor { delete $$; } <tree_constant_type> +%destructor { delete $$; } <tree_fcn_handle_type> +%destructor { delete $$; } <tree_anon_fcn_handle_type> +%destructor { delete $$; } <tree_identifier_type> +%destructor { delete $$; } <tree_index_expression_type> +%destructor { delete $$; } <tree_colon_expression_type> +%destructor { delete $$; } <tree_argument_list_type> +%destructor { delete $$; } <tree_parameter_list_type> +%destructor { delete $$; } <tree_command_type> +%destructor { delete $$; } <tree_if_command_type> +%destructor { delete $$; } <tree_if_clause_type> +%destructor { delete $$; } <tree_if_command_list_type> +%destructor { delete $$; } <tree_switch_command_type> +%destructor { delete $$; } <tree_switch_case_type> +%destructor { delete $$; } <tree_switch_case_list_type> +%destructor { delete $$; } <tree_decl_elt_type> +%destructor { delete $$; } <tree_decl_init_list_type> +%destructor { delete $$; } <tree_decl_command_type> +%destructor { delete $$; } <tree_statement_type> +%destructor { delete $$; } <tree_statement_list_type> +%destructor { delete $$; } <octave_user_function_type> %destructor { warning_with_id @@ -3428,7 +3428,7 @@ dynamic_cast<octave_push_lexer&> (lexer).append_input (input, eof); do - { + { YYSTYPE lval; int token = octave_lex (&lval, scanner); @@ -3461,7 +3461,7 @@ static octave_function * parse_fcn_file (const std::string& full_file, const std::string& file, const std::string& dispatch_type, - bool require_file, bool force_script, bool autoload, + bool require_file, bool force_script, bool autoload, bool relative_lookup, const std::string& warn_for) { unwind_protect frame; @@ -4610,7 +4610,7 @@ if (nargin == 1 || nargin == 2) { std::string file = args(0).string_value (); - + std::string full_file = octave_env::make_absolute (file); size_t file_len = file.length ();