Mercurial > octave-nkf
diff src/parse.y @ 3180:c17387059fd3
[project @ 1998-09-24 18:59:11 by jwe]
| author | jwe |
|---|---|
| date | Thu, 24 Sep 1998 19:00:19 +0000 |
| parents | 09a3064a3a17 |
| children | bef7b73c0724 |
line wrap: on
line diff
--- a/src/parse.y Wed Jul 29 19:50:02 1998 +0000 +++ b/src/parse.y Thu Sep 24 19:00:19 1998 +0000 @@ -1134,7 +1134,17 @@ // Plotting // ======== -plot_command : PLOT plot_command1 +plot_command : PLOT + { + if (! ($$ = make_plot_command ($1, 0, 0))) + ABORT_PARSE; + } + | PLOT ranges + { + if (! ($$ = make_plot_command ($1, $2, 0))) + ABORT_PARSE; + } + | PLOT plot_command1 { if (! ($$ = make_plot_command ($1, 0, $2))) ABORT_PARSE; @@ -1166,9 +1176,7 @@ { $$ = new plot_range (); } ; -plot_command1 : // empty - { $$ = 0; } - | plot_command2 +plot_command1 : plot_command2 { $$ = new subplot_list ($1); } | plot_command1 ',' plot_command2 { @@ -2781,6 +2789,12 @@ command_editor::set_input_stream (static_cast<FILE *> (f)); } +static void +clear_current_script_file_name (void *) +{ + bind_builtin_variable ("current_script_file_name", octave_value ()); +} + static bool parse_fcn_file (const string& ff, bool exec_script, bool force_script = false) { @@ -2881,6 +2895,10 @@ Vsaving_history = false; reading_script_file = true; + unwind_protect::add (clear_current_script_file_name, 0); + + bind_builtin_variable ("current_script_file_name", ff); + parse_and_execute (ffile); script_file_executed = true;