Mercurial > octave-libgccjit
annotate src/oct-parse.yy @ 10130:0c3609dd34cf
oct-parse.yy (eval_string): save and set reading_{script,fcn,classdef}_file vars
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 18 Jan 2010 16:04:09 -0500 |
| parents | 6f79338c269b |
| children | cd96d29c5efa |
| rev | line source |
|---|---|
| 1829 | 1 /* |
| 1 | 2 |
| 7017 | 3 Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
| 8920 | 4 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 John W. Eaton |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
5 Copyright (C) 2009 David Grundberg |
| 1 | 6 |
| 7 This file is part of Octave. | |
| 8 | |
| 9 Octave is free software; you can redistribute it and/or modify it | |
| 10 under the terms of the GNU General Public License as published by the | |
| 7016 | 11 Free Software Foundation; either version 3 of the License, or (at your |
| 12 option) any later version. | |
| 1 | 13 |
| 14 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 17 for more details. | |
| 18 | |
| 19 You should have received a copy of the GNU General Public License | |
| 7016 | 20 along with Octave; see the file COPYING. If not, see |
| 21 <http://www.gnu.org/licenses/>. | |
| 1 | 22 |
| 23 */ | |
| 24 | |
| 25 // Parser for Octave. | |
| 26 | |
| 767 | 27 // C decarations. |
| 28 | |
| 1 | 29 %{ |
| 30 #define YYDEBUG 1 | |
| 31 | |
| 240 | 32 #ifdef HAVE_CONFIG_H |
| 1229 | 33 #include <config.h> |
| 240 | 34 #endif |
| 35 | |
| 3178 | 36 #include <cassert> |
| 3156 | 37 #include <cstdio> |
| 38 | |
| 2427 | 39 #ifdef YYBYACC |
| 40 #include <cstdlib> | |
| 41 #endif | |
| 42 | |
|
8950
d865363208d6
include <iosfwd> instead of <iostream> in header files
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
43 #include <iostream> |
| 5484 | 44 #include <map> |
| 5765 | 45 #include <sstream> |
| 5484 | 46 |
| 3928 | 47 #include "Cell.h" |
| 1 | 48 #include "Matrix.h" |
| 3021 | 49 #include "cmd-edit.h" |
| 50 #include "cmd-hist.h" | |
| 51 #include "file-ops.h" | |
| 52 #include "file-stat.h" | |
| 4243 | 53 #include "oct-env.h" |
| 3712 | 54 #include "oct-time.h" |
| 4171 | 55 #include "quit.h" |
| 1 | 56 |
| 3665 | 57 #include "comment-list.h" |
| 4243 | 58 #include "defaults.h" |
| 2166 | 59 #include "defun.h" |
| 4243 | 60 #include "dirfns.h" |
| 3021 | 61 #include "dynamic-ld.h" |
| 1351 | 62 #include "error.h" |
| 63 #include "input.h" | |
| 64 #include "lex.h" | |
| 5832 | 65 #include "load-path.h" |
| 1743 | 66 #include "oct-hist.h" |
| 5626 | 67 #include "oct-map.h" |
| 4935 | 68 #include "ov-fcn-handle.h" |
| 2970 | 69 #include "ov-usr-fcn.h" |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8064
diff
changeset
|
70 #include "ov-null-mat.h" |
| 1670 | 71 #include "toplev.h" |
| 1351 | 72 #include "pager.h" |
| 73 #include "parse.h" | |
| 2987 | 74 #include "pt-all.h" |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
75 #include "pt-eval.h" |
| 1351 | 76 #include "symtab.h" |
| 77 #include "token.h" | |
| 3021 | 78 #include "unwind-prot.h" |
| 1 | 79 #include "utils.h" |
| 1351 | 80 #include "variables.h" |
| 1 | 81 |
| 82 // The current input line number. | |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8311
diff
changeset
|
83 int input_line_number = 1; |
| 1 | 84 |
| 85 // The column of the current token. | |
| 143 | 86 int current_input_column = 1; |
| 1 | 87 |
| 338 | 88 // Buffer for help text snagged from function files. |
| 4426 | 89 std::stack<std::string> help_buf; |
| 1 | 90 |
| 3665 | 91 // Buffer for comments appearing before a function statement. |
| 92 static std::string fcn_comment_header; | |
| 93 | |
| 3021 | 94 // TRUE means we are using readline. |
| 95 // (--no-line-editing) | |
| 96 bool line_editing = true; | |
| 97 | |
| 98 // TRUE means we printed messages about reading startup files. | |
| 99 bool reading_startup_message_printed = false; | |
| 100 | |
| 101 // TRUE means input is coming from startup file. | |
| 102 bool input_from_startup_file = false; | |
| 103 | |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
104 // = 0 currently outside any function. |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
105 // = 1 inside the primary function or a subfunction. |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
106 // > 1 means we are looking at a function definition that seems to be |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
107 // inside a function. Note that the function still might not be a |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
108 // nested function. |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
109 static int current_function_depth = 0; |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
110 |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
111 // Maximum function depth detected. Just here to determine whether |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
112 // we have nested functions or just implicitly ended subfunctions. |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
113 static int max_function_depth = 0; |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
114 |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
115 // FALSE if we are still at the primary function. Subfunctions can |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
116 // only be declared inside function files. |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
117 static int parsing_subfunctions = false; |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
118 |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
119 // Have we found an explicit end to a function? |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
120 static bool endfunction_found = false; |
| 4238 | 121 |
| 3903 | 122 // Keep track of symbol table information when parsing functions. |
| 7336 | 123 std::stack<symbol_table::scope_id> symtab_context; |
| 4238 | 124 |
| 7336 | 125 // Name of the current class when we are parsing class methods or |
| 126 // constructors. | |
| 127 std::string current_class_name; | |
| 128 | |
| 5484 | 129 // TRUE means we are in the process of autoloading a function. |
| 130 static bool autoloading = false; | |
| 131 | |
| 6323 | 132 // TRUE means the current function file was found in a relative path |
| 133 // element. | |
| 134 static bool fcn_file_from_relative_lookup = false; | |
| 135 | |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
136 // Pointer to the primary user function or user script function. |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
137 static octave_function *primary_fcn_ptr = 0; |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
138 |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
139 // Scope where we install all subfunctions and nested functions. Only |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
140 // used while reading function files. |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
141 static symbol_table::scope_id primary_fcn_scope; |
| 7336 | 142 |
| 5484 | 143 // List of autoloads (function -> file mapping). |
| 144 static std::map<std::string, std::string> autoload_map; | |
| 145 | |
| 496 | 146 // Forward declarations for some functions defined at the bottom of |
| 147 // the file. | |
| 148 | |
| 149 // Generic error messages. | |
| 2970 | 150 static void |
| 151 yyerror (const char *s); | |
| 1 | 152 |
| 578 | 153 // Error mesages for mismatched end tokens. |
| 2970 | 154 static void |
| 155 end_error (const char *type, token::end_tok_type ettype, int l, int c); | |
| 1 | 156 |
| 578 | 157 // Check to see that end tokens are properly matched. |
| 2970 | 158 static bool |
| 159 end_token_ok (token *tok, token::end_tok_type expected); | |
| 496 | 160 |
| 161 // Maybe print a warning if an assignment expression is used as the | |
| 162 // test in a logical expression. | |
| 2970 | 163 static void |
| 164 maybe_warn_assign_as_truth_value (tree_expression *expr); | |
| 1 | 165 |
| 2764 | 166 // Maybe print a warning about switch labels that aren't constants. |
| 2970 | 167 static void |
| 168 maybe_warn_variable_switch_label (tree_expression *expr); | |
| 2764 | 169 |
| 1623 | 170 // Finish building a range. |
| 2970 | 171 static tree_expression * |
| 172 finish_colon_expression (tree_colon_expression *e); | |
| 1623 | 173 |
| 1607 | 174 // Build a constant. |
| 2970 | 175 static tree_constant * |
| 176 make_constant (int op, token *tok_val); | |
| 1607 | 177 |
| 4342 | 178 // Build a function handle. |
| 179 static tree_fcn_handle * | |
| 180 make_fcn_handle (token *tok_val); | |
| 181 | |
| 4935 | 182 // Build an anonymous function handle. |
| 5861 | 183 static tree_anon_fcn_handle * |
| 4935 | 184 make_anon_fcn_handle (tree_parameter_list *param_list, tree_statement *stmt); |
| 185 | |
| 578 | 186 // Build a binary expression. |
| 2970 | 187 static tree_expression * |
| 188 make_binary_op (int op, tree_expression *op1, token *tok_val, | |
| 189 tree_expression *op2); | |
| 578 | 190 |
| 2375 | 191 // Build a boolean expression. |
| 2970 | 192 static tree_expression * |
| 193 make_boolean_op (int op, tree_expression *op1, token *tok_val, | |
| 194 tree_expression *op2); | |
| 2375 | 195 |
| 578 | 196 // Build a prefix expression. |
| 2970 | 197 static tree_expression * |
| 198 make_prefix_op (int op, tree_expression *op1, token *tok_val); | |
| 578 | 199 |
| 200 // Build a postfix expression. | |
| 2970 | 201 static tree_expression * |
| 202 make_postfix_op (int op, tree_expression *op1, token *tok_val); | |
| 578 | 203 |
| 1623 | 204 // Build an unwind-protect command. |
| 2970 | 205 static tree_command * |
| 206 make_unwind_command (token *unwind_tok, tree_statement_list *body, | |
| 3665 | 207 tree_statement_list *cleanup, token *end_tok, |
| 208 octave_comment_list *lc, octave_comment_list *mc); | |
| 1623 | 209 |
| 210 // Build a try-catch command. | |
| 2970 | 211 static tree_command * |
| 212 make_try_command (token *try_tok, tree_statement_list *body, | |
| 3665 | 213 tree_statement_list *cleanup, token *end_tok, |
| 214 octave_comment_list *lc, octave_comment_list *mc); | |
| 1623 | 215 |
| 216 // Build a while command. | |
| 2970 | 217 static tree_command * |
| 218 make_while_command (token *while_tok, tree_expression *expr, | |
| 3665 | 219 tree_statement_list *body, token *end_tok, |
| 220 octave_comment_list *lc); | |
| 1623 | 221 |
| 3484 | 222 // Build a do-until command. |
| 223 static tree_command * | |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
224 make_do_until_command (token *until_tok, tree_statement_list *body, |
| 3665 | 225 tree_expression *expr, octave_comment_list *lc); |
| 3484 | 226 |
| 1623 | 227 // Build a for command. |
| 2970 | 228 static tree_command * |
| 229 make_for_command (token *for_tok, tree_argument_list *lhs, | |
| 230 tree_expression *expr, tree_statement_list *body, | |
| 3665 | 231 token *end_tok, octave_comment_list *lc); |
| 1623 | 232 |
| 4207 | 233 // Build a break command. |
| 234 static tree_command * | |
| 235 make_break_command (token *break_tok); | |
| 236 | |
| 237 // Build a continue command. | |
| 238 static tree_command * | |
| 239 make_continue_command (token *continue_tok); | |
| 240 | |
| 241 // Build a return command. | |
| 242 static tree_command * | |
| 243 make_return_command (token *return_tok); | |
| 1623 | 244 |
| 245 // Start an if command. | |
| 2970 | 246 static tree_if_command_list * |
| 247 start_if_command (tree_expression *expr, tree_statement_list *list); | |
| 1623 | 248 |
| 249 // Finish an if command. | |
| 2970 | 250 static tree_if_command * |
| 3665 | 251 finish_if_command (token *if_tok, tree_if_command_list *list, |
| 252 token *end_tok, octave_comment_list *lc); | |
| 1623 | 253 |
| 254 // Build an elseif clause. | |
| 2970 | 255 static tree_if_clause * |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
256 make_elseif_clause (token *elseif_tok, tree_expression *expr, |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
257 tree_statement_list *list, octave_comment_list *lc); |
| 1623 | 258 |
| 2764 | 259 // Finish a switch command. |
| 2970 | 260 static tree_switch_command * |
| 261 finish_switch_command (token *switch_tok, tree_expression *expr, | |
| 3665 | 262 tree_switch_case_list *list, token *end_tok, |
| 263 octave_comment_list *lc); | |
| 2764 | 264 |
| 265 // Build a switch case. | |
| 2970 | 266 static tree_switch_case * |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
267 make_switch_case (token *case_tok, tree_expression *expr, |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
268 tree_statement_list *list, octave_comment_list *lc); |
| 2764 | 269 |
| 1623 | 270 // Build an assignment to a variable. |
| 2970 | 271 static tree_expression * |
| 272 make_assign_op (int op, tree_argument_list *lhs, token *eq_tok, | |
| 273 tree_expression *rhs); | |
| 1623 | 274 |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
275 // Define a script. |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
276 static void |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
277 make_script (tree_statement_list *cmds, tree_statement *end_script); |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
278 |
| 1623 | 279 // Begin defining a function. |
| 2970 | 280 static octave_user_function * |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
281 start_function (tree_parameter_list *param_list, tree_statement_list *body, |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
282 tree_statement *end_function); |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
283 |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
284 // Create a no-op statement for end_function. |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
285 static tree_statement * |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
286 make_end (const std::string& type, int l, int c); |
| 1623 | 287 |
| 288 // Do most of the work for defining a function. | |
| 2970 | 289 static octave_user_function * |
| 4872 | 290 frob_function (const std::string& fname, octave_user_function *fcn); |
| 1623 | 291 |
| 292 // Finish defining a function. | |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
293 static tree_function_def * |
| 3665 | 294 finish_function (tree_parameter_list *ret_list, |
| 295 octave_user_function *fcn, octave_comment_list *lc); | |
| 751 | 296 |
| 2883 | 297 // Reset state after parsing function. |
| 2970 | 298 static void |
| 299 recover_from_parsing_function (void); | |
| 2883 | 300 |
| 751 | 301 // Make an index expression. |
| 2970 | 302 static tree_index_expression * |
| 3933 | 303 make_index_expression (tree_expression *expr, |
| 304 tree_argument_list *args, char type); | |
| 2970 | 305 |
| 306 // Make an indirect reference expression. | |
| 3930 | 307 static tree_index_expression * |
| 3523 | 308 make_indirect_ref (tree_expression *expr, const std::string&); |
| 666 | 309 |
| 4131 | 310 // Make an indirect reference expression with dynamic field name. |
| 311 static tree_index_expression * | |
| 312 make_indirect_ref (tree_expression *expr, tree_expression *field); | |
| 313 | |
| 2846 | 314 // Make a declaration command. |
| 2970 | 315 static tree_decl_command * |
| 316 make_decl_command (int tok, token *tok_val, tree_decl_init_list *lst); | |
| 2846 | 317 |
| 1623 | 318 // Finish building a matrix list. |
| 2970 | 319 static tree_expression * |
| 320 finish_matrix (tree_matrix *m); | |
| 1623 | 321 |
| 3351 | 322 // Finish building a cell list. |
| 323 static tree_expression * | |
| 324 finish_cell (tree_cell *c); | |
| 325 | |
| 1511 | 326 // Maybe print a warning. Duh. |
| 2970 | 327 static void |
| 328 maybe_warn_missing_semi (tree_statement_list *); | |
| 1511 | 329 |
| 2525 | 330 // Set the print flag for a statement based on the separator type. |
|
8471
02de6775f1fe
parse.y: always append statements to list, but remove null statements after seeing separator
John W. Eaton <jwe@octave.org>
parents:
8448
diff
changeset
|
331 static tree_statement_list * |
| 2970 | 332 set_stmt_print_flag (tree_statement_list *, char, bool); |
| 2525 | 333 |
|
8448
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
334 // Create a statement list. |
|
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
335 static tree_statement_list *make_statement_list (tree_statement *stmt); |
|
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
336 |
|
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
337 // Append a statement to an existing statement list. |
|
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
338 static tree_statement_list * |
|
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
339 append_statement_list (tree_statement_list *list, char sep, |
|
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
340 tree_statement *stmt, bool warn_missing_semi); |
|
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
341 |
|
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
342 // Finish building a statement. |
|
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
343 template <class T> |
|
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
344 static tree_statement * |
|
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
345 make_statement (T *arg) |
|
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
346 { |
|
8471
02de6775f1fe
parse.y: always append statements to list, but remove null statements after seeing separator
John W. Eaton <jwe@octave.org>
parents:
8448
diff
changeset
|
347 octave_comment_list *comment = octave_comment_buffer::get_comment (); |
|
02de6775f1fe
parse.y: always append statements to list, but remove null statements after seeing separator
John W. Eaton <jwe@octave.org>
parents:
8448
diff
changeset
|
348 |
|
02de6775f1fe
parse.y: always append statements to list, but remove null statements after seeing separator
John W. Eaton <jwe@octave.org>
parents:
8448
diff
changeset
|
349 return new tree_statement (arg, comment); |
|
8448
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
350 } |
|
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
351 |
| 1 | 352 #define ABORT_PARSE \ |
| 353 do \ | |
| 354 { \ | |
| 522 | 355 global_command = 0; \ |
| 1 | 356 yyerrok; \ |
| 4238 | 357 if (! symtab_context.empty ()) \ |
| 3929 | 358 { \ |
| 7336 | 359 symbol_table::set_scope (symtab_context.top ()); \ |
| 4238 | 360 symtab_context.pop (); \ |
| 3929 | 361 } \ |
| 2865 | 362 if (interactive || forced_interactive) \ |
| 1 | 363 YYACCEPT; \ |
| 364 else \ | |
| 365 YYABORT; \ | |
| 366 } \ | |
| 367 while (0) | |
| 368 | |
| 369 %} | |
| 370 | |
| 666 | 371 // Bison declarations. |
| 372 | |
| 4813 | 373 // Don't add spaces around the = here; it causes some versions of |
| 374 // bison to fail to properly recognize the directive. | |
| 375 | |
| 376 %name-prefix="octave_" | |
| 4753 | 377 |
| 1 | 378 %union |
| 379 { | |
| 2891 | 380 // The type of the basic tokens returned by the lexer. |
| 143 | 381 token *tok_val; |
| 382 | |
| 3665 | 383 // Comment strings that we need to deal with mid-rule. |
| 384 octave_comment_list *comment_type; | |
| 385 | |
| 2891 | 386 // Types for the nonterminals we generate. |
| 2525 | 387 char sep_type; |
| 1 | 388 tree *tree_type; |
| 1829 | 389 tree_matrix *tree_matrix_type; |
| 3351 | 390 tree_cell *tree_cell_type; |
| 496 | 391 tree_expression *tree_expression_type; |
| 2375 | 392 tree_constant *tree_constant_type; |
| 4342 | 393 tree_fcn_handle *tree_fcn_handle_type; |
| 5861 | 394 tree_anon_fcn_handle *tree_anon_fcn_handle_type; |
| 1 | 395 tree_identifier *tree_identifier_type; |
| 396 tree_index_expression *tree_index_expression_type; | |
| 397 tree_colon_expression *tree_colon_expression_type; | |
| 398 tree_argument_list *tree_argument_list_type; | |
| 399 tree_parameter_list *tree_parameter_list_type; | |
| 400 tree_command *tree_command_type; | |
| 401 tree_if_command *tree_if_command_type; | |
| 578 | 402 tree_if_clause *tree_if_clause_type; |
| 403 tree_if_command_list *tree_if_command_list_type; | |
| 2764 | 404 tree_switch_command *tree_switch_command_type; |
| 405 tree_switch_case *tree_switch_case_type; | |
| 406 tree_switch_case_list *tree_switch_case_list_type; | |
| 2846 | 407 tree_decl_elt *tree_decl_elt_type; |
| 408 tree_decl_init_list *tree_decl_init_list_type; | |
| 409 tree_decl_command *tree_decl_command_type; | |
| 578 | 410 tree_statement *tree_statement_type; |
| 411 tree_statement_list *tree_statement_list_type; | |
| 2891 | 412 octave_user_function *octave_user_function_type; |
| 9476 | 413 void *dummy_type; |
| 1 | 414 } |
| 415 | |
| 143 | 416 // Tokens with line and column information. |
| 417 %token <tok_val> '=' ':' '-' '+' '*' '/' | |
| 4018 | 418 %token <tok_val> ADD_EQ SUB_EQ MUL_EQ DIV_EQ LEFTDIV_EQ POW_EQ |
| 419 %token <tok_val> EMUL_EQ EDIV_EQ ELEFTDIV_EQ EPOW_EQ AND_EQ OR_EQ | |
| 2899 | 420 %token <tok_val> LSHIFT_EQ RSHIFT_EQ LSHIFT RSHIFT |
| 428 | 421 %token <tok_val> EXPR_AND_AND EXPR_OR_OR |
| 143 | 422 %token <tok_val> EXPR_AND EXPR_OR EXPR_NOT |
| 423 %token <tok_val> EXPR_LT EXPR_LE EXPR_EQ EXPR_NE EXPR_GE EXPR_GT | |
| 1276 | 424 %token <tok_val> LEFTDIV EMUL EDIV ELEFTDIV EPLUS EMINUS |
| 425 %token <tok_val> QUOTE TRANSPOSE | |
| 143 | 426 %token <tok_val> PLUS_PLUS MINUS_MINUS POW EPOW |
| 427 %token <tok_val> NUM IMAG_NUM | |
| 2970 | 428 %token <tok_val> STRUCT_ELT |
| 2883 | 429 %token <tok_val> NAME |
| 143 | 430 %token <tok_val> END |
| 5279 | 431 %token <tok_val> DQ_STRING SQ_STRING |
| 3484 | 432 %token <tok_val> FOR WHILE DO UNTIL |
| 1491 | 433 %token <tok_val> IF ELSEIF ELSE |
| 2764 | 434 %token <tok_val> SWITCH CASE OTHERWISE |
| 1491 | 435 %token <tok_val> BREAK CONTINUE FUNC_RET |
| 924 | 436 %token <tok_val> UNWIND CLEANUP |
| 1489 | 437 %token <tok_val> TRY CATCH |
| 2846 | 438 %token <tok_val> GLOBAL STATIC |
| 4342 | 439 %token <tok_val> FCN_HANDLE |
| 9476 | 440 %token <tok_val> PROPERTIES |
| 441 %token <tok_val> METHODS | |
| 442 %token <tok_val> EVENTS | |
| 443 %token <tok_val> METAQUERY | |
| 444 %token <tok_val> SUPERCLASSREF | |
| 445 %token <tok_val> GET SET | |
| 1 | 446 |
| 143 | 447 // Other tokens. |
| 2970 | 448 %token END_OF_INPUT LEXICAL_ERROR |
| 9476 | 449 %token FCN SCRIPT_FILE FUNCTION_FILE CLASSDEF |
|
7587
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7562
diff
changeset
|
450 // %token VARARGIN VARARGOUT |
| 5296 | 451 %token CLOSE_BRACE |
| 1 | 452 |
| 143 | 453 // Nonterminals we construct. |
| 9476 | 454 %type <comment_type> stash_comment function_beg classdef_beg |
| 455 %type <comment_type> properties_beg methods_beg events_beg | |
| 2525 | 456 %type <sep_type> sep_no_nl opt_sep_no_nl sep opt_sep |
| 578 | 457 %type <tree_type> input |
| 5861 | 458 %type <tree_constant_type> string constant magic_colon |
| 459 %type <tree_anon_fcn_handle_type> anon_fcn_handle | |
| 4342 | 460 %type <tree_fcn_handle_type> fcn_handle |
| 3351 | 461 %type <tree_matrix_type> matrix_rows matrix_rows1 |
| 462 %type <tree_cell_type> cell_rows cell_rows1 | |
| 5102 | 463 %type <tree_expression_type> matrix cell |
| 4207 | 464 %type <tree_expression_type> primary_expr postfix_expr prefix_expr binary_expr |
| 465 %type <tree_expression_type> simple_expr colon_expr assign_expr expression | |
| 4238 | 466 %type <tree_identifier_type> identifier fcn_name |
| 9476 | 467 %type <tree_identifier_type> superclass_identifier meta_identifier |
| 468 %type <octave_user_function_type> function1 function2 classdef1 | |
| 2970 | 469 %type <tree_index_expression_type> word_list_cmd |
| 470 %type <tree_colon_expression_type> colon_expr1 | |
| 3351 | 471 %type <tree_argument_list_type> arg_list word_list assign_lhs |
| 472 %type <tree_argument_list_type> cell_or_matrix_row | |
| 4935 | 473 %type <tree_parameter_list_type> param_list param_list1 param_list2 |
| 723 | 474 %type <tree_parameter_list_type> return_list return_list1 |
| 9476 | 475 %type <tree_parameter_list_type> superclasses opt_superclasses |
| 2970 | 476 %type <tree_command_type> command select_command loop_command |
| 9476 | 477 %type <tree_command_type> jump_command except_command function |
| 478 %type <tree_command_type> script_file classdef | |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
479 %type <tree_command_type> function_file function_list |
| 578 | 480 %type <tree_if_command_type> if_command |
| 481 %type <tree_if_clause_type> elseif_clause else_clause | |
| 482 %type <tree_if_command_list_type> if_cmd_list1 if_cmd_list | |
| 2764 | 483 %type <tree_switch_command_type> switch_command |
| 484 %type <tree_switch_case_type> switch_case default_case | |
| 485 %type <tree_switch_case_list_type> case_list1 case_list | |
| 2846 | 486 %type <tree_decl_elt_type> decl2 |
| 487 %type <tree_decl_init_list_type> decl1 | |
| 488 %type <tree_decl_command_type> declaration | |
| 9476 | 489 %type <tree_statement_type> statement function_end classdef_end |
| 627 | 490 %type <tree_statement_list_type> simple_list simple_list1 list list1 |
| 7336 | 491 %type <tree_statement_list_type> opt_list input1 |
| 9476 | 492 // These types need to be specified. |
| 493 %type <dummy_type> attr | |
| 494 %type <dummy_type> class_event | |
| 495 %type <dummy_type> class_property | |
| 496 %type <dummy_type> properties_list | |
| 497 %type <dummy_type> properties_block | |
| 498 %type <dummy_type> methods_list | |
| 499 %type <dummy_type> methods_block | |
| 500 %type <dummy_type> opt_attr_list | |
| 501 %type <dummy_type> attr_list | |
| 502 %type <dummy_type> events_list | |
| 503 %type <dummy_type> events_block | |
| 504 %type <dummy_type> class_body | |
| 1 | 505 |
| 143 | 506 // Precedence and associativity. |
| 1 | 507 %left ';' ',' '\n' |
| 4018 | 508 %right '=' ADD_EQ SUB_EQ MUL_EQ DIV_EQ LEFTDIV_EQ POW_EQ EMUL_EQ EDIV_EQ ELEFTDIV_EQ EPOW_EQ OR_EQ AND_EQ LSHIFT_EQ RSHIFT_EQ |
| 4023 | 509 %left EXPR_OR_OR |
| 510 %left EXPR_AND_AND | |
| 511 %left EXPR_OR | |
| 512 %left EXPR_AND | |
| 1 | 513 %left EXPR_LT EXPR_LE EXPR_EQ EXPR_NE EXPR_GE EXPR_GT |
| 2899 | 514 %left LSHIFT RSHIFT |
| 1 | 515 %left ':' |
| 1276 | 516 %left '-' '+' EPLUS EMINUS |
| 1 | 517 %left '*' '/' LEFTDIV EMUL EDIV ELEFTDIV |
| 518 %left UNARY PLUS_PLUS MINUS_MINUS EXPR_NOT | |
| 5667 | 519 %left POW EPOW QUOTE TRANSPOSE |
| 3351 | 520 %left '(' '.' '{' |
| 1 | 521 |
| 143 | 522 // Where to start. |
| 1 | 523 %start input |
| 524 | |
| 525 %% | |
| 526 | |
| 2970 | 527 // ============================== |
| 528 // Statements and statement lists | |
| 529 // ============================== | |
| 530 | |
| 627 | 531 input : input1 |
| 1 | 532 { |
| 627 | 533 global_command = $1; |
| 1 | 534 promptflag = 1; |
| 535 YYACCEPT; | |
| 536 } | |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
537 | function_file |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
538 { |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
539 YYACCEPT; |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
540 } |
| 627 | 541 | simple_list parse_error |
| 1091 | 542 { ABORT_PARSE; } |
| 627 | 543 | parse_error |
| 1091 | 544 { ABORT_PARSE; } |
| 627 | 545 ; |
| 546 | |
| 547 input1 : '\n' | |
| 548 { $$ = 0; } | |
| 3883 | 549 | END_OF_INPUT |
| 550 { | |
| 551 parser_end_of_input = 1; | |
| 552 $$ = 0; | |
| 553 } | |
| 327 | 554 | simple_list |
| 627 | 555 { $$ = $1; } |
| 1 | 556 | simple_list '\n' |
| 627 | 557 { $$ = $1; } |
| 1 | 558 | simple_list END_OF_INPUT |
| 627 | 559 { $$ = $1; } |
| 560 ; | |
| 561 | |
| 2525 | 562 simple_list : simple_list1 opt_sep_no_nl |
|
8471
02de6775f1fe
parse.y: always append statements to list, but remove null statements after seeing separator
John W. Eaton <jwe@octave.org>
parents:
8448
diff
changeset
|
563 { $$ = set_stmt_print_flag ($1, $2, false); } |
| 1 | 564 ; |
| 565 | |
| 578 | 566 simple_list1 : statement |
|
8448
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
567 { $$ = make_statement_list ($1); } |
| 2525 | 568 | simple_list1 sep_no_nl statement |
|
8448
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
569 { $$ = append_statement_list ($1, $2, $3, false); } |
| 1 | 570 ; |
| 571 | |
| 572 opt_list : // empty | |
| 578 | 573 { $$ = new tree_statement_list (); } |
| 1 | 574 | list |
| 575 { $$ = $1; } | |
| 496 | 576 ; |
| 1 | 577 |
| 2525 | 578 list : list1 opt_sep |
|
8471
02de6775f1fe
parse.y: always append statements to list, but remove null statements after seeing separator
John W. Eaton <jwe@octave.org>
parents:
8448
diff
changeset
|
579 { $$ = set_stmt_print_flag ($1, $2, true); } |
| 1 | 580 ; |
| 581 | |
| 578 | 582 list1 : statement |
|
8448
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
583 { $$ = make_statement_list ($1); } |
| 2525 | 584 | list1 sep statement |
|
8448
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
585 { $$ = append_statement_list ($1, $2, $3, true); } |
| 1 | 586 ; |
| 587 | |
| 2970 | 588 statement : expression |
|
8448
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
589 { $$ = make_statement ($1); } |
| 2970 | 590 | command |
|
8448
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
591 { $$ = make_statement ($1); } |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
592 | word_list_cmd |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
593 { $$ = make_statement ($1); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
594 ; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
595 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
596 // ================= |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
597 // Word-list command |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
598 // ================= |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
599 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
600 // These are not really like expressions since they can't appear on |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
601 // the RHS of an assignment. But they are also not like commands (IF, |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
602 // WHILE, etc. |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
603 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
604 word_list_cmd : identifier word_list |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
605 { $$ = make_index_expression ($1, $2, '('); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
606 ; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
607 |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
608 word_list : string |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
609 { $$ = new tree_argument_list ($1); } |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
610 | word_list string |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
611 { |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
612 $1->append ($2); |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
613 $$ = $1; |
|
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
614 } |
| 1 | 615 ; |
| 616 | |
| 2970 | 617 // =========== |
| 618 // Expressions | |
| 619 // =========== | |
| 620 | |
| 621 identifier : NAME | |
| 622 { | |
| 7336 | 623 symbol_table::symbol_record *sr = $1->sym_rec (); |
| 624 $$ = new tree_identifier (*sr, $1->line (), $1->column ()); | |
| 2970 | 625 } |
| 626 ; | |
| 627 | |
| 9476 | 628 superclass_identifier |
| 629 : SUPERCLASSREF | |
| 630 { $$ = new tree_identifier ($1->line (), $1->column ()); } | |
| 631 ; | |
| 632 | |
| 633 meta_identifier : METAQUERY | |
| 634 { $$ = new tree_identifier ($1->line (), $1->column ()); } | |
| 635 ; | |
| 636 | |
| 5279 | 637 string : DQ_STRING |
| 638 { $$ = make_constant (DQ_STRING, $1); } | |
| 639 | SQ_STRING | |
| 640 { $$ = make_constant (SQ_STRING, $1); } | |
| 641 ; | |
| 642 | |
| 2970 | 643 constant : NUM |
| 644 { $$ = make_constant (NUM, $1); } | |
| 645 | IMAG_NUM | |
| 646 { $$ = make_constant (IMAG_NUM, $1); } | |
| 5279 | 647 | string |
| 648 { $$ = $1; } | |
| 2970 | 649 ; |
| 650 | |
| 651 matrix : '[' ']' | |
| 5615 | 652 { |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8064
diff
changeset
|
653 $$ = new tree_constant (octave_null_matrix::instance); |
| 5615 | 654 lexer_flags.looking_at_matrix_or_assign_lhs = false; |
|
8001
ff9e7873f8ea
improve handling of command-style names in matrix_or_assign_lhs context
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
655 lexer_flags.pending_local_variables.clear (); |
| 5615 | 656 } |
| 2970 | 657 | '[' ';' ']' |
| 3203 | 658 { |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8064
diff
changeset
|
659 $$ = new tree_constant (octave_null_matrix::instance); |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8064
diff
changeset
|
660 lexer_flags.looking_at_matrix_or_assign_lhs = false; |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8064
diff
changeset
|
661 lexer_flags.pending_local_variables.clear (); |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8064
diff
changeset
|
662 } |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8064
diff
changeset
|
663 | '[' ',' ']' |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8064
diff
changeset
|
664 { |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8064
diff
changeset
|
665 $$ = new tree_constant (octave_null_matrix::instance); |
| 5615 | 666 lexer_flags.looking_at_matrix_or_assign_lhs = false; |
|
8001
ff9e7873f8ea
improve handling of command-style names in matrix_or_assign_lhs context
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
667 lexer_flags.pending_local_variables.clear (); |
| 5615 | 668 } |
| 669 | '[' matrix_rows ']' | |
| 670 { | |
| 671 $$ = finish_matrix ($2); | |
| 3203 | 672 lexer_flags.looking_at_matrix_or_assign_lhs = false; |
|
8001
ff9e7873f8ea
improve handling of command-style names in matrix_or_assign_lhs context
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
673 lexer_flags.pending_local_variables.clear (); |
| 3203 | 674 } |
| 2970 | 675 ; |
| 676 | |
| 3351 | 677 matrix_rows : matrix_rows1 |
| 2970 | 678 { $$ = $1; } |
| 3351 | 679 | matrix_rows1 ';' // Ignore trailing semicolon. |
| 2970 | 680 { $$ = $1; } |
| 681 ; | |
| 682 | |
| 3351 | 683 matrix_rows1 : cell_or_matrix_row |
| 2970 | 684 { $$ = new tree_matrix ($1); } |
| 3351 | 685 | matrix_rows1 ';' cell_or_matrix_row |
| 2970 | 686 { |
| 687 $1->append ($3); | |
| 688 $$ = $1; | |
| 689 } | |
| 690 ; | |
| 691 | |
| 3351 | 692 cell : '{' '}' |
| 3928 | 693 { $$ = new tree_constant (octave_value (Cell ())); } |
| 3351 | 694 | '{' ';' '}' |
| 3928 | 695 { $$ = new tree_constant (octave_value (Cell ())); } |
| 3351 | 696 | '{' cell_rows '}' |
| 697 { $$ = finish_cell ($2); } | |
| 698 ; | |
| 699 | |
| 700 cell_rows : cell_rows1 | |
| 701 { $$ = $1; } | |
| 702 | cell_rows1 ';' // Ignore trailing semicolon. | |
| 703 { $$ = $1; } | |
| 704 ; | |
| 705 | |
| 706 cell_rows1 : cell_or_matrix_row | |
| 707 { $$ = new tree_cell ($1); } | |
| 708 | cell_rows1 ';' cell_or_matrix_row | |
| 709 { | |
| 710 $1->append ($3); | |
| 711 $$ = $1; | |
| 712 } | |
| 713 ; | |
| 714 | |
| 715 cell_or_matrix_row | |
| 716 : arg_list | |
| 2970 | 717 { $$ = $1; } |
| 718 | arg_list ',' // Ignore trailing comma. | |
| 719 { $$ = $1; } | |
| 720 ; | |
| 721 | |
| 4930 | 722 fcn_handle : '@' FCN_HANDLE |
| 723 { | |
| 724 $$ = make_fcn_handle ($2); | |
| 725 lexer_flags.looking_at_function_handle--; | |
| 726 } | |
| 727 ; | |
| 728 | |
| 4935 | 729 anon_fcn_handle : '@' param_list statement |
| 730 { $$ = make_anon_fcn_handle ($2, $3); } | |
| 4342 | 731 ; |
| 9476 | 732 |
| 2970 | 733 primary_expr : identifier |
| 734 { $$ = $1; } | |
| 735 | constant | |
| 736 { $$ = $1; } | |
| 4342 | 737 | fcn_handle |
| 738 { $$ = $1; } | |
| 2970 | 739 | matrix |
| 740 { $$ = $1; } | |
| 3351 | 741 | cell |
| 742 { $$ = $1; } | |
| 9476 | 743 | meta_identifier |
| 744 { $$ = $1; } | |
| 745 | superclass_identifier | |
| 746 { $$ = $1; } | |
| 2970 | 747 | '(' expression ')' |
| 748 { $$ = $2->mark_in_parens (); } | |
| 749 ; | |
| 750 | |
| 751 magic_colon : ':' | |
| 752 { | |
| 753 octave_value tmp (octave_value::magic_colon_t); | |
| 754 $$ = new tree_constant (tmp); | |
| 755 } | |
| 756 ; | |
| 757 | |
| 758 arg_list : expression | |
| 759 { $$ = new tree_argument_list ($1); } | |
| 760 | magic_colon | |
| 761 { $$ = new tree_argument_list ($1); } | |
| 762 | arg_list ',' magic_colon | |
| 763 { | |
| 764 $1->append ($3); | |
| 765 $$ = $1; | |
| 766 } | |
| 767 | arg_list ',' expression | |
| 768 { | |
| 769 $1->append ($3); | |
| 770 $$ = $1; | |
| 771 } | |
| 772 ; | |
| 773 | |
| 4131 | 774 indirect_ref_op : '.' |
| 2970 | 775 { lexer_flags.looking_at_indirect_ref = true; } |
| 776 ; | |
| 777 | |
| 778 postfix_expr : primary_expr | |
| 779 { $$ = $1; } | |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
780 | postfix_expr '(' ')' |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
781 { $$ = make_index_expression ($1, 0, '('); } |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
782 | postfix_expr '(' arg_list ')' |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
783 { $$ = make_index_expression ($1, $3, '('); } |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
784 | postfix_expr '{' '}' |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
785 { $$ = make_index_expression ($1, 0, '{'); } |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
786 | postfix_expr '{' arg_list '}' |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
787 { $$ = make_index_expression ($1, $3, '{'); } |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
788 | postfix_expr PLUS_PLUS |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
789 { $$ = make_postfix_op (PLUS_PLUS, $1, $2); } |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
790 | postfix_expr MINUS_MINUS |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
791 { $$ = make_postfix_op (MINUS_MINUS, $1, $2); } |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
792 | postfix_expr QUOTE |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
793 { $$ = make_postfix_op (QUOTE, $1, $2); } |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
794 | postfix_expr TRANSPOSE |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
795 { $$ = make_postfix_op (TRANSPOSE, $1, $2); } |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
796 | postfix_expr indirect_ref_op STRUCT_ELT |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
797 { $$ = make_indirect_ref ($1, $3->text ()); } |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
798 | postfix_expr indirect_ref_op '(' expression ')' |
|
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
799 { $$ = make_indirect_ref ($1, $4); } |
| 2970 | 800 ; |
| 801 | |
|
8745
6dc61981d18b
better handling of object indexing in lexer
John W. Eaton <jwe@octave.org>
parents:
8701
diff
changeset
|
802 prefix_expr : postfix_expr |
| 2970 | 803 { $$ = $1; } |
| 3178 | 804 | binary_expr |
| 805 { $$ = $1; } | |
| 2970 | 806 | PLUS_PLUS prefix_expr %prec UNARY |
| 807 { $$ = make_prefix_op (PLUS_PLUS, $2, $1); } | |
| 808 | MINUS_MINUS prefix_expr %prec UNARY | |
| 809 { $$ = make_prefix_op (MINUS_MINUS, $2, $1); } | |
| 810 | EXPR_NOT prefix_expr %prec UNARY | |
| 811 { $$ = make_prefix_op (EXPR_NOT, $2, $1); } | |
| 812 | '+' prefix_expr %prec UNARY | |
| 4965 | 813 { $$ = make_prefix_op ('+', $2, $1); } |
| 2970 | 814 | '-' prefix_expr %prec UNARY |
| 815 { $$ = make_prefix_op ('-', $2, $1); } | |
| 816 ; | |
| 817 | |
| 3178 | 818 binary_expr : prefix_expr POW prefix_expr |
| 2970 | 819 { $$ = make_binary_op (POW, $1, $2, $3); } |
| 3178 | 820 | prefix_expr EPOW prefix_expr |
| 2970 | 821 { $$ = make_binary_op (EPOW, $1, $2, $3); } |
| 3178 | 822 | prefix_expr '+' prefix_expr |
| 2970 | 823 { $$ = make_binary_op ('+', $1, $2, $3); } |
| 3178 | 824 | prefix_expr '-' prefix_expr |
| 2970 | 825 { $$ = make_binary_op ('-', $1, $2, $3); } |
| 3178 | 826 | prefix_expr '*' prefix_expr |
| 2970 | 827 { $$ = make_binary_op ('*', $1, $2, $3); } |
| 3178 | 828 | prefix_expr '/' prefix_expr |
| 2970 | 829 { $$ = make_binary_op ('/', $1, $2, $3); } |
| 3178 | 830 | prefix_expr EPLUS prefix_expr |
| 2970 | 831 { $$ = make_binary_op ('+', $1, $2, $3); } |
| 3178 | 832 | prefix_expr EMINUS prefix_expr |
| 2970 | 833 { $$ = make_binary_op ('-', $1, $2, $3); } |
| 3178 | 834 | prefix_expr EMUL prefix_expr |
| 2970 | 835 { $$ = make_binary_op (EMUL, $1, $2, $3); } |
| 3178 | 836 | prefix_expr EDIV prefix_expr |
| 2970 | 837 { $$ = make_binary_op (EDIV, $1, $2, $3); } |
| 3178 | 838 | prefix_expr LEFTDIV prefix_expr |
| 2970 | 839 { $$ = make_binary_op (LEFTDIV, $1, $2, $3); } |
| 3178 | 840 | prefix_expr ELEFTDIV prefix_expr |
| 2970 | 841 { $$ = make_binary_op (ELEFTDIV, $1, $2, $3); } |
| 842 ; | |
| 843 | |
| 844 colon_expr : colon_expr1 | |
| 845 { $$ = finish_colon_expression ($1); } | |
| 846 ; | |
| 847 | |
| 3178 | 848 colon_expr1 : prefix_expr |
| 2970 | 849 { $$ = new tree_colon_expression ($1); } |
| 3178 | 850 | colon_expr1 ':' prefix_expr |
| 2970 | 851 { |
| 852 if (! ($$ = $1->append ($3))) | |
| 853 ABORT_PARSE; | |
| 854 } | |
| 855 ; | |
| 856 | |
| 857 simple_expr : colon_expr | |
| 858 { $$ = $1; } | |
| 859 | simple_expr LSHIFT simple_expr | |
| 860 { $$ = make_binary_op (LSHIFT, $1, $2, $3); } | |
| 861 | simple_expr RSHIFT simple_expr | |
| 862 { $$ = make_binary_op (RSHIFT, $1, $2, $3); } | |
| 863 | simple_expr EXPR_LT simple_expr | |
| 864 { $$ = make_binary_op (EXPR_LT, $1, $2, $3); } | |
| 865 | simple_expr EXPR_LE simple_expr | |
| 866 { $$ = make_binary_op (EXPR_LE, $1, $2, $3); } | |
| 867 | simple_expr EXPR_EQ simple_expr | |
| 868 { $$ = make_binary_op (EXPR_EQ, $1, $2, $3); } | |
| 869 | simple_expr EXPR_GE simple_expr | |
| 870 { $$ = make_binary_op (EXPR_GE, $1, $2, $3); } | |
| 871 | simple_expr EXPR_GT simple_expr | |
| 872 { $$ = make_binary_op (EXPR_GT, $1, $2, $3); } | |
| 873 | simple_expr EXPR_NE simple_expr | |
| 874 { $$ = make_binary_op (EXPR_NE, $1, $2, $3); } | |
| 875 | simple_expr EXPR_AND simple_expr | |
| 876 { $$ = make_binary_op (EXPR_AND, $1, $2, $3); } | |
| 877 | simple_expr EXPR_OR simple_expr | |
| 878 { $$ = make_binary_op (EXPR_OR, $1, $2, $3); } | |
| 879 | simple_expr EXPR_AND_AND simple_expr | |
| 880 { $$ = make_boolean_op (EXPR_AND_AND, $1, $2, $3); } | |
| 881 | simple_expr EXPR_OR_OR simple_expr | |
| 882 { $$ = make_boolean_op (EXPR_OR_OR, $1, $2, $3); } | |
| 883 ; | |
| 884 | |
| 885 // Arrange for the lexer to return CLOSE_BRACE for `]' by looking ahead | |
| 886 // one token for an assignment op. | |
| 887 | |
| 888 assign_lhs : simple_expr | |
| 5841 | 889 { |
| 890 $$ = new tree_argument_list ($1); | |
| 891 $$->mark_as_simple_assign_lhs (); | |
| 892 } | |
| 5615 | 893 | '[' arg_list CLOSE_BRACE |
| 3189 | 894 { |
| 5615 | 895 $$ = $2; |
| 3189 | 896 lexer_flags.looking_at_matrix_or_assign_lhs = false; |
|
8001
ff9e7873f8ea
improve handling of command-style names in matrix_or_assign_lhs context
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
897 for (std::set<std::string>::const_iterator p = lexer_flags.pending_local_variables.begin (); |
|
ff9e7873f8ea
improve handling of command-style names in matrix_or_assign_lhs context
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
898 p != lexer_flags.pending_local_variables.end (); |
|
ff9e7873f8ea
improve handling of command-style names in matrix_or_assign_lhs context
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
899 p++) |
|
ff9e7873f8ea
improve handling of command-style names in matrix_or_assign_lhs context
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
900 { |
|
8881
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8842
diff
changeset
|
901 symbol_table::force_variable (*p); |
|
8001
ff9e7873f8ea
improve handling of command-style names in matrix_or_assign_lhs context
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
902 } |
|
ff9e7873f8ea
improve handling of command-style names in matrix_or_assign_lhs context
John W. Eaton <jwe@octave.org>
parents:
7968
diff
changeset
|
903 lexer_flags.pending_local_variables.clear (); |
| 3189 | 904 } |
| 2970 | 905 ; |
| 906 | |
| 907 assign_expr : assign_lhs '=' expression | |
| 908 { $$ = make_assign_op ('=', $1, $2, $3); } | |
| 909 | assign_lhs ADD_EQ expression | |
| 910 { $$ = make_assign_op (ADD_EQ, $1, $2, $3); } | |
| 911 | assign_lhs SUB_EQ expression | |
| 912 { $$ = make_assign_op (SUB_EQ, $1, $2, $3); } | |
| 913 | assign_lhs MUL_EQ expression | |
| 914 { $$ = make_assign_op (MUL_EQ, $1, $2, $3); } | |
| 915 | assign_lhs DIV_EQ expression | |
| 916 { $$ = make_assign_op (DIV_EQ, $1, $2, $3); } | |
| 3204 | 917 | assign_lhs LEFTDIV_EQ expression |
| 918 { $$ = make_assign_op (LEFTDIV_EQ, $1, $2, $3); } | |
| 4018 | 919 | assign_lhs POW_EQ expression |
| 920 { $$ = make_assign_op (POW_EQ, $1, $2, $3); } | |
| 2970 | 921 | assign_lhs LSHIFT_EQ expression |
| 922 { $$ = make_assign_op (LSHIFT_EQ, $1, $2, $3); } | |
| 923 | assign_lhs RSHIFT_EQ expression | |
| 924 { $$ = make_assign_op (RSHIFT_EQ, $1, $2, $3); } | |
| 925 | assign_lhs EMUL_EQ expression | |
| 926 { $$ = make_assign_op (EMUL_EQ, $1, $2, $3); } | |
| 927 | assign_lhs EDIV_EQ expression | |
| 928 { $$ = make_assign_op (EDIV_EQ, $1, $2, $3); } | |
| 3204 | 929 | assign_lhs ELEFTDIV_EQ expression |
| 930 { $$ = make_assign_op (ELEFTDIV_EQ, $1, $2, $3); } | |
| 4018 | 931 | assign_lhs EPOW_EQ expression |
| 932 { $$ = make_assign_op (EPOW_EQ, $1, $2, $3); } | |
| 2970 | 933 | assign_lhs AND_EQ expression |
| 934 { $$ = make_assign_op (AND_EQ, $1, $2, $3); } | |
| 935 | assign_lhs OR_EQ expression | |
| 936 { $$ = make_assign_op (OR_EQ, $1, $2, $3); } | |
| 937 ; | |
| 938 | |
| 939 expression : simple_expr | |
| 940 { $$ = $1; } | |
| 941 | assign_expr | |
| 942 { $$ = $1; } | |
| 4935 | 943 | anon_fcn_handle |
| 944 { $$ = $1; } | |
| 2970 | 945 ; |
| 946 | |
| 947 // ================================================ | |
| 948 // Commands, declarations, and function definitions | |
| 949 // ================================================ | |
| 950 | |
| 951 command : declaration | |
| 952 { $$ = $1; } | |
| 953 | select_command | |
| 954 { $$ = $1; } | |
| 955 | loop_command | |
| 956 { $$ = $1; } | |
| 4207 | 957 | jump_command |
| 958 { $$ = $1; } | |
| 2970 | 959 | except_command |
| 960 { $$ = $1; } | |
| 961 | function | |
| 962 { $$ = $1; } | |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
963 | script_file |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
964 { $$ = $1; } |
| 9476 | 965 | classdef |
| 966 { $$ = $1; } | |
| 2970 | 967 ; |
| 968 | |
| 969 // ===================== | |
| 970 // Declaration statemnts | |
| 971 // ===================== | |
| 972 | |
|
8701
1652e39b934e
handle command names in declaration lists
John W. Eaton <jwe@octave.org>
parents:
8697
diff
changeset
|
973 parsing_decl_list |
|
1652e39b934e
handle command names in declaration lists
John W. Eaton <jwe@octave.org>
parents:
8697
diff
changeset
|
974 : // empty |
|
1652e39b934e
handle command names in declaration lists
John W. Eaton <jwe@octave.org>
parents:
8697
diff
changeset
|
975 { lexer_flags.looking_at_decl_list = true; } |
|
1652e39b934e
handle command names in declaration lists
John W. Eaton <jwe@octave.org>
parents:
8697
diff
changeset
|
976 |
|
1652e39b934e
handle command names in declaration lists
John W. Eaton <jwe@octave.org>
parents:
8697
diff
changeset
|
977 declaration : GLOBAL parsing_decl_list decl1 |
|
1652e39b934e
handle command names in declaration lists
John W. Eaton <jwe@octave.org>
parents:
8697
diff
changeset
|
978 { |
|
1652e39b934e
handle command names in declaration lists
John W. Eaton <jwe@octave.org>
parents:
8697
diff
changeset
|
979 $$ = make_decl_command (GLOBAL, $1, $3); |
|
1652e39b934e
handle command names in declaration lists
John W. Eaton <jwe@octave.org>
parents:
8697
diff
changeset
|
980 lexer_flags.looking_at_decl_list = false; |
|
1652e39b934e
handle command names in declaration lists
John W. Eaton <jwe@octave.org>
parents:
8697
diff
changeset
|
981 } |
|
1652e39b934e
handle command names in declaration lists
John W. Eaton <jwe@octave.org>
parents:
8697
diff
changeset
|
982 | STATIC parsing_decl_list decl1 |
|
1652e39b934e
handle command names in declaration lists
John W. Eaton <jwe@octave.org>
parents:
8697
diff
changeset
|
983 { |
|
1652e39b934e
handle command names in declaration lists
John W. Eaton <jwe@octave.org>
parents:
8697
diff
changeset
|
984 $$ = make_decl_command (STATIC, $1, $3); |
|
1652e39b934e
handle command names in declaration lists
John W. Eaton <jwe@octave.org>
parents:
8697
diff
changeset
|
985 lexer_flags.looking_at_decl_list = false; |
|
1652e39b934e
handle command names in declaration lists
John W. Eaton <jwe@octave.org>
parents:
8697
diff
changeset
|
986 } |
| 2970 | 987 ; |
| 988 | |
| 989 decl1 : decl2 | |
| 990 { $$ = new tree_decl_init_list ($1); } | |
| 991 | decl1 decl2 | |
| 992 { | |
| 993 $1->append ($2); | |
| 994 $$ = $1; | |
| 995 } | |
| 996 ; | |
| 997 | |
|
7634
ae90e05ad299
fix parameter list initializer bug
John W. Eaton <jwe@octave.org>
parents:
7587
diff
changeset
|
998 decl_param_init : // empty |
|
ae90e05ad299
fix parameter list initializer bug
John W. Eaton <jwe@octave.org>
parents:
7587
diff
changeset
|
999 { lexer_flags.looking_at_initializer_expression = true; } |
|
ae90e05ad299
fix parameter list initializer bug
John W. Eaton <jwe@octave.org>
parents:
7587
diff
changeset
|
1000 |
| 2970 | 1001 decl2 : identifier |
| 1002 { $$ = new tree_decl_elt ($1); } | |
|
7634
ae90e05ad299
fix parameter list initializer bug
John W. Eaton <jwe@octave.org>
parents:
7587
diff
changeset
|
1003 | identifier '=' decl_param_init expression |
|
ae90e05ad299
fix parameter list initializer bug
John W. Eaton <jwe@octave.org>
parents:
7587
diff
changeset
|
1004 { |
|
ae90e05ad299
fix parameter list initializer bug
John W. Eaton <jwe@octave.org>
parents:
7587
diff
changeset
|
1005 lexer_flags.looking_at_initializer_expression = false; |
|
ae90e05ad299
fix parameter list initializer bug
John W. Eaton <jwe@octave.org>
parents:
7587
diff
changeset
|
1006 $$ = new tree_decl_elt ($1, $4); |
|
ae90e05ad299
fix parameter list initializer bug
John W. Eaton <jwe@octave.org>
parents:
7587
diff
changeset
|
1007 } |
| 2970 | 1008 ; |
| 1009 | |
| 1010 // ==================== | |
| 1011 // Selection statements | |
| 1012 // ==================== | |
| 1013 | |
| 1014 select_command : if_command | |
| 1015 { $$ = $1; } | |
| 1016 | switch_command | |
| 1017 { $$ = $1; } | |
| 1018 ; | |
| 1019 | |
| 1020 // ============ | |
| 1021 // If statement | |
| 1022 // ============ | |
| 1023 | |
| 3665 | 1024 if_command : IF stash_comment if_cmd_list END |
| 2970 | 1025 { |
| 3665 | 1026 if (! ($$ = finish_if_command ($1, $3, $4, $2))) |
| 2970 | 1027 ABORT_PARSE; |
| 1028 } | |
| 1029 ; | |
| 1030 | |
| 1031 if_cmd_list : if_cmd_list1 | |
| 1032 { $$ = $1; } | |
| 1033 | if_cmd_list1 else_clause | |
| 1034 { | |
| 1035 $1->append ($2); | |
| 1036 $$ = $1; | |
| 1037 } | |
| 1038 ; | |
| 1039 | |
| 1040 if_cmd_list1 : expression opt_sep opt_list | |
| 1041 { $$ = start_if_command ($1, $3); } | |
| 1042 | if_cmd_list1 elseif_clause | |
| 1043 { | |
| 1044 $1->append ($2); | |
| 1045 $$ = $1; | |
| 1046 } | |
| 1047 ; | |
| 1048 | |
| 3665 | 1049 elseif_clause : ELSEIF stash_comment opt_sep expression opt_sep opt_list |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
1050 { $$ = make_elseif_clause ($1, $4, $6, $2); } |
| 2970 | 1051 ; |
| 1052 | |
| 3665 | 1053 else_clause : ELSE stash_comment opt_sep opt_list |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
1054 { $$ = new tree_if_clause ($4, $2); } |
| 2970 | 1055 ; |
| 1056 | |
| 1057 // ================ | |
| 1058 // Switch statement | |
| 1059 // ================ | |
| 1060 | |
| 3665 | 1061 switch_command : SWITCH stash_comment expression opt_sep case_list END |
| 2970 | 1062 { |
| 3665 | 1063 if (! ($$ = finish_switch_command ($1, $3, $5, $6, $2))) |
| 2970 | 1064 ABORT_PARSE; |
| 1065 } | |
| 1066 ; | |
| 1067 | |
| 4044 | 1068 case_list : // empty |
| 1069 { $$ = new tree_switch_case_list (); } | |
| 1070 | case_list1 | |
| 2970 | 1071 { $$ = $1; } |
| 1072 | case_list1 default_case | |
| 1073 { | |
| 1074 $1->append ($2); | |
| 1075 $$ = $1; | |
| 1076 } | |
| 1077 ; | |
| 1078 | |
| 1079 case_list1 : switch_case | |
| 1080 { $$ = new tree_switch_case_list ($1); } | |
| 1081 | case_list1 switch_case | |
| 1082 { | |
| 1083 $1->append ($2); | |
| 1084 $$ = $1; | |
| 1085 } | |
| 1086 ; | |
| 1087 | |
| 4025 | 1088 switch_case : CASE stash_comment opt_sep expression opt_sep opt_list |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
1089 { $$ = make_switch_case ($1, $4, $6, $2); } |
| 2970 | 1090 ; |
| 1091 | |
| 3665 | 1092 default_case : OTHERWISE stash_comment opt_sep opt_list |
| 1093 { | |
| 1094 $$ = new tree_switch_case ($4, $2); | |
| 1095 } | |
| 2970 | 1096 ; |
| 1097 | |
| 1098 // ======= | |
| 1099 // Looping | |
| 1100 // ======= | |
| 1101 | |
| 3665 | 1102 loop_command : WHILE stash_comment expression opt_sep opt_list END |
| 2970 | 1103 { |
| 3665 | 1104 if (! ($$ = make_while_command ($1, $3, $5, $6, $2))) |
| 2970 | 1105 ABORT_PARSE; |
| 1106 } | |
| 3665 | 1107 | DO stash_comment opt_sep opt_list UNTIL expression |
| 3484 | 1108 { |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
1109 if (! ($$ = make_do_until_command ($5, $4, $6, $2))) |
| 3484 | 1110 ABORT_PARSE; |
| 1111 } | |
| 3665 | 1112 | FOR stash_comment assign_lhs '=' expression opt_sep opt_list END |
| 2970 | 1113 { |
| 3665 | 1114 if (! ($$ = make_for_command ($1, $3, $5, $7, $8, $2))) |
| 2970 | 1115 ABORT_PARSE; |
| 1116 } | |
| 5127 | 1117 | FOR stash_comment '(' assign_lhs '=' expression ')' opt_sep opt_list END |
| 1118 { | |
| 1119 if (! ($$ = make_for_command ($1, $4, $6, $9, $10, $2))) | |
| 1120 ABORT_PARSE; | |
| 1121 } | |
| 2970 | 1122 ; |
| 1123 | |
| 1124 // ======= | |
| 1125 // Jumping | |
| 1126 // ======= | |
| 1127 | |
| 4207 | 1128 jump_command : BREAK |
| 2970 | 1129 { |
| 4207 | 1130 if (! ($$ = make_break_command ($1))) |
| 2970 | 1131 ABORT_PARSE; |
| 1132 } | |
| 1133 | CONTINUE | |
| 1134 { | |
| 4207 | 1135 if (! ($$ = make_continue_command ($1))) |
| 2970 | 1136 ABORT_PARSE; |
| 1137 } | |
| 1138 | FUNC_RET | |
| 1139 { | |
| 4207 | 1140 if (! ($$ = make_return_command ($1))) |
| 2970 | 1141 ABORT_PARSE; |
| 1142 } | |
| 1143 ; | |
| 1144 | |
| 1145 // ========== | |
| 1146 // Exceptions | |
| 1147 // ========== | |
| 1148 | |
| 3665 | 1149 except_command : UNWIND stash_comment opt_sep opt_list CLEANUP |
| 1150 stash_comment opt_sep opt_list END | |
| 2970 | 1151 { |
| 3665 | 1152 if (! ($$ = make_unwind_command ($1, $4, $8, $9, $2, $6))) |
| 2970 | 1153 ABORT_PARSE; |
| 1154 } | |
| 3665 | 1155 | TRY stash_comment opt_sep opt_list CATCH |
| 1156 stash_comment opt_sep opt_list END | |
| 2970 | 1157 { |
| 3665 | 1158 if (! ($$ = make_try_command ($1, $4, $8, $9, $2, $6))) |
| 2970 | 1159 ABORT_PARSE; |
| 1160 } | |
| 5344 | 1161 | TRY stash_comment opt_sep opt_list END |
| 1162 { | |
| 1163 if (! ($$ = make_try_command ($1, $4, 0, $5, $2, 0))) | |
| 1164 ABORT_PARSE; | |
| 1165 } | |
| 2970 | 1166 ; |
| 1167 | |
| 1168 // =========================================== | |
| 1169 // Some `subroutines' for function definitions | |
| 1170 // =========================================== | |
| 1171 | |
| 7336 | 1172 push_fcn_symtab : // empty |
| 1173 { | |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1174 current_function_depth++; |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1175 |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1176 if (max_function_depth < current_function_depth) |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1177 max_function_depth = current_function_depth; |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1178 |
| 7336 | 1179 symtab_context.push (symbol_table::current_scope ()); |
| 1180 symbol_table::set_scope (symbol_table::alloc_scope ()); | |
| 1181 | |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1182 if (! reading_script_file && current_function_depth == 1 |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1183 && ! parsing_subfunctions) |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1184 primary_fcn_scope = symbol_table::current_scope (); |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1185 |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1186 if (reading_script_file && current_function_depth > 1) |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1187 yyerror ("nested functions not implemented in this context"); |
| 7336 | 1188 } |
| 2970 | 1189 ; |
| 1190 | |
| 1191 // =========================== | |
| 1192 // List of function parameters | |
| 1193 // =========================== | |
| 1194 | |
| 1195 param_list_beg : '(' | |
| 4935 | 1196 { |
| 1197 lexer_flags.looking_at_parameter_list = true; | |
| 1198 | |
| 1199 if (lexer_flags.looking_at_function_handle) | |
| 1200 { | |
| 7336 | 1201 symtab_context.push (symbol_table::current_scope ()); |
| 1202 symbol_table::set_scope (symbol_table::alloc_scope ()); | |
| 4935 | 1203 lexer_flags.looking_at_function_handle--; |
| 1204 } | |
| 1205 } | |
| 2970 | 1206 ; |
| 1207 | |
| 1208 param_list_end : ')' | |
|
9471
24df2e66abbe
correctly parse things like '@(){1 2}'
John W. Eaton <jwe@octave.org>
parents:
9396
diff
changeset
|
1209 { |
|
24df2e66abbe
correctly parse things like '@(){1 2}'
John W. Eaton <jwe@octave.org>
parents:
9396
diff
changeset
|
1210 lexer_flags.looking_at_parameter_list = false; |
|
24df2e66abbe
correctly parse things like '@(){1 2}'
John W. Eaton <jwe@octave.org>
parents:
9396
diff
changeset
|
1211 lexer_flags.looking_for_object_index = false; |
|
24df2e66abbe
correctly parse things like '@(){1 2}'
John W. Eaton <jwe@octave.org>
parents:
9396
diff
changeset
|
1212 } |
| 2970 | 1213 ; |
| 1214 | |
| 4935 | 1215 param_list : param_list_beg param_list1 param_list_end |
| 2970 | 1216 { |
| 1217 lexer_flags.quote_is_transpose = false; | |
| 4935 | 1218 $$ = $2; |
| 2970 | 1219 } |
| 1220 | param_list_beg error | |
| 1221 { | |
| 1222 yyerror ("invalid parameter list"); | |
| 1223 $$ = 0; | |
| 1224 ABORT_PARSE; | |
| 1225 } | |
| 4935 | 1226 ; |
| 1227 | |
| 1228 param_list1 : // empty | |
| 1229 { $$ = 0; } | |
| 1230 | param_list2 | |
| 1231 { | |
| 1232 $1->mark_as_formal_parameters (); | |
|
7587
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7562
diff
changeset
|
1233 if ($1->validate (tree_parameter_list::in)) |
|
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7562
diff
changeset
|
1234 $$ = $1; |
|
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7562
diff
changeset
|
1235 else |
|
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7562
diff
changeset
|
1236 ABORT_PARSE; |
| 4935 | 1237 } |
| 1238 ; | |
| 1239 | |
| 6215 | 1240 param_list2 : decl2 |
| 4935 | 1241 { $$ = new tree_parameter_list ($1); } |
| 6215 | 1242 | param_list2 ',' decl2 |
| 4935 | 1243 { |
| 1244 $1->append ($3); | |
| 1245 $$ = $1; | |
| 2970 | 1246 } |
| 1247 ; | |
| 1248 | |
| 1249 // =================================== | |
| 1250 // List of function return value names | |
| 1251 // =================================== | |
| 1252 | |
| 7336 | 1253 return_list : '[' ']' |
| 2970 | 1254 { |
| 1255 lexer_flags.looking_at_return_list = false; | |
| 1256 $$ = new tree_parameter_list (); | |
| 1257 } | |
| 7336 | 1258 | return_list1 |
| 1259 { | |
| 1260 lexer_flags.looking_at_return_list = false; | |
|
7587
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7562
diff
changeset
|
1261 if ($1->validate (tree_parameter_list::out)) |
|
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7562
diff
changeset
|
1262 $$ = $1; |
|
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7562
diff
changeset
|
1263 else |
|
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7562
diff
changeset
|
1264 ABORT_PARSE; |
| 7336 | 1265 } |
| 1266 | '[' return_list1 ']' | |
| 2970 | 1267 { |
| 1268 lexer_flags.looking_at_return_list = false; | |
|
7587
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7562
diff
changeset
|
1269 if ($2->validate (tree_parameter_list::out)) |
|
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7562
diff
changeset
|
1270 $$ = $2; |
|
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7562
diff
changeset
|
1271 else |
|
1f662945c2be
handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents:
7562
diff
changeset
|
1272 ABORT_PARSE; |
| 2970 | 1273 } |
| 1274 ; | |
| 1275 | |
| 1276 return_list1 : identifier | |
| 6215 | 1277 { $$ = new tree_parameter_list (new tree_decl_elt ($1)); } |
| 2970 | 1278 | return_list1 ',' identifier |
| 1279 { | |
| 6215 | 1280 $1->append (new tree_decl_elt ($3)); |
| 2970 | 1281 $$ = $1; |
| 1282 } | |
| 1283 ; | |
| 1284 | |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
1285 // =========== |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
1286 // Script file |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
1287 // =========== |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
1288 |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1289 script_file : SCRIPT_FILE opt_list END_OF_INPUT |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
1290 { |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
1291 tree_statement *end_of_script |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
1292 = make_end ("endscript", input_line_number, |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
1293 current_input_column); |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
1294 |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
1295 make_script ($2, end_of_script); |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
1296 |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
1297 $$ = 0; |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
1298 } |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
1299 ; |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
1300 |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1301 // ============= |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1302 // Function file |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1303 // ============= |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1304 |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1305 function_file : FUNCTION_FILE function_list opt_sep END_OF_INPUT |
| 9476 | 1306 { $$ = 0; } |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1307 ; |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1308 |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1309 function_list : function |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1310 | function_list sep function |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1311 ; |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1312 |
| 2970 | 1313 // =================== |
| 1314 // Function definition | |
| 1315 // =================== | |
| 1316 | |
| 7336 | 1317 function_beg : push_fcn_symtab FCN stash_comment |
| 9476 | 1318 { |
| 1319 $$ = $3; | |
| 1320 | |
| 1321 if (reading_classdef_file || lexer_flags.parsing_classdef) | |
| 1322 lexer_flags.maybe_classdef_get_set_method = true; | |
| 1323 } | |
| 2970 | 1324 ; |
| 1325 | |
| 7336 | 1326 function : function_beg function1 |
| 2970 | 1327 { |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
1328 $$ = finish_function (0, $2, $1); |
| 2970 | 1329 recover_from_parsing_function (); |
| 1330 } | |
| 7336 | 1331 | function_beg return_list '=' function1 |
| 2970 | 1332 { |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
1333 $$ = finish_function ($2, $4, $1); |
| 2970 | 1334 recover_from_parsing_function (); |
| 1335 } | |
| 1336 ; | |
| 1337 | |
| 7336 | 1338 fcn_name : identifier |
| 2970 | 1339 { |
| 4238 | 1340 std::string id_name = $1->name (); |
| 1341 | |
| 1342 lexer_flags.parsed_function_name = true; | |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1343 lexer_flags.defining_func = false; |
| 9476 | 1344 lexer_flags.maybe_classdef_get_set_method = false; |
| 1345 | |
| 4238 | 1346 $$ = $1; |
| 1347 } | |
| 9476 | 1348 | GET '.' identifier |
| 1349 { | |
| 1350 lexer_flags.maybe_classdef_get_set_method = false; | |
| 1351 $$ = $3; | |
| 1352 } | |
| 1353 | SET '.' identifier | |
| 1354 { | |
| 1355 lexer_flags.maybe_classdef_get_set_method = false; | |
| 1356 $$ = $3; | |
| 1357 } | |
| 4238 | 1358 ; |
| 1359 | |
| 7336 | 1360 function1 : fcn_name function2 |
| 4238 | 1361 { |
| 4872 | 1362 std::string fname = $1->name (); |
| 1363 | |
| 1364 delete $1; | |
| 1365 | |
| 1366 if (! ($$ = frob_function (fname, $2))) | |
| 2970 | 1367 ABORT_PARSE; |
| 1368 } | |
| 1369 ; | |
| 1370 | |
| 7336 | 1371 function2 : param_list opt_sep opt_list function_end |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
1372 { $$ = start_function ($1, $3, $4); } |
| 7336 | 1373 | opt_sep opt_list function_end |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
1374 { $$ = start_function (0, $2, $3); } |
| 2970 | 1375 ; |
| 1376 | |
| 1377 function_end : END | |
| 1378 { | |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1379 endfunction_found = true; |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
1380 if (end_token_ok ($1, token::function_end)) |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
1381 $$ = make_end ("endfunction", $1->line (), $1->column ()); |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
1382 else |
| 2970 | 1383 ABORT_PARSE; |
| 1384 } | |
| 1385 | END_OF_INPUT | |
| 1386 { | |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1387 // A lot of tests are based on the assumption that this is OK |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1388 // if (reading_script_file) |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1389 // { |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1390 // yyerror ("function body open at end of script"); |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1391 // YYABORT; |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1392 // } |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1393 |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1394 if (endfunction_found) |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1395 { |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1396 yyerror ("inconsistent function endings -- " |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1397 "if one function is explicitly ended, " |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1398 "so must all the others"); |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1399 YYABORT; |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1400 } |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1401 |
|
10130
0c3609dd34cf
oct-parse.yy (eval_string): save and set reading_{script,fcn,classdef}_file vars
John W. Eaton <jwe@octave.org>
parents:
10067
diff
changeset
|
1402 if (! (reading_fcn_file || reading_script_file |
|
0c3609dd34cf
oct-parse.yy (eval_string): save and set reading_{script,fcn,classdef}_file vars
John W. Eaton <jwe@octave.org>
parents:
10067
diff
changeset
|
1403 || get_input_from_eval_string)) |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1404 { |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1405 yyerror ("function body open at end of input"); |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1406 YYABORT; |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1407 } |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1408 |
| 9476 | 1409 if (reading_classdef_file) |
| 1410 { | |
| 1411 yyerror ("classdef body open at end of input"); | |
| 1412 YYABORT; | |
| 1413 } | |
| 1414 | |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1415 $$ = make_end ("endfunction", input_line_number, |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
1416 current_input_column); |
| 2970 | 1417 } |
| 1418 ; | |
| 1419 | |
| 9476 | 1420 // ======== |
| 1421 // Classdef | |
| 1422 // ======== | |
| 1423 | |
| 1424 classdef_beg : CLASSDEF stash_comment | |
| 1425 { | |
| 1426 $$ = 0; | |
| 1427 lexer_flags.parsing_classdef = true; | |
| 1428 } | |
| 1429 ; | |
| 1430 | |
| 1431 classdef_end : END | |
| 1432 { | |
| 1433 lexer_flags.parsing_classdef = false; | |
| 1434 | |
| 1435 if (end_token_ok ($1, token::classdef_end)) | |
| 1436 $$ = make_end ("endclassdef", $1->line (), $1->column ()); | |
| 1437 else | |
| 1438 ABORT_PARSE; | |
| 1439 } | |
| 1440 ; | |
| 1441 | |
| 1442 classdef1 : classdef_beg opt_attr_list identifier opt_superclasses | |
| 1443 { $$ = 0; } | |
| 1444 ; | |
| 1445 | |
| 1446 classdef : classdef1 '\n' class_body '\n' stash_comment classdef_end | |
| 1447 { $$ = 0; } | |
| 1448 ; | |
| 1449 | |
| 1450 opt_attr_list : // empty | |
| 1451 { $$ = 0; } | |
| 1452 | '(' attr_list ')' | |
| 1453 { $$ = 0; } | |
| 1454 ; | |
| 1455 | |
| 1456 attr_list : attr | |
| 1457 { $$ = 0; } | |
| 1458 | attr_list ',' attr | |
| 1459 { $$ = 0; } | |
| 1460 ; | |
| 1461 | |
| 1462 attr : identifier | |
| 1463 { $$ = 0; } | |
| 1464 | identifier '=' decl_param_init expression | |
| 1465 { $$ = 0; } | |
| 1466 | EXPR_NOT identifier | |
| 1467 { $$ = 0; } | |
| 1468 ; | |
| 1469 | |
| 1470 opt_superclasses | |
| 1471 : // empty | |
| 1472 { $$ = 0; } | |
| 1473 | superclasses | |
| 1474 { $$ = 0; } | |
| 1475 ; | |
| 1476 | |
| 1477 superclasses : EXPR_LT identifier '.' identifier | |
| 1478 { $$ = 0; } | |
| 1479 | EXPR_LT identifier | |
| 1480 { $$ = 0; } | |
| 1481 | superclasses EXPR_AND identifier '.' identifier | |
| 1482 { $$ = 0; } | |
| 1483 | superclasses EXPR_AND identifier | |
| 1484 { $$ = 0; } | |
| 1485 ; | |
| 1486 | |
| 1487 class_body : properties_block | |
| 1488 { $$ = 0; } | |
| 1489 | methods_block | |
| 1490 { $$ = 0; } | |
| 1491 | events_block | |
| 1492 { $$ = 0; } | |
| 1493 | class_body '\n' properties_block | |
| 1494 { $$ = 0; } | |
| 1495 | class_body '\n' methods_block | |
| 1496 { $$ = 0; } | |
| 1497 | class_body '\n' events_block | |
| 1498 { $$ = 0; } | |
| 1499 ; | |
| 1500 | |
| 1501 properties_beg : PROPERTIES stash_comment | |
| 1502 { $$ = 0; } | |
| 1503 ; | |
| 1504 | |
| 1505 properties_block | |
| 1506 : properties_beg opt_attr_list '\n' properties_list '\n' END | |
| 1507 { $$ = 0; } | |
| 1508 ; | |
| 1509 | |
| 1510 properties_list | |
| 1511 : class_property | |
| 1512 { $$ = 0; } | |
| 1513 | properties_list '\n' class_property | |
| 1514 { $$ = 0; } | |
| 1515 ; | |
| 1516 | |
| 1517 class_property : identifier | |
| 1518 { $$ = 0; } | |
| 1519 | identifier '=' decl_param_init expression ';' | |
| 1520 { $$ = 0; } | |
| 1521 ; | |
| 1522 | |
| 1523 methods_beg : METHODS stash_comment | |
| 1524 { $$ = 0; } | |
| 1525 ; | |
| 1526 | |
| 1527 methods_block : methods_beg opt_attr_list '\n' methods_list '\n' END | |
| 1528 { $$ = 0; } | |
| 1529 ; | |
| 1530 | |
| 1531 methods_list : function | |
| 1532 { $$ = 0; } | |
| 1533 | methods_list '\n' function | |
| 1534 { $$ = 0; } | |
| 1535 ; | |
| 1536 | |
| 1537 events_beg : EVENTS stash_comment | |
| 1538 { $$ = 0; } | |
| 1539 ; | |
| 1540 | |
| 1541 events_block : events_beg opt_attr_list '\n' events_list '\n' END | |
| 1542 { $$ = 0; } | |
| 1543 ; | |
| 1544 | |
| 1545 events_list : class_event | |
| 1546 { $$ = 0; } | |
| 1547 | events_list '\n' class_event | |
| 1548 { $$ = 0; } | |
| 1549 ; | |
| 1550 | |
| 1551 class_event : identifier | |
| 1552 { $$ = 0; } | |
| 1553 ; | |
| 1554 | |
| 2970 | 1555 // ============= |
| 1556 // Miscellaneous | |
| 1557 // ============= | |
| 1558 | |
| 3665 | 1559 stash_comment : // empty |
| 1560 { $$ = octave_comment_buffer::get_comment (); } | |
| 1561 ; | |
| 1562 | |
| 2970 | 1563 parse_error : LEXICAL_ERROR |
| 1564 { yyerror ("parse error"); } | |
| 1565 | error | |
| 1 | 1566 ; |
| 1567 | |
| 2525 | 1568 sep_no_nl : ',' |
| 1569 { $$ = ','; } | |
| 1570 | ';' | |
| 1571 { $$ = ';'; } | |
| 1572 | sep_no_nl ',' | |
| 1573 { $$ = $1; } | |
| 1574 | sep_no_nl ';' | |
| 1575 { $$ = $1; } | |
| 1576 ; | |
| 1577 | |
| 1578 opt_sep_no_nl : // empty | |
| 1579 { $$ = 0; } | |
| 1580 | sep_no_nl | |
| 1581 { $$ = $1; } | |
| 1582 ; | |
| 1583 | |
| 1584 sep : ',' | |
| 1585 { $$ = ','; } | |
| 1586 | ';' | |
| 1587 { $$ = ';'; } | |
| 1588 | '\n' | |
| 1589 { $$ = '\n'; } | |
| 1590 | sep ',' | |
| 1591 { $$ = $1; } | |
| 1592 | sep ';' | |
| 1593 { $$ = $1; } | |
| 1594 | sep '\n' | |
| 1595 { $$ = $1; } | |
| 1596 ; | |
| 1597 | |
| 1598 opt_sep : // empty | |
| 1599 { $$ = 0; } | |
| 1600 | sep | |
| 1601 { $$ = $1; } | |
| 1602 ; | |
| 1603 | |
| 1 | 1604 %% |
| 1605 | |
| 666 | 1606 // Generic error messages. |
| 1607 | |
| 1 | 1608 static void |
| 2805 | 1609 yyerror (const char *s) |
| 1 | 1610 { |
| 143 | 1611 int err_col = current_input_column - 1; |
| 1 | 1612 |
| 5765 | 1613 std::ostringstream output_buf; |
| 1 | 1614 |
| 9476 | 1615 if (reading_fcn_file || reading_script_file || reading_classdef_file) |
| 1005 | 1616 output_buf << "parse error near line " << input_line_number |
| 1607 | 1617 << " of file " << curr_fcn_file_full_name; |
| 1005 | 1618 else |
| 1619 output_buf << "parse error:"; | |
| 581 | 1620 |
| 1005 | 1621 if (s && strcmp (s, "parse error") != 0) |
| 1622 output_buf << "\n\n " << s; | |
| 1623 | |
| 1624 output_buf << "\n\n"; | |
| 1 | 1625 |
| 1755 | 1626 if (! current_input_line.empty ()) |
| 1 | 1627 { |
| 1755 | 1628 size_t len = current_input_line.length (); |
| 1060 | 1629 |
| 1755 | 1630 if (current_input_line[len-1] == '\n') |
| 1631 current_input_line.resize (len-1); | |
| 1005 | 1632 |
| 4051 | 1633 // Print the line, maybe with a pointer near the error token. |
| 1005 | 1634 |
| 1755 | 1635 output_buf << ">>> " << current_input_line << "\n"; |
| 1060 | 1636 |
| 1637 if (err_col == 0) | |
| 1638 err_col = len; | |
| 1639 | |
| 1640 for (int i = 0; i < err_col + 3; i++) | |
| 1641 output_buf << " "; | |
| 1642 | |
| 1643 output_buf << "^"; | |
| 1 | 1644 } |
| 1005 | 1645 |
| 5765 | 1646 output_buf << "\n"; |
| 1647 | |
| 1648 std::string msg = output_buf.str (); | |
| 1649 | |
| 1650 parse_error ("%s", msg.c_str ()); | |
| 1 | 1651 } |
| 1652 | |
| 666 | 1653 // Error mesages for mismatched end tokens. |
| 1654 | |
| 496 | 1655 static void |
| 2805 | 1656 end_error (const char *type, token::end_tok_type ettype, int l, int c) |
| 496 | 1657 { |
| 2805 | 1658 static const char *fmt |
| 1659 = "`%s' command matched by `%s' near line %d column %d"; | |
| 496 | 1660 |
| 1661 switch (ettype) | |
| 1662 { | |
| 1663 case token::simple_end: | |
| 1664 error (fmt, type, "end", l, c); | |
| 1665 break; | |
| 777 | 1666 |
| 496 | 1667 case token::for_end: |
| 1668 error (fmt, type, "endfor", l, c); | |
| 1669 break; | |
| 777 | 1670 |
| 496 | 1671 case token::function_end: |
| 1672 error (fmt, type, "endfunction", l, c); | |
| 1673 break; | |
| 777 | 1674 |
| 9476 | 1675 case token::classdef_end: |
| 1676 error (fmt, type, "endclassdef", l, c); | |
| 1677 break; | |
| 1678 | |
| 496 | 1679 case token::if_end: |
| 1680 error (fmt, type, "endif", l, c); | |
| 1681 break; | |
| 777 | 1682 |
| 3233 | 1683 case token::switch_end: |
| 1684 error (fmt, type, "endswitch", l, c); | |
| 1685 break; | |
| 1686 | |
| 496 | 1687 case token::while_end: |
| 1688 error (fmt, type, "endwhile", l, c); | |
| 1689 break; | |
| 777 | 1690 |
| 5400 | 1691 case token::try_catch_end: |
| 1692 error (fmt, type, "end_try_catch", l, c); | |
| 1693 break; | |
| 1694 | |
| 1371 | 1695 case token::unwind_protect_end: |
| 1696 error (fmt, type, "end_unwind_protect", l, c); | |
| 1697 break; | |
| 1698 | |
| 496 | 1699 default: |
| 1700 panic_impossible (); | |
| 1701 break; | |
| 1702 } | |
| 1703 } | |
| 1704 | |
| 666 | 1705 // Check to see that end tokens are properly matched. |
| 1706 | |
| 2857 | 1707 static bool |
| 1708 end_token_ok (token *tok, token::end_tok_type expected) | |
| 143 | 1709 { |
| 2857 | 1710 bool retval = true; |
| 1711 | |
| 143 | 1712 token::end_tok_type ettype = tok->ettype (); |
| 2857 | 1713 |
| 143 | 1714 if (ettype != expected && ettype != token::simple_end) |
| 1715 { | |
| 2857 | 1716 retval = false; |
| 1717 | |
| 143 | 1718 yyerror ("parse error"); |
| 1719 | |
| 1720 int l = tok->line (); | |
| 1721 int c = tok->column (); | |
| 1722 | |
| 1723 switch (expected) | |
| 1724 { | |
| 9476 | 1725 case token::classdef_end: |
| 1726 end_error ("classdef", ettype, l, c); | |
| 1727 break; | |
| 1728 | |
| 143 | 1729 case token::for_end: |
| 1730 end_error ("for", ettype, l, c); | |
| 1731 break; | |
| 777 | 1732 |
| 143 | 1733 case token::function_end: |
| 1734 end_error ("function", ettype, l, c); | |
| 1735 break; | |
| 777 | 1736 |
| 143 | 1737 case token::if_end: |
| 1738 end_error ("if", ettype, l, c); | |
| 1739 break; | |
| 777 | 1740 |
| 1489 | 1741 case token::try_catch_end: |
| 1742 end_error ("try", ettype, l, c); | |
| 1743 break; | |
| 1744 | |
| 2764 | 1745 case token::switch_end: |
| 1746 end_error ("switch", ettype, l, c); | |
| 1747 break; | |
| 1748 | |
| 1489 | 1749 case token::unwind_protect_end: |
| 1750 end_error ("unwind_protect", ettype, l, c); | |
| 1751 break; | |
| 1752 | |
| 143 | 1753 case token::while_end: |
| 1754 end_error ("while", ettype, l, c); | |
| 1755 break; | |
| 777 | 1756 |
| 143 | 1757 default: |
| 1758 panic_impossible (); | |
| 1759 break; | |
| 1760 } | |
| 1761 } | |
| 2857 | 1762 |
| 1763 return retval; | |
| 143 | 1764 } |
| 1765 | |
| 666 | 1766 // Maybe print a warning if an assignment expression is used as the |
| 1767 // test in a logical expression. | |
| 1768 | |
| 496 | 1769 static void |
| 1770 maybe_warn_assign_as_truth_value (tree_expression *expr) | |
| 1 | 1771 { |
| 5781 | 1772 if (expr->is_assignment_expression () |
| 2961 | 1773 && expr->paren_count () < 2) |
| 1 | 1774 { |
|
8974
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
1775 if (curr_fcn_file_full_name.empty ()) |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
1776 warning_with_id |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
1777 ("Octave:assign-as-truth-value", |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
1778 "suggest parenthesis around assignment used as truth value"); |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
1779 else |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
1780 warning_with_id |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
1781 ("Octave:assign-as-truth-value", |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
1782 "suggest parenthesis around assignment used as truth value near line %d, column %d in file `%s'", |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
1783 expr->line (), expr->column (), curr_fcn_file_full_name.c_str ()); |
| 1 | 1784 } |
| 1785 } | |
| 578 | 1786 |
| 2764 | 1787 // Maybe print a warning about switch labels that aren't constants. |
| 1788 | |
| 1789 static void | |
| 1790 maybe_warn_variable_switch_label (tree_expression *expr) | |
| 1791 { | |
| 5781 | 1792 if (! expr->is_constant ()) |
|
8974
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
1793 { |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
1794 if (curr_fcn_file_full_name.empty ()) |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
1795 warning_with_id ("Octave:variable-switch-label", |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
1796 "variable switch label"); |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
1797 else |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
1798 warning_with_id |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
1799 ("Octave:variable-switch-label", |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
1800 "variable switch label near line %d, column %d in file `%s'", |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
1801 expr->line (), expr->column (), curr_fcn_file_full_name.c_str ()); |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
1802 } |
| 2764 | 1803 } |
| 1804 | |
| 2533 | 1805 static tree_expression * |
| 1806 fold (tree_binary_expression *e) | |
| 1807 { | |
| 3110 | 1808 tree_expression *retval = e; |
| 1809 | |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
1810 unwind_protect frame; |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
1811 |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
1812 frame.protect_var (error_state); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
1813 frame.protect_var (warning_state); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
1814 |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
1815 frame.protect_var (discard_error_messages); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
1816 frame.protect_var (discard_warning_messages); |
| 4452 | 1817 |
| 3815 | 1818 discard_error_messages = true; |
| 4452 | 1819 discard_warning_messages = true; |
| 2533 | 1820 |
| 1821 tree_expression *op1 = e->lhs (); | |
| 1822 tree_expression *op2 = e->rhs (); | |
| 1823 | |
| 5161 | 1824 octave_value::binary_op op_type = e->op_type (); |
| 1825 | |
| 1826 if (op1->is_constant () && op2->is_constant () | |
| 5781 | 1827 && (! ((warning_enabled ("Octave:associativity-change") |
| 5161 | 1828 && (op_type == POW || op_type == EPOW)) |
| 5781 | 1829 || (warning_enabled ("Octave:precedence-change") |
| 5161 | 1830 && (op_type == EXPR_OR || op_type == EXPR_OR_OR))))) |
| 2533 | 1831 { |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
1832 octave_value tmp = e->rvalue1 (); |
| 2533 | 1833 |
| 3489 | 1834 if (! (error_state || warning_state)) |
| 2533 | 1835 { |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
1836 tree_constant *tc_retval |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
1837 = new tree_constant (tmp, op1->line (), op1->column ()); |
| 2533 | 1838 |
| 5765 | 1839 std::ostringstream buf; |
| 2533 | 1840 |
| 1841 tree_print_code tpc (buf); | |
| 1842 | |
| 1843 e->accept (tpc); | |
| 1844 | |
| 5765 | 1845 tc_retval->stash_original_text (buf.str ()); |
| 2533 | 1846 |
| 1847 delete e; | |
| 1848 | |
| 1849 retval = tc_retval; | |
| 1850 } | |
| 1851 } | |
| 3110 | 1852 |
| 3292 | 1853 return retval; |
| 1854 } | |
| 1855 | |
| 1856 static tree_expression * | |
| 1857 fold (tree_unary_expression *e) | |
| 1858 { | |
| 1859 tree_expression *retval = e; | |
| 1860 | |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
1861 unwind_protect frame; |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
1862 |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
1863 frame.protect_var (error_state); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
1864 frame.protect_var (warning_state); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
1865 |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
1866 frame.protect_var (discard_error_messages); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
1867 frame.protect_var (discard_warning_messages); |
| 4452 | 1868 |
| 3815 | 1869 discard_error_messages = true; |
| 4452 | 1870 discard_warning_messages = true; |
| 3292 | 1871 |
| 1872 tree_expression *op = e->operand (); | |
| 1873 | |
| 1874 if (op->is_constant ()) | |
| 1875 { | |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
1876 octave_value tmp = e->rvalue1 (); |
| 3292 | 1877 |
| 3489 | 1878 if (! (error_state || warning_state)) |
| 3292 | 1879 { |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
1880 tree_constant *tc_retval |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
1881 = new tree_constant (tmp, op->line (), op->column ()); |
| 3292 | 1882 |
| 5765 | 1883 std::ostringstream buf; |
| 3292 | 1884 |
| 1885 tree_print_code tpc (buf); | |
| 1886 | |
| 1887 e->accept (tpc); | |
| 1888 | |
| 5765 | 1889 tc_retval->stash_original_text (buf.str ()); |
| 3292 | 1890 |
| 1891 delete e; | |
| 1892 | |
| 1893 retval = tc_retval; | |
| 1894 } | |
| 1895 } | |
| 1896 | |
| 2533 | 1897 return retval; |
| 1898 } | |
| 1899 | |
| 1623 | 1900 // Finish building a range. |
| 1901 | |
| 1902 static tree_expression * | |
| 1903 finish_colon_expression (tree_colon_expression *e) | |
| 1904 { | |
| 3110 | 1905 tree_expression *retval = e; |
| 1906 | |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
1907 unwind_protect frame; |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
1908 |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
1909 frame.protect_var (error_state); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
1910 frame.protect_var (warning_state); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
1911 |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
1912 frame.protect_var (discard_error_messages); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
1913 frame.protect_var (discard_warning_messages); |
| 4452 | 1914 |
| 3815 | 1915 discard_error_messages = true; |
| 4452 | 1916 discard_warning_messages = true; |
| 1623 | 1917 |
| 2533 | 1918 tree_expression *base = e->base (); |
| 1919 tree_expression *limit = e->limit (); | |
| 1920 tree_expression *incr = e->increment (); | |
| 1921 | |
| 2970 | 1922 if (base) |
| 1623 | 1923 { |
| 2970 | 1924 if (limit) |
| 2533 | 1925 { |
| 2970 | 1926 if (base->is_constant () && limit->is_constant () |
| 1927 && (! incr || (incr && incr->is_constant ()))) | |
| 1928 { | |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
1929 octave_value tmp = e->rvalue1 (); |
| 2970 | 1930 |
| 3489 | 1931 if (! (error_state || warning_state)) |
| 2970 | 1932 { |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
1933 tree_constant *tc_retval |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
1934 = new tree_constant (tmp, base->line (), base->column ()); |
| 2970 | 1935 |
| 5765 | 1936 std::ostringstream buf; |
| 2970 | 1937 |
| 1938 tree_print_code tpc (buf); | |
| 1939 | |
| 1940 e->accept (tpc); | |
| 1941 | |
| 5765 | 1942 tc_retval->stash_original_text (buf.str ()); |
| 2970 | 1943 |
| 1944 delete e; | |
| 1945 | |
| 1946 retval = tc_retval; | |
| 1947 } | |
| 1948 } | |
| 2533 | 1949 } |
| 1950 else | |
| 2970 | 1951 { |
| 2990 | 1952 e->preserve_base (); |
| 1953 delete e; | |
| 2970 | 1954 |
| 5775 | 1955 // FIXME -- need to attempt constant folding here |
| 2970 | 1956 // too (we need a generic way to do that). |
| 1957 retval = base; | |
| 1958 } | |
| 1623 | 1959 } |
| 1960 | |
| 1961 return retval; | |
| 1962 } | |
| 1963 | |
| 1607 | 1964 // Make a constant. |
| 1965 | |
| 2375 | 1966 static tree_constant * |
| 1607 | 1967 make_constant (int op, token *tok_val) |
| 1968 { | |
| 1969 int l = tok_val->line (); | |
| 1970 int c = tok_val->column (); | |
| 1971 | |
| 3216 | 1972 tree_constant *retval = 0; |
| 1607 | 1973 |
| 1974 switch (op) | |
| 1975 { | |
| 1976 case NUM: | |
| 2533 | 1977 { |
| 2883 | 1978 octave_value tmp (tok_val->number ()); |
| 1979 retval = new tree_constant (tmp, l, c); | |
| 2533 | 1980 retval->stash_original_text (tok_val->text_rep ()); |
| 1981 } | |
| 1607 | 1982 break; |
| 1983 | |
| 1984 case IMAG_NUM: | |
| 1985 { | |
| 2883 | 1986 octave_value tmp (Complex (0.0, tok_val->number ())); |
| 1987 retval = new tree_constant (tmp, l, c); | |
| 1607 | 1988 retval->stash_original_text (tok_val->text_rep ()); |
| 1989 } | |
| 1990 break; | |
| 1991 | |
| 5279 | 1992 case DQ_STRING: |
| 1993 case SQ_STRING: | |
| 2883 | 1994 { |
|
7699
27a5f578750c
make_constant: handle escape sequences in dq-strings
John W. Eaton <jwe@octave.org>
parents:
7690
diff
changeset
|
1995 std::string txt = tok_val->text (); |
|
27a5f578750c
make_constant: handle escape sequences in dq-strings
John W. Eaton <jwe@octave.org>
parents:
7690
diff
changeset
|
1996 |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8064
diff
changeset
|
1997 char delim = op == DQ_STRING ? '"' : '\''; |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8064
diff
changeset
|
1998 octave_value tmp (txt, delim); |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8064
diff
changeset
|
1999 |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8064
diff
changeset
|
2000 if (txt.empty ()) |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8064
diff
changeset
|
2001 { |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8064
diff
changeset
|
2002 if (op == DQ_STRING) |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8064
diff
changeset
|
2003 tmp = octave_null_str::instance; |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8064
diff
changeset
|
2004 else |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8064
diff
changeset
|
2005 tmp = octave_null_sq_str::instance; |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8064
diff
changeset
|
2006 } |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8064
diff
changeset
|
2007 |
| 2883 | 2008 retval = new tree_constant (tmp, l, c); |
|
7699
27a5f578750c
make_constant: handle escape sequences in dq-strings
John W. Eaton <jwe@octave.org>
parents:
7690
diff
changeset
|
2009 |
|
27a5f578750c
make_constant: handle escape sequences in dq-strings
John W. Eaton <jwe@octave.org>
parents:
7690
diff
changeset
|
2010 if (op == DQ_STRING) |
|
27a5f578750c
make_constant: handle escape sequences in dq-strings
John W. Eaton <jwe@octave.org>
parents:
7690
diff
changeset
|
2011 txt = undo_string_escapes (txt); |
|
27a5f578750c
make_constant: handle escape sequences in dq-strings
John W. Eaton <jwe@octave.org>
parents:
7690
diff
changeset
|
2012 |
|
7690
97e535ec65db
make_constant: stash original text for strings
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
2013 // FIXME -- maybe this should also be handled by |
|
97e535ec65db
make_constant: stash original text for strings
John W. Eaton <jwe@octave.org>
parents:
7634
diff
changeset
|
2014 // tok_val->text_rep () for character strings? |
|
7699
27a5f578750c
make_constant: handle escape sequences in dq-strings
John W. Eaton <jwe@octave.org>
parents:
7690
diff
changeset
|
2015 retval->stash_original_text (delim + txt + delim); |
| 2883 | 2016 } |
| 1607 | 2017 break; |
| 2018 | |
| 2019 default: | |
| 2020 panic_impossible (); | |
| 2021 break; | |
| 2022 } | |
| 2023 | |
| 2024 return retval; | |
| 2025 } | |
| 2026 | |
| 4342 | 2027 // Make a function handle. |
| 2028 | |
| 2029 static tree_fcn_handle * | |
| 2030 make_fcn_handle (token *tok_val) | |
| 2031 { | |
| 2032 int l = tok_val->line (); | |
| 2033 int c = tok_val->column (); | |
| 2034 | |
| 2035 tree_fcn_handle *retval = new tree_fcn_handle (tok_val->text (), l, c); | |
| 2036 | |
| 2037 return retval; | |
| 2038 } | |
| 2039 | |
| 4935 | 2040 // Make an anonymous function handle. |
| 2041 | |
| 5861 | 2042 static tree_anon_fcn_handle * |
| 4935 | 2043 make_anon_fcn_handle (tree_parameter_list *param_list, tree_statement *stmt) |
| 2044 { | |
| 5775 | 2045 // FIXME -- need to get these from the location of the @ symbol. |
| 4935 | 2046 |
| 2047 int l = -1; | |
| 2048 int c = -1; | |
| 2049 | |
| 2050 tree_parameter_list *ret_list = 0; | |
| 2051 | |
| 7336 | 2052 symbol_table::scope_id fcn_scope = symbol_table::current_scope (); |
| 5861 | 2053 |
| 2054 if (symtab_context.empty ()) | |
| 2055 panic_impossible (); | |
| 2056 | |
| 7336 | 2057 symbol_table::set_scope (symtab_context.top ()); |
| 5861 | 2058 |
| 2059 symtab_context.pop (); | |
| 2060 | |
| 7351 | 2061 stmt->set_print_flag (false); |
| 4935 | 2062 |
| 2063 tree_statement_list *body = new tree_statement_list (stmt); | |
| 2064 | |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2065 body->mark_as_anon_function_body (); |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2066 |
| 5861 | 2067 tree_anon_fcn_handle *retval |
| 7336 | 2068 = new tree_anon_fcn_handle (param_list, ret_list, body, fcn_scope, l, c); |
| 4935 | 2069 |
| 2070 return retval; | |
| 2071 } | |
| 2072 | |
| 5161 | 2073 static void |
| 2074 maybe_warn_associativity_change (tree_expression *op) | |
| 2075 { | |
| 5781 | 2076 if (op->paren_count () == 0 && op->is_binary_expression ()) |
| 5161 | 2077 { |
| 2078 tree_binary_expression *e | |
| 2079 = dynamic_cast<tree_binary_expression *> (op); | |
| 2080 | |
| 2081 octave_value::binary_op op_type = e->op_type (); | |
| 2082 | |
| 2083 if (op_type == octave_value::op_pow | |
| 2084 || op_type == octave_value::op_el_pow) | |
| 2085 { | |
| 2086 std::string op_str = octave_value::binary_op_as_string (op_type); | |
| 2087 | |
|
8974
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
2088 if (curr_fcn_file_full_name.empty ()) |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
2089 warning_with_id |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
2090 ("Octave:associativity-change", |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
2091 "meaning may have changed due to change in associativity for %s operator", |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
2092 op_str.c_str ()); |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
2093 else |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
2094 warning_with_id |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
2095 ("Octave:associativity-change", |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
2096 "meaning may have changed due to change in associativity for %s operator near line %d, column %d in file `%s'", |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
2097 op_str.c_str (), op->line (), op->column (), |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
2098 curr_fcn_file_full_name.c_str ()); |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
2099 } |
| 5161 | 2100 } |
| 2101 } | |
| 2102 | |
| 666 | 2103 // Build a binary expression. |
| 2104 | |
| 578 | 2105 static tree_expression * |
| 2106 make_binary_op (int op, tree_expression *op1, token *tok_val, | |
| 2107 tree_expression *op2) | |
| 2108 { | |
| 2883 | 2109 octave_value::binary_op t = octave_value::unknown_binary_op; |
| 1623 | 2110 |
| 578 | 2111 switch (op) |
| 2112 { | |
| 2113 case POW: | |
| 3525 | 2114 t = octave_value::op_pow; |
| 5161 | 2115 maybe_warn_associativity_change (op1); |
| 578 | 2116 break; |
| 777 | 2117 |
| 578 | 2118 case EPOW: |
| 3525 | 2119 t = octave_value::op_el_pow; |
| 5161 | 2120 maybe_warn_associativity_change (op1); |
| 578 | 2121 break; |
| 777 | 2122 |
| 578 | 2123 case '+': |
| 3525 | 2124 t = octave_value::op_add; |
| 578 | 2125 break; |
| 777 | 2126 |
| 578 | 2127 case '-': |
| 3525 | 2128 t = octave_value::op_sub; |
| 578 | 2129 break; |
| 777 | 2130 |
| 578 | 2131 case '*': |
| 3525 | 2132 t = octave_value::op_mul; |
| 578 | 2133 break; |
| 777 | 2134 |
| 578 | 2135 case '/': |
| 3525 | 2136 t = octave_value::op_div; |
| 578 | 2137 break; |
| 777 | 2138 |
| 578 | 2139 case EMUL: |
| 3525 | 2140 t = octave_value::op_el_mul; |
| 578 | 2141 break; |
| 777 | 2142 |
| 578 | 2143 case EDIV: |
| 3525 | 2144 t = octave_value::op_el_div; |
| 578 | 2145 break; |
| 777 | 2146 |
| 578 | 2147 case LEFTDIV: |
| 3525 | 2148 t = octave_value::op_ldiv; |
| 578 | 2149 break; |
| 777 | 2150 |
| 578 | 2151 case ELEFTDIV: |
| 3525 | 2152 t = octave_value::op_el_ldiv; |
| 578 | 2153 break; |
| 777 | 2154 |
| 2899 | 2155 case LSHIFT: |
| 3525 | 2156 t = octave_value::op_lshift; |
| 2899 | 2157 break; |
| 2158 | |
| 2159 case RSHIFT: | |
| 3525 | 2160 t = octave_value::op_rshift; |
| 2899 | 2161 break; |
| 2162 | |
| 578 | 2163 case EXPR_LT: |
| 3525 | 2164 t = octave_value::op_lt; |
| 578 | 2165 break; |
| 777 | 2166 |
| 578 | 2167 case EXPR_LE: |
| 3525 | 2168 t = octave_value::op_le; |
| 578 | 2169 break; |
| 777 | 2170 |
| 578 | 2171 case EXPR_EQ: |
| 3525 | 2172 t = octave_value::op_eq; |
| 578 | 2173 break; |
| 777 | 2174 |
| 578 | 2175 case EXPR_GE: |
| 3525 | 2176 t = octave_value::op_ge; |
| 578 | 2177 break; |
| 777 | 2178 |
| 578 | 2179 case EXPR_GT: |
| 3525 | 2180 t = octave_value::op_gt; |
| 578 | 2181 break; |
| 777 | 2182 |
| 578 | 2183 case EXPR_NE: |
| 3525 | 2184 t = octave_value::op_ne; |
| 578 | 2185 break; |
| 777 | 2186 |
| 578 | 2187 case EXPR_AND: |
| 3525 | 2188 t = octave_value::op_el_and; |
| 578 | 2189 break; |
| 777 | 2190 |
| 578 | 2191 case EXPR_OR: |
| 3525 | 2192 t = octave_value::op_el_or; |
| 5781 | 2193 if (op2->paren_count () == 0 && op2->is_binary_expression ()) |
| 4023 | 2194 { |
| 2195 tree_binary_expression *e | |
| 2196 = dynamic_cast<tree_binary_expression *> (op2); | |
| 2197 | |
| 2198 if (e->op_type () == octave_value::op_el_and) | |
|
8974
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
2199 { |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
2200 if (curr_fcn_file_full_name.empty ()) |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
2201 warning_with_id |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
2202 ("Octave:precedence-change", |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
2203 "meaning may have changed due to change in precedence for & and | operators"); |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
2204 else |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
2205 warning_with_id |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
2206 ("Octave:precedence-change", |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
2207 "meaning may have changed due to change in precedence for & and | operators near line %d, column %d in file `%s'", |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
2208 op2->line (), op2->column (), |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
2209 curr_fcn_file_full_name.c_str ()); |
|
fde2a916b2ac
include line and file info in parser warnings
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
2210 } |
| 4023 | 2211 } |
| 578 | 2212 break; |
| 777 | 2213 |
| 578 | 2214 default: |
| 2215 panic_impossible (); | |
| 2216 break; | |
| 2217 } | |
| 2218 | |
| 2219 int l = tok_val->line (); | |
| 2220 int c = tok_val->column (); | |
| 2221 | |
| 2533 | 2222 tree_binary_expression *e |
|
7800
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7787
diff
changeset
|
2223 = maybe_compound_binary_expression (op1, op2, l, c, t); |
| 1623 | 2224 |
| 2533 | 2225 return fold (e); |
| 578 | 2226 } |
| 2227 | |
| 2375 | 2228 // Build a boolean expression. |
| 666 | 2229 |
| 578 | 2230 static tree_expression * |
| 2375 | 2231 make_boolean_op (int op, tree_expression *op1, token *tok_val, |
| 2232 tree_expression *op2) | |
| 578 | 2233 { |
| 2375 | 2234 tree_boolean_expression::type t; |
| 2235 | |
| 578 | 2236 switch (op) |
| 2237 { | |
| 2375 | 2238 case EXPR_AND_AND: |
| 2805 | 2239 t = tree_boolean_expression::bool_and; |
| 578 | 2240 break; |
| 777 | 2241 |
| 2375 | 2242 case EXPR_OR_OR: |
| 2805 | 2243 t = tree_boolean_expression::bool_or; |
| 5781 | 2244 if (op2->paren_count () == 0 && op2->is_boolean_expression ()) |
| 4023 | 2245 { |
| 2246 tree_boolean_expression *e | |
| 2247 = dynamic_cast<tree_boolean_expression *> (op2); | |
| 2248 | |
| 2249 if (e->op_type () == tree_boolean_expression::bool_and) | |
| 5781 | 2250 warning_with_id |
| 2251 ("Octave:precedence-change", | |
| 2252 "meaning may have changed due to change in precedence for && and || operators"); | |
| 4023 | 2253 } |
| 578 | 2254 break; |
| 777 | 2255 |
| 578 | 2256 default: |
| 2257 panic_impossible (); | |
| 2258 break; | |
| 2259 } | |
| 2260 | |
| 2261 int l = tok_val->line (); | |
| 2262 int c = tok_val->column (); | |
| 2263 | |
| 2533 | 2264 tree_boolean_expression *e |
| 2265 = new tree_boolean_expression (op1, op2, l, c, t); | |
| 2375 | 2266 |
| 2533 | 2267 return fold (e); |
| 578 | 2268 } |
| 2269 | |
| 2375 | 2270 // Build a prefix expression. |
| 666 | 2271 |
| 578 | 2272 static tree_expression * |
| 2960 | 2273 make_prefix_op (int op, tree_expression *op1, token *tok_val) |
| 578 | 2274 { |
| 3203 | 2275 octave_value::unary_op t = octave_value::unknown_unary_op; |
| 2375 | 2276 |
| 578 | 2277 switch (op) |
| 2278 { | |
| 2960 | 2279 case EXPR_NOT: |
| 3525 | 2280 t = octave_value::op_not; |
| 2960 | 2281 break; |
| 2282 | |
| 4965 | 2283 case '+': |
| 2284 t = octave_value::op_uplus; | |
| 2285 break; | |
| 2286 | |
| 2960 | 2287 case '-': |
| 3525 | 2288 t = octave_value::op_uminus; |
| 2960 | 2289 break; |
| 2290 | |
| 578 | 2291 case PLUS_PLUS: |
| 3525 | 2292 t = octave_value::op_incr; |
| 578 | 2293 break; |
| 777 | 2294 |
| 578 | 2295 case MINUS_MINUS: |
| 3525 | 2296 t = octave_value::op_decr; |
| 578 | 2297 break; |
| 777 | 2298 |
| 578 | 2299 default: |
| 2300 panic_impossible (); | |
| 2301 break; | |
| 2302 } | |
| 2303 | |
| 2304 int l = tok_val->line (); | |
| 2305 int c = tok_val->column (); | |
| 2306 | |
| 3292 | 2307 tree_prefix_expression *e |
| 2308 = new tree_prefix_expression (op1, l, c, t); | |
| 2309 | |
| 2310 return fold (e); | |
| 578 | 2311 } |
| 2312 | |
| 2375 | 2313 // Build a postfix expression. |
| 666 | 2314 |
| 578 | 2315 static tree_expression * |
| 2960 | 2316 make_postfix_op (int op, tree_expression *op1, token *tok_val) |
| 578 | 2317 { |
| 3203 | 2318 octave_value::unary_op t = octave_value::unknown_unary_op; |
| 1623 | 2319 |
| 578 | 2320 switch (op) |
| 2321 { | |
| 2960 | 2322 case QUOTE: |
| 3525 | 2323 t = octave_value::op_hermitian; |
| 2960 | 2324 break; |
| 2325 | |
| 2326 case TRANSPOSE: | |
| 3525 | 2327 t = octave_value::op_transpose; |
| 2960 | 2328 break; |
| 2329 | |
| 2375 | 2330 case PLUS_PLUS: |
| 3525 | 2331 t = octave_value::op_incr; |
| 578 | 2332 break; |
| 777 | 2333 |
| 2375 | 2334 case MINUS_MINUS: |
| 3525 | 2335 t = octave_value::op_decr; |
| 578 | 2336 break; |
| 777 | 2337 |
| 578 | 2338 default: |
| 2339 panic_impossible (); | |
| 2340 break; | |
| 2341 } | |
| 2342 | |
| 2343 int l = tok_val->line (); | |
| 2344 int c = tok_val->column (); | |
| 2345 | |
| 3292 | 2346 tree_postfix_expression *e |
| 2347 = new tree_postfix_expression (op1, l, c, t); | |
| 2348 | |
| 2349 return fold (e); | |
| 1623 | 2350 } |
| 2351 | |
| 2352 // Build an unwind-protect command. | |
| 2353 | |
| 2354 static tree_command * | |
| 2355 make_unwind_command (token *unwind_tok, tree_statement_list *body, | |
| 3665 | 2356 tree_statement_list *cleanup, token *end_tok, |
| 2357 octave_comment_list *lc, octave_comment_list *mc) | |
| 1623 | 2358 { |
| 2359 tree_command *retval = 0; | |
| 2360 | |
| 2857 | 2361 if (end_token_ok (end_tok, token::unwind_protect_end)) |
| 1623 | 2362 { |
| 3665 | 2363 octave_comment_list *tc = octave_comment_buffer::get_comment (); |
| 2364 | |
| 1623 | 2365 int l = unwind_tok->line (); |
| 2366 int c = unwind_tok->column (); | |
| 2367 | |
| 3665 | 2368 retval = new tree_unwind_protect_command (body, cleanup, |
| 2369 lc, mc, tc, l, c); | |
| 1623 | 2370 } |
| 2371 | |
| 2372 return retval; | |
| 2373 } | |
| 2374 | |
| 2375 // Build a try-catch command. | |
| 2376 | |
| 2377 static tree_command * | |
| 2378 make_try_command (token *try_tok, tree_statement_list *body, | |
| 3665 | 2379 tree_statement_list *cleanup, token *end_tok, |
| 2380 octave_comment_list *lc, octave_comment_list *mc) | |
| 1623 | 2381 { |
| 2382 tree_command *retval = 0; | |
| 2383 | |
| 2857 | 2384 if (end_token_ok (end_tok, token::try_catch_end)) |
| 1623 | 2385 { |
| 3665 | 2386 octave_comment_list *tc = octave_comment_buffer::get_comment (); |
| 2387 | |
| 1623 | 2388 int l = try_tok->line (); |
| 2389 int c = try_tok->column (); | |
| 2390 | |
| 3665 | 2391 retval = new tree_try_catch_command (body, cleanup, |
| 2392 lc, mc, tc, l, c); | |
| 1623 | 2393 } |
| 2394 | |
| 2395 return retval; | |
| 2396 } | |
| 2397 | |
| 2398 // Build a while command. | |
| 2399 | |
| 2400 static tree_command * | |
| 2401 make_while_command (token *while_tok, tree_expression *expr, | |
| 3665 | 2402 tree_statement_list *body, token *end_tok, |
| 2403 octave_comment_list *lc) | |
| 1623 | 2404 { |
| 2405 tree_command *retval = 0; | |
| 2406 | |
| 2407 maybe_warn_assign_as_truth_value (expr); | |
| 2408 | |
| 2857 | 2409 if (end_token_ok (end_tok, token::while_end)) |
| 1623 | 2410 { |
| 3665 | 2411 octave_comment_list *tc = octave_comment_buffer::get_comment (); |
| 2412 | |
| 1826 | 2413 lexer_flags.looping--; |
| 1623 | 2414 |
| 2415 int l = while_tok->line (); | |
| 2416 int c = while_tok->column (); | |
| 2417 | |
| 3665 | 2418 retval = new tree_while_command (expr, body, lc, tc, l, c); |
| 1623 | 2419 } |
| 2420 | |
| 2421 return retval; | |
| 2422 } | |
| 2423 | |
| 3484 | 2424 // Build a do-until command. |
| 2425 | |
| 2426 static tree_command * | |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2427 make_do_until_command (token *until_tok, tree_statement_list *body, |
| 3665 | 2428 tree_expression *expr, octave_comment_list *lc) |
| 3484 | 2429 { |
| 2430 tree_command *retval = 0; | |
| 2431 | |
| 2432 maybe_warn_assign_as_truth_value (expr); | |
| 2433 | |
| 3665 | 2434 octave_comment_list *tc = octave_comment_buffer::get_comment (); |
| 2435 | |
| 3484 | 2436 lexer_flags.looping--; |
| 2437 | |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2438 int l = until_tok->line (); |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2439 int c = until_tok->column (); |
| 3484 | 2440 |
| 3665 | 2441 retval = new tree_do_until_command (expr, body, lc, tc, l, c); |
| 3484 | 2442 |
| 2443 return retval; | |
| 2444 } | |
| 2445 | |
| 1623 | 2446 // Build a for command. |
| 2447 | |
| 2448 static tree_command * | |
| 2970 | 2449 make_for_command (token *for_tok, tree_argument_list *lhs, |
| 1623 | 2450 tree_expression *expr, tree_statement_list *body, |
| 3665 | 2451 token *end_tok, octave_comment_list *lc) |
| 1623 | 2452 { |
| 2453 tree_command *retval = 0; | |
| 2454 | |
| 2857 | 2455 if (end_token_ok (end_tok, token::for_end)) |
| 1623 | 2456 { |
| 3665 | 2457 octave_comment_list *tc = octave_comment_buffer::get_comment (); |
| 2458 | |
| 1826 | 2459 lexer_flags.looping--; |
| 1623 | 2460 |
| 2461 int l = for_tok->line (); | |
| 2462 int c = for_tok->column (); | |
| 2463 | |
| 2970 | 2464 if (lhs->length () == 1) |
| 2465 { | |
| 2466 tree_expression *tmp = lhs->remove_front (); | |
| 2467 | |
| 3665 | 2468 retval = new tree_simple_for_command (tmp, expr, body, |
| 2469 lc, tc, l, c); | |
| 2970 | 2470 |
| 2471 delete lhs; | |
| 2472 } | |
| 2473 else | |
| 3665 | 2474 retval = new tree_complex_for_command (lhs, expr, body, |
| 2475 lc, tc, l, c); | |
| 1623 | 2476 } |
| 2477 | |
| 2478 return retval; | |
| 2479 } | |
| 2480 | |
| 4207 | 2481 // Build a break command. |
| 2482 | |
| 2483 static tree_command * | |
| 2484 make_break_command (token *break_tok) | |
| 1623 | 2485 { |
| 4207 | 2486 tree_command *retval = 0; |
| 1623 | 2487 |
| 2620 | 2488 int l = break_tok->line (); |
| 2489 int c = break_tok->column (); | |
| 2490 | |
|
8669
33783e94fb16
line number fixes and other evaluator tweaks
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
2491 // We check to see if we are evaluating a function, script, or loop |
|
33783e94fb16
line number fixes and other evaluator tweaks
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
2492 // so that we don't turn eval ("break;") inside a function, script, |
|
33783e94fb16
line number fixes and other evaluator tweaks
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
2493 // or loop into a no-op command. |
|
33783e94fb16
line number fixes and other evaluator tweaks
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
2494 |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2495 if (lexer_flags.looping || current_function_depth > 0 |
|
8669
33783e94fb16
line number fixes and other evaluator tweaks
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
2496 || reading_script_file || tree_evaluator::in_fcn_or_script_body |
|
33783e94fb16
line number fixes and other evaluator tweaks
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
2497 || tree_evaluator::in_loop_command) |
| 4207 | 2498 retval = new tree_break_command (l, c); |
| 1623 | 2499 else |
| 4207 | 2500 retval = new tree_no_op_command ("break", l, c); |
| 1623 | 2501 |
| 2502 return retval; | |
| 2503 } | |
| 2504 | |
| 4207 | 2505 // Build a continue command. |
| 2506 | |
| 2507 static tree_command * | |
| 2508 make_continue_command (token *continue_tok) | |
| 1623 | 2509 { |
| 4207 | 2510 tree_command *retval = 0; |
| 1623 | 2511 |
| 2620 | 2512 int l = continue_tok->line (); |
| 2513 int c = continue_tok->column (); | |
| 2514 | |
|
8669
33783e94fb16
line number fixes and other evaluator tweaks
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
2515 // We check to see if we are evaluating a loop so that we don't turn |
|
33783e94fb16
line number fixes and other evaluator tweaks
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
2516 // eval ("continue;") into a no-op command inside a loop. |
|
33783e94fb16
line number fixes and other evaluator tweaks
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
2517 |
|
33783e94fb16
line number fixes and other evaluator tweaks
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
2518 if (lexer_flags.looping || tree_evaluator::in_loop_command) |
| 4207 | 2519 retval = new tree_continue_command (l, c); |
| 1623 | 2520 else |
| 4207 | 2521 retval = new tree_no_op_command ("continue", l, c); |
| 1623 | 2522 |
| 2523 return retval; | |
| 2524 } | |
| 2525 | |
| 4207 | 2526 // Build a return command. |
| 2527 | |
| 2528 static tree_command * | |
| 2529 make_return_command (token *return_tok) | |
| 1623 | 2530 { |
| 4207 | 2531 tree_command *retval = 0; |
| 1623 | 2532 |
| 2620 | 2533 int l = return_tok->line (); |
| 2534 int c = return_tok->column (); | |
| 2535 | |
|
7787
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
2536 if (Vdebugging) |
|
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
2537 { |
|
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
2538 Vdebugging = false; |
|
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
2539 |
|
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
2540 retval = new tree_no_op_command ("return", l, c); |
|
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
2541 } |
| 1623 | 2542 else |
|
7787
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
2543 { |
|
8669
33783e94fb16
line number fixes and other evaluator tweaks
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
2544 // We check to see if we are evaluating a function or script so |
|
33783e94fb16
line number fixes and other evaluator tweaks
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
2545 // that we don't turn eval ("return;") inside a function, script, |
|
33783e94fb16
line number fixes and other evaluator tweaks
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
2546 // or loop into a no-op command. |
|
33783e94fb16
line number fixes and other evaluator tweaks
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
2547 |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2548 if (current_function_depth > 0 || reading_script_file |
|
8669
33783e94fb16
line number fixes and other evaluator tweaks
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
2549 || tree_evaluator::in_fcn_or_script_body) |
|
7787
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
2550 retval = new tree_return_command (l, c); |
|
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
2551 else |
|
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
2552 retval = new tree_no_op_command ("return", l, c); |
|
6b521b1e3631
Add dbquit and make dbstep compatible. Use parser in debug mode to handle multi-line input
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
2553 } |
| 1623 | 2554 |
| 2555 return retval; | |
| 2556 } | |
| 2557 | |
| 2558 // Start an if command. | |
| 2559 | |
| 2560 static tree_if_command_list * | |
| 2561 start_if_command (tree_expression *expr, tree_statement_list *list) | |
| 2562 { | |
| 2563 maybe_warn_assign_as_truth_value (expr); | |
| 2564 | |
| 2565 tree_if_clause *t = new tree_if_clause (expr, list); | |
| 2566 | |
| 2567 return new tree_if_command_list (t); | |
| 2568 } | |
| 2569 | |
| 2570 // Finish an if command. | |
| 2571 | |
| 2572 static tree_if_command * | |
| 2573 finish_if_command (token *if_tok, tree_if_command_list *list, | |
| 3665 | 2574 token *end_tok, octave_comment_list *lc) |
| 1623 | 2575 { |
| 2576 tree_if_command *retval = 0; | |
| 2577 | |
| 2857 | 2578 if (end_token_ok (end_tok, token::if_end)) |
| 1623 | 2579 { |
| 3665 | 2580 octave_comment_list *tc = octave_comment_buffer::get_comment (); |
| 2581 | |
| 1623 | 2582 int l = if_tok->line (); |
| 2583 int c = if_tok->column (); | |
| 2584 | |
|
8842
be7b30a24938
line/column info for switch and if statements
John W. Eaton <jwe@octave.org>
parents:
8828
diff
changeset
|
2585 if (list && ! list->empty ()) |
|
be7b30a24938
line/column info for switch and if statements
John W. Eaton <jwe@octave.org>
parents:
8828
diff
changeset
|
2586 { |
|
be7b30a24938
line/column info for switch and if statements
John W. Eaton <jwe@octave.org>
parents:
8828
diff
changeset
|
2587 tree_if_clause *elt = list->front (); |
|
be7b30a24938
line/column info for switch and if statements
John W. Eaton <jwe@octave.org>
parents:
8828
diff
changeset
|
2588 |
|
be7b30a24938
line/column info for switch and if statements
John W. Eaton <jwe@octave.org>
parents:
8828
diff
changeset
|
2589 if (elt) |
|
be7b30a24938
line/column info for switch and if statements
John W. Eaton <jwe@octave.org>
parents:
8828
diff
changeset
|
2590 { |
|
be7b30a24938
line/column info for switch and if statements
John W. Eaton <jwe@octave.org>
parents:
8828
diff
changeset
|
2591 elt->line (l); |
|
be7b30a24938
line/column info for switch and if statements
John W. Eaton <jwe@octave.org>
parents:
8828
diff
changeset
|
2592 elt->column (c); |
|
be7b30a24938
line/column info for switch and if statements
John W. Eaton <jwe@octave.org>
parents:
8828
diff
changeset
|
2593 } |
|
be7b30a24938
line/column info for switch and if statements
John W. Eaton <jwe@octave.org>
parents:
8828
diff
changeset
|
2594 } |
|
be7b30a24938
line/column info for switch and if statements
John W. Eaton <jwe@octave.org>
parents:
8828
diff
changeset
|
2595 |
| 3665 | 2596 retval = new tree_if_command (list, lc, tc, l, c); |
| 1623 | 2597 } |
| 2598 | |
| 2599 return retval; | |
| 2600 } | |
| 2601 | |
| 2602 // Build an elseif clause. | |
| 2603 | |
| 2604 static tree_if_clause * | |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2605 make_elseif_clause (token *elseif_tok, tree_expression *expr, |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2606 tree_statement_list *list, octave_comment_list *lc) |
| 1623 | 2607 { |
| 2608 maybe_warn_assign_as_truth_value (expr); | |
| 2609 | |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2610 int l = elseif_tok->line (); |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2611 int c = elseif_tok->column (); |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2612 |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2613 return new tree_if_clause (expr, list, lc, l, c); |
| 1623 | 2614 } |
| 2615 | |
| 2764 | 2616 // Finish a switch command. |
| 2617 | |
| 2618 static tree_switch_command * | |
| 2619 finish_switch_command (token *switch_tok, tree_expression *expr, | |
| 3665 | 2620 tree_switch_case_list *list, token *end_tok, |
| 2621 octave_comment_list *lc) | |
| 2764 | 2622 { |
| 2623 tree_switch_command *retval = 0; | |
| 2624 | |
| 2857 | 2625 if (end_token_ok (end_tok, token::switch_end)) |
| 2764 | 2626 { |
| 3665 | 2627 octave_comment_list *tc = octave_comment_buffer::get_comment (); |
| 2628 | |
| 2764 | 2629 int l = switch_tok->line (); |
| 2630 int c = switch_tok->column (); | |
| 2631 | |
|
8842
be7b30a24938
line/column info for switch and if statements
John W. Eaton <jwe@octave.org>
parents:
8828
diff
changeset
|
2632 if (list && ! list->empty ()) |
|
be7b30a24938
line/column info for switch and if statements
John W. Eaton <jwe@octave.org>
parents:
8828
diff
changeset
|
2633 { |
|
be7b30a24938
line/column info for switch and if statements
John W. Eaton <jwe@octave.org>
parents:
8828
diff
changeset
|
2634 tree_switch_case *elt = list->front (); |
|
be7b30a24938
line/column info for switch and if statements
John W. Eaton <jwe@octave.org>
parents:
8828
diff
changeset
|
2635 |
|
be7b30a24938
line/column info for switch and if statements
John W. Eaton <jwe@octave.org>
parents:
8828
diff
changeset
|
2636 if (elt) |
|
be7b30a24938
line/column info for switch and if statements
John W. Eaton <jwe@octave.org>
parents:
8828
diff
changeset
|
2637 { |
|
be7b30a24938
line/column info for switch and if statements
John W. Eaton <jwe@octave.org>
parents:
8828
diff
changeset
|
2638 elt->line (l); |
|
be7b30a24938
line/column info for switch and if statements
John W. Eaton <jwe@octave.org>
parents:
8828
diff
changeset
|
2639 elt->column (c); |
|
be7b30a24938
line/column info for switch and if statements
John W. Eaton <jwe@octave.org>
parents:
8828
diff
changeset
|
2640 } |
|
be7b30a24938
line/column info for switch and if statements
John W. Eaton <jwe@octave.org>
parents:
8828
diff
changeset
|
2641 } |
|
be7b30a24938
line/column info for switch and if statements
John W. Eaton <jwe@octave.org>
parents:
8828
diff
changeset
|
2642 |
| 3665 | 2643 retval = new tree_switch_command (expr, list, lc, tc, l, c); |
| 2764 | 2644 } |
| 2645 | |
| 2646 return retval; | |
| 2647 } | |
| 2648 | |
| 2649 // Build a switch case. | |
| 2650 | |
| 2651 static tree_switch_case * | |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2652 make_switch_case (token *case_tok, tree_expression *expr, |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2653 tree_statement_list *list, octave_comment_list *lc) |
| 2764 | 2654 { |
| 2655 maybe_warn_variable_switch_label (expr); | |
| 2656 | |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2657 int l = case_tok->line (); |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2658 int c = case_tok->column (); |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2659 |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2660 return new tree_switch_case (expr, list, lc, l, c); |
| 2764 | 2661 } |
| 2662 | |
| 1623 | 2663 // Build an assignment to a variable. |
| 2664 | |
| 2665 static tree_expression * | |
| 2970 | 2666 make_assign_op (int op, tree_argument_list *lhs, token *eq_tok, |
| 2667 tree_expression *rhs) | |
| 1623 | 2668 { |
| 2970 | 2669 tree_expression *retval = 0; |
| 2670 | |
| 2883 | 2671 octave_value::assign_op t = octave_value::unknown_assign_op; |
| 2672 | |
| 2673 switch (op) | |
| 2674 { | |
| 2675 case '=': | |
| 3525 | 2676 t = octave_value::op_asn_eq; |
| 2883 | 2677 break; |
| 2678 | |
| 2679 case ADD_EQ: | |
| 3525 | 2680 t = octave_value::op_add_eq; |
| 2883 | 2681 break; |
| 2682 | |
| 2683 case SUB_EQ: | |
| 3525 | 2684 t = octave_value::op_sub_eq; |
| 2883 | 2685 break; |
| 2686 | |
| 2687 case MUL_EQ: | |
| 3525 | 2688 t = octave_value::op_mul_eq; |
| 2883 | 2689 break; |
| 2690 | |
| 2691 case DIV_EQ: | |
| 3525 | 2692 t = octave_value::op_div_eq; |
| 2883 | 2693 break; |
| 2694 | |
| 3204 | 2695 case LEFTDIV_EQ: |
| 3525 | 2696 t = octave_value::op_ldiv_eq; |
| 3204 | 2697 break; |
| 2698 | |
| 4018 | 2699 case POW_EQ: |
| 2700 t = octave_value::op_pow_eq; | |
| 2701 break; | |
| 2702 | |
| 2899 | 2703 case LSHIFT_EQ: |
| 3525 | 2704 t = octave_value::op_lshift_eq; |
| 2899 | 2705 break; |
| 2706 | |
| 2707 case RSHIFT_EQ: | |
| 3525 | 2708 t = octave_value::op_rshift_eq; |
| 2899 | 2709 break; |
| 2710 | |
| 2883 | 2711 case EMUL_EQ: |
| 3525 | 2712 t = octave_value::op_el_mul_eq; |
| 2883 | 2713 break; |
| 2714 | |
| 2715 case EDIV_EQ: | |
| 3525 | 2716 t = octave_value::op_el_div_eq; |
| 2883 | 2717 break; |
| 2718 | |
| 3204 | 2719 case ELEFTDIV_EQ: |
| 3525 | 2720 t = octave_value::op_el_ldiv_eq; |
| 3204 | 2721 break; |
| 2722 | |
| 4018 | 2723 case EPOW_EQ: |
| 2724 t = octave_value::op_el_pow_eq; | |
| 2725 break; | |
| 2726 | |
| 2883 | 2727 case AND_EQ: |
| 3525 | 2728 t = octave_value::op_el_and_eq; |
| 2883 | 2729 break; |
| 2730 | |
| 2731 case OR_EQ: | |
| 3525 | 2732 t = octave_value::op_el_or_eq; |
| 2883 | 2733 break; |
| 2734 | |
| 2735 default: | |
| 2736 panic_impossible (); | |
| 2737 break; | |
| 2738 } | |
| 2739 | |
| 1623 | 2740 int l = eq_tok->line (); |
| 2741 int c = eq_tok->column (); | |
| 2742 | |
| 5841 | 2743 if (lhs->is_simple_assign_lhs ()) |
| 666 | 2744 { |
| 2970 | 2745 tree_expression *tmp = lhs->remove_front (); |
| 2746 | |
| 2747 retval = new tree_simple_assignment (tmp, rhs, false, l, c, t); | |
| 2748 | |
| 2749 delete lhs; | |
| 666 | 2750 } |
| 2751 else | |
| 3208 | 2752 return new tree_multi_assignment (lhs, rhs, false, l, c, t); |
| 666 | 2753 |
| 2754 return retval; | |
| 2755 } | |
| 751 | 2756 |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2757 // Define a script. |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2758 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2759 static void |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2760 make_script (tree_statement_list *cmds, tree_statement *end_script) |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2761 { |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2762 std::string doc_string; |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2763 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2764 if (! help_buf.empty ()) |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2765 { |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2766 doc_string = help_buf.top (); |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2767 help_buf.pop (); |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2768 } |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2769 |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2770 if (! cmds) |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2771 cmds = new tree_statement_list (); |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2772 |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2773 cmds->append (end_script); |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2774 |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2775 octave_user_script *script |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2776 = new octave_user_script (curr_fcn_file_full_name, curr_fcn_file_name, |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2777 cmds, doc_string); |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2778 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2779 octave_time now; |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2780 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2781 script->stash_fcn_file_time (now); |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2782 |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2783 primary_fcn_ptr = script; |
|
8881
8ed42c679af5
after defining a script or function, clear local variables created for parsing
John W. Eaton <jwe@octave.org>
parents:
8842
diff
changeset
|
2784 |
|
9009
da58ec8f62e8
tag bug don't define forced variables
John W. Eaton <jwe@octave.org>
parents:
8974
diff
changeset
|
2785 // Unmark any symbols that may have been tagged as local variables |
|
da58ec8f62e8
tag bug don't define forced variables
John W. Eaton <jwe@octave.org>
parents:
8974
diff
changeset
|
2786 // while parsing (for example, by force_local_variable in lex.l). |
|
da58ec8f62e8
tag bug don't define forced variables
John W. Eaton <jwe@octave.org>
parents:
8974
diff
changeset
|
2787 |
|
da58ec8f62e8
tag bug don't define forced variables
John W. Eaton <jwe@octave.org>
parents:
8974
diff
changeset
|
2788 symbol_table::unmark_forced_variables (); |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2789 } |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2790 |
| 1623 | 2791 // Begin defining a function. |
| 2792 | |
| 2891 | 2793 static octave_user_function * |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2794 start_function (tree_parameter_list *param_list, tree_statement_list *body, |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2795 tree_statement *end_fcn_stmt) |
| 1623 | 2796 { |
| 2891 | 2797 // We'll fill in the return list later. |
| 2798 | |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2799 if (! body) |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2800 body = new tree_statement_list (); |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2801 |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2802 body->append (end_fcn_stmt); |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2803 |
| 2891 | 2804 octave_user_function *fcn |
| 7336 | 2805 = new octave_user_function (symbol_table::current_scope (), |
| 2806 param_list, 0, body); | |
| 1623 | 2807 |
| 3665 | 2808 if (fcn) |
| 2809 { | |
| 2810 octave_comment_list *tc = octave_comment_buffer::get_comment (); | |
| 2811 | |
| 2812 fcn->stash_trailing_comment (tc); | |
| 2813 } | |
| 2814 | |
| 1623 | 2815 return fcn; |
| 2816 } | |
| 2817 | |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2818 static tree_statement * |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2819 make_end (const std::string& type, int l, int c) |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2820 { |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2821 return make_statement (new tree_no_op_command (type, l, c)); |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2822 } |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
2823 |
| 1623 | 2824 // Do most of the work for defining a function. |
| 2825 | |
| 2891 | 2826 static octave_user_function * |
| 4872 | 2827 frob_function (const std::string& fname, octave_user_function *fcn) |
| 1623 | 2828 { |
| 4872 | 2829 std::string id_name = fname; |
| 1623 | 2830 |
| 2831 // If input is coming from a file, issue a warning if the name of | |
| 2832 // the file does not match the name of the function stated in the | |
| 2833 // file. Matlab doesn't provide a diagnostic (it ignores the stated | |
| 2834 // name). | |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2835 if (! autoloading && reading_fcn_file |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2836 && (current_function_depth == 1 |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2837 && ! (parsing_subfunctions || lexer_flags.parsing_class_method))) |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2838 { |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2839 // FIXME -- should curr_fcn_file_name already be |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2840 // preprocessed when we get here? It seems to only be a |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2841 // problem with relative file names. |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2842 |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2843 std::string nm = curr_fcn_file_name; |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2844 |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2845 size_t pos = nm.find_last_of (file_ops::dir_sep_chars ()); |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2846 |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2847 if (pos != std::string::npos) |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2848 nm = curr_fcn_file_name.substr (pos+1); |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2849 |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2850 if (nm != id_name) |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2851 { |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2852 warning_with_id |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2853 ("Octave:function-name-clash", |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2854 "function name `%s' does not agree with function file name `%s'", |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2855 id_name.c_str (), curr_fcn_file_full_name.c_str ()); |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2856 |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2857 id_name = nm; |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2858 } |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2859 } |
| 1623 | 2860 |
| 9476 | 2861 if (reading_fcn_file || reading_classdef_file || autoloading) |
| 1623 | 2862 { |
| 3712 | 2863 octave_time now; |
| 3162 | 2864 |
| 4343 | 2865 fcn->stash_fcn_file_name (curr_fcn_file_full_name); |
| 3162 | 2866 fcn->stash_fcn_file_time (now); |
| 1623 | 2867 fcn->mark_as_system_fcn_file (); |
| 3162 | 2868 |
| 6323 | 2869 if (fcn_file_from_relative_lookup) |
| 2870 fcn->mark_relative (); | |
| 2871 | |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2872 if (current_function_depth > 1 || parsing_subfunctions) |
|
7968
0d607e8dbbfa
eliminate curr_parent_function; fix subfunction lookup
John W. Eaton <jwe@octave.org>
parents:
7903
diff
changeset
|
2873 { |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2874 fcn->stash_parent_fcn_name (curr_fcn_file_name); |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2875 fcn->stash_parent_fcn_scope (primary_fcn_scope); |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2876 } |
| 6323 | 2877 |
| 7336 | 2878 if (lexer_flags.parsing_class_method) |
| 2879 { | |
| 2880 if (current_class_name == id_name) | |
| 2881 fcn->mark_as_class_constructor (); | |
| 2882 else | |
| 2883 fcn->mark_as_class_method (); | |
| 2884 | |
| 2885 fcn->stash_dispatch_class (current_class_name); | |
| 2886 } | |
| 2887 | |
| 5781 | 2888 std::string nm = fcn->fcn_file_name (); |
| 2889 | |
| 2890 file_stat fs (nm); | |
| 2891 | |
| 2892 if (fs && fs.is_newer (now)) | |
| 2893 warning_with_id ("Octave:future-time-stamp", | |
| 2894 "time stamp for `%s' is in the future", nm.c_str ()); | |
| 1623 | 2895 } |
| 2896 else if (! (input_from_tmp_history_file || input_from_startup_file) | |
| 2897 && reading_script_file | |
| 1755 | 2898 && curr_fcn_file_name == id_name) |
| 1623 | 2899 { |
| 2900 warning ("function `%s' defined within script file `%s'", | |
| 1755 | 2901 id_name.c_str (), curr_fcn_file_full_name.c_str ()); |
| 1623 | 2902 } |
| 2903 | |
| 4872 | 2904 fcn->stash_function_name (id_name); |
| 2905 | |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2906 if (! help_buf.empty () && current_function_depth == 1 |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2907 && ! parsing_subfunctions) |
| 7336 | 2908 { |
| 2909 fcn->document (help_buf.top ()); | |
| 2910 | |
| 2911 help_buf.pop (); | |
| 2912 } | |
| 2913 | |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2914 if (reading_fcn_file && current_function_depth == 1 |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2915 && ! parsing_subfunctions) |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2916 primary_fcn_ptr = fcn; |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2917 |
| 1623 | 2918 return fcn; |
| 2919 } | |
| 2920 | |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2921 static tree_function_def * |
| 3665 | 2922 finish_function (tree_parameter_list *ret_list, |
| 2923 octave_user_function *fcn, octave_comment_list *lc) | |
| 1623 | 2924 { |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2925 tree_function_def *retval = 0; |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2926 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2927 if (ret_list) |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2928 ret_list->mark_as_formal_parameters (); |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2929 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2930 if (fcn) |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2931 { |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7755
diff
changeset
|
2932 std::string nm = fcn->name (); |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7755
diff
changeset
|
2933 std::string file = fcn->fcn_file_name (); |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7755
diff
changeset
|
2934 |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7755
diff
changeset
|
2935 std::string tmp = nm; |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7755
diff
changeset
|
2936 if (! file.empty ()) |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7755
diff
changeset
|
2937 tmp += ": " + file; |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7755
diff
changeset
|
2938 |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7755
diff
changeset
|
2939 symbol_table::cache_name (fcn->scope (), tmp); |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7755
diff
changeset
|
2940 |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2941 if (lc) |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2942 fcn->stash_leading_comment (lc); |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2943 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2944 fcn->define_ret_list (ret_list); |
|
7755
ea9cb4d68dbf
avoid installing subfunctions twice
John W. Eaton <jwe@octave.org>
parents:
7750
diff
changeset
|
2945 |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2946 if (current_function_depth > 1 || parsing_subfunctions) |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2947 { |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2948 // FIXME -- is this flag used to determine if the function is a |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2949 // _subfunction_ somewhere? |
|
7755
ea9cb4d68dbf
avoid installing subfunctions twice
John W. Eaton <jwe@octave.org>
parents:
7750
diff
changeset
|
2950 fcn->mark_as_nested_function (); |
|
ea9cb4d68dbf
avoid installing subfunctions twice
John W. Eaton <jwe@octave.org>
parents:
7750
diff
changeset
|
2951 |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2952 symbol_table::install_subfunction (nm, octave_value (fcn), |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2953 primary_fcn_scope); |
|
7755
ea9cb4d68dbf
avoid installing subfunctions twice
John W. Eaton <jwe@octave.org>
parents:
7750
diff
changeset
|
2954 } |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2955 |
|
9761
5f8971be8e12
parse.y (finish_function): retrun function object unless parsing function file
John W. Eaton <jwe@octave.org>
parents:
9506
diff
changeset
|
2956 if (! reading_fcn_file) |
|
7755
ea9cb4d68dbf
avoid installing subfunctions twice
John W. Eaton <jwe@octave.org>
parents:
7750
diff
changeset
|
2957 { |
|
9761
5f8971be8e12
parse.y (finish_function): retrun function object unless parsing function file
John W. Eaton <jwe@octave.org>
parents:
9506
diff
changeset
|
2958 // We are either reading a script file or defining a function |
|
5f8971be8e12
parse.y (finish_function): retrun function object unless parsing function file
John W. Eaton <jwe@octave.org>
parents:
9506
diff
changeset
|
2959 // at the command line, so this definition creates a |
|
5f8971be8e12
parse.y (finish_function): retrun function object unless parsing function file
John W. Eaton <jwe@octave.org>
parents:
9506
diff
changeset
|
2960 // tree_function object that is placed in the parse tree. |
|
5f8971be8e12
parse.y (finish_function): retrun function object unless parsing function file
John W. Eaton <jwe@octave.org>
parents:
9506
diff
changeset
|
2961 // Otherwise, it is just inserted in the symbol table, |
|
5f8971be8e12
parse.y (finish_function): retrun function object unless parsing function file
John W. Eaton <jwe@octave.org>
parents:
9506
diff
changeset
|
2962 // either as a subfunction (see above), or as the primary |
|
5f8971be8e12
parse.y (finish_function): retrun function object unless parsing function file
John W. Eaton <jwe@octave.org>
parents:
9506
diff
changeset
|
2963 // function for the file, via primary_fcn_ptr (see also |
|
5f8971be8e12
parse.y (finish_function): retrun function object unless parsing function file
John W. Eaton <jwe@octave.org>
parents:
9506
diff
changeset
|
2964 // load_fcn_from_file,, parse_fcn_file, and |
|
5f8971be8e12
parse.y (finish_function): retrun function object unless parsing function file
John W. Eaton <jwe@octave.org>
parents:
9506
diff
changeset
|
2965 // symbol_table::fcn_info::fcn_info_rep::find_user_function). |
|
5f8971be8e12
parse.y (finish_function): retrun function object unless parsing function file
John W. Eaton <jwe@octave.org>
parents:
9506
diff
changeset
|
2966 |
|
5f8971be8e12
parse.y (finish_function): retrun function object unless parsing function file
John W. Eaton <jwe@octave.org>
parents:
9506
diff
changeset
|
2967 retval = new tree_function_def (fcn); |
|
7755
ea9cb4d68dbf
avoid installing subfunctions twice
John W. Eaton <jwe@octave.org>
parents:
7750
diff
changeset
|
2968 } |
|
8282
47a3d2f829e4
clear local symbol table after parsing function
John W. Eaton <jwe@octave.org>
parents:
8150
diff
changeset
|
2969 |
|
9009
da58ec8f62e8
tag bug don't define forced variables
John W. Eaton <jwe@octave.org>
parents:
8974
diff
changeset
|
2970 // Unmark any symbols that may have been tagged as local |
|
da58ec8f62e8
tag bug don't define forced variables
John W. Eaton <jwe@octave.org>
parents:
8974
diff
changeset
|
2971 // variables while parsing (for example, by force_local_variable |
|
da58ec8f62e8
tag bug don't define forced variables
John W. Eaton <jwe@octave.org>
parents:
8974
diff
changeset
|
2972 // in lex.l). |
|
da58ec8f62e8
tag bug don't define forced variables
John W. Eaton <jwe@octave.org>
parents:
8974
diff
changeset
|
2973 |
|
da58ec8f62e8
tag bug don't define forced variables
John W. Eaton <jwe@octave.org>
parents:
8974
diff
changeset
|
2974 symbol_table::unmark_forced_variables (fcn->scope ()); |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2975 } |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2976 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
2977 return retval; |
| 1623 | 2978 } |
| 2979 | |
| 2883 | 2980 static void |
| 2981 recover_from_parsing_function (void) | |
| 2982 { | |
| 4238 | 2983 if (symtab_context.empty ()) |
| 3903 | 2984 panic_impossible (); |
| 2985 | |
| 7336 | 2986 symbol_table::set_scope (symtab_context.top ()); |
| 4238 | 2987 symtab_context.pop (); |
| 2883 | 2988 |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2989 if (reading_fcn_file && current_function_depth == 1 |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2990 && ! parsing_subfunctions) |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2991 parsing_subfunctions = true; |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2992 |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2993 current_function_depth--; |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
2994 |
| 2883 | 2995 lexer_flags.parsed_function_name = false; |
| 2996 lexer_flags.looking_at_return_list = false; | |
| 2997 lexer_flags.looking_at_parameter_list = false; | |
| 2998 } | |
| 2999 | |
| 2846 | 3000 // Make an index expression. |
| 3001 | |
| 751 | 3002 static tree_index_expression * |
| 3929 | 3003 make_index_expression (tree_expression *expr, tree_argument_list *args, |
| 3933 | 3004 char type) |
| 751 | 3005 { |
| 3006 tree_index_expression *retval = 0; | |
| 3007 | |
| 2970 | 3008 int l = expr->line (); |
| 3009 int c = expr->column (); | |
| 3010 | |
| 3011 expr->mark_postfix_indexed (); | |
| 3012 | |
| 3933 | 3013 if (expr->is_index_expression ()) |
| 3014 { | |
| 3015 tree_index_expression *tmp = static_cast<tree_index_expression *> (expr); | |
| 3016 | |
| 3017 tmp->append (args, type); | |
| 3018 | |
| 3019 retval = tmp; | |
| 3020 } | |
| 3021 else | |
| 3022 retval = new tree_index_expression (expr, args, l, c, type); | |
| 2970 | 3023 |
| 3024 return retval; | |
| 3025 } | |
| 3026 | |
| 3027 // Make an indirect reference expression. | |
| 3028 | |
| 3930 | 3029 static tree_index_expression * |
| 3523 | 3030 make_indirect_ref (tree_expression *expr, const std::string& elt) |
| 2970 | 3031 { |
| 3930 | 3032 tree_index_expression *retval = 0; |
| 2970 | 3033 |
| 3034 int l = expr->line (); | |
| 3035 int c = expr->column (); | |
| 3036 | |
| 3933 | 3037 if (expr->is_index_expression ()) |
| 3038 { | |
| 3039 tree_index_expression *tmp = static_cast<tree_index_expression *> (expr); | |
| 3040 | |
| 3041 tmp->append (elt); | |
| 3042 | |
| 3043 retval = tmp; | |
| 3044 } | |
| 3045 else | |
| 3046 retval = new tree_index_expression (expr, elt, l, c); | |
| 2970 | 3047 |
| 3048 lexer_flags.looking_at_indirect_ref = false; | |
| 751 | 3049 |
| 3050 return retval; | |
| 3051 } | |
| 1511 | 3052 |
| 4131 | 3053 // Make an indirect reference expression with dynamic field name. |
| 3054 | |
| 3055 static tree_index_expression * | |
| 3056 make_indirect_ref (tree_expression *expr, tree_expression *elt) | |
| 3057 { | |
| 3058 tree_index_expression *retval = 0; | |
| 3059 | |
| 3060 int l = expr->line (); | |
| 3061 int c = expr->column (); | |
| 3062 | |
| 3063 if (expr->is_index_expression ()) | |
| 3064 { | |
| 3065 tree_index_expression *tmp = static_cast<tree_index_expression *> (expr); | |
| 3066 | |
| 3067 tmp->append (elt); | |
| 3068 | |
| 3069 retval = tmp; | |
| 3070 } | |
| 3071 else | |
| 3072 retval = new tree_index_expression (expr, elt, l, c); | |
| 3073 | |
| 3074 lexer_flags.looking_at_indirect_ref = false; | |
| 3075 | |
| 3076 return retval; | |
| 3077 } | |
| 3078 | |
| 2846 | 3079 // Make a declaration command. |
| 3080 | |
| 3081 static tree_decl_command * | |
| 3082 make_decl_command (int tok, token *tok_val, tree_decl_init_list *lst) | |
| 3083 { | |
| 3084 tree_decl_command *retval = 0; | |
| 3085 | |
| 3086 int l = tok_val->line (); | |
| 3087 int c = tok_val->column (); | |
| 3088 | |
| 3089 switch (tok) | |
| 3090 { | |
| 3091 case GLOBAL: | |
| 3092 retval = new tree_global_command (lst, l, c); | |
| 3093 break; | |
| 3094 | |
| 3095 case STATIC: | |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
3096 if (current_function_depth > 0) |
| 2846 | 3097 retval = new tree_static_command (lst, l, c); |
| 3098 else | |
| 3099 { | |
| 3100 if (reading_script_file) | |
| 4844 | 3101 warning ("ignoring persistent declaration near line %d of file `%s'", |
| 2846 | 3102 l, curr_fcn_file_full_name.c_str ()); |
| 3103 else | |
| 4844 | 3104 warning ("ignoring persistent declaration near line %d", l); |
| 2846 | 3105 } |
| 3106 break; | |
| 3107 | |
| 3108 default: | |
| 3109 panic_impossible (); | |
| 3110 break; | |
| 3111 } | |
| 3112 | |
| 3113 return retval; | |
| 3114 } | |
| 3115 | |
| 1623 | 3116 // Finish building a matrix list. |
| 3117 | |
| 3118 static tree_expression * | |
| 1829 | 3119 finish_matrix (tree_matrix *m) |
| 1623 | 3120 { |
| 3110 | 3121 tree_expression *retval = m; |
| 3122 | |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3123 unwind_protect frame; |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3124 |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3125 frame.protect_var (error_state); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3126 frame.protect_var (warning_state); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3127 |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3128 frame.protect_var (discard_error_messages); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3129 frame.protect_var (discard_warning_messages); |
| 4452 | 3130 |
| 3815 | 3131 discard_error_messages = true; |
| 4452 | 3132 discard_warning_messages = true; |
| 1623 | 3133 |
| 2533 | 3134 if (m->all_elements_are_constant ()) |
| 1829 | 3135 { |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
3136 octave_value tmp = m->rvalue1 (); |
| 1623 | 3137 |
| 3489 | 3138 if (! (error_state || warning_state)) |
| 2533 | 3139 { |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
3140 tree_constant *tc_retval |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
3141 = new tree_constant (tmp, m->line (), m->column ()); |
| 2533 | 3142 |
| 5765 | 3143 std::ostringstream buf; |
| 2533 | 3144 |
| 3145 tree_print_code tpc (buf); | |
| 3146 | |
| 3147 m->accept (tpc); | |
| 3148 | |
| 5765 | 3149 tc_retval->stash_original_text (buf.str ()); |
| 2533 | 3150 |
| 3151 delete m; | |
| 3152 | |
| 3153 retval = tc_retval; | |
| 3154 } | |
| 1623 | 3155 } |
| 3110 | 3156 |
| 1623 | 3157 return retval; |
| 3158 } | |
| 3159 | |
| 3351 | 3160 // Finish building a cell list. |
| 3161 | |
| 3162 static tree_expression * | |
| 3163 finish_cell (tree_cell *c) | |
| 3164 { | |
| 5875 | 3165 return finish_matrix (c); |
| 3351 | 3166 } |
| 3167 | |
| 1511 | 3168 static void |
| 3169 maybe_warn_missing_semi (tree_statement_list *t) | |
| 3170 { | |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
3171 if (current_function_depth > 0) |
| 1511 | 3172 { |
| 4219 | 3173 tree_statement *tmp = t->back(); |
| 1607 | 3174 |
| 1511 | 3175 if (tmp->is_expression ()) |
| 5781 | 3176 warning_with_id |
| 3177 ("Octave:missing-semicolon", | |
| 3178 "missing semicolon near line %d, column %d in file `%s'", | |
| 3179 tmp->line (), tmp->column (), curr_fcn_file_full_name.c_str ()); | |
| 1511 | 3180 } |
| 3181 } | |
| 1994 | 3182 |
|
8471
02de6775f1fe
parse.y: always append statements to list, but remove null statements after seeing separator
John W. Eaton <jwe@octave.org>
parents:
8448
diff
changeset
|
3183 static tree_statement_list * |
| 2525 | 3184 set_stmt_print_flag (tree_statement_list *list, char sep, |
| 3185 bool warn_missing_semi) | |
| 3186 { | |
|
8471
02de6775f1fe
parse.y: always append statements to list, but remove null statements after seeing separator
John W. Eaton <jwe@octave.org>
parents:
8448
diff
changeset
|
3187 tree_statement *tmp = list->back (); |
|
02de6775f1fe
parse.y: always append statements to list, but remove null statements after seeing separator
John W. Eaton <jwe@octave.org>
parents:
8448
diff
changeset
|
3188 |
| 2525 | 3189 switch (sep) |
| 3190 { | |
| 3191 case ';': | |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
3192 tmp->set_print_flag (false); |
| 2525 | 3193 break; |
| 3194 | |
| 3195 case 0: | |
| 3196 case ',': | |
| 3197 case '\n': | |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
3198 tmp->set_print_flag (true); |
| 2525 | 3199 if (warn_missing_semi) |
| 3200 maybe_warn_missing_semi (list); | |
| 3201 break; | |
| 3202 | |
| 3203 default: | |
| 3204 warning ("unrecognized separator type!"); | |
| 3205 break; | |
| 3206 } | |
|
8471
02de6775f1fe
parse.y: always append statements to list, but remove null statements after seeing separator
John W. Eaton <jwe@octave.org>
parents:
8448
diff
changeset
|
3207 |
|
02de6775f1fe
parse.y: always append statements to list, but remove null statements after seeing separator
John W. Eaton <jwe@octave.org>
parents:
8448
diff
changeset
|
3208 // Even if a statement is null, we add it to the list then remove it |
|
02de6775f1fe
parse.y: always append statements to list, but remove null statements after seeing separator
John W. Eaton <jwe@octave.org>
parents:
8448
diff
changeset
|
3209 // here so that the print flag is applied to the correct statement. |
|
02de6775f1fe
parse.y: always append statements to list, but remove null statements after seeing separator
John W. Eaton <jwe@octave.org>
parents:
8448
diff
changeset
|
3210 |
|
02de6775f1fe
parse.y: always append statements to list, but remove null statements after seeing separator
John W. Eaton <jwe@octave.org>
parents:
8448
diff
changeset
|
3211 if (tmp->is_null_statement ()) |
|
02de6775f1fe
parse.y: always append statements to list, but remove null statements after seeing separator
John W. Eaton <jwe@octave.org>
parents:
8448
diff
changeset
|
3212 { |
|
02de6775f1fe
parse.y: always append statements to list, but remove null statements after seeing separator
John W. Eaton <jwe@octave.org>
parents:
8448
diff
changeset
|
3213 list->pop_back (); |
|
02de6775f1fe
parse.y: always append statements to list, but remove null statements after seeing separator
John W. Eaton <jwe@octave.org>
parents:
8448
diff
changeset
|
3214 delete tmp; |
|
02de6775f1fe
parse.y: always append statements to list, but remove null statements after seeing separator
John W. Eaton <jwe@octave.org>
parents:
8448
diff
changeset
|
3215 } |
|
02de6775f1fe
parse.y: always append statements to list, but remove null statements after seeing separator
John W. Eaton <jwe@octave.org>
parents:
8448
diff
changeset
|
3216 |
|
02de6775f1fe
parse.y: always append statements to list, but remove null statements after seeing separator
John W. Eaton <jwe@octave.org>
parents:
8448
diff
changeset
|
3217 return list; |
| 2525 | 3218 } |
| 3219 | |
|
8448
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
3220 static tree_statement_list * |
|
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
3221 make_statement_list (tree_statement *stmt) |
|
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
3222 { |
|
8471
02de6775f1fe
parse.y: always append statements to list, but remove null statements after seeing separator
John W. Eaton <jwe@octave.org>
parents:
8448
diff
changeset
|
3223 return new tree_statement_list (stmt); |
|
8448
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
3224 } |
|
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
3225 |
|
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
3226 static tree_statement_list * |
|
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
3227 append_statement_list (tree_statement_list *list, char sep, |
|
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
3228 tree_statement *stmt, bool warn_missing_semi) |
|
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
3229 { |
|
8471
02de6775f1fe
parse.y: always append statements to list, but remove null statements after seeing separator
John W. Eaton <jwe@octave.org>
parents:
8448
diff
changeset
|
3230 set_stmt_print_flag (list, sep, warn_missing_semi); |
|
02de6775f1fe
parse.y: always append statements to list, but remove null statements after seeing separator
John W. Eaton <jwe@octave.org>
parents:
8448
diff
changeset
|
3231 |
|
02de6775f1fe
parse.y: always append statements to list, but remove null statements after seeing separator
John W. Eaton <jwe@octave.org>
parents:
8448
diff
changeset
|
3232 list->append (stmt); |
|
02de6775f1fe
parse.y: always append statements to list, but remove null statements after seeing separator
John W. Eaton <jwe@octave.org>
parents:
8448
diff
changeset
|
3233 |
|
02de6775f1fe
parse.y: always append statements to list, but remove null statements after seeing separator
John W. Eaton <jwe@octave.org>
parents:
8448
diff
changeset
|
3234 return list; |
|
8448
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
3235 } |
|
d6c0d5f208de
parse.y: avoid storing null statements in statement lists
John W. Eaton <jwe@octave.org>
parents:
8447
diff
changeset
|
3236 |
| 3021 | 3237 static void |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3238 safe_fclose (FILE *f) |
| 3021 | 3239 { |
| 5775 | 3240 // FIXME -- comments at the end of an input file are |
| 3765 | 3241 // discarded (otherwise, they would be appended to the next |
| 3242 // statement, possibly from the command line or another file, which | |
| 3243 // can be quite confusing). | |
| 3244 | |
| 5308 | 3245 octave_comment_list *tc = octave_comment_buffer::get_comment (); |
| 3246 | |
| 3247 delete tc; | |
| 3765 | 3248 |
| 3021 | 3249 if (f) |
| 3250 fclose (static_cast<FILE *> (f)); | |
| 3251 } | |
| 3252 | |
| 3253 static bool | |
| 5175 | 3254 looks_like_copyright (const std::string& s) |
| 3021 | 3255 { |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3256 bool retval = false; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3257 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3258 if (! s.empty ()) |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3259 { |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3260 size_t offset = s.find_first_not_of (" \t"); |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3261 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3262 retval = (s.substr (offset, 9) == "Copyright"); |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3263 } |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3264 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3265 return retval; |
| 3021 | 3266 } |
| 3267 | |
| 4540 | 3268 static int |
| 3269 text_getc (FILE *f) | |
| 3270 { | |
| 3271 int c = getc (f); | |
| 3272 | |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
3273 // Convert CRLF into just LF and single CR into LF. |
| 4540 | 3274 |
| 3275 if (c == '\r') | |
| 3276 { | |
| 3277 c = getc (f); | |
| 3278 | |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8311
diff
changeset
|
3279 if (c != '\n') |
| 4540 | 3280 { |
| 3281 ungetc (c, f); | |
|
7728
13820b9f5fd9
more consistent handling of CR/CRLF/LF line endings in lexer and parser
John W. Eaton <jwe@octave.org>
parents:
7723
diff
changeset
|
3282 c = '\n'; |
| 4540 | 3283 } |
| 3284 } | |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8311
diff
changeset
|
3285 |
|
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8311
diff
changeset
|
3286 if (c == '\n') |
|
7723
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3287 input_line_number++; |
| 4540 | 3288 |
| 3289 return c; | |
| 3290 } | |
| 3291 | |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3292 class |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3293 stdio_stream_reader : public stream_reader |
| 3021 | 3294 { |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3295 public: |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3296 stdio_stream_reader (FILE *f_arg) : stream_reader (), f (f_arg) { } |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3297 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3298 int getc (void) { return ::text_getc (f); } |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8311
diff
changeset
|
3299 int ungetc (int c) |
|
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8311
diff
changeset
|
3300 { |
|
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8311
diff
changeset
|
3301 if (c == '\n') |
|
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8311
diff
changeset
|
3302 input_line_number--; |
|
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8311
diff
changeset
|
3303 |
|
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8311
diff
changeset
|
3304 return ::ungetc (c, f); |
|
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8311
diff
changeset
|
3305 } |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3306 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3307 private: |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3308 FILE *f; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3309 }; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3310 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3311 static bool |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3312 skip_white_space (stream_reader& reader) |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3313 { |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3314 int c = 0; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3315 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3316 while ((c = reader.getc ()) != EOF) |
| 3021 | 3317 { |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3318 switch (c) |
| 3021 | 3319 { |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3320 case ' ': |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3321 case '\t': |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3322 current_input_column++; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3323 break; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3324 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3325 case '\n': |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3326 current_input_column = 0; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3327 break; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3328 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3329 default: |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3330 current_input_column--; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3331 reader.ungetc (c); |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3332 goto done; |
| 3021 | 3333 } |
| 3334 } | |
| 3335 | |
| 3336 done: | |
| 3337 | |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3338 return (c == EOF); |
| 3021 | 3339 } |
| 3340 | |
| 9476 | 3341 static bool |
| 3342 looking_at_classdef_keyword (FILE *ffile) | |
| 3343 { | |
| 3344 bool status = false; | |
| 3345 | |
| 3346 long pos = ftell (ffile); | |
| 3347 | |
| 3348 char buf [10]; | |
| 3349 fgets (buf, 10, ffile); | |
| 3350 size_t len = strlen (buf); | |
| 3351 if (len > 8 && strncmp (buf, "classdef", 8) == 0 | |
| 3352 && ! (isalnum (buf[8]) || buf[8] == '_')) | |
| 3353 status = true; | |
| 3354 | |
| 3355 fseek (ffile, pos, SEEK_SET); | |
| 3356 | |
| 3357 return status; | |
| 3358 } | |
| 3359 | |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3360 static std::string |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3361 gobble_leading_white_space (FILE *ffile, bool& eof) |
| 3021 | 3362 { |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3363 std::string help_txt; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3364 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3365 eof = false; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3366 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3367 // TRUE means we have already cached the help text. |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3368 bool have_help_text = false; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3369 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3370 std::string txt; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3371 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3372 stdio_stream_reader stdio_reader (ffile); |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3373 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3374 while (true) |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3375 { |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3376 eof = skip_white_space (stdio_reader); |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3377 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3378 if (eof) |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3379 break; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3380 |
|
7723
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3381 txt = grab_comment_block (stdio_reader, true, eof); |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3382 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3383 if (txt.empty ()) |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3384 break; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3385 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3386 if (! (have_help_text || looks_like_copyright (txt))) |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3387 { |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3388 help_txt = txt; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3389 have_help_text = true; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3390 } |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3391 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3392 octave_comment_buffer::append (txt); |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3393 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3394 if (eof) |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3395 break; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3396 } |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3397 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3398 return help_txt; |
| 3021 | 3399 } |
| 3400 | |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3401 static bool |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3402 looking_at_function_keyword (FILE *ffile) |
| 5931 | 3403 { |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3404 bool status = false; |
| 3021 | 3405 |
| 3406 long pos = ftell (ffile); | |
| 3407 | |
| 3408 char buf [10]; | |
| 3409 fgets (buf, 10, ffile); | |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3410 size_t len = strlen (buf); |
| 3021 | 3411 if (len > 8 && strncmp (buf, "function", 8) == 0 |
| 3412 && ! (isalnum (buf[8]) || buf[8] == '_')) | |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3413 status = true; |
| 3021 | 3414 |
| 3415 fseek (ffile, pos, SEEK_SET); | |
| 3416 | |
| 3417 return status; | |
| 3418 } | |
| 3419 | |
| 7336 | 3420 static octave_function * |
| 3421 parse_fcn_file (const std::string& ff, const std::string& dispatch_type, | |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3422 bool force_script = false, bool require_file = true, |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3423 const std::string& warn_for = std::string ()) |
| 3021 | 3424 { |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3425 unwind_protect frame; |
| 3021 | 3426 |
| 7336 | 3427 octave_function *fcn_ptr = 0; |
| 3021 | 3428 |
| 3429 // Open function file and parse. | |
| 3430 | |
| 3431 FILE *in_stream = command_editor::get_input_stream (); | |
| 3432 | |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3433 frame.add_fcn (command_editor::set_input_stream, in_stream); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3434 |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3435 frame.protect_var (ff_instream); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3436 |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3437 frame.protect_var (input_line_number); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3438 frame.protect_var (current_input_column); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3439 frame.protect_var (reading_fcn_file); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3440 frame.protect_var (line_editing); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3441 frame.protect_var (current_class_name); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3442 frame.protect_var (current_function_depth); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3443 frame.protect_var (max_function_depth); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3444 frame.protect_var (parsing_subfunctions); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3445 frame.protect_var (endfunction_found); |
| 3021 | 3446 |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8311
diff
changeset
|
3447 input_line_number = 1; |
| 3021 | 3448 current_input_column = 1; |
| 3449 reading_fcn_file = true; | |
| 3450 line_editing = false; | |
| 7336 | 3451 current_class_name = dispatch_type; |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
3452 current_function_depth = 0; |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
3453 max_function_depth = 0; |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
3454 parsing_subfunctions = false; |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
3455 endfunction_found = false; |
| 3021 | 3456 |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3457 // The next four lines must be in this order. |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3458 frame.add_fcn (command_history::ignore_entries, ! Vsaving_history); |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3459 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3460 // FIXME -- we shouldn't need both the |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3461 // command_history object and the |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3462 // Vsaving_history variable... |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3463 command_history::ignore_entries (); |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3464 |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3465 frame.protect_var (Vsaving_history); |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3466 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3467 Vsaving_history = false; |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3468 |
| 3021 | 3469 FILE *ffile = get_input_from_file (ff, 0); |
| 3470 | |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3471 frame.add_fcn (safe_fclose, ffile); |
| 3021 | 3472 |
| 3473 if (ffile) | |
| 3474 { | |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3475 bool eof; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3476 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3477 std::string help_txt = gobble_leading_white_space (ffile, eof); |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3478 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3479 if (! eof) |
| 3021 | 3480 { |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3481 std::string file_type; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3482 |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3483 frame.protect_var (get_input_from_eval_string); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3484 frame.protect_var (parser_end_of_input); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3485 frame.protect_var (reading_fcn_file); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3486 frame.protect_var (reading_script_file); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3487 frame.protect_var (reading_classdef_file); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3488 frame.protect_var (Vecho_executing_commands); |
| 9476 | 3489 |
|
7750
5c6c6f4803c8
make eval('script') to work again
John W. Eaton <jwe@octave.org>
parents:
7749
diff
changeset
|
3490 |
|
5c6c6f4803c8
make eval('script') to work again
John W. Eaton <jwe@octave.org>
parents:
7749
diff
changeset
|
3491 get_input_from_eval_string = false; |
|
5c6c6f4803c8
make eval('script') to work again
John W. Eaton <jwe@octave.org>
parents:
7749
diff
changeset
|
3492 parser_end_of_input = false; |
|
5c6c6f4803c8
make eval('script') to work again
John W. Eaton <jwe@octave.org>
parents:
7749
diff
changeset
|
3493 |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3494 if (! force_script && looking_at_function_keyword (ffile)) |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3495 { |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3496 file_type = "function"; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3497 |
| 9476 | 3498 Vecho_executing_commands = ECHO_OFF; |
| 3499 | |
| 3500 reading_classdef_file = false; | |
| 3501 reading_fcn_file = true; | |
| 3502 reading_script_file = false; | |
| 3503 } | |
| 3504 else if (! force_script && looking_at_classdef_keyword (ffile)) | |
| 3505 { | |
| 3506 file_type = "classdef"; | |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3507 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3508 Vecho_executing_commands = ECHO_OFF; |
| 9476 | 3509 |
| 3510 reading_classdef_file = true; | |
| 3511 reading_fcn_file = false; | |
| 3512 reading_script_file = false; | |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3513 } |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3514 else |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3515 { |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3516 file_type = "script"; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3517 |
| 9476 | 3518 Vecho_executing_commands = ECHO_OFF; |
| 3519 | |
| 3520 reading_classdef_file = false; | |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
3521 reading_fcn_file = false; |
| 9476 | 3522 reading_script_file = true; |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3523 } |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3524 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3525 YY_BUFFER_STATE old_buf = current_buffer (); |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3526 YY_BUFFER_STATE new_buf = create_buffer (ffile); |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3527 |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3528 frame.add_fcn (switch_to_buffer, old_buf); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3529 frame.add_fcn (delete_buffer, new_buf); |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3530 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3531 switch_to_buffer (new_buf); |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3532 |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3533 frame.protect_var (primary_fcn_ptr); |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
3534 primary_fcn_ptr = 0; |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3535 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3536 reset_parser (); |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3537 |
|
9260
9c2349a51218
properly unmark forced variables
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
3538 // Do this with an unwind-protect cleanup function so that |
|
9c2349a51218
properly unmark forced variables
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
3539 // the forced variables will be unmarked in the event of an |
|
9c2349a51218
properly unmark forced variables
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
3540 // interrupt. |
|
9c2349a51218
properly unmark forced variables
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
3541 symbol_table::scope_id scope = symbol_table::top_scope (); |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3542 frame.add_fcn (symbol_table::unmark_forced_variables, scope); |
|
9260
9c2349a51218
properly unmark forced variables
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
3543 |
|
7723
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3544 if (! help_txt.empty ()) |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3545 help_buf.push (help_txt); |
|
74f5e0c7de9e
first pass at handling block comments
John W. Eaton <jwe@octave.org>
parents:
7720
diff
changeset
|
3546 |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
3547 if (reading_script_file) |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
3548 prep_lexer_for_script_file (); |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
3549 else |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
3550 prep_lexer_for_function_file (); |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3551 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3552 lexer_flags.parsing_class_method = ! dispatch_type.empty (); |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3553 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3554 int status = yyparse (); |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3555 |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
3556 fcn_ptr = primary_fcn_ptr; |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
3557 |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
3558 if (reading_fcn_file && endfunction_found && max_function_depth > 1) |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
3559 warning_with_id ("Octave:nested-functions-coerced", |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
3560 "nested functions are coerced into subfunctions " |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
3561 "in file %s", ff.c_str ()); |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3562 |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3563 if (status != 0) |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3564 error ("parse error while reading %s file %s", |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3565 file_type.c_str(), ff.c_str ()); |
| 3021 | 3566 } |
| 3567 } | |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3568 else if (require_file) |
| 3880 | 3569 error ("no such file, `%s'", ff.c_str ()); |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3570 else if (! warn_for.empty ()) |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3571 error ("%s: unable to open file `%s'", warn_for.c_str (), ff.c_str ()); |
| 3021 | 3572 |
| 7336 | 3573 return fcn_ptr; |
| 3021 | 3574 } |
| 3575 | |
| 5484 | 3576 std::string |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3577 get_help_from_file (const std::string& nm, bool& symbol_found, |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3578 std::string& file) |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3579 { |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3580 std::string retval; |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3581 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3582 file = fcn_file_in_path (nm); |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3583 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3584 if (! file.empty ()) |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3585 { |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3586 symbol_found = true; |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3587 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3588 FILE *fptr = fopen (file.c_str (), "r"); |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3589 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3590 if (fptr) |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3591 { |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3592 unwind_protect frame; |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3593 frame.add_fcn (safe_fclose, fptr); |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3594 |
|
7720
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3595 bool eof; |
|
4e2eafef689c
unify comment and help text processing in lex.l and parse.y
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
3596 retval = gobble_leading_white_space (fptr, eof); |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3597 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3598 if (retval.empty ()) |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3599 { |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3600 octave_function *fcn = parse_fcn_file (file, ""); |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3601 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3602 if (fcn) |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3603 { |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3604 retval = fcn->doc_string (); |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3605 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3606 delete fcn; |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3607 } |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3608 } |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3609 } |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3610 } |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3611 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3612 return retval; |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3613 } |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3614 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3615 std::string |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3616 get_help_from_file (const std::string& nm, bool& symbol_found) |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3617 { |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3618 std::string file; |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3619 return get_help_from_file (nm, symbol_found, file); |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3620 } |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3621 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3622 std::string |
| 5484 | 3623 lookup_autoload (const std::string& nm) |
| 3624 { | |
| 5626 | 3625 std::string retval; |
| 3626 | |
| 3627 typedef std::map<std::string, std::string>::const_iterator am_iter; | |
| 3628 | |
| 3629 am_iter p = autoload_map.find (nm); | |
| 3630 | |
| 3631 if (p != autoload_map.end ()) | |
| 6323 | 3632 retval = load_path::find_file (p->second); |
| 5626 | 3633 |
| 3634 return retval; | |
| 5484 | 3635 } |
| 3636 | |
| 5592 | 3637 string_vector |
| 3638 autoloaded_functions (void) | |
| 3639 { | |
| 3640 string_vector names (autoload_map.size()); | |
| 3641 | |
| 3642 octave_idx_type i = 0; | |
| 5626 | 3643 typedef std::map<std::string, std::string>::const_iterator am_iter; |
| 3644 for (am_iter p = autoload_map.begin (); p != autoload_map.end (); p++) | |
| 5592 | 3645 names[i++] = p->first; |
| 3646 | |
| 3647 return names; | |
| 3648 } | |
| 3649 | |
| 3650 string_vector | |
| 3651 reverse_lookup_autoload (const std::string& nm) | |
| 3652 { | |
| 3653 string_vector names; | |
| 3654 | |
| 5626 | 3655 typedef std::map<std::string, std::string>::const_iterator am_iter; |
| 3656 for (am_iter p = autoload_map.begin (); p != autoload_map.end (); p++) | |
| 5592 | 3657 if (nm == p->second) |
| 3658 names.append (p->first); | |
| 3659 | |
| 3660 return names; | |
| 3661 } | |
| 3662 | |
| 7336 | 3663 octave_function * |
| 3664 load_fcn_from_file (const std::string& file_name, const std::string& dir_name, | |
| 3665 const std::string& dispatch_type, | |
| 3666 const std::string& fcn_name, bool autoload) | |
| 3021 | 3667 { |
| 7336 | 3668 octave_function *retval = 0; |
| 3669 | |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3670 unwind_protect frame; |
| 5484 | 3671 |
| 7336 | 3672 std::string nm = file_name; |
| 6238 | 3673 |
| 3674 size_t nm_len = nm.length (); | |
| 5472 | 3675 |
| 3676 std::string file; | |
| 3677 | |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3678 frame.protect_var (fcn_file_from_relative_lookup); |
| 6323 | 3679 |
| 3680 fcn_file_from_relative_lookup = false; | |
| 3681 | |
| 7336 | 3682 file = nm; |
| 3683 | |
| 3684 if ((nm_len > 4 && nm.substr (nm_len-4) == ".oct") | |
| 3685 || (nm_len > 4 && nm.substr (nm_len-4) == ".mex") | |
| 3686 || (nm_len > 2 && nm.substr (nm_len-2) == ".m")) | |
| 5472 | 3687 { |
| 6238 | 3688 nm = octave_env::base_pathname (file); |
| 3689 nm = nm.substr (0, nm.find_last_of ('.')); | |
| 5472 | 3690 } |
| 7336 | 3691 |
| 3692 if (autoload) | |
| 5472 | 3693 { |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3694 frame.protect_var (autoloading); |
| 7336 | 3695 autoloading = true; |
| 3696 } | |
| 3697 | |
|
7749
14e05160b99f
reference counting for functions loaded from shared libraries
John W. Eaton <jwe@octave.org>
parents:
7736
diff
changeset
|
3698 fcn_file_from_relative_lookup = ! octave_env::absolute_pathname (file); |
|
14e05160b99f
reference counting for functions loaded from shared libraries
John W. Eaton <jwe@octave.org>
parents:
7736
diff
changeset
|
3699 |
|
14e05160b99f
reference counting for functions loaded from shared libraries
John W. Eaton <jwe@octave.org>
parents:
7736
diff
changeset
|
3700 file = octave_env::make_absolute (file, octave_env::getcwd ()); |
| 4243 | 3701 |
| 3702 int len = file.length (); | |
| 3703 | |
| 4244 | 3704 if (len > 4 && file.substr (len-4, len-1) == ".oct") |
| 3021 | 3705 { |
| 7336 | 3706 if (autoload && ! fcn_name.empty ()) |
| 3707 nm = fcn_name; | |
| 3708 | |
| 3709 retval = octave_dynamic_loader::load_oct (nm, file, fcn_file_from_relative_lookup); | |
| 5864 | 3710 } |
| 3711 else if (len > 4 && file.substr (len-4, len-1) == ".mex") | |
| 7336 | 3712 retval = octave_dynamic_loader::load_mex (nm, file, fcn_file_from_relative_lookup); |
| 4244 | 3713 else if (len > 2) |
| 3021 | 3714 { |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3715 // These are needed by yyparse. |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3716 |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3717 frame.protect_var (curr_fcn_file_name); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3718 frame.protect_var (curr_fcn_file_full_name); |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3719 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3720 curr_fcn_file_name = nm; |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3721 curr_fcn_file_full_name = file; |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3722 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3723 retval = parse_fcn_file (file, dispatch_type, autoloading); |
| 3021 | 3724 } |
| 3725 | |
| 7336 | 3726 if (retval) |
|
8819
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8812
diff
changeset
|
3727 { |
|
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8812
diff
changeset
|
3728 retval->stash_dir_name (dir_name); |
|
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8812
diff
changeset
|
3729 |
|
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8812
diff
changeset
|
3730 if (retval->is_user_function ()) |
|
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8812
diff
changeset
|
3731 { |
|
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8812
diff
changeset
|
3732 symbol_table::scope_id id = retval->scope (); |
|
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8812
diff
changeset
|
3733 |
|
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8812
diff
changeset
|
3734 symbol_table::stash_dir_name_for_subfunctions (id, dir_name); |
|
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8812
diff
changeset
|
3735 } |
|
96d87674b818
also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents:
8812
diff
changeset
|
3736 } |
| 7336 | 3737 |
| 3738 return retval; | |
| 5312 | 3739 } |
| 3740 | |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8745
diff
changeset
|
3741 DEFUN (autoload, args, , |
| 5484 | 3742 "-*- texinfo -*-\n\ |
| 3743 @deftypefn {Built-in Function} {} autoload (@var{function}, @var{file})\n\ | |
| 3744 Define @var{function} to autoload from @var{file}.\n\ | |
| 5626 | 3745 \n\ |
| 6926 | 3746 The second argument, @var{file}, should be an absolute file name or\n\ |
| 3747 a file name in the same directory as the function or script from which\n\ | |
|
9038
fca0dc2fb042
Cleanup documentation files stmt.texi and func.texi
Rik <rdrider0-list@yahoo.com>
parents:
8974
diff
changeset
|
3748 the autoload command was run. @var{file} should not depend on the\n\ |
| 6926 | 3749 Octave load path.\n\ |
| 6380 | 3750 \n\ |
| 3751 Normally, calls to @code{autoload} appear in PKG_ADD script files that\n\ | |
| 3752 are evaluated when a directory is added to the Octave's load path. To\n\ | |
| 6926 | 3753 avoid having to hardcode directory names in @var{file}, if @var{file}\n\ |
| 3754 is in the same directory as the PKG_ADD script then\n\ | |
| 6380 | 3755 \n\ |
| 3756 @example\n\ | |
| 6926 | 3757 autoload (\"foo\", \"bar.oct\");\n\ |
| 6380 | 3758 @end example\n\ |
| 3759 \n\ | |
|
9038
fca0dc2fb042
Cleanup documentation files stmt.texi and func.texi
Rik <rdrider0-list@yahoo.com>
parents:
8974
diff
changeset
|
3760 will load the function @code{foo} from the file @code{bar.oct}. The above\n\ |
| 6926 | 3761 when @code{bar.oct} is not in the same directory or uses like\n\ |
| 6380 | 3762 \n\ |
| 3763 @example\n\ | |
| 6637 | 3764 autoload (\"foo\", file_in_loadpath (\"bar.oct\"))\n\ |
| 6380 | 3765 @end example\n\ |
| 3766 \n\ | |
| 3767 @noindent\n\ | |
| 6926 | 3768 are strongly discouraged, as their behavior might be unpredictable.\n\ |
| 6380 | 3769 \n\ |
| 6637 | 3770 With no arguments, return a structure containing the current autoload map.\n\ |
| 6380 | 3771 @seealso{PKG_ADD}\n\ |
| 5484 | 3772 @end deftypefn") |
| 3773 { | |
| 5626 | 3774 octave_value retval; |
| 5484 | 3775 |
| 3776 int nargin = args.length (); | |
| 3777 | |
| 5626 | 3778 if (nargin == 0) |
| 3779 { | |
| 3780 Cell func_names (dim_vector (autoload_map.size ()), 1); | |
| 3781 Cell file_names (dim_vector (autoload_map.size ()), 1); | |
| 3782 | |
| 3783 octave_idx_type i = 0; | |
| 3784 typedef std::map<std::string, std::string>::const_iterator am_iter; | |
| 3785 for (am_iter p = autoload_map.begin (); p != autoload_map.end (); p++) | |
| 3786 { | |
| 3787 func_names(i) = p->first; | |
| 3788 file_names(i) = p->second; | |
| 3789 | |
| 3790 i++; | |
| 3791 } | |
| 3792 | |
| 3793 Octave_map m; | |
| 3794 | |
| 3795 m.assign ("function", func_names); | |
| 3796 m.assign ("file", file_names); | |
| 3797 | |
| 3798 retval = m; | |
| 3799 } | |
| 3800 else if (nargin == 2) | |
| 5484 | 3801 { |
| 3802 string_vector argv = args.make_argv ("autoload"); | |
| 3803 | |
| 3804 if (! error_state) | |
| 6380 | 3805 { |
| 3806 std::string nm = argv[2]; | |
| 3807 | |
| 3808 if (! octave_env::absolute_pathname (nm)) | |
| 6926 | 3809 { |
|
7719
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
3810 octave_user_code *fcn = octave_call_stack::caller_user_code (); |
|
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
3811 |
| 6926 | 3812 bool found = false; |
|
7719
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
3813 |
| 6926 | 3814 if (fcn) |
| 3815 { | |
| 3816 std::string fname = fcn->fcn_file_name (); | |
|
7719
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
3817 |
| 6926 | 3818 if (! fname.empty ()) |
| 3819 { | |
|
7719
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
3820 fname = octave_env::make_absolute (fname, octave_env::getcwd ()); |
|
8007
a2ab20ba78f7
make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents:
8001
diff
changeset
|
3821 fname = fname.substr (0, fname.find_last_of (file_ops::dir_sep_str ()) + 1); |
|
7719
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
3822 |
| 6926 | 3823 file_stat fs (fname + nm); |
|
7719
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
3824 |
| 6926 | 3825 if (fs.exists ()) |
| 3826 { | |
| 3827 nm = fname + nm; | |
| 3828 found = true; | |
| 3829 } | |
| 3830 } | |
| 3831 } | |
| 3832 if (! found) | |
| 3833 warning_with_id ("Octave:autoload-relative-file-name", | |
| 3834 "autoload: `%s' is not an absolute file name", | |
| 3835 nm.c_str ()); | |
| 3836 } | |
| 6380 | 3837 autoload_map[argv[1]] = nm; |
| 3838 } | |
| 5484 | 3839 } |
| 3840 else | |
| 5823 | 3841 print_usage (); |
| 5484 | 3842 |
| 3843 return retval; | |
| 3844 } | |
| 3845 | |
| 4486 | 3846 void |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3847 source_file (const std::string& file_name, const std::string& context, |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3848 bool verbose, bool require_file, const std::string& warn_for) |
| 4486 | 3849 { |
| 3850 std::string file_full_name = file_ops::tilde_expand (file_name); | |
| 3851 | |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3852 unwind_protect frame; |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3853 |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3854 frame.protect_var (curr_fcn_file_name); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3855 frame.protect_var (curr_fcn_file_full_name); |
| 4486 | 3856 |
| 3857 curr_fcn_file_name = file_name; | |
| 3858 curr_fcn_file_full_name = file_full_name; | |
| 3859 | |
| 5975 | 3860 if (! context.empty ()) |
| 3861 { | |
| 3862 if (context == "caller") | |
| 7901 | 3863 octave_call_stack::goto_caller_frame (); |
| 5975 | 3864 else if (context == "base") |
| 7901 | 3865 octave_call_stack::goto_base_frame (); |
| 5975 | 3866 else |
| 3867 error ("source: context must be \"caller\" or \"base\""); | |
| 7336 | 3868 |
| 3869 if (! error_state) | |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
3870 frame.add_fcn (octave_call_stack::pop); |
| 5975 | 3871 } |
| 3872 | |
| 3873 if (! error_state) | |
| 3874 { | |
|
7715
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3875 octave_function *fcn = parse_fcn_file (file_full_name, "", true, |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3876 require_file, warn_for); |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3877 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3878 if (! error_state) |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3879 { |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3880 if (fcn && fcn->is_user_script ()) |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3881 { |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3882 octave_value_list args; |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3883 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3884 if (verbose) |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3885 { |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3886 std::cout << "executing commands from " << file_full_name << " ... "; |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3887 reading_startup_message_printed = true; |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3888 std::cout.flush (); |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3889 } |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3890 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3891 fcn->do_multi_index_op (0, args); |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3892 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3893 if (verbose) |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3894 std::cout << "done." << std::endl; |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3895 |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3896 delete fcn; |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3897 } |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3898 } |
|
5b4d278ec828
parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents:
7699
diff
changeset
|
3899 else |
| 5975 | 3900 error ("source: error sourcing file `%s'", |
| 3901 file_full_name.c_str ()); | |
| 3902 } | |
| 4486 | 3903 } |
| 3904 | |
| 5739 | 3905 DEFUN (mfilename, args, , |
| 3906 "-*- texinfo -*-\n\ | |
| 3907 @deftypefn {Built-in Function} {} mfilename ()\n\ | |
| 3908 @deftypefnx {Built-in Function} {} mfilename (@code{\"fullpath\"})\n\ | |
| 3909 @deftypefnx {Built-in Function} {} mfilename (@code{\"fullpathext\"})\n\ | |
| 3910 Return the name of the currently executing file. At the top-level,\n\ | |
| 3911 return the empty string. Given the argument @code{\"fullpath\"},\n\ | |
| 3912 include the directory part of the file name, but not the extension.\n\ | |
| 3913 Given the argument @code{\"fullpathext\"}, include the directory part\n\ | |
| 3914 of the file name and the extension.\n\ | |
| 5774 | 3915 @end deftypefn") |
| 5739 | 3916 { |
| 3917 octave_value retval; | |
| 3918 | |
| 3919 int nargin = args.length (); | |
| 3920 | |
| 3921 if (nargin > 1) | |
| 3922 { | |
| 5823 | 3923 print_usage (); |
| 5739 | 3924 return retval; |
| 3925 } | |
| 3926 | |
| 3927 std::string arg; | |
| 3928 | |
| 3929 if (nargin == 1) | |
| 3930 { | |
| 3931 arg = args(0).string_value (); | |
| 3932 | |
| 3933 if (error_state) | |
| 3934 { | |
| 3935 error ("mfilename: expecting argument to be a character string"); | |
| 3936 return retval; | |
| 3937 } | |
| 3938 } | |
| 3939 | |
| 3940 std::string fname; | |
| 3941 | |
|
7719
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7715
diff
changeset
|
3942 octave_user_code *fcn = octave_call_stack::caller_user_code (); |
| 5743 | 3943 |
| 3944 if (fcn) | |
| 3945 { | |
| 3946 fname = fcn->fcn_file_name (); | |
| 3947 | |
| 3948 if (fname.empty ()) | |
| 3949 fname = fcn->name (); | |
| 3950 } | |
| 5739 | 3951 |
| 3952 if (arg == "fullpathext") | |
| 3953 retval = fname; | |
| 3954 else | |
| 3955 { | |
|
8007
a2ab20ba78f7
make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents:
8001
diff
changeset
|
3956 size_t dpos = fname.rfind (file_ops::dir_sep_char ()); |
| 5747 | 3957 size_t epos = fname.rfind ('.'); |
| 3958 | |
| 3959 if (epos <= dpos) | |
| 8021 | 3960 epos = std::string::npos; |
| 3961 | |
| 3962 fname = (epos != std::string::npos) ? fname.substr (0, epos) : fname; | |
| 5739 | 3963 |
| 3964 if (arg == "fullpath") | |
| 3965 retval = fname; | |
| 3966 else | |
| 8021 | 3967 retval = (dpos != std::string::npos) ? fname.substr (dpos+1) : fname; |
| 5739 | 3968 } |
| 3969 | |
| 3970 return retval; | |
| 3971 } | |
| 3972 | |
| 3973 | |
| 3021 | 3974 DEFUN (source, args, , |
| 3371 | 3975 "-*- texinfo -*-\n\ |
| 3976 @deftypefn {Built-in Function} {} source (@var{file})\n\ | |
| 3977 Parse and execute the contents of @var{file}. This is equivalent to\n\ | |
| 3978 executing commands from a script file, but without requiring the file to\n\ | |
| 3979 be named @file{@var{file}.m}.\n\ | |
| 3980 @end deftypefn") | |
| 3021 | 3981 { |
| 3982 octave_value_list retval; | |
| 3983 | |
| 3984 int nargin = args.length (); | |
| 3985 | |
| 5975 | 3986 if (nargin == 1 || nargin == 2) |
| 3021 | 3987 { |
| 3523 | 3988 std::string file_name = args(0).string_value (); |
| 3021 | 3989 |
| 3990 if (! error_state) | |
| 5975 | 3991 { |
| 3992 std::string context; | |
| 3993 | |
| 3994 if (nargin == 2) | |
| 3995 context = args(1).string_value (); | |
| 3996 | |
| 3997 if (! error_state) | |
| 3998 source_file (file_name, context); | |
| 3999 else | |
| 4000 error ("source: expecting context to be character string"); | |
| 4001 } | |
| 3021 | 4002 else |
| 4003 error ("source: expecting file name as argument"); | |
| 4004 } | |
| 4005 else | |
| 5823 | 4006 print_usage (); |
| 3021 | 4007 |
| 4008 return retval; | |
| 4009 } | |
| 4010 | |
| 3726 | 4011 // Evaluate an Octave function (built-in or interpreted) and return |
| 3844 | 4012 // the list of result values. NAME is the name of the function to |
| 4013 // call. ARGS are the arguments to the function. NARGOUT is the | |
| 4014 // number of output arguments expected. | |
| 3726 | 4015 |
| 3021 | 4016 octave_value_list |
| 3523 | 4017 feval (const std::string& name, const octave_value_list& args, int nargout) |
| 3156 | 4018 { |
| 4019 octave_value_list retval; | |
| 4020 | |
| 7336 | 4021 octave_value fcn = symbol_table::find_function (name, args); |
| 4022 | |
| 4023 if (fcn.is_defined ()) | |
| 4024 retval = fcn.do_multi_index_op (nargout, args); | |
| 4025 else | |
| 4026 error ("feval: function `%s' not found", name.c_str ()); | |
| 3156 | 4027 |
| 4028 return retval; | |
| 4029 } | |
| 4030 | |
| 4342 | 4031 octave_value_list |
| 4032 feval (octave_function *fcn, const octave_value_list& args, int nargout) | |
| 4033 { | |
| 4034 octave_value_list retval; | |
| 4035 | |
| 4036 if (fcn) | |
| 4037 retval = fcn->do_multi_index_op (nargout, args); | |
| 4038 | |
| 4039 return retval; | |
| 4040 } | |
| 4041 | |
| 4042 static octave_value_list | |
| 4043 get_feval_args (const octave_value_list& args) | |
| 4044 { | |
| 4045 int tmp_nargin = args.length () - 1; | |
| 4046 | |
| 4047 octave_value_list retval (tmp_nargin, octave_value ()); | |
| 4048 | |
| 4049 for (int i = 0; i < tmp_nargin; i++) | |
| 4050 retval(i) = args(i+1); | |
| 4051 | |
| 4052 string_vector arg_names = args.name_tags (); | |
| 4053 | |
| 4054 if (! arg_names.empty ()) | |
| 4055 { | |
| 4056 // tmp_nargin and arg_names.length () - 1 may differ if | |
| 4057 // we are passed all_va_args. | |
| 4058 | |
| 4059 int n = arg_names.length () - 1; | |
| 4060 | |
| 4061 int len = n > tmp_nargin ? tmp_nargin : n; | |
| 4062 | |
| 4063 string_vector tmp_arg_names (len); | |
| 4064 | |
| 4065 for (int i = 0; i < len; i++) | |
| 4066 tmp_arg_names(i) = arg_names(i+1); | |
| 4067 | |
| 4068 retval.stash_name_tags (tmp_arg_names); | |
| 4069 } | |
| 4070 | |
| 4071 return retval; | |
| 4072 } | |
| 4073 | |
| 4074 | |
| 3726 | 4075 // Evaluate an Octave function (built-in or interpreted) and return |
| 4076 // the list of result values. The first element of ARGS should be a | |
| 4077 // string containing the name of the function to call, then the rest | |
| 4078 // are the actual arguments to the function. NARGOUT is the number of | |
| 4079 // output arguments expected. | |
| 4080 | |
| 3156 | 4081 octave_value_list |
| 3021 | 4082 feval (const octave_value_list& args, int nargout) |
| 4083 { | |
| 4084 octave_value_list retval; | |
| 4085 | |
| 4342 | 4086 int nargin = args.length (); |
| 4087 | |
| 4088 if (nargin > 0) | |
| 3021 | 4089 { |
| 4342 | 4090 octave_value f_arg = args(0); |
| 4091 | |
| 4092 if (f_arg.is_string ()) | |
| 4093 { | |
| 4094 std::string name = f_arg.string_value (); | |
| 4095 | |
| 4096 if (! error_state) | |
| 3156 | 4097 { |
| 4342 | 4098 octave_value_list tmp_args = get_feval_args (args); |
| 4099 | |
| 4100 retval = feval (name, tmp_args, nargout); | |
| 3156 | 4101 } |
| 4342 | 4102 } |
| 4103 else | |
| 4104 { | |
| 4105 octave_function *fcn = f_arg.function_value (); | |
| 4106 | |
| 4107 if (fcn) | |
| 4108 { | |
| 4109 octave_value_list tmp_args = get_feval_args (args); | |
| 4110 | |
| 4111 retval = feval (fcn, tmp_args, nargout); | |
| 4112 } | |
| 3021 | 4113 } |
| 4114 } | |
| 4115 | |
| 4116 return retval; | |
| 4117 } | |
| 4118 | |
| 4119 DEFUN (feval, args, nargout, | |
| 3371 | 4120 "-*- texinfo -*-\n\ |
| 4121 @deftypefn {Built-in Function} {} feval (@var{name}, @dots{})\n\ | |
| 4122 Evaluate the function named @var{name}. Any arguments after the first\n\ | |
| 4123 are passed on to the named function. For example,\n\ | |
| 4124 \n\ | |
| 4125 @example\n\ | |
| 4126 feval (\"acos\", -1)\n\ | |
| 4127 @result{} 3.1416\n\ | |
| 4128 @end example\n\ | |
| 3021 | 4129 \n\ |
| 3371 | 4130 @noindent\n\ |
| 4131 calls the function @code{acos} with the argument @samp{-1}.\n\ | |
| 4132 \n\ | |
| 4133 The function @code{feval} is necessary in order to be able to write\n\ | |
| 4134 functions that call user-supplied functions, because Octave does not\n\ | |
| 4135 have a way to declare a pointer to a function (like C) or to declare a\n\ | |
| 4136 special kind of variable that can be used to hold the name of a function\n\ | |
| 4137 (like @code{EXTERNAL} in Fortran). Instead, you must refer to functions\n\ | |
| 4138 by name, and use @code{feval} to call them.\n\ | |
| 4139 @end deftypefn") | |
| 3021 | 4140 { |
| 4141 octave_value_list retval; | |
| 4142 | |
| 4143 int nargin = args.length (); | |
| 4144 | |
| 4145 if (nargin > 0) | |
| 4146 retval = feval (args, nargout); | |
| 4147 else | |
| 5823 | 4148 print_usage (); |
| 3021 | 4149 |
| 4150 return retval; | |
| 4151 } | |
| 4152 | |
| 3099 | 4153 octave_value_list |
| 3523 | 4154 eval_string (const std::string& s, bool silent, int& parse_status, int nargout) |
| 3021 | 4155 { |
| 3877 | 4156 octave_value_list retval; |
| 4157 | |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
4158 unwind_protect frame; |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
4159 |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
4160 frame.protect_var (input_line_number); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
4161 frame.protect_var (current_input_column); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
4162 frame.protect_var (get_input_from_eval_string); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
4163 frame.protect_var (input_from_eval_string_pending); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
4164 frame.protect_var (parser_end_of_input); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
4165 frame.protect_var (line_editing); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
4166 frame.protect_var (current_eval_string); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
4167 frame.protect_var (current_function_depth); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
4168 frame.protect_var (max_function_depth); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
4169 frame.protect_var (parsing_subfunctions); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
4170 frame.protect_var (endfunction_found); |
|
10130
0c3609dd34cf
oct-parse.yy (eval_string): save and set reading_{script,fcn,classdef}_file vars
John W. Eaton <jwe@octave.org>
parents:
10067
diff
changeset
|
4171 frame.protect_var (reading_fcn_file); |
|
0c3609dd34cf
oct-parse.yy (eval_string): save and set reading_{script,fcn,classdef}_file vars
John W. Eaton <jwe@octave.org>
parents:
10067
diff
changeset
|
4172 frame.protect_var (reading_script_file); |
|
0c3609dd34cf
oct-parse.yy (eval_string): save and set reading_{script,fcn,classdef}_file vars
John W. Eaton <jwe@octave.org>
parents:
10067
diff
changeset
|
4173 frame.protect_var (reading_classdef_file); |
| 3021 | 4174 |
|
8447
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8311
diff
changeset
|
4175 input_line_number = 1; |
|
adab48231a03
make input_line_number work again
John W. Eaton <jwe@octave.org>
parents:
8311
diff
changeset
|
4176 current_input_column = 1; |
| 3021 | 4177 get_input_from_eval_string = true; |
| 3877 | 4178 input_from_eval_string_pending = true; |
| 3883 | 4179 parser_end_of_input = false; |
| 5189 | 4180 line_editing = false; |
|
9474
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
4181 current_function_depth = 0; |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
4182 max_function_depth = 0; |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
4183 parsing_subfunctions = false; |
|
25ed2d6aacf6
Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents:
9471
diff
changeset
|
4184 endfunction_found = false; |
|
10130
0c3609dd34cf
oct-parse.yy (eval_string): save and set reading_{script,fcn,classdef}_file vars
John W. Eaton <jwe@octave.org>
parents:
10067
diff
changeset
|
4185 reading_fcn_file = false; |
|
0c3609dd34cf
oct-parse.yy (eval_string): save and set reading_{script,fcn,classdef}_file vars
John W. Eaton <jwe@octave.org>
parents:
10067
diff
changeset
|
4186 reading_script_file = false; |
|
0c3609dd34cf
oct-parse.yy (eval_string): save and set reading_{script,fcn,classdef}_file vars
John W. Eaton <jwe@octave.org>
parents:
10067
diff
changeset
|
4187 reading_classdef_file = false; |
| 5189 | 4188 |
| 3021 | 4189 current_eval_string = s; |
| 4190 | |
| 4191 YY_BUFFER_STATE old_buf = current_buffer (); | |
| 4192 YY_BUFFER_STATE new_buf = create_buffer (0); | |
| 4193 | |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
4194 frame.add_fcn (switch_to_buffer, old_buf); |
|
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
4195 frame.add_fcn (delete_buffer, new_buf); |
| 3021 | 4196 |
| 4197 switch_to_buffer (new_buf); | |
| 4198 | |
| 3877 | 4199 do |
| 4200 { | |
| 4318 | 4201 reset_parser (); |
| 4202 | |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
4203 frame.protect_var (global_command); |
|
7903
8018e10d2b87
save and restore global_command as needed
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
4204 |
|
9260
9c2349a51218
properly unmark forced variables
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
4205 // Do this with an unwind-protect cleanup function so that the |
|
9c2349a51218
properly unmark forced variables
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
4206 // forced variables will be unmarked in the event of an |
|
9c2349a51218
properly unmark forced variables
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
4207 // interrupt. |
|
9c2349a51218
properly unmark forced variables
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
4208 symbol_table::scope_id scope = symbol_table::top_scope (); |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
4209 frame.add_fcn (symbol_table::unmark_forced_variables, scope); |
|
9260
9c2349a51218
properly unmark forced variables
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
4210 |
| 3877 | 4211 parse_status = yyparse (); |
| 4212 | |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4213 tree_statement_list *command_list = global_command; |
| 3877 | 4214 |
|
9260
9c2349a51218
properly unmark forced variables
John W. Eaton <jwe@octave.org>
parents:
9144
diff
changeset
|
4215 // Unmark forced variables. |
|
7903
8018e10d2b87
save and restore global_command as needed
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
4216 // Restore previous value of global_command. |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
4217 frame.run_top (2); |
|
7903
8018e10d2b87
save and restore global_command as needed
John W. Eaton <jwe@octave.org>
parents:
7901
diff
changeset
|
4218 |
| 3883 | 4219 if (parse_status == 0) |
| 3877 | 4220 { |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4221 if (command_list) |
| 3883 | 4222 { |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4223 tree_statement *stmt = 0; |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4224 |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4225 if (command_list->length () == 1 |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4226 && (stmt = command_list->front ()) |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4227 && stmt->is_expression ()) |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4228 { |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4229 tree_expression *expr = stmt->expression (); |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4230 |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4231 if (silent) |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4232 expr->set_print_flag (false); |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4233 |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4234 bool do_bind_ans = false; |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4235 |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4236 if (expr->is_identifier ()) |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4237 { |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4238 tree_identifier *id |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4239 = dynamic_cast<tree_identifier *> (expr); |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4240 |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4241 do_bind_ans = (! id->is_variable ()); |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4242 } |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4243 else |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4244 do_bind_ans = (! expr->is_assignment_expression ()); |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4245 |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4246 retval = expr->rvalue (nargout); |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4247 |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4248 if (do_bind_ans && ! (error_state || retval.empty ())) |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4249 bind_ans (retval(0), expr->print_result ()); |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4250 |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4251 if (nargout == 0) |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4252 retval = octave_value_list (); |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4253 } |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4254 else if (nargout == 0) |
|
8697
b227213a70c3
parse.y (eval_string): use the one true evaluator
John W. Eaton <jwe@octave.org>
parents:
8669
diff
changeset
|
4255 command_list->accept (*current_evaluator); |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4256 else |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4257 error ("eval: invalid use of statement list"); |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4258 |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4259 delete command_list; |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4260 |
|
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8471
diff
changeset
|
4261 command_list = 0; |
| 3883 | 4262 |
| 4263 if (error_state | |
| 4207 | 4264 || tree_return_command::returning |
| 4265 || tree_break_command::breaking | |
| 4266 || tree_continue_command::continuing) | |
| 3883 | 4267 break; |
| 4268 } | |
| 4269 else if (parser_end_of_input) | |
| 3877 | 4270 break; |
| 3883 | 4271 } |
| 3877 | 4272 } |
| 4273 while (parse_status == 0); | |
| 3021 | 4274 |
| 4275 return retval; | |
| 4276 } | |
| 4277 | |
| 4278 octave_value | |
| 3523 | 4279 eval_string (const std::string& s, bool silent, int& parse_status) |
| 3021 | 4280 { |
| 4281 octave_value retval; | |
| 4282 | |
| 4283 octave_value_list tmp = eval_string (s, silent, parse_status, 1); | |
| 4284 | |
| 4285 if (! tmp.empty ()) | |
| 4286 retval = tmp(0); | |
| 4287 | |
| 4288 return retval; | |
| 4289 } | |
| 4290 | |
| 4291 static octave_value_list | |
| 4292 eval_string (const octave_value& arg, bool silent, int& parse_status, | |
| 4293 int nargout) | |
| 4294 { | |
| 3523 | 4295 std::string s = arg.string_value (); |
| 3021 | 4296 |
| 4297 if (error_state) | |
| 4298 { | |
| 3523 | 4299 error ("eval: expecting std::string argument"); |
| 4233 | 4300 return octave_value (-1); |
| 3021 | 4301 } |
| 4302 | |
| 4303 return eval_string (s, silent, parse_status, nargout); | |
| 4304 } | |
| 4305 | |
| 4306 DEFUN (eval, args, nargout, | |
| 3371 | 4307 "-*- texinfo -*-\n\ |
| 4308 @deftypefn {Built-in Function} {} eval (@var{try}, @var{catch})\n\ | |
| 4309 Parse the string @var{try} and evaluate it as if it were an Octave\n\ | |
| 6643 | 4310 program. If that fails, evaluate the optional string @var{catch}.\n\ |
| 4463 | 4311 The string @var{try} is evaluated in the current context,\n\ |
| 4312 so any results remain available after @code{eval} returns.\n\ | |
| 6643 | 4313 \n\ |
| 4314 The following example makes the variable @var{a} with the approximate\n\ | |
| 4315 value 3.1416 available.\n\ | |
| 4316 \n\ | |
| 4317 @example\n\ | |
| 4318 eval(\"a = acos(-1);\");\n\ | |
| 4319 @end example\n\ | |
| 4320 \n\ | |
| 4321 If an error occurs during the evaluation of @var{try} the @var{catch}\n\ | |
| 8828 | 4322 string is evaluated, as the following example shows:\n\ |
| 6643 | 4323 \n\ |
| 4324 @example\n\ | |
| 4325 eval ('error (\"This is a bad example\");',\n\ | |
|
8015
30629059b72d
Update the manual to reflect the changes in error output
sh@sh-laptop
parents:
8007
diff
changeset
|
4326 'printf (\"This error occurred:\\n%s\\n\", lasterr ());');\n\ |
| 7001 | 4327 @print{} This error occurred:\n\ |
|
8015
30629059b72d
Update the manual to reflect the changes in error output
sh@sh-laptop
parents:
8007
diff
changeset
|
4328 This is a bad example\n\ |
| 6643 | 4329 @end example\n\ |
| 3371 | 4330 @end deftypefn") |
| 3021 | 4331 { |
| 4332 octave_value_list retval; | |
| 4333 | |
| 4334 int nargin = args.length (); | |
| 4335 | |
| 4336 if (nargin > 0) | |
| 4337 { | |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
4338 unwind_protect frame; |
| 3021 | 4339 |
| 4340 if (nargin > 1) | |
| 4341 { | |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
4342 frame.protect_var (buffer_error_messages); |
| 4699 | 4343 buffer_error_messages++; |
| 3021 | 4344 } |
| 4345 | |
| 4346 int parse_status = 0; | |
| 4347 | |
| 4463 | 4348 octave_value_list tmp = eval_string (args(0), nargout > 0, |
| 4349 parse_status, nargout); | |
| 4350 | |
| 3021 | 4351 if (nargin > 1 && (parse_status != 0 || error_state)) |
| 4352 { | |
| 4353 error_state = 0; | |
| 4354 | |
| 4355 // Set up for letting the user print any messages from | |
| 4356 // errors that occurred in the first part of this eval(). | |
| 4357 | |
| 4699 | 4358 buffer_error_messages--; |
| 3021 | 4359 |
|
8033
2ad5ba320b93
parse.y (Feval): Return value produced by evaluating CATCH string
John W. Eaton <jwe@octave.org>
parents:
8021
diff
changeset
|
4360 tmp = eval_string (args(1), nargout > 0, parse_status, nargout); |
|
2ad5ba320b93
parse.y (Feval): Return value produced by evaluating CATCH string
John W. Eaton <jwe@octave.org>
parents:
8021
diff
changeset
|
4361 |
|
2ad5ba320b93
parse.y (Feval): Return value produced by evaluating CATCH string
John W. Eaton <jwe@octave.org>
parents:
8021
diff
changeset
|
4362 if (nargout > 0) |
|
2ad5ba320b93
parse.y (Feval): Return value produced by evaluating CATCH string
John W. Eaton <jwe@octave.org>
parents:
8021
diff
changeset
|
4363 retval = tmp; |
| 3021 | 4364 } |
|
8033
2ad5ba320b93
parse.y (Feval): Return value produced by evaluating CATCH string
John W. Eaton <jwe@octave.org>
parents:
8021
diff
changeset
|
4365 else if (nargout > 0) |
|
2ad5ba320b93
parse.y (Feval): Return value produced by evaluating CATCH string
John W. Eaton <jwe@octave.org>
parents:
8021
diff
changeset
|
4366 retval = tmp; |
| 3021 | 4367 } |
| 4368 else | |
| 5823 | 4369 print_usage (); |
| 3021 | 4370 |
| 4371 return retval; | |
| 4372 } | |
| 4373 | |
|
7562
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4374 /* |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4375 |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4376 %% test/octave.test/eval/eval-1.m |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4377 %!#test |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4378 %! x = 1; |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4379 %! assert(eval ("x"),1); |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4380 |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4381 %% test/octave.test/eval/eval-2.m |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4382 %!test |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4383 %! x = 1; |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4384 %! assert(eval ("x;")); |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4385 |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4386 %% test/octave.test/eval/eval-3.m |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4387 %!test |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4388 %! x = 1; |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4389 %! assert(eval ("x;"),1); |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4390 |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4391 %% FIXME |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4392 %% Disable this test as adding the ";" is redundant with eval-1 and |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4393 %% in any case is a syntax error with assert |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4394 %% test/octave.test/eval/eval-4.m |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4395 %!#test |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4396 %! x = 1; |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4397 %! assert(eval ("x");,1); |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4398 |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4399 %% test/octave.test/eval/eval-5.m |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4400 %!test |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4401 %! eval ("flipud = 2;"); |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4402 %! assert(flipud,2); |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4403 |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4404 %% test/octave.test/eval/eval-6.m |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4405 %!function y = f () |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4406 %! eval ("flipud = 2;"); |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4407 %! y = flipud; |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4408 %!test |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4409 %! assert(f,2); |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4410 |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4411 %% test/octave.test/eval/eval-7.m |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4412 %!#test |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4413 %! eval ("x = 1"); |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4414 %! assert(x,1); |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4415 |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4416 %% test/octave.test/eval/eval-8.m |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4417 %!test |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4418 %! eval ("x = 1;") |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4419 %! assert(x,1); |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4420 |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4421 %% test/octave.test/eval/eval-9.m |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4422 %!test |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4423 %! eval ("x = 1;"); |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4424 %! assert(x,1); |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4425 |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4426 %% test/octave.test/eval/eval-10.m |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4427 %!#test |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4428 %! eval ("x = 1") |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4429 %! assert(x,1); |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4430 |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4431 %% test/octave.test/eval/eval-11.m |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4432 %!test |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4433 %! x = 1; |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4434 %! y = eval ("x"); |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4435 %! assert(y,1); |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4436 |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4437 %% test/octave.test/eval/eval-12.m |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4438 %!test |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4439 %! x = 1; |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4440 %! y = eval ("x;"); |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4441 %! assert(y,1); |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4442 |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4443 %% test/octave.test/eval/eval-13.m |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4444 %!test |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4445 %! x = 1; |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4446 %! y = eval ("x;"); |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4447 %! assert(y,1); |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4448 |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4449 %% test/octave.test/eval/eval-14.m |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4450 %!test |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4451 %! x = 1; |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4452 %! y = eval ("x"); |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4453 %! assert(y,1); |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4454 |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4455 */ |
|
c827f5673321
move tests to individual source files
John W. Eaton <jwe@octave.org>
parents:
7351
diff
changeset
|
4456 |
| 4661 | 4457 DEFUN (assignin, args, , |
| 4297 | 4458 "-*- texinfo -*-\n\ |
| 4459 @deftypefn {Built-in Function} {} assignin (@var{context}, @var{varname}, @var{value})\n\ | |
| 4460 Assign @var{value} to @var{varname} in context @var{context}, which\n\ | |
| 4461 may be either @code{\"base\"} or @code{\"caller\"}.\n\ | |
| 4462 @end deftypefn") | |
| 4463 { | |
| 4464 octave_value_list retval; | |
| 4465 | |
| 4466 int nargin = args.length (); | |
| 4467 | |
| 4468 if (nargin == 3) | |
| 4469 { | |
| 4470 std::string context = args(0).string_value (); | |
| 4471 | |
| 4472 if (! error_state) | |
| 4473 { | |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
4474 unwind_protect frame; |
|
9144
c6463412aebb
eliminate symbol_table::scope_stack; fix scoping issue with evalin
John W. Eaton <jwe@octave.org>
parents:
9042
diff
changeset
|
4475 |
| 4297 | 4476 if (context == "caller") |
| 7901 | 4477 octave_call_stack::goto_caller_frame (); |
| 4297 | 4478 else if (context == "base") |
| 7901 | 4479 octave_call_stack::goto_base_frame (); |
| 4297 | 4480 else |
| 4481 error ("assignin: context must be \"caller\" or \"base\""); | |
| 4482 | |
| 4483 if (! error_state) | |
| 4484 { | |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
4485 frame.add_fcn (octave_call_stack::pop); |
| 7901 | 4486 |
| 4297 | 4487 std::string nm = args(1).string_value (); |
| 4488 | |
| 4489 if (! error_state) | |
| 4490 { | |
| 4491 if (valid_identifier (nm)) | |
|
8064
4f1ebb704545
fix invalid scope use in assignin
Jaroslav Hajek <highegg@gmail.com>
parents:
8033
diff
changeset
|
4492 symbol_table::varref (nm) = args(2); |
| 4297 | 4493 else |
| 4494 error ("assignin: invalid variable name"); | |
| 4495 } | |
| 4496 else | |
| 4497 error ("assignin: expecting variable name as second argument"); | |
| 4498 } | |
| 4499 } | |
| 4500 else | |
| 4501 error ("assignin: expecting string as first argument"); | |
| 4502 } | |
| 4503 else | |
| 5823 | 4504 print_usage (); |
| 4297 | 4505 |
| 4506 return retval; | |
| 4507 } | |
| 4508 | |
| 4245 | 4509 DEFUN (evalin, args, nargout, |
| 4510 "-*- texinfo -*-\n\ | |
| 4511 @deftypefn {Built-in Function} {} evalin (@var{context}, @var{try}, @var{catch})\n\ | |
| 4512 Like @code{eval}, except that the expressions are evaluated in the\n\ | |
| 4513 context @var{context}, which may be either @code{\"caller\"} or\n\ | |
| 4246 | 4514 @code{\"base\"}.\n\ |
| 4245 | 4515 @end deftypefn") |
| 4516 { | |
| 4517 octave_value_list retval; | |
| 4518 | |
| 4519 int nargin = args.length (); | |
| 4520 | |
| 4521 if (nargin > 1) | |
| 4522 { | |
| 4523 std::string context = args(0).string_value (); | |
| 4524 | |
| 4525 if (! error_state) | |
| 4526 { | |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
4527 unwind_protect frame; |
| 4245 | 4528 |
| 4529 if (context == "caller") | |
| 7901 | 4530 octave_call_stack::goto_caller_frame (); |
| 4245 | 4531 else if (context == "base") |
| 7901 | 4532 octave_call_stack::goto_base_frame (); |
| 4245 | 4533 else |
| 4534 error ("evalin: context must be \"caller\" or \"base\""); | |
| 4535 | |
| 4297 | 4536 if (! error_state) |
| 4245 | 4537 { |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
4538 frame.add_fcn (octave_call_stack::pop); |
| 7336 | 4539 |
| 4297 | 4540 if (nargin > 2) |
| 4541 { | |
|
10067
6f79338c269b
omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9794
diff
changeset
|
4542 frame.protect_var (buffer_error_messages); |
| 4699 | 4543 buffer_error_messages++; |
| 4297 | 4544 } |
| 4545 | |
| 4546 int parse_status = 0; | |
| 4547 | |
| 4463 | 4548 octave_value_list tmp = eval_string (args(1), nargout > 0, |
| 4549 parse_status, nargout); | |
| 4550 | |
| 4551 if (nargout > 0) | |
| 4552 retval = tmp; | |
| 4297 | 4553 |
| 4554 if (nargin > 2 && (parse_status != 0 || error_state)) | |
| 4555 { | |
| 4556 error_state = 0; | |
| 4557 | |
| 4558 // Set up for letting the user print any messages from | |
| 4559 // errors that occurred in the first part of this eval(). | |
| 4560 | |
| 4699 | 4561 buffer_error_messages--; |
| 4297 | 4562 |
|
9506
4562a9a730ae
parse.y (Fevalin): also return output from CATCH expression
John W. Eaton <jwe@octave.org>
parents:
9476
diff
changeset
|
4563 tmp = eval_string (args(2), nargout > 0, |
|
4562a9a730ae
parse.y (Fevalin): also return output from CATCH expression
John W. Eaton <jwe@octave.org>
parents:
9476
diff
changeset
|
4564 parse_status, nargout); |
|
4562a9a730ae
parse.y (Fevalin): also return output from CATCH expression
John W. Eaton <jwe@octave.org>
parents:
9476
diff
changeset
|
4565 |
|
4562a9a730ae
parse.y (Fevalin): also return output from CATCH expression
John W. Eaton <jwe@octave.org>
parents:
9476
diff
changeset
|
4566 retval = (nargout > 0) ? tmp : octave_value_list (); |
| 4297 | 4567 } |
| 4245 | 4568 } |
| 4569 } | |
| 4570 else | |
| 4571 error ("evalin: expecting string as first argument"); | |
| 4572 } | |
| 4573 else | |
| 5823 | 4574 print_usage (); |
| 4245 | 4575 |
| 4576 return retval; | |
| 4577 } | |
| 4578 | |
|
8311
7124bffc89c7
parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents:
8283
diff
changeset
|
4579 DEFUN (__parser_debug_flag__, args, nargout, |
|
8812
7d48766c21a5
use consistent format for doc strings of internal functions
John W. Eaton <jwe@octave.org>
parents:
8746
diff
changeset
|
4580 "-*- texinfo -*-\n\ |
|
7d48766c21a5
use consistent format for doc strings of internal functions
John W. Eaton <jwe@octave.org>
parents:
8746
diff
changeset
|
4581 @deftypefn {Built-in Function} {@var{old_val} =} __parser_debug_flag__ (@var{new_val}))\n\ |
|
7d48766c21a5
use consistent format for doc strings of internal functions
John W. Eaton <jwe@octave.org>
parents:
8746
diff
changeset
|
4582 Undocumented internal function.\n\ |
|
7d48766c21a5
use consistent format for doc strings of internal functions
John W. Eaton <jwe@octave.org>
parents:
8746
diff
changeset
|
4583 @end deftypefn") |
|
8311
7124bffc89c7
parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents:
8283
diff
changeset
|
4584 { |
|
7124bffc89c7
parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents:
8283
diff
changeset
|
4585 octave_value retval; |
|
7124bffc89c7
parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents:
8283
diff
changeset
|
4586 |
|
7124bffc89c7
parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents:
8283
diff
changeset
|
4587 bool debug_flag = octave_debug; |
|
7124bffc89c7
parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents:
8283
diff
changeset
|
4588 |
|
7124bffc89c7
parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents:
8283
diff
changeset
|
4589 retval = set_internal_variable (debug_flag, args, nargout, |
|
7124bffc89c7
parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents:
8283
diff
changeset
|
4590 "__parser_debug_flag__"); |
|
7124bffc89c7
parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents:
8283
diff
changeset
|
4591 |
|
7124bffc89c7
parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents:
8283
diff
changeset
|
4592 octave_debug = debug_flag; |
|
7124bffc89c7
parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents:
8283
diff
changeset
|
4593 |
|
7124bffc89c7
parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents:
8283
diff
changeset
|
4594 return retval; |
|
7124bffc89c7
parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents:
8283
diff
changeset
|
4595 } |
|
7124bffc89c7
parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents:
8283
diff
changeset
|
4596 |
| 1994 | 4597 /* |
| 4598 ;;; Local Variables: *** | |
| 4599 ;;; mode: text *** | |
| 4600 ;;; End: *** | |
| 4601 */ |