Mercurial > octave-nkf

comparison libinterp/parse-tree/oct-parse.in.yy @ 19628:fe689210525c gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
19624:6d75f1683ce8 19628:fe689210525c
301 %destructor { } <tok_val> 301 %destructor { } <tok_val>
302 %destructor { } <comment_type> 302 %destructor { } <comment_type>
303 %destructor { } <dummy_type> 303 %destructor { } <dummy_type>
304 %destructor { } <> 304 %destructor { } <>
305 305
306 %destructor { delete $$; } <tree_type> 306 %destructor { delete $$; } <tree_type>
307 %destructor { delete $$; } <tree_matrix_type> 307 %destructor { delete $$; } <tree_matrix_type>
308 %destructor { delete $$; } <tree_cell_type> 308 %destructor { delete $$; } <tree_cell_type>
309 %destructor { delete $$; } <tree_expression_type> 309 %destructor { delete $$; } <tree_expression_type>
310 %destructor { delete $$; } <tree_constant_type> 310 %destructor { delete $$; } <tree_constant_type>
311 %destructor { delete $$; } <tree_fcn_handle_type> 311 %destructor { delete $$; } <tree_fcn_handle_type>
312 %destructor { delete $$; } <tree_anon_fcn_handle_type> 312 %destructor { delete $$; } <tree_anon_fcn_handle_type>
313 %destructor { delete $$; } <tree_identifier_type> 313 %destructor { delete $$; } <tree_identifier_type>
314 %destructor { delete $$; } <tree_index_expression_type> 314 %destructor { delete $$; } <tree_index_expression_type>
315 %destructor { delete $$; } <tree_colon_expression_type> 315 %destructor { delete $$; } <tree_colon_expression_type>
316 %destructor { delete $$; } <tree_argument_list_type> 316 %destructor { delete $$; } <tree_argument_list_type>
317 %destructor { delete $$; } <tree_parameter_list_type> 317 %destructor { delete $$; } <tree_parameter_list_type>
318 %destructor { delete $$; } <tree_command_type> 318 %destructor { delete $$; } <tree_command_type>
319 %destructor { delete $$; } <tree_if_command_type> 319 %destructor { delete $$; } <tree_if_command_type>
320 %destructor { delete $$; } <tree_if_clause_type> 320 %destructor { delete $$; } <tree_if_clause_type>
321 %destructor { delete $$; } <tree_if_command_list_type> 321 %destructor { delete $$; } <tree_if_command_list_type>
322 %destructor { delete $$; } <tree_switch_command_type> 322 %destructor { delete $$; } <tree_switch_command_type>
323 %destructor { delete $$; } <tree_switch_case_type> 323 %destructor { delete $$; } <tree_switch_case_type>
324 %destructor { delete $$; } <tree_switch_case_list_type> 324 %destructor { delete $$; } <tree_switch_case_list_type>
325 %destructor { delete $$; } <tree_decl_elt_type> 325 %destructor { delete $$; } <tree_decl_elt_type>
326 %destructor { delete $$; } <tree_decl_init_list_type> 326 %destructor { delete $$; } <tree_decl_init_list_type>
327 %destructor { delete $$; } <tree_decl_command_type> 327 %destructor { delete $$; } <tree_decl_command_type>
328 %destructor { delete $$; } <tree_statement_type> 328 %destructor { delete $$; } <tree_statement_type>
329 %destructor { delete $$; } <tree_statement_list_type> 329 %destructor { delete $$; } <tree_statement_list_type>
330 %destructor { delete $$; } <octave_user_function_type> 330 %destructor { delete $$; } <octave_user_function_type>
331 331
332 %destructor { 332 %destructor {
333 warning_with_id 333 warning_with_id
334 ("Octave:parser-destructor", 334 ("Octave:parser-destructor",
335 "possible memory leak in cleanup following parse error"); 335 "possible memory leak in cleanup following parse error");
3426 int status = -1; 3426 int status = -1;
3427 3427
3428 dynamic_cast<octave_push_lexer&> (lexer).append_input (input, eof); 3428 dynamic_cast<octave_push_lexer&> (lexer).append_input (input, eof);
3429 3429
3430 do 3430 do
3431 { 3431 {
3432 YYSTYPE lval; 3432 YYSTYPE lval;
3433 3433
3434 int token = octave_lex (&lval, scanner); 3434 int token = octave_lex (&lval, scanner);
3435 3435
3436 if (token < 0) 3436 if (token < 0)
3459 } 3459 }
3460 3460
3461 static octave_function * 3461 static octave_function *
3462 parse_fcn_file (const std::string& full_file, const std::string& file, 3462 parse_fcn_file (const std::string& full_file, const std::string& file,
3463 const std::string& dispatch_type, 3463 const std::string& dispatch_type,
3464 bool require_file, bool force_script, bool autoload, 3464 bool require_file, bool force_script, bool autoload,
3465 bool relative_lookup, const std::string& warn_for) 3465 bool relative_lookup, const std::string& warn_for)
3466 { 3466 {
3467 unwind_protect frame; 3467 unwind_protect frame;
3468 3468
3469 octave_function *fcn_ptr = 0; 3469 octave_function *fcn_ptr = 0;
4608 int nargin = args.length (); 4608 int nargin = args.length ();
4609 4609
4610 if (nargin == 1 || nargin == 2) 4610 if (nargin == 1 || nargin == 2)
4611 { 4611 {
4612 std::string file = args(0).string_value (); 4612 std::string file = args(0).string_value ();
4613 4613
4614 std::string full_file = octave_env::make_absolute (file); 4614 std::string full_file = octave_env::make_absolute (file);
4615 4615
4616 size_t file_len = file.length (); 4616 size_t file_len = file.length ();
4617 4617
4618 if ((file_len > 4 && file.substr (file_len-4) == ".oct") 4618 if ((file_len > 4 && file.substr (file_len-4) == ".oct")