octave: libinterp/parse-tree/oct-parse.yy annotate

annotate libinterp/parse-tree/oct-parse.yy @ 26040:0af4653e48a4

install auto function vars in symbol scope when parsing function * symscope.h, symscope.cc (symbol_scope::install_auto_fcn_vars, symbol_scope_rep::install_auto_fcn_vars, symbol_scope_rep::install_auto_fcn_var): New functions. * oct-parse.yy (base_parser::finish_function): Call symbol_scope::install_auto_fcn_vars.

author	John W. Eaton <jwe@octave.org>
date	Sat, 03 Nov 2018 09:27:37 -0400
parents	3fc9d7453ba6
children	da2bbcf1fbcd

rev	line source
1829 7d2982b55242 [project @ 1996-02-02 14:12:59 by jwe] jwe parents: 1826 diff changeset	1 /*
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2
25054 6652d3823428 maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 24833 diff changeset	3 Copyright (C) 1993-2018 John W. Eaton
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	4 Copyright (C) 2009 David Grundberg
11523 fd0a3ac60b0e update copyright notices John W. Eaton <jwe@octave.org> parents: 11464 diff changeset	5 Copyright (C) 2009-2010 VZLU Prague
25054 6652d3823428 maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 24833 diff changeset	6 Copyright (C) 2016-2018 Oliver Heimlich
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	7
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	8 This file is part of Octave.
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	9
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24444 diff changeset	10 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22712 diff changeset	11 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24444 diff changeset	12 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22712 diff changeset	13 (at your option) any later version.
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22712 diff changeset	14
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22712 diff changeset	15 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22712 diff changeset	16 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22712 diff changeset	17 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22712 diff changeset	18 GNU General Public License for more details.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	19
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	20 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	21 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24444 diff changeset	22 <https://www.gnu.org/licenses/>.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	23
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	24 */
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	25
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	26 // Parser for Octave.
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	27
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 751 diff changeset	28 // C decarations.
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 751 diff changeset	29
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	30 %{
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 21021 diff changeset	31
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	32 #define YYDEBUG 1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	33
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21707 diff changeset	34 #if defined (HAVE_CONFIG_H)
22003 2d3972b802ff use consistent style for including config.h in source files John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	35 # include "config.h"
240 a99f28f5e351 [project @ 1993-11-30 20:24:36 by jwe] jwe parents: 206 diff changeset	36 #endif
a99f28f5e351 [project @ 1993-11-30 20:24:36 by jwe] jwe parents: 206 diff changeset	37
3178 09a3064a3a17 [project @ 1998-06-23 03:46:42 by jwe] jwe parents: 3165 diff changeset	38 #include <cassert>
10463 bbe99b2a5ba7 undo recent gnulib-related changes John W. Eaton <jwe@octave.org> parents: 10447 diff changeset	39 #include <cstdio>
bbe99b2a5ba7 undo recent gnulib-related changes John W. Eaton <jwe@octave.org> parents: 10447 diff changeset	40 #include <cstdlib>
2427 2f50b24ce84f [project @ 1996-10-25 06:15:28 by jwe] jwe parents: 2375 diff changeset	41
8950 d865363208d6 include <iosfwd> instead of <iostream> in header files John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	42 #include <iostream>
5484 2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	43 #include <map>
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	44 #include <sstream>
5484 2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	45
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	46 #include "Matrix.h"
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	47 #include "cmd-edit.h"
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	48 #include "cmd-hist.h"
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	49 #include "file-ops.h"
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	50 #include "file-stat.h"
4243 7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4240 diff changeset	51 #include "oct-env.h"
3712 7066a8065e7e [project @ 2000-08-22 06:21:20 by jwe] jwe parents: 3665 diff changeset	52 #include "oct-time.h"
4171 04694e5b4239 [project @ 2002-11-12 20:27:24 by jwe] jwe parents: 4131 diff changeset	53 #include "quit.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	54
22091 0f6fc2ec3b1a move call_stack class to a separate file John W. Eaton <jwe@octave.org> parents: 22003 diff changeset	55 #include "Cell.h"
23454 30b6eccd6708 use builtin-defun-decls.h to ensure declarations of interpreter functions John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	56 #include "builtin-defun-decls.h"
22091 0f6fc2ec3b1a move call_stack class to a separate file John W. Eaton <jwe@octave.org> parents: 22003 diff changeset	57 #include "call-stack.h"
2166 d68119516779 [project @ 1996-05-13 13:41:55 by jwe] jwe parents: 2124 diff changeset	58 #include "defun.h"
4243 7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4240 diff changeset	59 #include "dirfns.h"
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	60 #include "dynamic-ld.h"
1351 8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	61 #include "error.h"
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	62 #include "input.h"
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	63 #include "interpreter-private.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: 22091 diff changeset	64 #include "interpreter.h"
1351 8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	65 #include "lex.h"
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: 5823 diff changeset	66 #include "load-path.h"
25517 7fbc39a46be8 Add wrapper to fopen for files with non-ASCII chars in path on Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25442 diff changeset	67 #include "lo-sysdep.h"
1743 ab8612a09449 [project @ 1996-01-12 11:25:30 by jwe] jwe parents: 1740 diff changeset	68 #include "oct-hist.h"
5626 3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	69 #include "oct-map.h"
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	70 #include "ov-classdef.h"
4935 4fc993a4e072 [project @ 2004-08-06 03:17:12 by jwe] jwe parents: 4930 diff changeset	71 #include "ov-fcn-handle.h"
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	72 #include "ov-usr-fcn.h"
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8064 diff changeset	73 #include "ov-null-mat.h"
1351 8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	74 #include "pager.h"
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	75 #include "parse.h"
2987 ae20b3f37f5e [project @ 1997-05-16 07:05:15 by jwe] jwe parents: 2982 diff changeset	76 #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	77 #include "pt-eval.h"
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	78 #include "pt-funcall.h"
1351 8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	79 #include "symtab.h"
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	80 #include "token.h"
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	81 #include "unwind-prot.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	82 #include "utils.h"
1351 8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	83 #include "variables.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	84
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	85 // oct-parse.h must be included after pt-all.h
23479 06bf3a0b08bf maint: Use "" instead of <> for our own include files. John W. Eaton <jwe@octave.org> parents: 23473 diff changeset	86 #include "oct-parse.h"
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	87
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	88 extern int octave_lex (YYSTYPE , void );
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	89
5484 2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	90 // List of autoloads (function -> file mapping).
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	91 static std::map<std::string, std::string> autoload_map;
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	92
496 e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	93 // Forward declarations for some functions defined at the bottom of
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	94 // the file.
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	95
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	96 static void yyerror (octave::base_parser& parser, const char *s);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	97
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	98 #define lexer parser.m_lexer
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	99 #define scanner lexer.m_scanner
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	100
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 21021 diff changeset	101 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
24444 53ca76c5cc8d maint: Indent pragmas as other preprocessor directives. John W. Eaton <jwe@octave.org> parents: 24377 diff changeset	102 // Disable this warning for code that is generated by Bison,
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives. John W. Eaton <jwe@octave.org> parents: 24377 diff changeset	103 // including grammar rules. Push the current state so we can
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives. John W. Eaton <jwe@octave.org> parents: 24377 diff changeset	104 // restore the warning state prior to functions we define at
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives. John W. Eaton <jwe@octave.org> parents: 24377 diff changeset	105 // the bottom of the file.
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives. John W. Eaton <jwe@octave.org> parents: 24377 diff changeset	106 # pragma GCC diagnostic push
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives. John W. Eaton <jwe@octave.org> parents: 24377 diff changeset	107 # pragma GCC diagnostic ignored "-Wold-style-cast"
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 21021 diff changeset	108 #endif
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 21021 diff changeset	109
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	110 %}
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	111
666 fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	112 // Bison declarations.
fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	113
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	114 // The grammar currently has 9 shift/reduce conflicts. Ensure that
17743 af5ad573c665 oct-parse.in.yy: Add %expect declaration. John W. Eaton <jwe@octave.org> parents: 17731 diff changeset	115 // we notice if that number changes.
af5ad573c665 oct-parse.in.yy: Add %expect declaration. John W. Eaton <jwe@octave.org> parents: 17731 diff changeset	116
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	117 %expect 9
17743 af5ad573c665 oct-parse.in.yy: Add %expect declaration. John W. Eaton <jwe@octave.org> parents: 17731 diff changeset	118
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	119 // We are using the pure parser interface and the reentrant lexer
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	120 // interface but the Octave parser and lexer are NOT properly
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	121 // reentrant because both still use many global variables. It should be
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	122 // safe to create a parser object and call it while another parser
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	123 // object is active (to parse a callback function while the main
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	124 // interactive parser is waiting for input, for example) if you take
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	125 // care to properly save and restore (typically with an unwind_protect
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	126 // object) relevant global values before and after the nested call.
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	127
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	128 %define api.pure
25640 7aaf091d39fc one more fix for parser change... Doh! John W. Eaton <jwe@octave.org> parents: 25638 diff changeset	129 // No spaces inside the braces for the prefix and push-pull definitions!
7aaf091d39fc one more fix for parser change... Doh! John W. Eaton <jwe@octave.org> parents: 25638 diff changeset	130 %define api.prefix {octave_}
25644 bee8d60413f3 avoid bison warning about deprecated syntax John W. Eaton <jwe@octave.org> parents: 25640 diff changeset	131 %define api.push-pull both
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	132 %parse-param { octave::base_parser& parser }
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	133 %lex-param { void *lexer.scanner }
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	134
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	135 %union
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	136 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	137 int dummy_type;
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	138
2891 1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2884 diff changeset	139 // The type of the basic tokens returned by the lexer.
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	140 octave::token *tok_val;
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	141
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	142 // Comment strings that we need to deal with mid-rule.
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	143 octave::comment_list *comment_type;
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	144
2891 1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2884 diff changeset	145 // Types for the nonterminals we generate.
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	146 char punct_type;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	147 octave::tree *tree_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	148 octave::tree_matrix *tree_matrix_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	149 octave::tree_cell *tree_cell_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	150 octave::tree_expression *tree_expression_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	151 octave::tree_constant *tree_constant_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	152 octave::tree_fcn_handle *tree_fcn_handle_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	153 octave::tree_funcall *tree_funcall_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	154 octave::tree_function_def *tree_function_def_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	155 octave::tree_anon_fcn_handle *tree_anon_fcn_handle_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	156 octave::tree_identifier *tree_identifier_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	157 octave::tree_index_expression *tree_index_expression_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	158 octave::tree_colon_expression *tree_colon_expression_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	159 octave::tree_argument_list *tree_argument_list_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	160 octave::tree_parameter_list *tree_parameter_list_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	161 octave::tree_command *tree_command_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	162 octave::tree_if_command *tree_if_command_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	163 octave::tree_if_clause *tree_if_clause_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	164 octave::tree_if_command_list *tree_if_command_list_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	165 octave::tree_switch_command *tree_switch_command_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	166 octave::tree_switch_case *tree_switch_case_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	167 octave::tree_switch_case_list *tree_switch_case_list_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	168 octave::tree_decl_elt *tree_decl_elt_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	169 octave::tree_decl_init_list *tree_decl_init_list_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	170 octave::tree_decl_command *tree_decl_command_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	171 octave::tree_statement *tree_statement_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	172 octave::tree_statement_list *tree_statement_list_type;
2891 1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2884 diff changeset	173 octave_user_function *octave_user_function_type;
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	174
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	175 octave::tree_classdef *tree_classdef_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	176 octave::tree_classdef_attribute* tree_classdef_attribute_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	177 octave::tree_classdef_attribute_list* tree_classdef_attribute_list_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	178 octave::tree_classdef_superclass* tree_classdef_superclass_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	179 octave::tree_classdef_superclass_list* tree_classdef_superclass_list_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	180 octave::tree_classdef_body* tree_classdef_body_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	181 octave::tree_classdef_property* tree_classdef_property_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	182 octave::tree_classdef_property_list* tree_classdef_property_list_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	183 octave::tree_classdef_properties_block* tree_classdef_properties_block_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	184 octave::tree_classdef_methods_list* tree_classdef_methods_list_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	185 octave::tree_classdef_methods_block* tree_classdef_methods_block_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	186 octave::tree_classdef_event* tree_classdef_event_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	187 octave::tree_classdef_events_list* tree_classdef_events_list_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	188 octave::tree_classdef_events_block* tree_classdef_events_block_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	189 octave::tree_classdef_enum* tree_classdef_enum_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	190 octave::tree_classdef_enum_list* tree_classdef_enum_list_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	191 octave::tree_classdef_enum_block* tree_classdef_enum_block_type;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	192 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	193
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	194 // Tokens with line and column information.
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	195 %token <tok_val> '=' ':' '-' '+' '*' '/'
4018 a8621d87fbf5 [project @ 2002-08-05 03:17:25 by jwe] jwe parents: 4009 diff changeset	196 %token <tok_val> ADD_EQ SUB_EQ MUL_EQ DIV_EQ LEFTDIV_EQ POW_EQ
a8621d87fbf5 [project @ 2002-08-05 03:17:25 by jwe] jwe parents: 4009 diff changeset	197 %token <tok_val> EMUL_EQ EDIV_EQ ELEFTDIV_EQ EPOW_EQ AND_EQ OR_EQ
428 fa0453b25410 [project @ 1994-05-25 01:06:28 by jwe] jwe parents: 341 diff changeset	198 %token <tok_val> EXPR_AND_AND EXPR_OR_OR
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	199 %token <tok_val> EXPR_AND EXPR_OR EXPR_NOT
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	200 %token <tok_val> EXPR_LT EXPR_LE EXPR_EQ EXPR_NE EXPR_GE EXPR_GT
1276 cbdf7db98554 [project @ 1995-04-24 15:31:24 by jwe] jwe parents: 1266 diff changeset	201 %token <tok_val> LEFTDIV EMUL EDIV ELEFTDIV EPLUS EMINUS
16284 09881dab3aaf * lex.ll, oct-parse.in.yy (HERMITIAN): Rename token from QUOTE. John W. Eaton <jwe@octave.org> parents: 16279 diff changeset	202 %token <tok_val> HERMITIAN TRANSPOSE
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	203 %token <tok_val> PLUS_PLUS MINUS_MINUS POW EPOW
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	204 %token <tok_val> NUM IMAG_NUM
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	205 %token <tok_val> STRUCT_ELT
2883 0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	206 %token <tok_val> NAME
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	207 %token <tok_val> END
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5189 diff changeset	208 %token <tok_val> DQ_STRING SQ_STRING
13245 027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now John W. Eaton <jwe@octave.org> parents: 13241 diff changeset	209 %token <tok_val> FOR PARFOR WHILE DO UNTIL
1491 893b416bb919 [project @ 1995-09-29 04:03:01 by jwe] jwe parents: 1489 diff changeset	210 %token <tok_val> IF ELSEIF ELSE
2764 2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	211 %token <tok_val> SWITCH CASE OTHERWISE
1491 893b416bb919 [project @ 1995-09-29 04:03:01 by jwe] jwe parents: 1489 diff changeset	212 %token <tok_val> BREAK CONTINUE FUNC_RET
924 8b0920cc1d64 [project @ 1994-11-15 00:40:50 by jwe] jwe parents: 922 diff changeset	213 %token <tok_val> UNWIND CLEANUP
1489 3e705c864019 [project @ 1995-09-28 05:38:26 by jwe] jwe parents: 1371 diff changeset	214 %token <tok_val> TRY CATCH
14294 9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14293 diff changeset	215 %token <tok_val> GLOBAL PERSISTENT
4342 813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	216 %token <tok_val> FCN_HANDLE
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	217 %token <tok_val> CLASSDEF
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	218 %token <tok_val> PROPERTIES METHODS EVENTS ENUMERATION
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	219 %token <tok_val> METAQUERY
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	220 %token <tok_val> SUPERCLASSREF
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18419 diff changeset	221 %token <tok_val> FQ_IDENT
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	222 %token <tok_val> GET SET
16627 de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16574 diff changeset	223 %token <tok_val> FCN
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21063 diff changeset	224 %token <tok_val> LEXICAL_ERROR
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	225
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	226 // Other tokens.
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21063 diff changeset	227 %token<dummy_type> END_OF_INPUT
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	228 %token<dummy_type> INPUT_FILE
7587 1f662945c2be handle varargin and varargout without keywords John W. Eaton <jwe@octave.org> parents: 7562 diff changeset	229 // %token VARARGIN VARARGOUT
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	230
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	231 %token<dummy_type> '(' ')' '[' ']' '{' '}' '.' ',' ';' '@' '\n'
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	232
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	233 // Nonterminals we construct.
24037 21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	234 %type <dummy_type> indirect_ref_op decl_param_init
21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	235 %type <dummy_type> push_fcn_symtab push_script_symtab begin_file
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	236 %type <dummy_type> param_list_beg param_list_end stmt_begin parse_error
23343 49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	237 %type <dummy_type> parsing_local_fcns
16644 856cb7cba231 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16595 16627 diff changeset	238 %type <comment_type> stash_comment
17657 df266c923b83 delete unnecessary tok_type semantic value in parser John W. Eaton <jwe@octave.org> parents: 17656 diff changeset	239 %type <tok_val> function_beg classdef_beg
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	240 %type <punct_type> sep_no_nl opt_sep_no_nl nl opt_nl sep opt_sep
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	241 %type <tree_type> input
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5848 diff changeset	242 %type <tree_constant_type> string constant magic_colon
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5848 diff changeset	243 %type <tree_anon_fcn_handle_type> anon_fcn_handle
4342 813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	244 %type <tree_fcn_handle_type> fcn_handle
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	245 %type <tree_matrix_type> matrix_rows
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	246 %type <tree_cell_type> cell_rows
5102 b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe] jwe parents: 5013 diff changeset	247 %type <tree_expression_type> matrix cell
23600 db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	248 %type <tree_expression_type> primary_expr oper_expr power_expr expr_no_assign
4207 fa3482b34599 [project @ 2002-12-03 18:22:05 by jwe] jwe parents: 4186 diff changeset	249 %type <tree_expression_type> simple_expr colon_expr assign_expr expression
17283 e6c0ac8ce5b6 eliminate parse conflicts introduced by changeset 923ce8b42db2 John W. Eaton <jwe@octave.org> parents: 17281 diff changeset	250 %type <tree_identifier_type> identifier fcn_name magic_tilde
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	251 %type <tree_funcall_type> superclass_identifier meta_identifier
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	252 %type <tree_index_expression_type> word_list_cmd
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3347 diff changeset	253 %type <tree_argument_list_type> arg_list word_list assign_lhs
8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3347 diff changeset	254 %type <tree_argument_list_type> cell_or_matrix_row
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	255 %type <tree_parameter_list_type> opt_param_list param_list
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	256 %type <tree_parameter_list_type> param_list1 param_list2
723 1c072f20b522 [project @ 1994-09-21 16:00:10 by jwe] jwe parents: 666 diff changeset	257 %type <tree_parameter_list_type> return_list return_list1
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	258 %type <tree_command_type> command select_command loop_command
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	259 %type <tree_command_type> jump_command except_command
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	260 %type <tree_function_def_type> function
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	261 %type <tree_classdef_type> classdef
16211 3449bf257514 maint: fix botched merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16205 diff changeset	262 %type <tree_command_type> file
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	263 %type <tree_if_command_type> if_command
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	264 %type <tree_if_clause_type> elseif_clause else_clause
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	265 %type <tree_if_command_list_type> if_cmd_list1 if_cmd_list
2764 2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	266 %type <tree_switch_command_type> switch_command
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	267 %type <tree_switch_case_type> switch_case default_case
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	268 %type <tree_switch_case_list_type> case_list1 case_list
17317 56fe31b248de disallow ~ in global and persistent declaration lists John W. Eaton <jwe@octave.org> parents: 17316 diff changeset	269 %type <tree_decl_elt_type> decl2 param_list_elt
2846 52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	270 %type <tree_decl_init_list_type> decl1
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	271 %type <tree_decl_command_type> declaration
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	272 %type <tree_statement_type> statement function_end
627 739d16c30481 [project @ 1994-08-19 13:23:14 by jwe] jwe parents: 620 diff changeset	273 %type <tree_statement_list_type> simple_list simple_list1 list list1
17322 4c1ae06111c9 allow parser to accept empty statements (bug #37099) John W. Eaton <jwe@octave.org> parents: 17317 diff changeset	274 %type <tree_statement_list_type> opt_list
23343 49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	275 %type <tree_statement_list_type> opt_fcn_list fcn_list fcn_list1
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	276 %type <tree_classdef_attribute_type> attr
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	277 %type <tree_classdef_attribute_list_type> attr_list opt_attr_list
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	278 %type <tree_classdef_superclass_type> superclass
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	279 %type <tree_classdef_superclass_list_type> superclass_list opt_superclass_list
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	280 %type <tree_classdef_body_type> class_body
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	281 %type <tree_classdef_property_type> class_property
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	282 %type <tree_classdef_property_list_type> property_list
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	283 %type <tree_classdef_properties_block_type> properties_block
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	284 %type <tree_classdef_methods_list_type> methods_list
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	285 %type <tree_classdef_methods_block_type> methods_block
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	286 %type <tree_classdef_event_type> class_event
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	287 %type <tree_classdef_events_list_type> events_list
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	288 %type <tree_classdef_events_block_type> events_block
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	289 %type <tree_classdef_enum_type> class_enum
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	290 %type <tree_classdef_enum_list_type> enum_list
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	291 %type <tree_classdef_enum_block_type> enum_block
18262 69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	292 %type <tree_function_def_type> method_decl method
69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	293 %type <octave_user_function_type> method_decl1
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	294
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	295 // Precedence and associativity.
21294 3d375b0905a0 eliminate unused << and >> operators from Octave scripting language John W. Eaton <jwe@octave.org> parents: 21159 diff changeset	296 %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
4023 ef3caf27cb9c [project @ 2002-08-07 06:54:41 by jwe] jwe parents: 4018 diff changeset	297 %left EXPR_OR_OR
ef3caf27cb9c [project @ 2002-08-07 06:54:41 by jwe] jwe parents: 4018 diff changeset	298 %left EXPR_AND_AND
ef3caf27cb9c [project @ 2002-08-07 06:54:41 by jwe] jwe parents: 4018 diff changeset	299 %left EXPR_OR
ef3caf27cb9c [project @ 2002-08-07 06:54:41 by jwe] jwe parents: 4018 diff changeset	300 %left EXPR_AND
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	301 %left EXPR_LT EXPR_LE EXPR_EQ EXPR_NE EXPR_GE EXPR_GT
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	302 %left ':'
1276 cbdf7db98554 [project @ 1995-04-24 15:31:24 by jwe] jwe parents: 1266 diff changeset	303 %left '-' '+' EPLUS EMINUS
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	304 %left '*' '/' LEFTDIV EMUL EDIV ELEFTDIV
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	305 %right UNARY EXPR_NOT
16284 09881dab3aaf * lex.ll, oct-parse.in.yy (HERMITIAN): Rename token from QUOTE. John W. Eaton <jwe@octave.org> parents: 16279 diff changeset	306 %left POW EPOW HERMITIAN TRANSPOSE
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	307 %right PLUS_PLUS MINUS_MINUS
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3347 diff changeset	308 %left '(' '.' '{'
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	309
17629 1e8f8900a041 clean up partially constructed parse tree objects on parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17622 diff changeset	310 // How to clean up if there is a parse error. We handle deleting tokens
1e8f8900a041 clean up partially constructed parse tree objects on parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17622 diff changeset	311 // and comments seperately and separators are just characters. The
1e8f8900a041 clean up partially constructed parse tree objects on parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17622 diff changeset	312 // remaining items are dynamically allocated parse tree objects that
17658 0c5f50706ba3 attempt to catch possible memory leaks in parser cleanup John W. Eaton <jwe@octave.org> parents: 17632 diff changeset	313 // must be deleted. Use the wildcard case (<*>) to detect unhandled
0c5f50706ba3 attempt to catch possible memory leaks in parser cleanup John W. Eaton <jwe@octave.org> parents: 17632 diff changeset	314 // cases (for example, a new semantic type is added but not handled
0c5f50706ba3 attempt to catch possible memory leaks in parser cleanup John W. Eaton <jwe@octave.org> parents: 17632 diff changeset	315 // here).
0c5f50706ba3 attempt to catch possible memory leaks in parser cleanup John W. Eaton <jwe@octave.org> parents: 17632 diff changeset	316
0c5f50706ba3 attempt to catch possible memory leaks in parser cleanup John W. Eaton <jwe@octave.org> parents: 17632 diff changeset	317 %destructor { } <tok_val>
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	318 %destructor { } <punct_type>
17658 0c5f50706ba3 attempt to catch possible memory leaks in parser cleanup John W. Eaton <jwe@octave.org> parents: 17632 diff changeset	319 %destructor { } <comment_type>
0c5f50706ba3 attempt to catch possible memory leaks in parser cleanup John W. Eaton <jwe@octave.org> parents: 17632 diff changeset	320 %destructor { } <>
0c5f50706ba3 attempt to catch possible memory leaks in parser cleanup John W. Eaton <jwe@octave.org> parents: 17632 diff changeset	321
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	322 %destructor { delete $$; } <tree_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	323 %destructor { delete $$; } <tree_matrix_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	324 %destructor { delete $$; } <tree_cell_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	325 %destructor { delete $$; } <tree_expression_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	326 %destructor { delete $$; } <tree_constant_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	327 %destructor { delete $$; } <tree_fcn_handle_type>
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	328 %destructor { delete $$; } <tree_funcall_type>
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	329 %destructor { delete $$; } <tree_function_def_type>
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	330 %destructor { delete $$; } <tree_anon_fcn_handle_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	331 %destructor { delete $$; } <tree_identifier_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	332 %destructor { delete $$; } <tree_index_expression_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	333 %destructor { delete $$; } <tree_argument_list_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	334 %destructor { delete $$; } <tree_parameter_list_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	335 %destructor { delete $$; } <tree_command_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	336 %destructor { delete $$; } <tree_if_command_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	337 %destructor { delete $$; } <tree_if_clause_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	338 %destructor { delete $$; } <tree_if_command_list_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	339 %destructor { delete $$; } <tree_switch_command_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	340 %destructor { delete $$; } <tree_switch_case_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	341 %destructor { delete $$; } <tree_switch_case_list_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	342 %destructor { delete $$; } <tree_decl_elt_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	343 %destructor { delete $$; } <tree_decl_init_list_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	344 %destructor { delete $$; } <tree_decl_command_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	345 %destructor { delete $$; } <tree_statement_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	346 %destructor { delete $$; } <tree_statement_list_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	347 %destructor { delete $$; } <octave_user_function_type>
17658 0c5f50706ba3 attempt to catch possible memory leaks in parser cleanup John W. Eaton <jwe@octave.org> parents: 17632 diff changeset	348
18262 69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	349 %destructor { delete $$; } <tree_classdef_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	350 %destructor { delete $$; } <tree_classdef_attribute_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	351 %destructor { delete $$; } <tree_classdef_attribute_list_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	352 %destructor { delete $$; } <tree_classdef_superclass_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	353 %destructor { delete $$; } <tree_classdef_superclass_list_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	354 %destructor { delete $$; } <tree_classdef_body_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	355 %destructor { delete $$; } <tree_classdef_property_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	356 %destructor { delete $$; } <tree_classdef_property_list_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	357 %destructor { delete $$; } <tree_classdef_properties_block_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	358 %destructor { delete $$; } <tree_classdef_methods_list_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	359 %destructor { delete $$; } <tree_classdef_methods_block_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	360 %destructor { delete $$; } <tree_classdef_event_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	361 %destructor { delete $$; } <tree_classdef_events_list_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	362 %destructor { delete $$; } <tree_classdef_events_block_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	363 %destructor { delete $$; } <tree_classdef_enum_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	364 %destructor { delete $$; } <tree_classdef_enum_list_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	365 %destructor { delete $$; } <tree_classdef_enum_block_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	366
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	367 // Defining a generic destructor generates a warning if destructors are
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	368 // already explicitly declared for all types.
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	369 //
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	370 // %destructor {
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	371 // warning_with_id
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	372 // ("Octave:parser-destructor",
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	373 // "possible memory leak in cleanup following parse error");
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	374 // } <*>
17629 1e8f8900a041 clean up partially constructed parse tree objects on parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17622 diff changeset	375
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	376 // Where to start.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	377 %start input
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	378
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	379 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	380
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	381 // ==============================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	382 // Statements and statement lists
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	383 // ==============================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	384
17322 4c1ae06111c9 allow parser to accept empty statements (bug #37099) John W. Eaton <jwe@octave.org> parents: 17317 diff changeset	385 input : simple_list '\n'
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	386 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	387 $$ = nullptr;
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	388 parser.m_stmt_list = $1;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	389 YYACCEPT;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	390 }
17322 4c1ae06111c9 allow parser to accept empty statements (bug #37099) John W. Eaton <jwe@octave.org> parents: 17317 diff changeset	391 \| simple_list END_OF_INPUT
4c1ae06111c9 allow parser to accept empty statements (bug #37099) John W. Eaton <jwe@octave.org> parents: 17317 diff changeset	392 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	393 $$ = nullptr;
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	394 lexer.m_end_of_input = true;
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	395 parser.m_stmt_list = $1;
17322 4c1ae06111c9 allow parser to accept empty statements (bug #37099) John W. Eaton <jwe@octave.org> parents: 17317 diff changeset	396 YYACCEPT;
4c1ae06111c9 allow parser to accept empty statements (bug #37099) John W. Eaton <jwe@octave.org> parents: 17317 diff changeset	397 }
17326 f444e4cef9b9 avoid exiting Octave on parse error (bug #39862) John W. Eaton <jwe@octave.org> parents: 17322 diff changeset	398 \| parse_error
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	399 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	400 $$ = nullptr;
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	401 YYABORT;
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	402 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	403 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	404
17322 4c1ae06111c9 allow parser to accept empty statements (bug #37099) John W. Eaton <jwe@octave.org> parents: 17317 diff changeset	405 simple_list : opt_sep_no_nl
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	406 {
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	407 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	408
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	409 $$ = nullptr;
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	410 }
17322 4c1ae06111c9 allow parser to accept empty statements (bug #37099) John W. Eaton <jwe@octave.org> parents: 17317 diff changeset	411 \| simple_list1 opt_sep_no_nl
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	412 { $$ = parser.set_stmt_print_flag ($1, $2, false); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	413 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	414
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	415 simple_list1 : statement
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	416 { $$ = parser.make_statement_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	417 \| simple_list1 sep_no_nl statement
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	418 { $$ = parser.append_statement_list ($1, $2, $3, false); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	419 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	420
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	421 opt_list : // empty
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	422 { $$ = new octave::tree_statement_list (); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	423 \| list
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	424 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	425 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	426
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	427 list : list1 opt_sep
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	428 { $$ = parser.set_stmt_print_flag ($1, $2, true); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	429 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	430
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	431 list1 : statement
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	432 { $$ = parser.make_statement_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	433 \| list1 sep statement
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	434 { $$ = parser.append_statement_list ($1, $2, $3, true); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	435 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	436
23343 49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	437 opt_fcn_list : // empty
23635 b5a9cd6de1b8 avoid possible memory error in parser John W. Eaton <jwe@octave.org> parents: 23631 diff changeset	438 { $$ = new octave::tree_statement_list (); }
23343 49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	439 \| fcn_list
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	440 { $$ = $1; }
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	441 ;
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23343 diff changeset	442
23343 49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	443 fcn_list : fcn_list1 opt_sep
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	444 {
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	445 YYUSE ($2);
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	446
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	447 $$ = $1;
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	448 }
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	449 ;
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	450
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	451 fcn_list1 : function
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	452 {
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	453 octave::tree_statement *stmt = parser.make_statement ($1);
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	454 $$ = new octave::tree_statement_list (stmt);
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	455 }
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	456 \| fcn_list1 opt_sep function
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	457 {
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	458 octave::tree_statement *stmt = parser.make_statement ($3);
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	459 $$ = parser.append_statement_list ($1, $2, stmt, false);
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	460 }
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	461 ;
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	462
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	463 statement : expression
17693 efbe746f8fa8 eliminate octave_comment_buffer singleton John W. Eaton <jwe@octave.org> parents: 17673 diff changeset	464 { $$ = parser.make_statement ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	465 \| command
17693 efbe746f8fa8 eliminate octave_comment_buffer singleton John W. Eaton <jwe@octave.org> parents: 17673 diff changeset	466 { $$ = parser.make_statement ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	467 \| word_list_cmd
17693 efbe746f8fa8 eliminate octave_comment_buffer singleton John W. Eaton <jwe@octave.org> parents: 17673 diff changeset	468 { $$ = parser.make_statement ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	469 ;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	470
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	471 // =================
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	472 // Word-list command
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	473 // =================
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	474
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	475 // 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	476 // 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	477 // WHILE, etc.
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	478
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	479 word_list_cmd : identifier word_list
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	480 {
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	481 $$ = parser.make_index_expression ($1, $2, '(');
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	482 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	483 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	484 // make_index_expression deleted $1 and $2.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	485 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	486 }
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	487 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	488 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	489
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	490 word_list : string
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	491 { $$ = new octave::tree_argument_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	492 \| word_list string
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	493 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	494 $1->append ($2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	495 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	496 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	497 ;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	498
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	499 // ===========
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	500 // Expressions
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	501 // ===========
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	502
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	503 identifier : NAME
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	504 {
24270 bc3819b7cca1 don't use symbol_table:: nesting for symbol_record, symbol_scope, or fcn_info John W. Eaton <jwe@octave.org> parents: 24216 diff changeset	505 octave::symbol_record sr = $1->sym_rec ();
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	506 $$ = new octave::tree_identifier (sr, $1->line (), $1->column ());
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	507 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	508 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	509
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	510 superclass_identifier
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	511 : SUPERCLASSREF
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	512 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	513 std::string method_nm = $1->superclass_method_name ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	514 std::string class_nm = $1->superclass_class_name ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	515
18927 09eb8a2ddb02 eliminate some unused parameter warnings in parser functions John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	516 $$ = parser.make_superclass_ref (method_nm, class_nm);
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	517 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	518 ;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	519
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	520 meta_identifier : METAQUERY
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	521 {
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18419 diff changeset	522 std::string class_nm = $1->text ();
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18419 diff changeset	523
18927 09eb8a2ddb02 eliminate some unused parameter warnings in parser functions John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	524 $$ = parser.make_meta_class_query (class_nm);
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	525 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	526 ;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	527
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	528 string : DQ_STRING
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	529 { $$ = parser.make_constant (DQ_STRING, $1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	530 \| SQ_STRING
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	531 { $$ = parser.make_constant (SQ_STRING, $1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	532 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	533
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	534 constant : NUM
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	535 { $$ = parser.make_constant (NUM, $1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	536 \| IMAG_NUM
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	537 { $$ = parser.make_constant (IMAG_NUM, $1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	538 \| string
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	539 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	540 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	541
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	542 matrix : '[' matrix_rows ']'
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	543 { $$ = parser.finish_matrix ($2); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	544 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	545
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	546 matrix_rows : cell_or_matrix_row
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	547 { $$ = $1 ? new octave::tree_matrix ($1) : nullptr; }
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	548 \| matrix_rows ';' cell_or_matrix_row
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	549 {
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	550 if ($1)
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	551 {
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	552 if ($3)
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	553 $1->append ($3);
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	554
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	555 $$ = $1;
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	556 }
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	557 else
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	558 $$ = $3 ? new octave::tree_matrix ($3) : nullptr;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	559 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	560 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	561
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	562 cell : '{' cell_rows '}'
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	563 { $$ = parser.finish_cell ($2); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	564 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	565
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	566 cell_rows : cell_or_matrix_row
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	567 { $$ = $1 ? new octave::tree_cell ($1) : nullptr; }
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	568 \| cell_rows ';' cell_or_matrix_row
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	569 {
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	570 if ($1)
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	571 {
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	572 if ($3)
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	573 $1->append ($3);
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	574
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	575 $$ = $1;
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	576 }
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	577 else
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	578 $$ = $3 ? new octave::tree_cell ($3) : nullptr;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	579 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	580 ;
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3347 diff changeset	581
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	582 // tree_argument_list objects can't be empty or have leading or trailing
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	583 // commas, but those are all allowed in matrix and cell array rows.
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	584
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3347 diff changeset	585 cell_or_matrix_row
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	586 : // empty
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	587 { $$ = nullptr; }
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	588 \| ','
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	589 { $$ = nullptr; }
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	590 \| arg_list
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16251 diff changeset	591 { $$ = $1; }
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	592 \| arg_list ','
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16251 diff changeset	593 { $$ = $1; }
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	594 \| ',' arg_list
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	595 { $$ = $2; }
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	596 \| ',' arg_list ','
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	597 { $$ = $2; }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	598 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	599
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	600 fcn_handle : '@' FCN_HANDLE
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	601 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	602 $$ = parser.make_fcn_handle ($2);
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	603 lexer.m_looking_at_function_handle--;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	604 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	605 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	606
23600 db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	607 anon_fcn_handle : '@' param_list stmt_begin expr_no_assign
13237 1bfca2bbea8b fix parsing of anonymous functions inside cell array lists. John W. Eaton <jwe@octave.org> parents: 13125 diff changeset	608 {
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	609 $$ = parser.make_anon_fcn_handle ($2, $4);
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	610 lexer.m_nesting_level.remove ();
13237 1bfca2bbea8b fix parsing of anonymous functions inside cell array lists. John W. Eaton <jwe@octave.org> parents: 13125 diff changeset	611 }
24283 81557c74be7f improve error message for invalid anonymous functions John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	612 \| '@' param_list stmt_begin error
81557c74be7f improve error message for invalid anonymous functions John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	613 {
81557c74be7f improve error message for invalid anonymous functions John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	614 YYUSE ($2);
81557c74be7f improve error message for invalid anonymous functions John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	615
81557c74be7f improve error message for invalid anonymous functions John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	616 $$ = nullptr;
81557c74be7f improve error message for invalid anonymous functions John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	617 parser.bison_error ("anonymous function bodies must be single expressions");
81557c74be7f improve error message for invalid anonymous functions John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	618 YYABORT;
81557c74be7f improve error message for invalid anonymous functions John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	619 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	620 ;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	621
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	622 primary_expr : identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	623 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	624 \| constant
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	625 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	626 \| fcn_handle
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	627 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	628 \| matrix
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16251 diff changeset	629 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	630 lexer.m_looking_at_matrix_or_assign_lhs = false;
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16251 diff changeset	631 $$ = $1;
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16251 diff changeset	632 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	633 \| cell
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	634 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	635 \| meta_identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	636 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	637 \| superclass_identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	638 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	639 \| '(' expression ')'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	640 { $$ = $2->mark_in_parens (); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	641 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	642
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	643 magic_colon : ':'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	644 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	645 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	646
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	647 octave_value tmp (octave_value::magic_colon_t);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	648 $$ = new octave::tree_constant (tmp);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	649 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	650 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	651
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	652 magic_tilde : EXPR_NOT
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	653 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	654 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	655
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	656 $$ = new octave::tree_black_hole ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	657 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	658 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	659
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	660 arg_list : expression
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	661 { $$ = new octave::tree_argument_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	662 \| magic_colon
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	663 { $$ = new octave::tree_argument_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	664 \| magic_tilde
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	665 { $$ = new octave::tree_argument_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	666 \| arg_list ',' magic_colon
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	667 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	668 $1->append ($3);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	669 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	670 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	671 \| arg_list ',' magic_tilde
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	672 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	673 $1->append ($3);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	674 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	675 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	676 \| arg_list ',' expression
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	677 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	678 $1->append ($3);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	679 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	680 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	681 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	682
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	683 indirect_ref_op : '.'
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	684 {
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	685 $$ = 0;
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	686 lexer.m_looking_at_indirect_ref = true;
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	687 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	688 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	689
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	690 oper_expr : primary_expr
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	691 { $$ = $1; }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	692 \| oper_expr PLUS_PLUS
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	693 { $$ = parser.make_postfix_op (PLUS_PLUS, $1, $2); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	694 \| oper_expr MINUS_MINUS
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	695 { $$ = parser.make_postfix_op (MINUS_MINUS, $1, $2); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	696 \| oper_expr '(' ')'
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	697 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	698 $$ = parser.make_index_expression ($1, nullptr, '(');
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	699 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	700 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	701 // make_index_expression deleted $1.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	702 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	703 }
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	704 }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	705 \| oper_expr '(' arg_list ')'
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	706 {
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	707 $$ = parser.make_index_expression ($1, $3, '(');
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	708 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	709 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	710 // make_index_expression deleted $1 and $3.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	711 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	712 }
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	713 }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	714 \| oper_expr '{' '}'
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	715 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	716 $$ = parser.make_index_expression ($1, nullptr, '{');
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	717 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	718 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	719 // make_index_expression deleted $1.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	720 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	721 }
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	722 }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	723 \| oper_expr '{' arg_list '}'
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	724 {
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	725 $$ = parser.make_index_expression ($1, $3, '{');
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	726 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	727 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	728 // make_index_expression deleted $1 and $3.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	729 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	730 }
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	731 }
16284 09881dab3aaf * lex.ll, oct-parse.in.yy (HERMITIAN): Rename token from QUOTE. John W. Eaton <jwe@octave.org> parents: 16279 diff changeset	732 \| oper_expr HERMITIAN
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	733 { $$ = parser.make_postfix_op (HERMITIAN, $1, $2); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	734 \| oper_expr TRANSPOSE
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	735 { $$ = parser.make_postfix_op (TRANSPOSE, $1, $2); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	736 \| oper_expr indirect_ref_op STRUCT_ELT
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	737 { $$ = parser.make_indirect_ref ($1, $3->text ()); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	738 \| oper_expr indirect_ref_op '(' expression ')'
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	739 { $$ = parser.make_indirect_ref ($1, $4); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	740 \| PLUS_PLUS oper_expr %prec UNARY
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	741 { $$ = parser.make_prefix_op (PLUS_PLUS, $2, $1); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	742 \| MINUS_MINUS oper_expr %prec UNARY
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	743 { $$ = parser.make_prefix_op (MINUS_MINUS, $2, $1); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	744 \| EXPR_NOT oper_expr %prec UNARY
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	745 { $$ = parser.make_prefix_op (EXPR_NOT, $2, $1); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	746 \| '+' oper_expr %prec UNARY
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	747 { $$ = parser.make_prefix_op ('+', $2, $1); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	748 \| '-' oper_expr %prec UNARY
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	749 { $$ = parser.make_prefix_op ('-', $2, $1); }
17622 fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	750 \| oper_expr POW power_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	751 { $$ = parser.make_binary_op (POW, $1, $2, $3); }
17622 fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	752 \| oper_expr EPOW power_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	753 { $$ = parser.make_binary_op (EPOW, $1, $2, $3); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	754 \| oper_expr '+' oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	755 { $$ = parser.make_binary_op ('+', $1, $2, $3); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	756 \| oper_expr '-' oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	757 { $$ = parser.make_binary_op ('-', $1, $2, $3); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	758 \| oper_expr '*' oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	759 { $$ = parser.make_binary_op ('*', $1, $2, $3); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	760 \| oper_expr '/' oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	761 { $$ = parser.make_binary_op ('/', $1, $2, $3); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	762 \| oper_expr EPLUS oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	763 { $$ = parser.make_binary_op ('+', $1, $2, $3); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	764 \| oper_expr EMINUS oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	765 { $$ = parser.make_binary_op ('-', $1, $2, $3); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	766 \| oper_expr EMUL oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	767 { $$ = parser.make_binary_op (EMUL, $1, $2, $3); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	768 \| oper_expr EDIV oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	769 { $$ = parser.make_binary_op (EDIV, $1, $2, $3); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	770 \| oper_expr LEFTDIV oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	771 { $$ = parser.make_binary_op (LEFTDIV, $1, $2, $3); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	772 \| oper_expr ELEFTDIV oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	773 { $$ = parser.make_binary_op (ELEFTDIV, $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	774 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	775
17622 fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	776 power_expr : primary_expr
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	777 { $$ = $1; }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	778 \| power_expr PLUS_PLUS
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	779 { $$ = parser.make_postfix_op (PLUS_PLUS, $1, $2); }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	780 \| power_expr MINUS_MINUS
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	781 { $$ = parser.make_postfix_op (MINUS_MINUS, $1, $2); }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	782 \| power_expr '(' ')'
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	783 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	784 $$ = parser.make_index_expression ($1, nullptr, '(');
17622 fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	785 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	786 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	787 // make_index_expression deleted $1.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	788 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	789 }
17622 fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	790 }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	791 \| power_expr '(' arg_list ')'
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	792 {
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	793 $$ = parser.make_index_expression ($1, $3, '(');
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	794 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	795 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	796 // make_index_expression deleted $1 and $3.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	797 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	798 }
17622 fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	799 }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	800 \| power_expr '{' '}'
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	801 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	802 $$ = parser.make_index_expression ($1, nullptr, '{');
17622 fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	803 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	804 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	805 // make_index_expression deleted $1.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	806 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	807 }
17622 fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	808 }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	809 \| power_expr '{' arg_list '}'
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	810 {
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	811 $$ = parser.make_index_expression ($1, $3, '{');
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	812 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	813 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	814 // make_index_expression deleted $1 and $3.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	815 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	816 }
17622 fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	817 }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	818 \| power_expr indirect_ref_op STRUCT_ELT
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	819 { $$ = parser.make_indirect_ref ($1, $3->text ()); }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	820 \| power_expr indirect_ref_op '(' expression ')'
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	821 { $$ = parser.make_indirect_ref ($1, $4); }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	822 \| PLUS_PLUS power_expr %prec POW
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	823 { $$ = parser.make_prefix_op (PLUS_PLUS, $2, $1); }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	824 \| MINUS_MINUS power_expr %prec POW
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	825 { $$ = parser.make_prefix_op (MINUS_MINUS, $2, $1); }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	826 \| EXPR_NOT power_expr %prec POW
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	827 { $$ = parser.make_prefix_op (EXPR_NOT, $2, $1); }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	828 \| '+' power_expr %prec POW
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	829 { $$ = parser.make_prefix_op ('+', $2, $1); }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	830 \| '-' power_expr %prec POW
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	831 { $$ = parser.make_prefix_op ('-', $2, $1); }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	832 ;
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	833
23655 bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	834 colon_expr : oper_expr ':' oper_expr
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	835 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	836 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	837
23655 bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	838 $$ = parser.make_colon_expression ($1, $3);
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	839
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	840 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	841 {
23655 bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	842 // finish_colon_expression deleted $1 and $3.
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	843 YYABORT;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	844 }
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	845 }
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	846 \| oper_expr ':' oper_expr ':' oper_expr
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	847 {
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	848 YYUSE ($2);
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	849 YYUSE ($4);
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	850
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	851 $$ = parser.make_colon_expression ($1, $5, $3);
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	852
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	853 if (! $$)
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	854 {
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	855 // finish_colon_expression deleted $1, $3, and $5.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	856 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	857 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	858 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	859 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	860
23655 bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	861 simple_expr : oper_expr
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	862 { $$ = $1; }
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	863 \| colon_expr
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	864 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	865 \| simple_expr EXPR_LT simple_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	866 { $$ = parser.make_binary_op (EXPR_LT, $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	867 \| simple_expr EXPR_LE simple_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	868 { $$ = parser.make_binary_op (EXPR_LE, $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	869 \| simple_expr EXPR_EQ simple_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	870 { $$ = parser.make_binary_op (EXPR_EQ, $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	871 \| simple_expr EXPR_GE simple_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	872 { $$ = parser.make_binary_op (EXPR_GE, $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	873 \| simple_expr EXPR_GT simple_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	874 { $$ = parser.make_binary_op (EXPR_GT, $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	875 \| simple_expr EXPR_NE simple_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	876 { $$ = parser.make_binary_op (EXPR_NE, $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	877 \| simple_expr EXPR_AND simple_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	878 { $$ = parser.make_binary_op (EXPR_AND, $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	879 \| simple_expr EXPR_OR simple_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	880 { $$ = parser.make_binary_op (EXPR_OR, $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	881 \| simple_expr EXPR_AND_AND simple_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	882 { $$ = parser.make_boolean_op (EXPR_AND_AND, $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	883 \| simple_expr EXPR_OR_OR simple_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	884 { $$ = parser.make_boolean_op (EXPR_OR_OR, $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	885 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	886
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	887 assign_lhs : simple_expr
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	888 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	889 $$ = parser.validate_matrix_for_assignment ($1);
16273 c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	890
c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	891 if ($$)
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	892 { lexer.m_looking_at_matrix_or_assign_lhs = false; }
16273 c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	893 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	894 {
16277 8cb65fd72164 eliminate obsolete concepts of "pending local" and "forced" variables John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	895 // validate_matrix_for_assignment deleted $1.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	896 YYABORT;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	897 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	898 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	899 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	900
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	901 assign_expr : assign_lhs '=' expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	902 { $$ = parser.make_assign_op ('=', $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	903 \| assign_lhs ADD_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	904 { $$ = parser.make_assign_op (ADD_EQ, $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	905 \| assign_lhs SUB_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	906 { $$ = parser.make_assign_op (SUB_EQ, $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	907 \| assign_lhs MUL_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	908 { $$ = parser.make_assign_op (MUL_EQ, $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	909 \| assign_lhs DIV_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	910 { $$ = parser.make_assign_op (DIV_EQ, $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	911 \| assign_lhs LEFTDIV_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	912 { $$ = parser.make_assign_op (LEFTDIV_EQ, $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	913 \| assign_lhs POW_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	914 { $$ = parser.make_assign_op (POW_EQ, $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	915 \| assign_lhs EMUL_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	916 { $$ = parser.make_assign_op (EMUL_EQ, $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	917 \| assign_lhs EDIV_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	918 { $$ = parser.make_assign_op (EDIV_EQ, $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	919 \| assign_lhs ELEFTDIV_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	920 { $$ = parser.make_assign_op (ELEFTDIV_EQ, $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	921 \| assign_lhs EPOW_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	922 { $$ = parser.make_assign_op (EPOW_EQ, $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	923 \| assign_lhs AND_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	924 { $$ = parser.make_assign_op (AND_EQ, $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	925 \| assign_lhs OR_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	926 { $$ = parser.make_assign_op (OR_EQ, $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	927 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	928
23600 db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	929 expr_no_assign : simple_expr
16273 c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	930 {
23576 00e518162fda maint: Deprecate is_cell and replace with iscell. Rik <rik@octave.org> parents: 23553 diff changeset	931 if ($1 && ($1->is_matrix () \|\| $1->iscell ()))
16273 c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	932 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	933 if (parser.validate_array_list ($1))
16273 c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	934 $$ = $1;
c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	935 else
c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	936 {
c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	937 delete $1;
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	938 YYABORT;
16273 c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	939 }
c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	940 }
c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	941 else
c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	942 $$ = $1;
c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	943 }
23600 db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	944 \| anon_fcn_handle
db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	945 { $$ = $1; }
db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	946 ;
db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	947
db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	948 expression : expr_no_assign
db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	949 { $$ = $1; }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	950 \| assign_expr
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	951 {
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	952 if (! $1)
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	953 YYABORT;
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	954
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	955 $$ = $1;
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	956 }
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	957
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	958 // ================================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	959 // Commands, declarations, and function definitions
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	960 // ================================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	961
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	962 command : declaration
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	963 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	964 \| select_command
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	965 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	966 \| loop_command
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	967 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	968 \| jump_command
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	969 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	970 \| except_command
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	971 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	972 \| function
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	973 { $$ = $1; }
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	974 \| file
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	975 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	976 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	977
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	978 // =====================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	979 // Declaration statemnts
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	980 // =====================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	981
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	982 declaration : GLOBAL decl1
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	983 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	984 $$ = parser.make_decl_command (GLOBAL, $1, $2);
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	985 lexer.m_looking_at_decl_list = false;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	986 }
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	987 \| PERSISTENT decl1
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	988 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	989 $$ = parser.make_decl_command (PERSISTENT, $1, $2);
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	990 lexer.m_looking_at_decl_list = false;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	991 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	992 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	993
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	994 decl1 : decl2
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	995 { $$ = new octave::tree_decl_init_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	996 \| decl1 decl2
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	997 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	998 $1->append ($2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	999 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1000 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1001 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1002
7634 ae90e05ad299 fix parameter list initializer bug John W. Eaton <jwe@octave.org> parents: 7587 diff changeset	1003 decl_param_init : // empty
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1004 {
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1005 $$ = 0;
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1006 lexer.m_looking_at_initializer_expression = true;
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1007 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1008
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1009 decl2 : identifier
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1010 { $$ = new octave::tree_decl_elt ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1011 \| identifier '=' decl_param_init expression
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1012 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1013 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1014
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1015 lexer.m_looking_at_initializer_expression = false;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1016 $$ = new octave::tree_decl_elt ($1, $4);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1017 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1018 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1019
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1020 // ====================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1021 // Selection statements
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1022 // ====================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1023
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1024 select_command : if_command
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1025 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1026 \| switch_command
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1027 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1028 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1029
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1030 // ============
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1031 // If statement
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1032 // ============
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1033
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1034 if_command : IF stash_comment if_cmd_list END
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1035 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1036 if (! ($$ = parser.finish_if_command ($1, $3, $4, $2)))
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1037 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1038 // finish_if_command deleted $3.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1039 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1040 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1041 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1042 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1043
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1044 if_cmd_list : if_cmd_list1
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1045 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1046 \| if_cmd_list1 else_clause
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1047 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1048 $1->append ($2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1049 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1050 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1051 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1052
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1053 if_cmd_list1 : expression stmt_begin opt_sep opt_list
11091 5677f3f7b5fa Matlab compatible short-circuit behavior for & and \| operators John W. Eaton <jwe@octave.org> parents: 11060 diff changeset	1054 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1055 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1056
18127 d76f790b4eec enable do_braindead_shortcircuit_evaluation by default and deprecate John W. Eaton <jwe@octave.org> parents: 17796 diff changeset	1057 $1->mark_braindead_shortcircuit ();
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1058
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1059 $$ = parser.start_if_command ($1, $4);
11091 5677f3f7b5fa Matlab compatible short-circuit behavior for & and \| operators John W. Eaton <jwe@octave.org> parents: 11060 diff changeset	1060 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1061 \| if_cmd_list1 elseif_clause
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1062 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1063 $1->append ($2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1064 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1065 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1066 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1067
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1068 elseif_clause : ELSEIF stash_comment opt_sep expression stmt_begin opt_sep opt_list
11091 5677f3f7b5fa Matlab compatible short-circuit behavior for & and \| operators John W. Eaton <jwe@octave.org> parents: 11060 diff changeset	1069 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1070 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1071 YYUSE ($6);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1072
18127 d76f790b4eec enable do_braindead_shortcircuit_evaluation by default and deprecate John W. Eaton <jwe@octave.org> parents: 17796 diff changeset	1073 $4->mark_braindead_shortcircuit ();
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1074
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1075 $$ = parser.make_elseif_clause ($1, $4, $7, $2);
11091 5677f3f7b5fa Matlab compatible short-circuit behavior for & and \| operators John W. Eaton <jwe@octave.org> parents: 11060 diff changeset	1076 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1077 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1078
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1079 else_clause : ELSE stash_comment opt_sep opt_list
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1080 {
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1081 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1082 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1083
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1084 $$ = new octave::tree_if_clause ($4, $2);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1085 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1086 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1087
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1088 // ================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1089 // Switch statement
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1090 // ================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1091
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1092 switch_command : SWITCH stash_comment expression opt_sep case_list END
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1093 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1094 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1095
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1096 if (! ($$ = parser.finish_switch_command ($1, $3, $5, $6, $2)))
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1097 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1098 // finish_switch_command deleted $3 adn $5.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1099 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1100 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1101 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1102 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1103
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1104 case_list : // empty
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1105 { $$ = new octave::tree_switch_case_list (); }
11317 2da532d0f41c accept otherwise clause in switch statement without preceding case statements John W. Eaton <jwe@octave.org> parents: 11258 diff changeset	1106 \| default_case
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1107 { $$ = new octave::tree_switch_case_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1108 \| case_list1
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1109 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1110 \| case_list1 default_case
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1111 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1112 $1->append ($2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1113 $$ = $1;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	1114 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1115 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1116
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1117 case_list1 : switch_case
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1118 { $$ = new octave::tree_switch_case_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1119 \| case_list1 switch_case
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1120 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1121 $1->append ($2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1122 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1123 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1124 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1125
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1126 switch_case : CASE stash_comment opt_sep expression stmt_begin opt_sep opt_list
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1127 {
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1128 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1129 YYUSE ($6);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1130
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1131 $$ = parser.make_switch_case ($1, $4, $7, $2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1132 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1133 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1134
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1135 default_case : OTHERWISE stash_comment opt_sep opt_list
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1136 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1137 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1138 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1139
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1140 $$ = new octave::tree_switch_case ($4, $2);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1141 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1142 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1143
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1144 // =======
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1145 // Looping
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1146 // =======
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1147
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1148 loop_command : WHILE stash_comment expression stmt_begin opt_sep opt_list END
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1149 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1150 YYUSE ($5);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1151
18127 d76f790b4eec enable do_braindead_shortcircuit_evaluation by default and deprecate John W. Eaton <jwe@octave.org> parents: 17796 diff changeset	1152 $3->mark_braindead_shortcircuit ();
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1153
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1154 if (! ($$ = parser.make_while_command ($1, $3, $6, $7, $2)))
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1155 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1156 // make_while_command deleted $3 and $6.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1157 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1158 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1159 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1160 \| DO stash_comment opt_sep opt_list UNTIL expression
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1161 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1162 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1163 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1164
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1165 $$ = parser.make_do_until_command ($5, $4, $6, $2);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1166 }
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1167 \| FOR stash_comment assign_lhs '=' expression stmt_begin opt_sep opt_list END
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1168 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1169 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1170 YYUSE ($7);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1171
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1172 if (! ($$ = parser.make_for_command (FOR, $1, $3, $5,
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1173 nullptr, $8, $9, $2)))
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1174 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1175 // make_for_command deleted $3, $5, and $8.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1176 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1177 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1178 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1179 \| FOR stash_comment '(' assign_lhs '=' expression ')' opt_sep opt_list END
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1180 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1181 YYUSE ($5);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1182 YYUSE ($8);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1183
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1184 if (! ($$ = parser.make_for_command (FOR, $1, $4, $6,
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1185 nullptr, $9, $10, $2)))
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1186 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1187 // make_for_command deleted $4, $6, and $9.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1188 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1189 }
13245 027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now John W. Eaton <jwe@octave.org> parents: 13241 diff changeset	1190 }
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1191 \| PARFOR stash_comment assign_lhs '=' expression stmt_begin opt_sep opt_list END
13245 027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now John W. Eaton <jwe@octave.org> parents: 13241 diff changeset	1192 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1193 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1194 YYUSE ($7);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1195
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1196 if (! ($$ = parser.make_for_command (PARFOR, $1, $3, $5,
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1197 nullptr, $8, $9, $2)))
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1198 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1199 // make_for_command deleted $3, $5, and $8.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1200 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1201 }
13245 027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now John W. Eaton <jwe@octave.org> parents: 13241 diff changeset	1202 }
027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now John W. Eaton <jwe@octave.org> parents: 13241 diff changeset	1203 \| PARFOR stash_comment '(' assign_lhs '=' expression ',' expression ')' opt_sep opt_list END
027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now John W. Eaton <jwe@octave.org> parents: 13241 diff changeset	1204 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1205 YYUSE ($5);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1206 YYUSE ($10);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1207
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1208 if (! ($$ = parser.make_for_command (PARFOR, $1, $4, $6,
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1209 $8, $11, $12, $2)))
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1210 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1211 // make_for_command deleted $4, $6, $8, and $11.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1212 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1213 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1214 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1215 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1216
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1217 // =======
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1218 // Jumping
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1219 // =======
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1220
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1221 jump_command : BREAK
22785 9c6661004167 error if break statement is in script file separate from loop (bug #39168) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1222 {
9c6661004167 error if break statement is in script file separate from loop (bug #39168) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1223 if (! ($$ = parser.make_break_command ($1)))
9c6661004167 error if break statement is in script file separate from loop (bug #39168) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1224 YYABORT;
9c6661004167 error if break statement is in script file separate from loop (bug #39168) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1225 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1226 \| CONTINUE
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1227 { $$ = parser.make_continue_command ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1228 \| FUNC_RET
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1229 { $$ = parser.make_return_command ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1230 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1231
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1232 // ==========
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1233 // Exceptions
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1234 // ==========
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1235
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1236 except_command : UNWIND stash_comment opt_sep opt_list CLEANUP
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1237 stash_comment opt_sep opt_list END
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1238 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1239 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1240 YYUSE ($5);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1241 YYUSE ($7);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1242
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1243 if (! ($$ = parser.make_unwind_command ($1, $4, $8, $9, $2, $6)))
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1244 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1245 // make_unwind_command deleted $4 and $8.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1246 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1247 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1248 }
17283 e6c0ac8ce5b6 eliminate parse conflicts introduced by changeset 923ce8b42db2 John W. Eaton <jwe@octave.org> parents: 17281 diff changeset	1249 \| TRY stash_comment opt_sep opt_list CATCH stash_comment
e6c0ac8ce5b6 eliminate parse conflicts introduced by changeset 923ce8b42db2 John W. Eaton <jwe@octave.org> parents: 17281 diff changeset	1250 opt_sep opt_list END
17249 923ce8b42db2 improve try-catch-statement to save exception to a variable (bug #33217) Stefan Mahr <dac922@gmx.de> parents: 17170 diff changeset	1251 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1252 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1253 YYUSE ($5);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1254 YYUSE ($7);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1255
17283 e6c0ac8ce5b6 eliminate parse conflicts introduced by changeset 923ce8b42db2 John W. Eaton <jwe@octave.org> parents: 17281 diff changeset	1256 if (! ($$ = parser.make_try_command ($1, $4, $7, $8, $9, $2, $6)))
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1257 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1258 // make_try_command deleted $4 and $8.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1259 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1260 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1261 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1262 \| TRY stash_comment opt_sep opt_list END
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1263 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1264 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1265
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1266 if (! ($$ = parser.make_try_command ($1, $4, 0, nullptr,
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1267 $5, $2, nullptr)))
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1268 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1269 // make_try_command deleted $4.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1270 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1271 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1272 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1273 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1274
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1275 // ===========================================
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14189 diff changeset	1276 // Some 'subroutines' for function definitions
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1277 // ===========================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1278
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1279 push_fcn_symtab : // empty
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1280 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1281 $$ = 0;
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1282
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1283 parser.m_curr_fcn_depth++;
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1284
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1285 if (parser.m_max_fcn_depth < parser.m_curr_fcn_depth)
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1286 parser.m_max_fcn_depth = parser.m_curr_fcn_depth;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1287
24354 11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	1288 // Will get a real name later.
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1289 lexer.m_symtab_context.push (octave::symbol_scope ("parser:push_fcn_symtab"));
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1290 parser.m_function_scopes.push (lexer.m_symtab_context.curr_scope ());
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1291
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1292 if (! lexer.m_reading_script_file
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1293 && parser.m_curr_fcn_depth == 1
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1294 && ! parser.m_parsing_subfunctions)
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1295 parser.m_primary_fcn_scope
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1296 = lexer.m_symtab_context.curr_scope ();
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1297
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1298 if (lexer.m_reading_script_file
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1299 && parser.m_curr_fcn_depth > 1)
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1300 {
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1301 parser.bison_error ("nested functions not implemented in this context");
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1302 YYABORT;
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1303 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1304 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1305 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1306
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1307 // ===========================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1308 // List of function parameters
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1309 // ===========================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1310
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1311 param_list_beg : '('
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1312 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1313 $$ = 0;
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1314 lexer.m_looking_at_parameter_list = true;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1315
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1316 if (lexer.m_looking_at_function_handle)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1317 {
24354 11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	1318 // Will get a real name later.
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1319 lexer.m_symtab_context.push (octave::symbol_scope ("parser:param_lsit_beg"));
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1320 lexer.m_looking_at_function_handle--;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1321 lexer.m_looking_at_anon_fcn_args = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1322 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1323 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1324 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1325
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1326 param_list_end : ')'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1327 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1328 $$ = 0;
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1329 lexer.m_looking_at_parameter_list = false;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1330 lexer.m_looking_for_object_index = false;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1331 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1332 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1333
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1334 opt_param_list : // empty
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1335 { $$ = nullptr; }
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1336 \| param_list
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1337 { $$ = $1; }
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1338 ;
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1339
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1340 param_list : param_list_beg param_list1 param_list_end
16360 11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1341 {
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1342 if ($2)
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1343 lexer.mark_as_variables ($2->variable_names ());
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1344
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1345 $$ = $2;
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1346 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1347 \| param_list_beg error
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1348 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1349 $$ = nullptr;
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1350 parser.bison_error ("invalid parameter list");
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1351 YYABORT;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1352 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1353 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1354
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1355 param_list1 : // empty
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1356 { $$ = nullptr; }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1357 \| param_list2
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1358 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1359 $1->mark_as_formal_parameters ();
23654 da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	1360
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	1361 if (parser.validate_param_list ($1, octave::tree_parameter_list::in))
16360 11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1362 {
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1363 lexer.mark_as_variables ($1->variable_names ());
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1364 $$ = $1;
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1365 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1366 else
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1367 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1368 delete $1;
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1369 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1370 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1371 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1372 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1373
17317 56fe31b248de disallow ~ in global and persistent declaration lists John W. Eaton <jwe@octave.org> parents: 17316 diff changeset	1374 param_list2 : param_list_elt
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1375 { $$ = new octave::tree_parameter_list ($1); }
17317 56fe31b248de disallow ~ in global and persistent declaration lists John W. Eaton <jwe@octave.org> parents: 17316 diff changeset	1376 \| param_list2 ',' param_list_elt
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1377 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1378 $1->append ($3);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1379 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1380 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1381 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1382
17317 56fe31b248de disallow ~ in global and persistent declaration lists John W. Eaton <jwe@octave.org> parents: 17316 diff changeset	1383 param_list_elt : decl2
56fe31b248de disallow ~ in global and persistent declaration lists John W. Eaton <jwe@octave.org> parents: 17316 diff changeset	1384 { $$ = $1; }
56fe31b248de disallow ~ in global and persistent declaration lists John W. Eaton <jwe@octave.org> parents: 17316 diff changeset	1385 \| magic_tilde
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1386 { $$ = new octave::tree_decl_elt ($1); }
17317 56fe31b248de disallow ~ in global and persistent declaration lists John W. Eaton <jwe@octave.org> parents: 17316 diff changeset	1387 ;
56fe31b248de disallow ~ in global and persistent declaration lists John W. Eaton <jwe@octave.org> parents: 17316 diff changeset	1388
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1389 // ===================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1390 // List of function return value names
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1391 // ===================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1392
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1393 return_list : '[' ']'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1394 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1395 lexer.m_looking_at_return_list = false;
17316 8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1396
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1397 $$ = new octave::tree_parameter_list ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1398 }
17316 8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1399 \| identifier
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1400 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1401 lexer.m_looking_at_return_list = false;
17316 8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1402
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1403 octave::tree_parameter_list *tmp = new octave::tree_parameter_list ($1);
17316 8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1404
8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1405 // Even though this parameter list can contain only
8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1406 // a single identifier, we still need to validate it
8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1407 // to check for varargin or varargout.
8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1408
23654 da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	1409 if (parser.validate_param_list (tmp, octave::tree_parameter_list::out))
17316 8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1410 $$ = tmp;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1411 else
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1412 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1413 delete tmp;
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1414 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1415 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1416 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1417 \| '[' return_list1 ']'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1418 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1419 lexer.m_looking_at_return_list = false;
17316 8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1420
8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1421 // Check for duplicate parameter names, varargin,
8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1422 // or varargout.
8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1423
23654 da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	1424 if (parser.validate_param_list ($2, octave::tree_parameter_list::out))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1425 $$ = $2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1426 else
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1427 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1428 delete $2;
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1429 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1430 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1431 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1432 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1433
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1434 return_list1 : identifier
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1435 { $$ = new octave::tree_parameter_list (new octave::tree_decl_elt ($1)); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1436 \| return_list1 ',' identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1437 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1438 $1->append (new octave::tree_decl_elt ($3));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1439 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1440 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1441 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1442
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1443 // =======================
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1444 // Script or function file
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1445 // =======================
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1446
23343 49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	1447 parsing_local_fcns
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	1448 : // empty
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1449 { parser.m_parsing_local_functions = true; }
23343 49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	1450 ;
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	1451
24037 21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1452 push_script_symtab : // empty
21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1453 {
21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1454 $$ = 0;
21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1455
24377 ea3458c1d884 improve handling of invalid symbol_scope objects (bug #52607) John W. Eaton <jwe@octave.org> parents: 24361 diff changeset	1456 // This scope may serve as the parent scope for local
ea3458c1d884 improve handling of invalid symbol_scope objects (bug #52607) John W. Eaton <jwe@octave.org> parents: 24361 diff changeset	1457 // functions in classdef files..
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1458 lexer.m_symtab_context.push (octave::symbol_scope ("parser:push_script_symtab"));
24037 21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1459 }
21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1460 ;
21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1461
21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1462 begin_file : push_script_symtab INPUT_FILE
21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1463 { $$ = 0; }
21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1464 ;
21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1465
21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1466 file : begin_file opt_nl opt_list END_OF_INPUT
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1467 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1468 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1469
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1470 if (lexer.m_reading_fcn_file)
17618 77eff9c6fb09 avoid memory leak when parsing function files (bug #40218) John W. Eaton <jwe@octave.org> parents: 17377 diff changeset	1471 {
77eff9c6fb09 avoid memory leak when parsing function files (bug #40218) John W. Eaton <jwe@octave.org> parents: 17377 diff changeset	1472 // Delete the dummy statement_list we created
77eff9c6fb09 avoid memory leak when parsing function files (bug #40218) John W. Eaton <jwe@octave.org> parents: 17377 diff changeset	1473 // after parsing the function. Any function
77eff9c6fb09 avoid memory leak when parsing function files (bug #40218) John W. Eaton <jwe@octave.org> parents: 17377 diff changeset	1474 // definitions found in the file have already
77eff9c6fb09 avoid memory leak when parsing function files (bug #40218) John W. Eaton <jwe@octave.org> parents: 17377 diff changeset	1475 // been stored in the symbol table or in
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1476 // base_parser::m_primary_fcn_ptr.
17618 77eff9c6fb09 avoid memory leak when parsing function files (bug #40218) John W. Eaton <jwe@octave.org> parents: 17377 diff changeset	1477
24037 21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1478 // Unused symbol table context.
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1479 lexer.m_symtab_context.pop ();
17618 77eff9c6fb09 avoid memory leak when parsing function files (bug #40218) John W. Eaton <jwe@octave.org> parents: 17377 diff changeset	1480
77eff9c6fb09 avoid memory leak when parsing function files (bug #40218) John W. Eaton <jwe@octave.org> parents: 17377 diff changeset	1481 delete $3;
77eff9c6fb09 avoid memory leak when parsing function files (bug #40218) John W. Eaton <jwe@octave.org> parents: 17377 diff changeset	1482 }
77eff9c6fb09 avoid memory leak when parsing function files (bug #40218) John W. Eaton <jwe@octave.org> parents: 17377 diff changeset	1483 else
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1484 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1485 octave::tree_statement *end_of_script
16627 de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16574 diff changeset	1486 = parser.make_end ("endscript", true,
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1487 lexer.m_input_line_number,
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1488 lexer.m_current_input_column);
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1489
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1490 parser.make_script ($3, end_of_script);
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1491 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1492
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1493 $$ = nullptr;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1494 }
24037 21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1495 \| begin_file opt_nl classdef parsing_local_fcns opt_sep opt_fcn_list END_OF_INPUT
16211 3449bf257514 maint: fix botched merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16205 diff changeset	1496 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1497 YYUSE ($2);
23343 49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	1498 YYUSE ($5);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1499
24037 21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1500 // Unused symbol table context.
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1501 lexer.m_symtab_context.pop ();
24037 21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1502
24067 5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	1503 parser.finish_classdef_file ($3, $6);
16211 3449bf257514 maint: fix botched merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16205 diff changeset	1504
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1505 $$ = nullptr;
16211 3449bf257514 maint: fix botched merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16205 diff changeset	1506 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1507 ;
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	1508
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1509 // ===================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1510 // Function definition
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1511 // ===================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1512
16627 de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16574 diff changeset	1513 function_beg : push_fcn_symtab FCN
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1514 {
16627 de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16574 diff changeset	1515 $$ = $2;
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1516 if (lexer.m_reading_classdef_file
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1517 \|\| lexer.m_parsing_classdef)
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1518 lexer.m_maybe_classdef_get_set_method = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1519 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1520 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1521
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1522 fcn_name : identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1523 {
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1524 std::string id = $1->name ();
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1525
24069 f8b8a8e6bd79 make local functions and method names unique for parser (Bug #52075) Piotr Held <pjheld@gmail.com> parents: 24067 diff changeset	1526 // Make classdef local functions unique from
f8b8a8e6bd79 make local functions and method names unique for parser (Bug #52075) Piotr Held <pjheld@gmail.com> parents: 24067 diff changeset	1527 // classdef methods.
f8b8a8e6bd79 make local functions and method names unique for parser (Bug #52075) Piotr Held <pjheld@gmail.com> parents: 24067 diff changeset	1528
f8b8a8e6bd79 make local functions and method names unique for parser (Bug #52075) Piotr Held <pjheld@gmail.com> parents: 24067 diff changeset	1529 if (parser.m_parsing_local_functions
f8b8a8e6bd79 make local functions and method names unique for parser (Bug #52075) Piotr Held <pjheld@gmail.com> parents: 24067 diff changeset	1530 && parser.m_curr_fcn_depth == 1)
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1531 id = lexer.m_fcn_file_name + ">" + id;
24069 f8b8a8e6bd79 make local functions and method names unique for parser (Bug #52075) Piotr Held <pjheld@gmail.com> parents: 24067 diff changeset	1532
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1533 if (! parser.m_function_scopes.name_current_scope (id))
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1534 {
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1535 parser.bison_error ("duplicate subfunction or nested function name",
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1536 $1->line (), $1->column ());
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1537
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1538 delete $1;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1539
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1540 YYABORT;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1541 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1542
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	1543 octave::symbol_scope curr_scope
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1544 = lexer.m_symtab_context.curr_scope ();
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	1545 curr_scope.cache_name (id);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1546
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1547 lexer.m_parsed_function_name.top () = true;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1548 lexer.m_maybe_classdef_get_set_method = false;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	1549
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1550 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1551 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1552 \| GET '.' identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1553 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1554 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1555
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1556 lexer.m_parsed_function_name.top () = true;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1557 lexer.m_maybe_classdef_get_set_method = false;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1558 lexer.m_parsing_classdef_get_method = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1559 $$ = $3;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1560 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1561 \| SET '.' identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1562 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1563 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1564
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1565 lexer.m_parsed_function_name.top () = true;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1566 lexer.m_maybe_classdef_get_set_method = false;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1567 lexer.m_parsing_classdef_set_method = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1568 $$ = $3;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1569 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1570 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1571
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1572 function_end : END
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1573 {
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1574 parser.m_endfunction_found = true;
21071 f25c14056b7c overhaul parser error handling for end token mismatch John W. Eaton <jwe@octave.org> parents: 21066 diff changeset	1575
23398 d4ef04757ead eliminate some compiler warnings John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	1576 if (parser.end_token_ok ($1, octave::token::function_end))
16627 de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16574 diff changeset	1577 $$ = parser.make_end ("endfunction", false,
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16574 diff changeset	1578 $1->line (), $1->column ());
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1579 else
21071 f25c14056b7c overhaul parser error handling for end token mismatch John W. Eaton <jwe@octave.org> parents: 21066 diff changeset	1580 {
23398 d4ef04757ead eliminate some compiler warnings John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	1581 parser.end_token_error ($1, octave::token::function_end);
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1582 YYABORT;
21071 f25c14056b7c overhaul parser error handling for end token mismatch John W. Eaton <jwe@octave.org> parents: 21066 diff changeset	1583 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1584 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1585 \| END_OF_INPUT
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1586 {
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	1587 // A lot of tests are based on the assumption that this is OK
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1588 // if (lexer.m_reading_script_file)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1589 // {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1590 // parser.bison_error ("function body open at end of script");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1591 // YYABORT;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1592 // }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1593
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	1594 if (parser.m_endfunction_found)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1595 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1596 parser.bison_error ("inconsistent function endings -- "
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1597 "if one function is explicitly ended, "
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1598 "so must all the others");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1599 YYABORT;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1600 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1601
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1602 if (! (lexer.m_reading_fcn_file \|\| lexer.m_reading_script_file
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1603 \|\| lexer.input_from_eval_string ()))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1604 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1605 parser.bison_error ("function body open at end of input");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1606 YYABORT;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1607 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1608
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1609 if (lexer.m_reading_classdef_file)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1610 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1611 parser.bison_error ("classdef body open at end of input");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1612 YYABORT;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1613 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1614
16627 de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16574 diff changeset	1615 $$ = parser.make_end ("endfunction", true,
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1616 lexer.m_input_line_number,
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1617 lexer.m_current_input_column);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1618 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1619 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1620
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1621 function : function_beg stash_comment fcn_name
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1622 opt_param_list opt_sep opt_list function_end
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1623 {
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1624 YYUSE ($5);
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1625
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1626 $$ = parser.make_function ($1, nullptr, $3, $4, $6, $7, $2);
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1627 }
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1628 \| function_beg stash_comment return_list '=' fcn_name
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1629 opt_param_list opt_sep opt_list function_end
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1630 {
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1631 YYUSE ($4);
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1632 YYUSE ($7);
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1633
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1634 $$ = parser.make_function ($1, $3, $5, $6, $8, $9, $2);
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1635 }
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1636 ;
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1637
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1638 // ========
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1639 // Classdef
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1640 // ========
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1641
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1642 classdef_beg : CLASSDEF
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1643 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1644 if (! lexer.m_reading_classdef_file)
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1645 {
16289 bde729ba8381 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16286 16288 diff changeset	1646 parser.bison_error ("classdef must appear inside a file containing only a class definition");
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1647 YYABORT;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1648 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1649
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1650 // Create invalid parent scope.
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1651 lexer.m_symtab_context.push (octave::symbol_scope ());
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1652 lexer.m_parsing_classdef = true;
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1653 $$ = $1;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1654 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1655 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1656
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1657 classdef : classdef_beg stash_comment opt_attr_list identifier opt_superclass_list opt_sep class_body opt_sep END
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1658 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1659 YYUSE ($6);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1660 YYUSE ($8);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1661
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1662 lexer.m_parsing_classdef = false;
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1663
16289 bde729ba8381 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16286 16288 diff changeset	1664 if (! ($$ = parser.make_classdef ($1, $3, $4, $5, $7, $9, $2)))
17656 2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1665 {
2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1666 // make_classdef deleted $3, $4, $5, and $7.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1667 YYABORT;
17656 2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1668 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1669 }
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1670 \| classdef_beg stash_comment opt_attr_list identifier opt_superclass_list opt_sep END
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1671 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1672 YYUSE ($6);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1673
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1674 lexer.m_parsing_classdef = false;
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1675
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1676 if (! ($$ = parser.make_classdef ($1, $3, $4, $5, nullptr,
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1677 $7, $2)))
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1678 {
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1679 // make_classdef deleted $3, $4, and $5.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1680 YYABORT;
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1681 }
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1682 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1683 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1684
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1685 opt_attr_list : // empty
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1686 { $$ = nullptr; }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1687 \| '(' attr_list ')'
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1688 { $$ = $2; }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1689 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1690
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1691 attr_list : attr
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1692 { $$ = new octave::tree_classdef_attribute_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1693 \| attr_list ',' attr
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1694 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1695 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1696 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1697 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1698 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1699
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1700 attr : identifier
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1701 { $$ = new octave::tree_classdef_attribute ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1702 \| identifier '=' decl_param_init expression
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1703 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1704 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1705
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1706 lexer.m_looking_at_initializer_expression = false;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1707 $$ = new octave::tree_classdef_attribute ($1, $4);
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1708 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1709 \| EXPR_NOT identifier
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1710 {
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1711 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1712
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1713 $$ = new octave::tree_classdef_attribute ($2, false);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1714 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1715 ;
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1716
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1717 opt_superclass_list
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1718 : // empty
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1719 { $$ = nullptr; }
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1720 \| superclass_list
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1721 { $$ = $1; }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1722 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1723
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18419 diff changeset	1724 superclass_list : EXPR_LT
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1725 {
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1726 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1727
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1728 lexer.enable_fq_identifier ();
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1729 }
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18419 diff changeset	1730 superclass
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1731 { $$ = new octave::tree_classdef_superclass_list ($3); }
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18419 diff changeset	1732 \| superclass_list EXPR_AND
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1733 {
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1734 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1735
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1736 lexer.enable_fq_identifier ();
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1737 }
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18419 diff changeset	1738 superclass
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1739 {
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18419 diff changeset	1740 $1->append ($4);
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1741 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1742 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1743 ;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1744
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18419 diff changeset	1745 superclass : FQ_IDENT
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1746 { $$ = new octave::tree_classdef_superclass ($1->text ()); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1747 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1748
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1749 class_body : properties_block
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1750 { $$ = new octave::tree_classdef_body ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1751 \| methods_block
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1752 { $$ = new octave::tree_classdef_body ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1753 \| events_block
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1754 { $$ = new octave::tree_classdef_body ($1); }
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1755 \| enum_block
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1756 { $$ = new octave::tree_classdef_body ($1); }
13250 f6bbdea030b2 use opt_sep instead of literal '\n' in parser rules for classdef John W. Eaton <jwe@octave.org> parents: 13249 diff changeset	1757 \| class_body opt_sep properties_block
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1758 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1759 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1760
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1761 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1762 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1763 }
13250 f6bbdea030b2 use opt_sep instead of literal '\n' in parser rules for classdef John W. Eaton <jwe@octave.org> parents: 13249 diff changeset	1764 \| class_body opt_sep methods_block
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1765 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1766 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1767
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1768 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1769 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1770 }
13250 f6bbdea030b2 use opt_sep instead of literal '\n' in parser rules for classdef John W. Eaton <jwe@octave.org> parents: 13249 diff changeset	1771 \| class_body opt_sep events_block
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1772 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1773 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1774
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1775 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1776 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1777 }
13250 f6bbdea030b2 use opt_sep instead of literal '\n' in parser rules for classdef John W. Eaton <jwe@octave.org> parents: 13249 diff changeset	1778 \| class_body opt_sep enum_block
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1779 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1780 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1781
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1782 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1783 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1784 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1785 ;
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1786
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1787 properties_block
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1788 : PROPERTIES stash_comment opt_attr_list opt_sep property_list opt_sep END
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1789 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1790 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1791 YYUSE ($6);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1792
16289 bde729ba8381 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16286 16288 diff changeset	1793 if (! ($$ = parser.make_classdef_properties_block
17656 2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1794 ($1, $3, $5, $7, $2)))
2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1795 {
2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1796 // make_classdef_properties_block delete $3 and $5.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1797 YYABORT;
17656 2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1798 }
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1799 }
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1800 \| PROPERTIES stash_comment opt_attr_list opt_sep END
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1801 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1802 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1803
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1804 if (! ($$ = parser.make_classdef_properties_block
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1805 ($1, $3, nullptr, $5, $2)))
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1806 {
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1807 // make_classdef_properties_block delete $3.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1808 YYABORT;
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1809 }
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1810 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1811 ;
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1812
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1813 property_list
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1814 : class_property
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1815 { $$ = new octave::tree_classdef_property_list ($1); }
22879 194481349d22 don't require semicolon between property list elements (bug #49819) John W. Eaton <jwe@octave.org> parents: 22712 diff changeset	1816 \| property_list sep class_property
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1817 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1818 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1819
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1820 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1821 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1822 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1823 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1824
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1825 class_property : identifier
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1826 { $$ = new octave::tree_classdef_property ($1); }
22879 194481349d22 don't require semicolon between property list elements (bug #49819) John W. Eaton <jwe@octave.org> parents: 22712 diff changeset	1827 \| identifier '=' decl_param_init expression
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1828 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1829 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1830
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1831 lexer.m_looking_at_initializer_expression = false;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1832 $$ = new octave::tree_classdef_property ($1, $4);
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1833 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1834 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1835
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1836 methods_block : METHODS stash_comment opt_attr_list opt_sep methods_list opt_sep END
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1837 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1838 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1839 YYUSE ($6);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1840
16289 bde729ba8381 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16286 16288 diff changeset	1841 if (! ($$ = parser.make_classdef_methods_block
17656 2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1842 ($1, $3, $5, $7, $2)))
2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1843 {
2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1844 // make_classdef_methods_block deleted $3 and $5.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1845 YYABORT;
17656 2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1846 }
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1847 }
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1848 \| METHODS stash_comment opt_attr_list opt_sep END
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1849 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1850 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1851
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1852 if (! ($$ = parser.make_classdef_methods_block
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1853 ($1, $3, nullptr, $5, $2)))
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1854 {
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1855 // make_classdef_methods_block deleted $3.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1856 YYABORT;
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1857 }
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1858 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1859 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1860 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1861
18262 69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	1862 method_decl1 : identifier
18308 c1baf94184af * oct-parse.in.yy: Suppress TAB characters. Michael Goffioul <michael.goffioul@gmail.com> parents: 18304 diff changeset	1863 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1864 if (! ($$ = parser.start_classdef_external_method ($1, nullptr)))
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1865 YYABORT;
18262 69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	1866 }
18308 c1baf94184af * oct-parse.in.yy: Suppress TAB characters. Michael Goffioul <michael.goffioul@gmail.com> parents: 18304 diff changeset	1867 \| identifier param_list
18341 02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	1868 {
02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	1869 if (! ($$ = parser.start_classdef_external_method ($1, $2)))
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1870 YYABORT;
18262 69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	1871 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1872 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1873
18262 69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	1874 method_decl : stash_comment method_decl1
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1875 { $$ = parser.finish_classdef_external_method ($2, nullptr, $1); }
18341 02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	1876 \| stash_comment return_list '='
02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	1877 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1878 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1879
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1880 lexer.m_defining_func++;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1881 lexer.m_parsed_function_name.push (false);
18341 02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	1882 }
02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	1883 method_decl1
02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	1884 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1885 lexer.m_defining_func--;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1886 lexer.m_parsed_function_name.pop ();
18341 02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	1887 $$ = parser.finish_classdef_external_method ($5, $2, $1);
02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	1888 }
18262 69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	1889 ;
69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	1890
69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	1891 method : method_decl
18308 c1baf94184af * oct-parse.in.yy: Suppress TAB characters. Michael Goffioul <michael.goffioul@gmail.com> parents: 18304 diff changeset	1892 { $$ = $1; }
c1baf94184af * oct-parse.in.yy: Suppress TAB characters. Michael Goffioul <michael.goffioul@gmail.com> parents: 18304 diff changeset	1893 \| function
18262 69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	1894 { $$ = $1; }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1895 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1896
18262 69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	1897 methods_list : method
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1898 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1899 octave_value fcn;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1900 if ($1)
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1901 fcn = $1->function ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1902 delete $1;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1903 $$ = new octave::tree_classdef_methods_list (fcn);
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1904 }
18262 69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	1905 \| methods_list opt_sep method
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1906 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1907 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1908
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1909 octave_value fcn;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1910 if ($3)
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1911 fcn = $3->function ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1912 delete $3;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1913
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1914 $1->append (fcn);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1915 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1916 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1917 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1918
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1919 events_block : EVENTS stash_comment opt_attr_list opt_sep events_list opt_sep END
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1920 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1921 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1922 YYUSE ($6);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1923
16289 bde729ba8381 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16286 16288 diff changeset	1924 if (! ($$ = parser.make_classdef_events_block
17656 2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1925 ($1, $3, $5, $7, $2)))
2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1926 {
2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1927 // make_classdef_events_block deleted $3 and $5.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1928 YYABORT;
17656 2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1929 }
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1930 }
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1931 \| EVENTS stash_comment opt_attr_list opt_sep END
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1932 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1933 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1934
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1935 if (! ($$ = parser.make_classdef_events_block
23798 771310737137 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23796 diff changeset	1936 ($1, $3, nullptr, $5, $2)))
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1937 {
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1938 // make_classdef_events_block deleted $3.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1939 YYABORT;
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1940 }
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1941 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1942 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1943
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1944 events_list : class_event
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1945 { $$ = new octave::tree_classdef_events_list ($1); }
13250 f6bbdea030b2 use opt_sep instead of literal '\n' in parser rules for classdef John W. Eaton <jwe@octave.org> parents: 13249 diff changeset	1946 \| events_list opt_sep class_event
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1947 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1948 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1949
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1950 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1951 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1952 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1953 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1954
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1955 class_event : identifier
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1956 { $$ = new octave::tree_classdef_event ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1957 ;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	1958
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1959 enum_block : ENUMERATION stash_comment opt_attr_list opt_sep enum_list opt_sep END
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1960 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1961 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1962 YYUSE ($6);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1963
16289 bde729ba8381 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16286 16288 diff changeset	1964 if (! ($$ = parser.make_classdef_enum_block
17656 2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1965 ($1, $3, $5, $7, $2)))
2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1966 {
2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1967 // make_classdef_enum_block deleted $3 and $5.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1968 YYABORT;
17656 2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1969 }
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1970 }
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1971 \| ENUMERATION stash_comment opt_attr_list opt_sep END
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1972 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1973 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1974
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1975 if (! ($$ = parser.make_classdef_enum_block
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1976 ($1, $3, nullptr, $5, $2)))
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1977 {
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1978 // make_classdef_enum_block deleted $3.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1979 YYABORT;
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1980 }
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1981 }
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1982 ;
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1983
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1984 enum_list : class_enum
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1985 { $$ = new octave::tree_classdef_enum_list ($1); }
13250 f6bbdea030b2 use opt_sep instead of literal '\n' in parser rules for classdef John W. Eaton <jwe@octave.org> parents: 13249 diff changeset	1986 \| enum_list opt_sep class_enum
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1987 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1988 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1989
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1990 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1991 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1992 }
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1993 ;
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1994
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1995 class_enum : identifier '(' expression ')'
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1996 { $$ = new octave::tree_classdef_enum ($1, $3); }
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1997 ;
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1998
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1999 // =============
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	2000 // Miscellaneous
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	2001 // =============
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	2002
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	2003 stmt_begin : // empty
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2004 {
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2005 $$ = 0;
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2006 lexer.m_at_beginning_of_statement = true;
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2007 }
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	2008 ;
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	2009
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2010 stash_comment : // empty
17693 efbe746f8fa8 eliminate octave_comment_buffer singleton John W. Eaton <jwe@octave.org> parents: 17673 diff changeset	2011 { $$ = lexer.get_comment (); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2012 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2013
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2014 parse_error : LEXICAL_ERROR
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2015 {
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2016 $$ = 0;
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21063 diff changeset	2017 std::string msg = $1->text ();
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21063 diff changeset	2018 parser.bison_error (msg.c_str ());
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2019 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2020 \| error
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2021 { $$ = 0; }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2022 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2023
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2024 sep_no_nl : ','
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2025 { $$ = ','; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2026 \| ';'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2027 { $$ = ';'; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2028 \| sep_no_nl ','
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2029 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2030 \| sep_no_nl ';'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2031 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2032 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2033
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2034 opt_sep_no_nl : // empty
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2035 { $$ = 0; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2036 \| sep_no_nl
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2037 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2038 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2039
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2040 opt_nl : // empty
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2041 { $$ = 0; }
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2042 \| nl
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2043 { $$ = $1; }
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2044 ;
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2045
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2046 nl : '\n'
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2047 { $$ = '\n'; }
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2048 \| nl '\n'
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2049 { $$ = $1; }
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2050 ;
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2051
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2052 sep : ','
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2053 { $$ = ','; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2054 \| ';'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2055 { $$ = ';'; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2056 \| '\n'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2057 { $$ = '\n'; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2058 \| sep ','
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2059 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2060 \| sep ';'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2061 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2062 \| sep '\n'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2063 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2064 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2065
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2066 opt_sep : // empty
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2067 { $$ = 0; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2068 \| sep
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2069 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2070 ;
2525 8561d88be5f2 [project @ 1996-11-17 21:23:31 by jwe] jwe parents: 2524 diff changeset	2071
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2072 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2073
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 21021 diff changeset	2074 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
24444 53ca76c5cc8d maint: Indent pragmas as other preprocessor directives. John W. Eaton <jwe@octave.org> parents: 24377 diff changeset	2075 // Restore prevailing warning state for remainder of the file.
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives. John W. Eaton <jwe@octave.org> parents: 24377 diff changeset	2076 # pragma GCC diagnostic pop
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 21021 diff changeset	2077 #endif
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 21021 diff changeset	2078
666 fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	2079 // Generic error messages.
fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	2080
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	2081 #undef lexer
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2082 #undef scanner
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	2083
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2084 static void
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2085 yyerror (octave::base_parser& parser, const char *s)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2086 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	2087 parser.bison_error (s);
16142 26d65d677557 rename yyerror to bison_error and make it a member of octave_parser class John W. Eaton <jwe@octave.org> parents: 16139 diff changeset	2088 }
26d65d677557 rename yyerror to bison_error and make it a member of octave_parser class John W. Eaton <jwe@octave.org> parents: 16139 diff changeset	2089
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2090 namespace octave
16157 335041cc657a optionally use push parser interface John W. Eaton <jwe@octave.org> parents: 16153 diff changeset	2091 {
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2092 size_t
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2093 base_parser::parent_scope_info::size (void) const
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2094 {
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2095 return m_info.size ();
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2096 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2097
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2098 void
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2099 base_parser::parent_scope_info::push (const value_type& elt)
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2100 {
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2101 m_info.push_back (elt);
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2102 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2103
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2104 void
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	2105 base_parser::parent_scope_info::push (const symbol_scope& scope)
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2106 {
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	2107 push (value_type (scope, ""));
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2108 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2109
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2110 void
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2111 base_parser::parent_scope_info::pop (void)
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2112 {
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2113 m_info.pop_back ();
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2114 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2115
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2116 bool
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2117 base_parser::parent_scope_info::name_ok (const std::string& name)
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2118 {
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2119 // Name can't be the same as any parent function or any other
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2120 // function we've already seen. We could maintain a complex
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2121 // tree structure of names, or we can just store the set of
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2122 // full names of all the functions, which must be unique.
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2123
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2124 std::string full_name;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2125
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2126 for (size_t i = 0; i < size()-1; i++)
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2127 {
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2128 const value_type& elt = m_info[i];
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2129
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2130 if (name == elt.second)
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2131 return false;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2132
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2133 full_name += elt.second + ">";
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2134 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2135
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2136 full_name += name;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2137
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2138 if (m_all_names.find (full_name) != m_all_names.end ())
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2139 return false;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2140
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2141 m_all_names.insert (full_name);
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2142
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2143 return true;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2144 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2145
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2146 bool
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2147 base_parser::parent_scope_info::name_current_scope (const std::string& name)
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2148 {
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2149 if (! name_ok (name))
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2150 return false;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2151
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2152 if (size () > 0)
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2153 m_info.back().second = name;
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2154
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2155 return true;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2156 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2157
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	2158 symbol_scope
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2159 base_parser::parent_scope_info::parent_scope (void) const
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2160 {
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	2161 return size () > 1 ? m_info[size()-2].first : symbol_scope ();
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2162 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2163
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2164 std::string
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2165 base_parser::parent_scope_info::parent_name (void) const
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2166 {
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2167 return m_info[size()-2].second;
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2168 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2169
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2170 void base_parser::parent_scope_info::clear (void)
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2171 {
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2172 m_info.clear ();
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2173 m_all_names.clear ();
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2174 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2175
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2176 base_parser::base_parser (base_lexer& lxr)
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2177 : m_endfunction_found (false), m_autoloading (false),
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2178 m_fcn_file_from_relative_lookup (false),
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2179 m_parsing_subfunctions (false), m_parsing_local_functions (false),
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	2180 m_max_fcn_depth (0), m_curr_fcn_depth (0), m_primary_fcn_scope (),
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2181 m_curr_class_name (), m_curr_package_name (), m_function_scopes (),
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	2182 m_primary_fcn_ptr (nullptr), m_subfunction_names (),
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	2183 m_classdef_object (nullptr), m_stmt_list (nullptr), m_lexer (lxr),
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	2184 m_parser_state (yypstate_new ())
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2185 { }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2186
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2187 base_parser::~base_parser (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2188 {
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2189 delete m_stmt_list;
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2190
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2191 delete &m_lexer;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2192
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2193 // FIXME: Deleting the internal Bison parser state structure does
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2194 // not clean up any partial parse trees in the event of an interrupt or
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2195 // error. It's not clear how to safely do that with the C language
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2196 // parser that Bison generates. The C++ language parser that Bison
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2197 // generates would do it for us automatically whenever an exception
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2198 // is thrown while parsing input, but there is currently no C++
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2199 // interface for a push parser.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2200
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2201 yypstate_delete (static_cast<yypstate *> (m_parser_state));
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2202 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2203
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2204 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2205 base_parser::reset (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2206 {
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2207 m_endfunction_found = false;
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2208 m_autoloading = false;
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2209 m_fcn_file_from_relative_lookup = false;
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2210 m_parsing_subfunctions = false;
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2211 m_parsing_local_functions = false;
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2212 m_max_fcn_depth = 0;
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2213 m_curr_fcn_depth = 0;
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	2214 m_primary_fcn_scope = symbol_scope ();
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2215 m_curr_class_name = "";
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2216 m_curr_package_name = "";
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2217 m_function_scopes.clear ();
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	2218 m_primary_fcn_ptr = nullptr;
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2219 m_subfunction_names.clear ();
23806 6925c8d2cd87 oct-parse.in.yy: Initialize m_classdef_object to nullptr when parser is reset. Rik <rik@octave.org> parents: 23798 diff changeset	2220 m_classdef_object = nullptr;
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2221
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2222 delete m_stmt_list;
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	2223 m_stmt_list = nullptr;
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2224
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2225 m_lexer.reset ();
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2226
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2227 yypstate_delete (static_cast<yypstate *> (m_parser_state));
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2228 m_parser_state = yypstate_new ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2229 }
25442 47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2230
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2231 // Error mesages for mismatched end tokens.
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2232
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2233 static std::string
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2234 end_token_as_string (token::end_tok_type ettype)
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2235 {
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2236 std::string retval = "<unknown>";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2237
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2238 switch (ettype)
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2239 {
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2240 case token::simple_end:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2241 retval = "end";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2242 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2243
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2244 case token::classdef_end:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2245 retval = "endclassdef";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2246 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2247
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2248 case token::enumeration_end:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2249 retval = "endenumeration";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2250 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2251
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2252 case token::events_end:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2253 retval = "endevents";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2254 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2255
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2256 case token::for_end:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2257 retval = "endfor";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2258 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2259
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2260 case token::function_end:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2261 retval = "endfunction";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2262 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2263
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2264 case token::if_end:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2265 retval = "endif";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2266 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2267
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2268 case token::methods_end:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2269 retval = "endmethods";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2270 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2271
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2272 case token::parfor_end:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2273 retval = "endparfor";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2274 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2275
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2276 case token::properties_end:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2277 retval = "endproperties";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2278 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2279
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2280 case token::switch_end:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2281 retval = "endswitch";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2282 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2283
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2284 case token::try_catch_end:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2285 retval = "end_try_catch";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2286 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2287
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2288 case token::unwind_protect_end:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2289 retval = "end_unwind_protect";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2290 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2291
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2292 case token::while_end:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2293 retval = "endwhile";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2294 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2295
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2296 default:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2297 panic_impossible ();
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2298 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2299 }
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2300
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2301 return retval;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2302 }
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2303
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2304 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2305 base_parser::end_token_error (token *tok, token::end_tok_type expected)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2306 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2307 std::string msg = ("'" + end_token_as_string (expected)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2308 + "' command matched by '"
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2309 + end_token_as_string (tok->ettype ()) + "'");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2310
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2311 bison_error (msg, tok->line (), tok->column ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2312 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2313
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2314 // Check to see that end tokens are properly matched.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2315
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2316 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2317 base_parser::end_token_ok (token *tok, token::end_tok_type expected)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2318 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2319 token::end_tok_type ettype = tok->ettype ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2320
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2321 return ettype == expected \|\| ettype == token::simple_end;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2322 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2323
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2324 // Maybe print a warning if an assignment expression is used as the
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2325 // test in a logical expression.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2326
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2327 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2328 base_parser::maybe_warn_assign_as_truth_value (tree_expression *expr)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2329 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2330 if (expr->is_assignment_expression ()
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2331 && expr->paren_count () < 2)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2332 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2333 if (m_lexer.m_fcn_file_full_name.empty ())
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2334 warning_with_id
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2335 ("Octave:assign-as-truth-value",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2336 "suggest parenthesis around assignment used as truth value");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2337 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2338 warning_with_id
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2339 ("Octave:assign-as-truth-value",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2340 "suggest parenthesis around assignment used as truth value near line %d, column %d in file '%s'",
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2341 expr->line (), expr->column (), m_lexer.m_fcn_file_full_name.c_str ());
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2342 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2343 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2344
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2345 // Maybe print a warning about switch labels that aren't constants.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2346
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2347 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2348 base_parser::maybe_warn_variable_switch_label (tree_expression *expr)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2349 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2350 if (! expr->is_constant ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2351 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2352 if (m_lexer.m_fcn_file_full_name.empty ())
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2353 warning_with_id ("Octave:variable-switch-label",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2354 "variable switch label");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2355 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2356 warning_with_id
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2357 ("Octave:variable-switch-label",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2358 "variable switch label near line %d, column %d in file '%s'",
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2359 expr->line (), expr->column (), m_lexer.m_fcn_file_full_name.c_str ());
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2360 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2361 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2362
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2363 // Make a constant.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2364
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2365 tree_constant *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2366 base_parser::make_constant (int op, token *tok_val)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2367 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2368 int l = tok_val->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2369 int c = tok_val->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2370
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	2371 tree_constant *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2372
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2373 switch (op)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2374 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2375 case NUM:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2376 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2377 octave_value tmp (tok_val->number ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2378 retval = new tree_constant (tmp, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2379 retval->stash_original_text (tok_val->text_rep ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2380 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2381 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2382
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2383 case IMAG_NUM:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2384 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2385 octave_value tmp (Complex (0.0, tok_val->number ()));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2386 retval = new tree_constant (tmp, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2387 retval->stash_original_text (tok_val->text_rep ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2388 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2389 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2390
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2391 case DQ_STRING:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2392 case SQ_STRING:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2393 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2394 std::string txt = tok_val->text ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2395
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2396 char delim = op == DQ_STRING ? '"' : '\'';
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2397 octave_value tmp (txt, delim);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2398
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2399 if (txt.empty ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2400 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2401 if (op == DQ_STRING)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2402 tmp = octave_null_str::instance;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2403 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2404 tmp = octave_null_sq_str::instance;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2405 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2406
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2407 retval = new tree_constant (tmp, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2408
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2409 if (op == DQ_STRING)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2410 txt = undo_string_escapes (txt);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2411
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2412 // FIXME: maybe this should also be handled by
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2413 // tok_val->text_rep () for character strings?
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2414 retval->stash_original_text (delim + txt + delim);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2415 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2416 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2417
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2418 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2419 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2420 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2421 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2422
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2423 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2424 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2425
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2426 // Make a function handle.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2427
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2428 tree_fcn_handle *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2429 base_parser::make_fcn_handle (token *tok_val)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2430 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2431 int l = tok_val->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2432 int c = tok_val->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2433
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2434 tree_fcn_handle *retval = new tree_fcn_handle (tok_val->text (), l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2435
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2436 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2437 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2438
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2439 // Make an anonymous function handle.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2440
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2441 tree_anon_fcn_handle *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2442 base_parser::make_anon_fcn_handle (tree_parameter_list *param_list,
23600 db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2443 tree_expression *expr)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2444 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2445 // FIXME: need to get these from the location of the @ symbol.
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2446 int l = m_lexer.m_input_line_number;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2447 int c = m_lexer.m_current_input_column;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2448
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2449 symbol_scope fcn_scope = m_lexer.m_symtab_context.curr_scope ();
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2450 symbol_scope parent_scope = m_lexer.m_symtab_context.parent_scope ();
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2451
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2452 m_lexer.m_symtab_context.pop ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2453
23600 db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2454 expr->set_print_flag (false);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2455
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	2456 fcn_scope.mark_static ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2457
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2458 tree_anon_fcn_handle *retval
23600 db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2459 = new tree_anon_fcn_handle (param_list, expr, fcn_scope,
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	2460 parent_scope, l, c);
23600 db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2461
24354 11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	2462 std::ostringstream buf;
11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	2463
11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	2464 tree_print_code tpc (buf);
11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	2465
11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	2466 retval->accept (tpc);
11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	2467
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2468 std::string file = m_lexer.m_fcn_file_full_name;
24354 11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	2469 if (! file.empty ())
11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	2470 buf << ": file: " << file;
11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	2471 else if (m_lexer.input_from_terminal ())
11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	2472 buf << ": terminal input";
11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	2473 else if (m_lexer.input_from_eval_string ())
11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	2474 buf << ": eval string";
11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	2475 buf << ": line: " << l << " column: " << c;
11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	2476
11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	2477 std::string scope_name = buf.str ();
11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	2478
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	2479 fcn_scope.cache_name (scope_name);
24354 11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	2480
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2481 // FIXME: Stash the filename. This does not work and produces
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2482 // errors when executed.
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2483 //retval->stash_file_name (m_lexer.m_fcn_file_name);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2484
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2485 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2486 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2487
23655 bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2488 // Build a colon expression.
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2489
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2490 tree_expression *
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2491 base_parser::make_colon_expression (tree_expression *base,
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2492 tree_expression *limit,
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2493 tree_expression *incr)
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2494 {
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2495 tree_expression *retval = nullptr;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2496
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	2497 unwind_protect frame;
23655 bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2498
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2499 frame.protect_var (discard_error_messages);
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2500 frame.protect_var (discard_warning_messages);
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2501
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2502 discard_error_messages = true;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2503 discard_warning_messages = true;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2504
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2505 if (! base \|\| ! limit)
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2506 {
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2507 delete base;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2508 delete limit;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2509 delete incr;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2510
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2511 return retval;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2512 }
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2513
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2514 int l = base->line ();
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2515 int c = base->column ();
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2516
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2517 tree_colon_expression *e
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2518 = new tree_colon_expression (base, limit, incr, l, c);
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2519
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2520 if (base->is_constant () && limit->is_constant ()
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2521 && (! incr \|\| (incr && incr->is_constant ())))
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2522 {
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2523 try
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2524 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	2525 tree_evaluator& tw
23655 bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2526 = __get_evaluator__ ("finish_colon_expression");
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2527
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2528 octave_value tmp = tw.evaluate (e);
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2529
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2530 tree_constant *tc_retval
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2531 = new tree_constant (tmp, e->line (), e->column ());
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2532
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2533 std::ostringstream buf;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2534
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2535 tree_print_code tpc (buf);
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2536
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2537 e->accept (tpc);
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2538
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2539 tc_retval->stash_original_text (buf.str ());
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2540
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2541 delete e;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2542
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2543 retval = tc_retval;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2544 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	2545 catch (const execution_exception&)
23655 bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2546 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	2547 interpreter::recover_from_exception ();
23655 bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2548 }
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2549 }
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2550 else
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	2551 retval = e;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2552
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2553 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2554 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2555
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2556 // Build a binary expression.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2557
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2558 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2559 base_parser::make_binary_op (int op, tree_expression *op1,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2560 token tok_val, tree_expression op2)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2561 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2562 octave_value::binary_op t = octave_value::unknown_binary_op;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2563
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2564 switch (op)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2565 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2566 case POW:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2567 t = octave_value::op_pow;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2568 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2569
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2570 case EPOW:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2571 t = octave_value::op_el_pow;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2572 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2573
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2574 case '+':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2575 t = octave_value::op_add;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2576 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2577
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2578 case '-':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2579 t = octave_value::op_sub;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2580 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2581
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2582 case '*':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2583 t = octave_value::op_mul;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2584 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2585
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2586 case '/':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2587 t = octave_value::op_div;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2588 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2589
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2590 case EMUL:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2591 t = octave_value::op_el_mul;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2592 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2593
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2594 case EDIV:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2595 t = octave_value::op_el_div;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2596 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2597
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2598 case LEFTDIV:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2599 t = octave_value::op_ldiv;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2600 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2601
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2602 case ELEFTDIV:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2603 t = octave_value::op_el_ldiv;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2604 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2605
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2606 case EXPR_LT:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2607 t = octave_value::op_lt;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2608 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2609
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2610 case EXPR_LE:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2611 t = octave_value::op_le;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2612 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2613
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2614 case EXPR_EQ:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2615 t = octave_value::op_eq;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2616 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2617
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2618 case EXPR_GE:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2619 t = octave_value::op_ge;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2620 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2621
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2622 case EXPR_GT:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2623 t = octave_value::op_gt;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2624 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2625
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2626 case EXPR_NE:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2627 t = octave_value::op_ne;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2628 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2629
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2630 case EXPR_AND:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2631 t = octave_value::op_el_and;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2632 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2633
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2634 case EXPR_OR:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2635 t = octave_value::op_el_or;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2636 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2637
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2638 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2639 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2640 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2641 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2642
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2643 int l = tok_val->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2644 int c = tok_val->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2645
25829 8ac4bfa55053 restore optimization for compound transpose-mul/div ops (bug #45890) John W. Eaton <jwe@octave.org> parents: 25753 diff changeset	2646 return maybe_compound_binary_expression (op1, op2, l, c, t);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2647 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2648
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2649 // Build a boolean expression.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2650
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2651 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2652 base_parser::make_boolean_op (int op, tree_expression *op1,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2653 token tok_val, tree_expression op2)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2654 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2655 tree_boolean_expression::type t;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2656
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2657 switch (op)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2658 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2659 case EXPR_AND_AND:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2660 t = tree_boolean_expression::bool_and;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2661 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2662
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2663 case EXPR_OR_OR:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2664 t = tree_boolean_expression::bool_or;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2665 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2666
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2667 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2668 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2669 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2670 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2671
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2672 int l = tok_val->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2673 int c = tok_val->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2674
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2675 return new tree_boolean_expression (op1, op2, l, c, t);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2676 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2677
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2678 // Build a prefix expression.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2679
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2680 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2681 base_parser::make_prefix_op (int op, tree_expression op1, token tok_val)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2682 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2683 octave_value::unary_op t = octave_value::unknown_unary_op;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2684
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2685 switch (op)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2686 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2687 case EXPR_NOT:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2688 t = octave_value::op_not;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2689 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2690
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2691 case '+':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2692 t = octave_value::op_uplus;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2693 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2694
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2695 case '-':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2696 t = octave_value::op_uminus;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2697 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2698
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2699 case PLUS_PLUS:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2700 t = octave_value::op_incr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2701 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2702
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2703 case MINUS_MINUS:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2704 t = octave_value::op_decr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2705 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2706
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2707 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2708 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2709 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2710 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2711
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2712 int l = tok_val->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2713 int c = tok_val->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2714
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2715 return new tree_prefix_expression (op1, l, c, t);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2716 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2717
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2718 // Build a postfix expression.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2719
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2720 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2721 base_parser::make_postfix_op (int op, tree_expression op1, token tok_val)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2722 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2723 octave_value::unary_op t = octave_value::unknown_unary_op;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2724
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2725 switch (op)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2726 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2727 case HERMITIAN:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2728 t = octave_value::op_hermitian;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2729 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2730
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2731 case TRANSPOSE:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2732 t = octave_value::op_transpose;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2733 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2734
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2735 case PLUS_PLUS:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2736 t = octave_value::op_incr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2737 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2738
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2739 case MINUS_MINUS:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2740 t = octave_value::op_decr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2741 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2742
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2743 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2744 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2745 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2746 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2747
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2748 int l = tok_val->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2749 int c = tok_val->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2750
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2751 return new tree_postfix_expression (op1, l, c, t);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2752 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2753
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2754 // Build an unwind-protect command.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2755
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2756 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2757 base_parser::make_unwind_command (token *unwind_tok,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2758 tree_statement_list *body,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2759 tree_statement_list *cleanup_stmts,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2760 token *end_tok,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	2761 comment_list *lc,
ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	2762 comment_list *mc)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2763 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	2764 tree_command *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2765
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2766 if (end_token_ok (end_tok, token::unwind_protect_end))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2767 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2768 comment_list *tc = m_lexer.m_comment_buf.get_comment ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2769
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2770 int l = unwind_tok->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2771 int c = unwind_tok->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2772
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2773 retval = new tree_unwind_protect_command (body, cleanup_stmts,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2774 lc, mc, tc, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2775 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2776 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2777 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2778 delete body;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2779 delete cleanup_stmts;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2780
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2781 end_token_error (end_tok, token::unwind_protect_end);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2782 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2783
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2784 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2785 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2786
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2787 // Build a try-catch command.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2788
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2789 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2790 base_parser::make_try_command (token *try_tok,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2791 tree_statement_list *body,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2792 char catch_sep,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2793 tree_statement_list *cleanup_stmts,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2794 token *end_tok,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	2795 comment_list *lc,
ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	2796 comment_list *mc)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2797 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	2798 tree_command *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2799
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2800 if (end_token_ok (end_tok, token::try_catch_end))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2801 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2802 comment_list *tc = m_lexer.m_comment_buf.get_comment ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2803
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2804 int l = try_tok->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2805 int c = try_tok->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2806
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	2807 tree_identifier *id = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2808
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2809 if (! catch_sep && cleanup_stmts && ! cleanup_stmts->empty ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2810 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2811 tree_statement *stmt = cleanup_stmts->front ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2812
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2813 if (stmt)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2814 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2815 tree_expression *expr = stmt->expression ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2816
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2817 if (expr && expr->is_identifier ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2818 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2819 id = dynamic_cast<tree_identifier *> (expr);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2820
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2821 cleanup_stmts->pop_front ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2822
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	2823 stmt->set_expression (nullptr);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2824 delete stmt;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2825 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2826 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2827 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2828
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2829 retval = new tree_try_catch_command (body, cleanup_stmts, id,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2830 lc, mc, tc, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2831 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2832 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2833 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2834 delete body;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2835 delete cleanup_stmts;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2836
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2837 end_token_error (end_tok, token::try_catch_end);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2838 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2839
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2840 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2841 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2842
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2843 // Build a while command.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2844
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2845 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2846 base_parser::make_while_command (token *while_tok,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2847 tree_expression *expr,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2848 tree_statement_list *body,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2849 token *end_tok,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	2850 comment_list *lc)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2851 {
23798 771310737137 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23796 diff changeset	2852 tree_command *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2853
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2854 maybe_warn_assign_as_truth_value (expr);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2855
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2856 if (end_token_ok (end_tok, token::while_end))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2857 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2858 comment_list *tc = m_lexer.m_comment_buf.get_comment ();
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2859
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2860 m_lexer.m_looping--;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2861
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2862 int l = while_tok->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2863 int c = while_tok->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2864
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2865 retval = new tree_while_command (expr, body, lc, tc, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2866 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2867 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2868 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2869 delete expr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2870 delete body;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2871
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2872 end_token_error (end_tok, token::while_end);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2873 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2874
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2875 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2876 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2877
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2878 // Build a do-until command.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2879
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2880 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2881 base_parser::make_do_until_command (token *until_tok,
16287 04a7953496a7 create base class for parser; use reference for curr_lexer John W. Eaton <jwe@octave.org> parents: 16285 diff changeset	2882 tree_statement_list *body,
04a7953496a7 create base class for parser; use reference for curr_lexer John W. Eaton <jwe@octave.org> parents: 16285 diff changeset	2883 tree_expression *expr,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	2884 comment_list *lc)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2885 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2886 maybe_warn_assign_as_truth_value (expr);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2887
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2888 comment_list *tc = m_lexer.m_comment_buf.get_comment ();
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2889
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2890 m_lexer.m_looping--;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2891
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2892 int l = until_tok->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2893 int c = until_tok->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2894
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2895 return new tree_do_until_command (expr, body, lc, tc, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2896 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2897
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2898 // Build a for command.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2899
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2900 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2901 base_parser::make_for_command (int tok_id, token *for_tok,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2902 tree_argument_list *lhs,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2903 tree_expression *expr,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2904 tree_expression *maxproc,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2905 tree_statement_list *body,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2906 token *end_tok,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	2907 comment_list *lc)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2908 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	2909 tree_command *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2910
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2911 bool parfor = tok_id == PARFOR;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2912
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2913 if (end_token_ok (end_tok, parfor ? token::parfor_end : token::for_end))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2914 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2915 expr->mark_as_for_cmd_expr ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2916
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2917 comment_list *tc = m_lexer.m_comment_buf.get_comment ();
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2918
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2919 m_lexer.m_looping--;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2920
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2921 int l = for_tok->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2922 int c = for_tok->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2923
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2924 if (lhs->length () == 1)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2925 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2926 tree_expression *tmp = lhs->remove_front ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2927
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2928 retval = new tree_simple_for_command (parfor, tmp, expr, maxproc,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2929 body, lc, tc, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2930
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2931 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2932 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2933 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2934 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2935 if (parfor)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2936 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2937 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2938 delete expr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2939 delete maxproc;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2940 delete body;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2941
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2942 bison_error ("invalid syntax for parfor statement");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2943 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2944 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2945 retval = new tree_complex_for_command (lhs, expr, body,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2946 lc, tc, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2947 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2948 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2949 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2950 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2951 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2952 delete expr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2953 delete maxproc;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2954 delete body;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2955
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2956 end_token_error (end_tok, parfor ? token::parfor_end : token::for_end);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2957 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2958
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2959 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2960 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2961
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2962 // Build a break command.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2963
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2964 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2965 base_parser::make_break_command (token *break_tok)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2966 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2967 int l = break_tok->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2968 int c = break_tok->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2969
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2970 if (! m_lexer.m_looping)
22785 9c6661004167 error if break statement is in script file separate from loop (bug #39168) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	2971 {
9c6661004167 error if break statement is in script file separate from loop (bug #39168) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	2972 bison_error ("break must appear in a loop in the same file as loop command");
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	2973 return nullptr;
22785 9c6661004167 error if break statement is in script file separate from loop (bug #39168) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	2974 }
9c6661004167 error if break statement is in script file separate from loop (bug #39168) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	2975 else
9c6661004167 error if break statement is in script file separate from loop (bug #39168) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	2976 return new tree_break_command (l, c);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2977 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2978
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2979 // Build a continue command.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2980
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2981 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2982 base_parser::make_continue_command (token *continue_tok)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2983 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2984 int l = continue_tok->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2985 int c = continue_tok->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2986
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2987 return new tree_continue_command (l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2988 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2989
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2990 // Build a return command.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2991
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2992 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2993 base_parser::make_return_command (token *return_tok)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2994 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2995 int l = return_tok->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2996 int c = return_tok->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2997
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2998 return new tree_return_command (l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2999 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3000
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3001 // Start an if command.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3002
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3003 tree_if_command_list *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3004 base_parser::start_if_command (tree_expression *expr,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3005 tree_statement_list *list)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3006 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3007 maybe_warn_assign_as_truth_value (expr);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3008
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3009 tree_if_clause *t = new tree_if_clause (expr, list);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3010
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3011 return new tree_if_command_list (t);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3012 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3013
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3014 // Finish an if command.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3015
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3016 tree_if_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3017 base_parser::finish_if_command (token *if_tok,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3018 tree_if_command_list *list,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3019 token *end_tok,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	3020 comment_list *lc)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3021 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3022 tree_if_command *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3023
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3024 if (end_token_ok (end_tok, token::if_end))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3025 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3026 comment_list *tc = m_lexer.m_comment_buf.get_comment ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3027
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3028 int l = if_tok->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3029 int c = if_tok->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3030
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3031 if (list && ! list->empty ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3032 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3033 tree_if_clause *elt = list->front ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3034
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3035 if (elt)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3036 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3037 elt->line (l);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3038 elt->column (c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3039 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3040 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3041
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3042 retval = new tree_if_command (list, lc, tc, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3043 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3044 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3045 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3046 delete list;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3047
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3048 end_token_error (end_tok, token::if_end);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3049 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3050
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3051 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3052 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3053
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3054 // Build an elseif clause.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3055
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3056 tree_if_clause *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3057 base_parser::make_elseif_clause (token *elseif_tok,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3058 tree_expression *expr,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3059 tree_statement_list *list,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	3060 comment_list *lc)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3061 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3062 maybe_warn_assign_as_truth_value (expr);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3063
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3064 int l = elseif_tok->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3065 int c = elseif_tok->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3066
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3067 return new tree_if_clause (expr, list, lc, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3068 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3069
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3070 // Finish a switch command.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3071
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3072 tree_switch_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3073 base_parser::finish_switch_command (token *switch_tok,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3074 tree_expression *expr,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3075 tree_switch_case_list *list,
16287 04a7953496a7 create base class for parser; use reference for curr_lexer John W. Eaton <jwe@octave.org> parents: 16285 diff changeset	3076 token *end_tok,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	3077 comment_list *lc)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3078 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3079 tree_switch_command *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3080
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3081 if (end_token_ok (end_tok, token::switch_end))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3082 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3083 comment_list *tc = m_lexer.m_comment_buf.get_comment ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3084
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3085 int l = switch_tok->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3086 int c = switch_tok->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3087
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3088 if (list && ! list->empty ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3089 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3090 tree_switch_case *elt = list->front ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3091
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3092 if (elt)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3093 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3094 elt->line (l);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3095 elt->column (c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3096 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3097 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3098
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3099 retval = new tree_switch_command (expr, list, lc, tc, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3100 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3101 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3102 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3103 delete expr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3104 delete list;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3105
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3106 end_token_error (end_tok, token::switch_end);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3107 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3108
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3109 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3110 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3111
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3112 // Build a switch case.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3113
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3114 tree_switch_case *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3115 base_parser::make_switch_case (token *case_tok,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3116 tree_expression *expr,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3117 tree_statement_list *list,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	3118 comment_list *lc)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3119 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3120 maybe_warn_variable_switch_label (expr);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3121
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3122 int l = case_tok->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3123 int c = case_tok->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3124
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3125 return new tree_switch_case (expr, list, lc, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3126 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3127
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3128 // Build an assignment to a variable.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3129
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3130 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3131 base_parser::make_assign_op (int op, tree_argument_list *lhs,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3132 token eq_tok, tree_expression rhs)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3133 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3134 octave_value::assign_op t = octave_value::unknown_assign_op;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3135
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3136 switch (op)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3137 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3138 case '=':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3139 t = octave_value::op_asn_eq;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3140 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3141
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3142 case ADD_EQ:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3143 t = octave_value::op_add_eq;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3144 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3145
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3146 case SUB_EQ:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3147 t = octave_value::op_sub_eq;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3148 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3149
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3150 case MUL_EQ:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3151 t = octave_value::op_mul_eq;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3152 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3153
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3154 case DIV_EQ:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3155 t = octave_value::op_div_eq;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3156 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3157
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3158 case LEFTDIV_EQ:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3159 t = octave_value::op_ldiv_eq;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3160 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3161
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3162 case POW_EQ:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3163 t = octave_value::op_pow_eq;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3164 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3165
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3166 case EMUL_EQ:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3167 t = octave_value::op_el_mul_eq;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3168 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3169
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3170 case EDIV_EQ:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3171 t = octave_value::op_el_div_eq;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3172 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3173
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3174 case ELEFTDIV_EQ:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3175 t = octave_value::op_el_ldiv_eq;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3176 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3177
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3178 case EPOW_EQ:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3179 t = octave_value::op_el_pow_eq;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3180 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3181
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3182 case AND_EQ:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3183 t = octave_value::op_el_and_eq;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3184 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3185
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3186 case OR_EQ:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3187 t = octave_value::op_el_or_eq;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3188 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3189
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3190 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3191 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3192 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3193 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3194
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3195 int l = eq_tok->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3196 int c = eq_tok->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3197
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3198 if (! lhs->is_simple_assign_lhs () && t != octave_value::op_asn_eq)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3199 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3200 // Multiple assignments like [x,y] OP= rhs are only valid for
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3201 // '=', not '+=', etc.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3202
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3203 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3204 delete rhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3205
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3206 bison_error ("computed multiple assignment not allowed", l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3207
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3208 return nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3209 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3210
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3211 if (lhs->is_simple_assign_lhs ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3212 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3213 // We are looking at a simple assignment statement like x = rhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3214
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3215 tree_expression *tmp = lhs->remove_front ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3216
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3217 if ((tmp->is_identifier () \|\| tmp->is_index_expression ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3218 && is_keyword (tmp->name ()))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3219 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3220 std::string kw = tmp->name ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3221
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3222 delete tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3223 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3224 delete rhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3225
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3226 bison_error ("invalid assignment to keyword \"" + kw + "\"", l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3227
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3228 return nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3229 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3230
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3231 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3232
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3233 return new tree_simple_assignment (tmp, rhs, false, l, c, t);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3234 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3235 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3236 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3237 std::list<std::string> names = lhs->variable_names ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3238
22872 551ac93c984c maint: Use C++ range feature to simplify some for loops in libinterp/parse-tree Rik <rik@octave.org> parents: 22785 diff changeset	3239 for (const auto& kw : names)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3240 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3241 if (is_keyword (kw))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3242 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3243 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3244 delete rhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3245
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3246 bison_error ("invalid assignment to keyword \"" + kw + "\"",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3247 l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3248
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3249 return nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3250 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3251 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3252
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3253 return new tree_multi_assignment (lhs, rhs, false, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3254 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3255 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3256
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3257 // Define a script.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3258
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3259 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3260 base_parser::make_script (tree_statement_list *cmds,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3261 tree_statement *end_script)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3262 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3263 if (! cmds)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3264 cmds = new tree_statement_list ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3265
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3266 cmds->append (end_script);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3267
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3268 symbol_scope script_scope = m_lexer.m_symtab_context.curr_scope ();
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3269
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3270 script_scope.cache_name (m_lexer.m_fcn_file_full_name);
24063 c81ed514ca2c give script scopes names John W. Eaton <jwe@octave.org> parents: 24045 diff changeset	3271
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3272 octave_user_script *script
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3273 = new octave_user_script (m_lexer.m_fcn_file_full_name,
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3274 m_lexer.m_fcn_file_name, script_scope,
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3275 cmds, m_lexer.m_help_text);
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3276
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3277 m_lexer.m_symtab_context.pop ();
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3278 m_lexer.m_help_text = "";
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3279
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	3280 sys::time now;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3281
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3282 script->stash_fcn_file_time (now);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3283
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	3284 m_primary_fcn_ptr = script;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3285 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3286
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3287 // Define a function.
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3288
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3289 // FIXME: combining start_function, finish_function, and
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3290 // recover_from_parsing_function should be possible, but it makes
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3291 // for a large mess. Maybe this could be a bit better organized?
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3292
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3293 tree_function_def *
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3294 base_parser::make_function (token *fcn_tok,
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3295 tree_parameter_list *ret_list,
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3296 tree_identifier *id,
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3297 tree_parameter_list *param_list,
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3298 tree_statement_list *body,
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3299 tree_statement *end_fcn_stmt,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	3300 comment_list *lc)
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3301 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3302 tree_function_def *retval = nullptr;
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3303
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3304 int l = fcn_tok->line ();
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3305 int c = fcn_tok->column ();
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3306
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3307 octave_user_function *tmp_fcn
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3308 = start_function (id, param_list, body, end_fcn_stmt);
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3309
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3310 retval = finish_function (ret_list, tmp_fcn, lc, l, c);
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3311
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3312 recover_from_parsing_function ();
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3313
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3314 return retval;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3315 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3316
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3317 // Begin defining a function.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3318
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3319 octave_user_function *
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3320 base_parser::start_function (tree_identifier *id,
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3321 tree_parameter_list *param_list,
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3322 tree_statement_list *body,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3323 tree_statement *end_fcn_stmt)
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	3324 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3325 // We'll fill in the return list later.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3326
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3327 std::string id_name = id->name ();
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3328
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3329 delete id;
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3330
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3331 if (m_lexer.m_parsing_classdef_get_method)
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3332 id_name.insert (0, "get.");
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3333 else if (m_lexer.m_parsing_classdef_set_method)
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3334 id_name.insert (0, "set.");
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3335
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3336 m_lexer.m_parsing_classdef_get_method = false;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3337 m_lexer.m_parsing_classdef_set_method = false;
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3338
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3339 if (! body)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3340 body = new tree_statement_list ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3341
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3342 body->append (end_fcn_stmt);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3343
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3344 octave_user_function *fcn
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3345 = new octave_user_function (m_lexer.m_symtab_context.curr_scope (),
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3346 param_list, nullptr, body);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3347
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3348 if (fcn)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3349 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3350 comment_list *tc = m_lexer.m_comment_buf.get_comment ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3351
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3352 fcn->stash_trailing_comment (tc);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3353 fcn->stash_fcn_end_location (end_fcn_stmt->line (),
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3354 end_fcn_stmt->column ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3355 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3356
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3357 // If input is coming from a file, issue a warning if the name of
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3358 // the file does not match the name of the function stated in the
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3359 // file. Matlab doesn't provide a diagnostic (it ignores the stated
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3360 // name).
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3361 if (! m_autoloading && m_lexer.m_reading_fcn_file
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	3362 && m_curr_fcn_depth == 1 && ! m_parsing_subfunctions)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3363 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3364 // FIXME: should m_lexer.m_fcn_file_name already be
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3365 // preprocessed when we get here? It seems to only be a
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3366 // problem with relative filenames.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3367
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3368 std::string nm = m_lexer.m_fcn_file_name;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3369
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	3370 size_t pos = nm.find_last_of (sys::file_ops::dir_sep_chars ());
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3371
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3372 if (pos != std::string::npos)
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3373 nm = m_lexer.m_fcn_file_name.substr (pos+1);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3374
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3375 if (nm != id_name)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3376 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3377 warning_with_id
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3378 ("Octave:function-name-clash",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3379 "function name '%s' does not agree with function filename '%s'",
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3380 id_name.c_str (), m_lexer.m_fcn_file_full_name.c_str ());
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3381
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3382 id_name = nm;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3383 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3384 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3385
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3386 if (m_lexer.m_reading_fcn_file \|\| m_lexer.m_reading_classdef_file \|\| m_autoloading)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3387 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	3388 sys::time now;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3389
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3390 fcn->stash_fcn_file_name (m_lexer.m_fcn_file_full_name);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3391 fcn->stash_fcn_file_time (now);
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3392 fcn->stash_dir_name (m_lexer.m_dir_name);
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3393 fcn->stash_package_name (m_lexer.m_package_name);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3394 fcn->mark_as_system_fcn_file ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3395
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	3396 if (m_fcn_file_from_relative_lookup)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3397 fcn->mark_relative ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3398
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3399 if (m_lexer.m_parsing_class_method)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3400 {
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	3401 if (m_curr_class_name == id_name)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3402 fcn->mark_as_class_constructor ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3403 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3404 fcn->mark_as_class_method ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3405
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	3406 fcn->stash_dispatch_class (m_curr_class_name);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3407 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3408
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3409 std::string nm = fcn->fcn_file_name ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3410
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	3411 sys::file_stat fs (nm);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3412
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3413 if (fs && fs.is_newer (now))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3414 warning_with_id ("Octave:future-time-stamp",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3415 "time stamp for '%s' is in the future", nm.c_str ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3416 }
25994 f881d3e271d2 eliminate global and file-scope static variables in oct-hist.cc John W. Eaton <jwe@octave.org> parents: 25830 diff changeset	3417 else if (! m_lexer.input_from_tmp_history_file ()
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3418 && ! m_lexer.m_force_script
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3419 && m_lexer.m_reading_script_file
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3420 && m_lexer.m_fcn_file_name == id_name)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3421 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3422 warning ("function '%s' defined within script file '%s'",
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3423 id_name.c_str (), m_lexer.m_fcn_file_full_name.c_str ());
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3424 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3425
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3426 fcn->stash_function_name (id_name);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3427
24297 9a1b193ddd01 Recognize docstrings from subfunctions (bug #46008). Rik <rik@octave.org> parents: 24283 diff changeset	3428 // Record help text for functions other than nested functions.
9a1b193ddd01 Recognize docstrings from subfunctions (bug #46008). Rik <rik@octave.org> parents: 24283 diff changeset	3429 // We cannot currently record help for nested functions (bug #46008)
9a1b193ddd01 Recognize docstrings from subfunctions (bug #46008). Rik <rik@octave.org> parents: 24283 diff changeset	3430 // because the doc_string of the outermost function is read first,
9a1b193ddd01 Recognize docstrings from subfunctions (bug #46008). Rik <rik@octave.org> parents: 24283 diff changeset	3431 // whereas this function is called for the innermost function first.
9a1b193ddd01 Recognize docstrings from subfunctions (bug #46008). Rik <rik@octave.org> parents: 24283 diff changeset	3432 // We could have a stack of help_text in lexer.
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3433 if (! m_lexer.m_help_text.empty () && m_curr_fcn_depth == 1)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3434 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3435 fcn->document (m_lexer.m_help_text);
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3436
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3437 m_lexer.m_help_text = "";
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3438 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3439
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3440 if (m_lexer.m_reading_fcn_file && m_curr_fcn_depth == 1
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	3441 && ! m_parsing_subfunctions)
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	3442 m_primary_fcn_ptr = fcn;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3443
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3444 return fcn;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3445 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3446
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3447 tree_statement *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3448 base_parser::make_end (const std::string& type, bool eof, int l, int c)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3449 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3450 return make_statement (new tree_no_op_command (type, eof, l, c));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3451 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3452
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3453 tree_function_def *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3454 base_parser::finish_function (tree_parameter_list *ret_list,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3455 octave_user_function *fcn,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	3456 comment_list *lc,
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3457 int l, int c)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3458 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3459 tree_function_def *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3460
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3461 if (ret_list)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3462 ret_list->mark_as_formal_parameters ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3463
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3464 if (fcn)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3465 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3466 std::string nm = fcn->name ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3467 std::string file = fcn->fcn_file_name ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3468
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3469 std::string tmp = nm;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3470 if (! file.empty ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3471 tmp += ": " + file;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3472
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	3473 symbol_scope fcn_scope = fcn->scope ();
8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	3474 fcn_scope.cache_name (tmp);
26040 0af4653e48a4 install auto function vars in symbol scope when parsing function John W. Eaton <jwe@octave.org> parents: 26009 diff changeset	3475 fcn_scope.install_auto_fcn_vars ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3476
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3477 if (lc)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3478 fcn->stash_leading_comment (lc);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3479
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3480 fcn->define_ret_list (ret_list);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3481
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	3482 if (m_curr_fcn_depth > 1 \|\| m_parsing_subfunctions)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3483 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3484 fcn->stash_fcn_location (l, c);
25394 9e39a53b4e00 make listing local functions for command completion work again (bug #53925) John W. Eaton <jwe@octave.org> parents: 25206 diff changeset	3485 fcn->stash_parent_fcn_name (m_lexer.m_fcn_file_name);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3486
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	3487 octave_value ov_fcn (fcn);
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	3488
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	3489 if (m_endfunction_found && m_function_scopes.size () > 1)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3490 {
24705 8b346a19108e mark objects as nested or subfunctions when parsing John W. Eaton <jwe@octave.org> parents: 24624 diff changeset	3491 fcn->mark_as_nested_function ();
8b346a19108e mark objects as nested or subfunctions when parsing John W. Eaton <jwe@octave.org> parents: 24624 diff changeset	3492 fcn_scope.mark_nested ();
8b346a19108e mark objects as nested or subfunctions when parsing John W. Eaton <jwe@octave.org> parents: 24624 diff changeset	3493
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	3494 symbol_scope pscope = m_function_scopes.parent_scope ();
24705 8b346a19108e mark objects as nested or subfunctions when parsing John W. Eaton <jwe@octave.org> parents: 24624 diff changeset	3495 fcn_scope.set_parent (pscope);
8b346a19108e mark objects as nested or subfunctions when parsing John W. Eaton <jwe@octave.org> parents: 24624 diff changeset	3496 pscope.install_nestfunction (nm, ov_fcn, fcn_scope);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3497 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3498 else
22974 ecc5eeada8dc Don't mark nested functions in primary function as subfunctions. Rik <rik@octave.org> parents: 22880 diff changeset	3499 {
ecc5eeada8dc Don't mark nested functions in primary function as subfunctions. Rik <rik@octave.org> parents: 22880 diff changeset	3500 fcn->mark_as_subfunction ();
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	3501 m_subfunction_names.push_back (nm);
24705 8b346a19108e mark objects as nested or subfunctions when parsing John W. Eaton <jwe@octave.org> parents: 24624 diff changeset	3502 fcn_scope.set_parent (m_primary_fcn_scope);
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	3503 m_primary_fcn_scope.install_subfunction (nm, ov_fcn);
24705 8b346a19108e mark objects as nested or subfunctions when parsing John W. Eaton <jwe@octave.org> parents: 24624 diff changeset	3504 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3505 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3506
24042 840882c82e22 install nested local functions only once (bug #51993) John W. Eaton <jwe@octave.org> parents: 24037 diff changeset	3507 if (m_curr_fcn_depth == 1)
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	3508 fcn_scope.update_nest ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3509
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3510 if (! m_lexer.m_reading_fcn_file && m_curr_fcn_depth == 1)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3511 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3512 // We are either reading a script file or defining a function
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3513 // at the command line, so this definition creates a
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3514 // tree_function object that is placed in the parse tree.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3515 // Otherwise, it is just inserted in the symbol table,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3516 // either as a subfunction or nested function (see above),
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3517 // or as the primary function for the file, via
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	3518 // m_primary_fcn_ptr (see also load_fcn_from_file,,
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3519 // parse_fcn_file, and
24270 bc3819b7cca1 don't use symbol_table:: nesting for symbol_record, symbol_scope, or fcn_info John W. Eaton <jwe@octave.org> parents: 24216 diff changeset	3520 // fcn_info::fcn_info_rep::find_user_function).
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3521
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3522 if (m_lexer.m_buffer_function_text)
23730 85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23705 diff changeset	3523 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3524 fcn->cache_function_text (m_lexer.m_function_text,
23730 85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23705 diff changeset	3525 fcn->time_parsed ());
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3526 m_lexer.m_buffer_function_text = false;
23730 85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23705 diff changeset	3527 }
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23705 diff changeset	3528
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3529 retval = new tree_function_def (fcn);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3530 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3531 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3532
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3533 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3534 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3535
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3536 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3537 base_parser::recover_from_parsing_function (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3538 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3539 m_lexer.m_symtab_context.pop ();
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3540
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3541 if (m_lexer.m_reading_fcn_file && m_curr_fcn_depth == 1
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	3542 && ! m_parsing_subfunctions)
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	3543 m_parsing_subfunctions = true;
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	3544
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	3545 m_curr_fcn_depth--;
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	3546 m_function_scopes.pop ();
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	3547
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3548 m_lexer.m_defining_func--;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3549 m_lexer.m_parsed_function_name.pop ();
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3550 m_lexer.m_looking_at_return_list = false;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3551 m_lexer.m_looking_at_parameter_list = false;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3552 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3553
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3554 tree_funcall *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3555 base_parser::make_superclass_ref (const std::string& method_nm,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3556 const std::string& class_nm)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3557 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3558 octave_value_list args;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3559
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3560 args(1) = class_nm;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3561 args(0) = method_nm;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3562
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3563 symbol_table& symtab
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	3564 = __get_symbol_table__ ("base_parser::make_superclass_ref");
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3565
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3566 octave_value fcn
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3567 = symtab.find_built_in_function ("__superclass_reference__");
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3568
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3569 return new tree_funcall (fcn, args);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3570 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3571
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3572 tree_funcall *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3573 base_parser::make_meta_class_query (const std::string& class_nm)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3574 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3575 octave_value_list args;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3576
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3577 args(0) = class_nm;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3578
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3579 symbol_table& symtab
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	3580 = __get_symbol_table__ ("base_parser::make_meta_class_query");
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3581
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3582 octave_value fcn
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3583 = symtab.find_built_in_function ("__meta_class_query__");
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3584
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3585 return new tree_funcall (fcn, args);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3586 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3587
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3588 // A CLASSDEF block defines a class that has a constructor and other
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3589 // methods, but it is not an executable command. Parsing the block
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3590 // makes some changes in the symbol table (inserting the constructor
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3591 // and methods, and adding to the list of known objects) and creates
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3592 // a parse tree containing meta information about the class.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3593
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3594 tree_classdef *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3595 base_parser::make_classdef (token *tok_val,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3596 tree_classdef_attribute_list *a,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3597 tree_identifier *id,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3598 tree_classdef_superclass_list *sc,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3599 tree_classdef_body body, token end_tok,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	3600 comment_list *lc)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3601 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3602 tree_classdef *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3603
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3604 m_lexer.m_symtab_context.pop ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3605
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3606 std::string cls_name = id->name ();
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	3607
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3608 std::string nm = m_lexer.m_fcn_file_name;
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	3609
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	3610 size_t pos = nm.find_last_of (sys::file_ops::dir_sep_chars ());
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	3611
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	3612 if (pos != std::string::npos)
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3613 nm = m_lexer.m_fcn_file_name.substr (pos+1);
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	3614
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3615 if (nm != cls_name)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3616 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3617 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3618 delete id;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3619 delete sc;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3620 delete body;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3621
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3622 bison_error ("invalid classdef definition, the class name must match the filename");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3623
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3624 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3625 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3626 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3627 if (end_token_ok (end_tok, token::classdef_end))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3628 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3629 comment_list *tc = m_lexer.m_comment_buf.get_comment ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3630
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3631 int l = tok_val->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3632 int c = tok_val->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3633
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3634 if (! body)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3635 body = new tree_classdef_body ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3636
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3637 retval = new tree_classdef (a, id, sc, body, lc, tc,
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	3638 m_curr_package_name, l, c);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3639 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3640 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3641 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3642 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3643 delete id;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3644 delete sc;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3645 delete body;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3646
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3647 end_token_error (end_tok, token::switch_end);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3648 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3649 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3650
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3651 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3652 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3653
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3654 tree_classdef_properties_block *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3655 base_parser::make_classdef_properties_block (token *tok_val,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3656 tree_classdef_attribute_list *a,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3657 tree_classdef_property_list *plist,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3658 token *end_tok,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	3659 comment_list *lc)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3660 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3661 tree_classdef_properties_block *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3662
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3663 if (end_token_ok (end_tok, token::properties_end))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3664 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3665 comment_list *tc = m_lexer.m_comment_buf.get_comment ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3666
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3667 int l = tok_val->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3668 int c = tok_val->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3669
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3670 if (! plist)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3671 plist = new tree_classdef_property_list ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3672
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3673 retval = new tree_classdef_properties_block (a, plist, lc, tc, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3674 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3675 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3676 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3677 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3678 delete plist;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3679
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3680 end_token_error (end_tok, token::properties_end);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3681 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3682
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3683 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3684 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3685
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3686 tree_classdef_methods_block *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3687 base_parser::make_classdef_methods_block (token *tok_val,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3688 tree_classdef_attribute_list *a,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3689 tree_classdef_methods_list *mlist,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3690 token *end_tok,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	3691 comment_list *lc)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3692 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3693 tree_classdef_methods_block *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3694
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3695 if (end_token_ok (end_tok, token::methods_end))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3696 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3697 comment_list *tc = m_lexer.m_comment_buf.get_comment ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3698
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3699 int l = tok_val->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3700 int c = tok_val->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3701
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3702 if (! mlist)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3703 mlist = new tree_classdef_methods_list ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3704
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3705 retval = new tree_classdef_methods_block (a, mlist, lc, tc, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3706 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3707 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3708 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3709 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3710 delete mlist;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3711
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3712 end_token_error (end_tok, token::methods_end);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3713 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3714
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3715 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3716 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3717
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3718 tree_classdef_events_block *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3719 base_parser::make_classdef_events_block (token *tok_val,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3720 tree_classdef_attribute_list *a,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3721 tree_classdef_events_list *elist,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3722 token *end_tok,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	3723 comment_list *lc)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3724 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3725 tree_classdef_events_block *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3726
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3727 if (end_token_ok (end_tok, token::events_end))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3728 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3729 comment_list *tc = m_lexer.m_comment_buf.get_comment ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3730
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3731 int l = tok_val->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3732 int c = tok_val->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3733
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3734 if (! elist)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3735 elist = new tree_classdef_events_list ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3736
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3737 retval = new tree_classdef_events_block (a, elist, lc, tc, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3738 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3739 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3740 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3741 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3742 delete elist;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3743
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3744 end_token_error (end_tok, token::events_end);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3745 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3746
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3747 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3748 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3749
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3750 tree_classdef_enum_block *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3751 base_parser::make_classdef_enum_block (token *tok_val,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3752 tree_classdef_attribute_list *a,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3753 tree_classdef_enum_list *elist,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3754 token *end_tok,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	3755 comment_list *lc)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3756 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3757 tree_classdef_enum_block *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3758
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3759 if (end_token_ok (end_tok, token::enumeration_end))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3760 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3761 comment_list *tc = m_lexer.m_comment_buf.get_comment ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3762
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3763 int l = tok_val->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3764 int c = tok_val->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3765
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3766 if (! elist)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3767 elist = new tree_classdef_enum_list ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3768
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3769 retval = new tree_classdef_enum_block (a, elist, lc, tc, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3770 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3771 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3772 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3773 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3774 delete elist;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3775
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3776 end_token_error (end_tok, token::enumeration_end);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3777 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3778
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3779 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3780 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3781
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3782 octave_user_function*
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3783 base_parser::start_classdef_external_method (tree_identifier *id,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3784 tree_parameter_list *pl)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3785 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3786 octave_user_function* retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3787
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3788 // External methods are only allowed within @-folders. In this case,
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	3789 // m_curr_class_name will be non-empty.
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	3790
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	3791 if (! m_curr_class_name.empty ())
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3792 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3793
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3794 std::string mname = id->name ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3795
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3796 // Methods that cannot be declared outside the classdef file:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3797 // - methods with '.' character (e.g. property accessors)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3798 // - class constructor
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3799 // - `delete'
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3800
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3801 if (mname.find_first_of (".") == std::string::npos
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3802 && mname != "delete"
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	3803 && mname != m_curr_class_name)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3804 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3805 // Create a dummy function that is used until the real method
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3806 // is loaded.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3807
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	3808 retval = new octave_user_function (symbol_scope (), pl);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3809
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3810 retval->stash_function_name (mname);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3811
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3812 int l = id->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3813 int c = id->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3814
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3815 retval->stash_fcn_location (l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3816 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3817 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3818 bison_error ("invalid external method declaration, an external "
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3819 "method cannot be the class constructor, `delete' "
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3820 "or have a dot (.) character in its name");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3821 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3822 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3823 bison_error ("external methods are only allowed in @-folders");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3824
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3825 if (! retval)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3826 delete id;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3827
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3828 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3829 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3830
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3831 tree_function_def *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3832 base_parser::finish_classdef_external_method (octave_user_function *fcn,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3833 tree_parameter_list *ret_list,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	3834 comment_list *cl)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3835 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3836 if (ret_list)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3837 fcn->define_ret_list (ret_list);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3838
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3839 if (cl)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3840 fcn->stash_leading_comment (cl);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3841
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3842 int l = fcn->beginning_line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3843 int c = fcn->beginning_column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3844
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3845 return new tree_function_def (fcn, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3846 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3847
24067 5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3848 void
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3849 base_parser::finish_classdef_file (tree_classdef *cls,
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3850 tree_statement_list *local_fcns)
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3851 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3852 if (m_lexer.m_reading_classdef_file)
24067 5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3853 m_classdef_object = cls;
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3854
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3855 if (local_fcns)
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3856 {
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3857 symbol_table& symtab
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3858 = __get_symbol_table__ ("base_parser::finish_classdef_file");
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3859
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3860 for (tree_statement elt : local_fcns)
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3861 {
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3862 tree_command *cmd = elt->command ();
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3863
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3864 tree_function_def *fcn_def
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3865 = dynamic_cast<tree_function_def *> (cmd);
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3866
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3867 octave_value ov_fcn = fcn_def->function ();
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3868 octave_function *fcn = ov_fcn.function_value ();
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3869 std::string nm = fcn->name ();
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3870 std::string file = fcn->fcn_file_name ();
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3871
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3872 symtab.install_local_function (nm, ov_fcn, file);
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3873 }
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3874
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3875 delete local_fcns;
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3876 }
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3877 }
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	3878
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3879 // Make an index expression.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3880
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3881 tree_index_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3882 base_parser::make_index_expression (tree_expression *expr,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3883 tree_argument_list *args,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3884 char type)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3885 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3886 tree_index_expression *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3887
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3888 if (args && args->has_magic_tilde ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3889 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3890 delete expr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3891 delete args;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3892
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3893 bison_error ("invalid use of empty argument (~) in index expression");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3894 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3895 else
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	3896 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3897 int l = expr->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3898 int c = expr->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3899
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3900 if (! expr->is_postfix_indexed ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3901 expr->set_postfix_index (type);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3902
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3903 if (expr->is_index_expression ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3904 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3905 tree_index_expression *tmp =
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3906 static_cast<tree_index_expression *> (expr);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3907
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3908 tmp->append (args, type);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3909
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3910 retval = tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3911 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3912 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3913 retval = new tree_index_expression (expr, args, l, c, type);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3914 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3915
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3916 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3917 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3918
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3919 // Make an indirect reference expression.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3920
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3921 tree_index_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3922 base_parser::make_indirect_ref (tree_expression *expr,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3923 const std::string& elt)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3924 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3925 tree_index_expression *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3926
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3927 int l = expr->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3928 int c = expr->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3929
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3930 if (! expr->is_postfix_indexed ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3931 expr->set_postfix_index ('.');
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3932
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3933 if (expr->is_index_expression ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3934 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3935 tree_index_expression tmp = static_cast<tree_index_expression > (expr);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3936
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3937 tmp->append (elt);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3938
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3939 retval = tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3940 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3941 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3942 retval = new tree_index_expression (expr, elt, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3943
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3944 m_lexer.m_looking_at_indirect_ref = false;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3945
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3946 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3947 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3948
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3949 // Make an indirect reference expression with dynamic field name.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3950
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3951 tree_index_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3952 base_parser::make_indirect_ref (tree_expression *expr,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3953 tree_expression *elt)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3954 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3955 tree_index_expression *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3956
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3957 int l = expr->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3958 int c = expr->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3959
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3960 if (! expr->is_postfix_indexed ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3961 expr->set_postfix_index ('.');
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3962
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3963 if (expr->is_index_expression ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3964 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3965 tree_index_expression tmp = static_cast<tree_index_expression > (expr);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3966
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3967 tmp->append (elt);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3968
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3969 retval = tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3970 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3971 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3972 retval = new tree_index_expression (expr, elt, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3973
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3974 m_lexer.m_looking_at_indirect_ref = false;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3975
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3976 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3977 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3978
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3979 // Make a declaration command.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3980
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3981 tree_decl_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3982 base_parser::make_decl_command (int tok, token *tok_val,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3983 tree_decl_init_list *lst)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3984 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3985 tree_decl_command *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3986
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3987 int l = tok_val->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3988 int c = tok_val->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3989
24216 81d723f0cdfe clean up change merged from stable John W. Eaton <jwe@octave.org> parents: 24215 diff changeset	3990 if (lst)
81d723f0cdfe clean up change merged from stable John W. Eaton <jwe@octave.org> parents: 24215 diff changeset	3991 m_lexer.mark_as_variables (lst->variable_names ());
24213 d2cfaaa57677 tag global and persistent symbols as variables when parsing (bug #52363) John W. Eaton <jwe@octave.org> parents: 23219 diff changeset	3992
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3993 switch (tok)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3994 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3995 case GLOBAL:
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23454 diff changeset	3996 {
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23454 diff changeset	3997 retval = new tree_decl_command ("global", lst, l, c);
23470 a41fdb801db6 use mark_global and mark_persistent consistently John W. Eaton <jwe@octave.org> parents: 23469 diff changeset	3998 retval->mark_global ();
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23454 diff changeset	3999 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4000 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4001
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4002 case PERSISTENT:
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	4003 if (m_curr_fcn_depth > 0)
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23454 diff changeset	4004 {
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23454 diff changeset	4005 retval = new tree_decl_command ("persistent", lst, l, c);
23470 a41fdb801db6 use mark_global and mark_persistent consistently John W. Eaton <jwe@octave.org> parents: 23469 diff changeset	4006 retval->mark_persistent ();
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23454 diff changeset	4007 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4008 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4009 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4010 if (m_lexer.m_reading_script_file)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4011 warning ("ignoring persistent declaration near line %d of file '%s'",
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4012 l, m_lexer.m_fcn_file_full_name.c_str ());
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4013 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4014 warning ("ignoring persistent declaration near line %d", l);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4015 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4016 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4017
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4018 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4019 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4020 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4021 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4022
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4023 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4024 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4025
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4026 bool
23654 da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4027 base_parser::validate_param_list (tree_parameter_list *lst,
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4028 tree_parameter_list::in_or_out type)
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4029 {
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4030 std::set<std::string> dict;
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4031
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4032 for (tree_decl_elt elt : lst)
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4033 {
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4034 tree_identifier *id = elt->ident ();
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4035
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4036 if (id)
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4037 {
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4038 std::string name = id->name ();
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4039
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4040 if (id->is_black_hole ())
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4041 {
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4042 if (type != tree_parameter_list::in)
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4043 {
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4044 bison_error ("invalid use of ~ in output list");
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4045 return false;
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4046 }
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4047 }
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4048 else if (dict.find (name) != dict.end ())
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4049 {
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4050 bison_error ("'" + name
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4051 + "' appears more than once in parameter list");
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4052 return false;
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4053 }
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4054 else
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4055 dict.insert (name);
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4056 }
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4057 }
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4058
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4059 std::string va_type = (type == tree_parameter_list::in
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4060 ? "varargin" : "varargout");
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4061
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4062 size_t len = lst->length ();
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4063
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4064 if (len > 0)
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4065 {
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4066 tree_decl_elt *elt = lst->back ();
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4067
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4068 tree_identifier *id = elt->ident ();
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4069
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4070 if (id && id->name () == va_type)
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4071 {
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4072 if (len == 1)
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4073 lst->mark_varargs_only ();
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4074 else
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4075 lst->mark_varargs ();
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4076
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4077 tree_parameter_list::iterator p = lst->end ();
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4078 --p;
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4079 delete *p;
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4080 lst->erase (p);
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4081 }
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4082 }
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4083
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4084 return true;
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4085 }
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4086
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4087 bool
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4088 base_parser::validate_array_list (tree_expression *e)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4089 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4090 bool retval = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4091
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4092 tree_array_list al = dynamic_cast<tree_array_list > (e);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4093
22872 551ac93c984c maint: Use C++ range feature to simplify some for loops in libinterp/parse-tree Rik <rik@octave.org> parents: 22785 diff changeset	4094 for (tree_argument_list* row : *al)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4095 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4096 if (row && row->has_magic_tilde ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4097 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4098 retval = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4099
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4100 if (e->is_matrix ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4101 bison_error ("invalid use of tilde (~) in matrix expression");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4102 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4103 bison_error ("invalid use of tilde (~) in cell expression");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4104
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4105 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4106 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4107 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4108
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4109 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4110 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4111
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4112 tree_argument_list *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4113 base_parser::validate_matrix_for_assignment (tree_expression *e)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4114 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	4115 tree_argument_list *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4116
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4117 if (e->is_constant ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4118 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4119 tree_evaluator& tw
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	4120 = __get_evaluator__ ("validate_matrix_for_assignment");
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	4121
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	4122 octave_value ov = tw.evaluate (e);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4123
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4124 delete e;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4125
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23576 diff changeset	4126 if (ov.isempty ())
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4127 bison_error ("invalid empty left hand side of assignment");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4128 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4129 bison_error ("invalid constant left hand side of assignment");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4130 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4131 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4132 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4133 bool is_simple_assign = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4134
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	4135 tree_argument_list *tmp = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4136
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4137 if (e->is_matrix ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4138 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4139 tree_matrix mat = dynamic_cast<tree_matrix > (e);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4140
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4141 if (mat && mat->size () == 1)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4142 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4143 tmp = mat->front ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4144 mat->pop_front ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4145 delete e;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4146 is_simple_assign = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4147 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4148 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4149 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4150 tmp = new tree_argument_list (e);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4151
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4152 if (tmp && tmp->is_valid_lvalue_list ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4153 {
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	4154 m_lexer.mark_as_variables (tmp->variable_names ());
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4155 retval = tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4156 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4157 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4158 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4159 delete tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4160
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4161 bison_error ("invalid left hand side of assignment");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4162 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4163
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4164 if (retval && is_simple_assign)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4165 retval->mark_as_simple_assign_lhs ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4166 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4167
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4168 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4169 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4170
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4171 // Finish building an array_list.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4172
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4173 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4174 base_parser::finish_array_list (tree_array_list *array_list)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4175 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4176 tree_expression *retval = array_list;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4177
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4178 unwind_protect frame;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4179
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4180 frame.protect_var (discard_error_messages);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4181 frame.protect_var (discard_warning_messages);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4182
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4183 discard_error_messages = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4184 discard_warning_messages = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4185
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4186 if (array_list->all_elements_are_constant ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4187 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4188 try
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4189 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4190 tree_evaluator& tw
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	4191 = __get_evaluator__ ("finish_array_list");
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	4192
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	4193 octave_value tmp = tw.evaluate (array_list);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4194
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4195 tree_constant *tc_retval
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4196 = new tree_constant (tmp, array_list->line (),
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4197 array_list->column ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4198
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4199 std::ostringstream buf;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4200
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4201 tree_print_code tpc (buf);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4202
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4203 array_list->accept (tpc);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4204
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4205 tc_retval->stash_original_text (buf.str ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4206
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4207 delete array_list;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4208
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4209 retval = tc_retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4210 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4211 catch (const execution_exception&)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4212 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4213 interpreter::recover_from_exception ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4214 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4215 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4216
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4217 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4218 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4219
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4220 // Finish building a matrix list.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4221
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4222 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4223 base_parser::finish_matrix (tree_matrix *m)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4224 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4225 return (m
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4226 ? finish_array_list (m)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4227 : new tree_constant (octave_null_matrix::instance));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4228 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4229
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4230 // Finish building a cell list.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4231
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4232 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4233 base_parser::finish_cell (tree_cell *c)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4234 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4235 return (c
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4236 ? finish_array_list (c)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4237 : new tree_constant (octave_value (Cell ())));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4238 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4239
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4240 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4241 base_parser::maybe_warn_missing_semi (tree_statement_list *t)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4242 {
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	4243 if (m_curr_fcn_depth > 0)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4244 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4245 tree_statement *tmp = t->back ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4246
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4247 if (tmp->is_expression ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4248 warning_with_id
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4249 ("Octave:missing-semicolon",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4250 "missing semicolon near line %d, column %d in file '%s'",
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4251 tmp->line (), tmp->column (), m_lexer.m_fcn_file_full_name.c_str ());
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	4252 }
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	4253 }
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	4254
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4255 tree_statement_list *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4256 base_parser::set_stmt_print_flag (tree_statement_list *list,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4257 char sep, bool warn_missing_semi)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4258 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4259 tree_statement *tmp = list->back ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4260
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4261 switch (sep)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4262 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4263 case ';':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4264 tmp->set_print_flag (false);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4265 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4266
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4267 case 0:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4268 case ',':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4269 case '\n':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4270 tmp->set_print_flag (true);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4271 if (warn_missing_semi)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4272 maybe_warn_missing_semi (list);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4273 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4274
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4275 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4276 warning ("unrecognized separator type!");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4277 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4278 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4279
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4280 // Even if a statement is null, we add it to the list then remove it
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4281 // here so that the print flag is applied to the correct statement.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4282
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4283 if (tmp->is_null_statement ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4284 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4285 list->pop_back ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4286 delete tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4287 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4288
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4289 return list;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4290 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4291
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4292 // Finish building a statement.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4293 template <typename T>
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4294 tree_statement *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4295 base_parser::make_statement (T *arg)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4296 {
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	4297 comment_list *comment = m_lexer.get_comment ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4298
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4299 return new tree_statement (arg, comment);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4300 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4301
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4302 tree_statement_list *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4303 base_parser::make_statement_list (tree_statement *stmt)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4304 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4305 return new tree_statement_list (stmt);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4306 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4307
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4308 tree_statement_list *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4309 base_parser::append_statement_list (tree_statement_list *list,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4310 char sep, tree_statement *stmt,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4311 bool warn_missing_semi)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4312 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4313 set_stmt_print_flag (list, sep, warn_missing_semi);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4314
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4315 list->append (stmt);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4316
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4317 return list;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4318 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4319
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4320 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4321 base_parser::bison_error (const std::string& str, int l, int c)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4322 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4323 int err_line = l < 0 ? m_lexer.m_input_line_number : l;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4324 int err_col = c < 0 ? m_lexer.m_current_input_column - 1 : c;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4325
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4326 std::ostringstream output_buf;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4327
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4328 if (m_lexer.m_reading_fcn_file \|\| m_lexer.m_reading_script_file
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4329 \|\| m_lexer.m_reading_classdef_file)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4330 output_buf << "parse error near line " << err_line
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4331 << " of file " << m_lexer.m_fcn_file_full_name;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4332 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4333 output_buf << "parse error:";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4334
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4335 if (str != "parse error")
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4336 output_buf << "\n\n " << str;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4337
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4338 output_buf << "\n\n";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4339
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4340 std::string curr_line = m_lexer.m_current_input_line;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4341
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4342 if (! curr_line.empty ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4343 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4344 size_t len = curr_line.length ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4345
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4346 if (curr_line[len-1] == '\n')
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4347 curr_line.resize (len-1);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4348
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4349 // Print the line, maybe with a pointer near the error token.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4350
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4351 output_buf << ">>> " << curr_line << "\n";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4352
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4353 if (err_col == 0)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4354 err_col = len;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4355
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4356 for (int i = 0; i < err_col + 3; i++)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4357 output_buf << " ";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4358
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4359 output_buf << "^";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4360 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4361
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4362 output_buf << "\n";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4363
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	4364 m_parse_error_msg = output_buf.str ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4365 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4366
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4367 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4368 parser::run (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4369 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4370 int status = -1;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4371
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	4372 yypstate pstate = static_cast<yypstate > (m_parser_state);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4373
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4374 try
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4375 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4376 status = octave_pull_parse (pstate, *this);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4377 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4378 catch (execution_exception& e)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4379 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4380 std::string file = m_lexer.m_fcn_file_full_name;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4381
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4382 if (file.empty ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4383 error (e, "parse error");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4384 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4385 error (e, "parse error in %s", file.c_str ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4386 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4387 catch (const exit_exception&)
23049 7351f2c93389 rethrow octave::exit_exception (bug #49304) Olaf Till <i7tiol@t-online.de> parents: 22879 diff changeset	4388 {
7351f2c93389 rethrow octave::exit_exception (bug #49304) Olaf Till <i7tiol@t-online.de> parents: 22879 diff changeset	4389 throw;
7351f2c93389 rethrow octave::exit_exception (bug #49304) Olaf Till <i7tiol@t-online.de> parents: 22879 diff changeset	4390 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4391 catch (interrupt_exception &)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4392 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4393 throw;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4394 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4395 catch (...)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4396 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4397 std::string file = m_lexer.m_fcn_file_full_name;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4398
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4399 if (file.empty ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4400 error ("unexpected exception while parsing input");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4401 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4402 error ("unexpected exception while parsing %s", file.c_str ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4403 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4404
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4405 if (status != 0)
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	4406 parse_error ("%s", m_parse_error_msg.c_str ());
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4407
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4408 return status;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4409 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4410
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4411 // Parse input from INPUT. Pass TRUE for EOF if the end of INPUT should
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4412 // finish the parse.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4413
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4414 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4415 push_parser::run (const std::string& input, bool eof)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4416 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4417 int status = -1;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4418
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	4419 dynamic_cast<push_lexer&> (m_lexer).append_input (input, eof);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4420
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4421 do
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4422 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4423 YYSTYPE lval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4424
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4425 int token = octave_lex (&lval, m_lexer.m_scanner);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4426
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4427 if (token < 0)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4428 {
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	4429 if (! eof && m_lexer.at_end_of_buffer ())
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4430 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4431 status = -1;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4432 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4433 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4434 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4435
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	4436 yypstate pstate = static_cast<yypstate > (m_parser_state);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4437
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4438 try
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4439 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4440 status = octave_push_parse (pstate, token, &lval, *this);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4441 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4442 catch (execution_exception& e)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4443 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4444 std::string file = m_lexer.m_fcn_file_full_name;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4445
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4446 if (file.empty ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4447 error (e, "parse error");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4448 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4449 error (e, "parse error in %s", file.c_str ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4450 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4451 catch (const exit_exception&)
23049 7351f2c93389 rethrow octave::exit_exception (bug #49304) Olaf Till <i7tiol@t-online.de> parents: 22879 diff changeset	4452 {
7351f2c93389 rethrow octave::exit_exception (bug #49304) Olaf Till <i7tiol@t-online.de> parents: 22879 diff changeset	4453 throw;
7351f2c93389 rethrow octave::exit_exception (bug #49304) Olaf Till <i7tiol@t-online.de> parents: 22879 diff changeset	4454 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4455 catch (interrupt_exception &)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4456 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4457 throw;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4458 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4459 catch (...)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4460 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4461 std::string file = m_lexer.m_fcn_file_full_name;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4462
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4463 if (file.empty ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4464 error ("unexpected exception while parsing input");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4465 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4466 error ("unexpected exception while parsing %s", file.c_str ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4467 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4468 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4469 while (status == YYPUSH_MORE);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4470
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4471 if (status != 0)
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	4472 parse_error ("%s", m_parse_error_msg.c_str ());
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4473
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4474 return status;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4475 }
25442 47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4476
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4477 static void
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4478 safe_fclose (FILE *f)
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4479 {
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4480 if (f)
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4481 fclose (static_cast<FILE *> (f));
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4482 }
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4483
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4484 static octave_value
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4485 parse_fcn_file (const std::string& full_file, const std::string& file,
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4486 const std::string& dir_name, const std::string& dispatch_type,
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4487 const std::string& package_name, bool require_file,
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4488 bool force_script, bool autoload, bool relative_lookup,
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4489 const std::string& warn_for)
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4490 {
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4491 octave_value retval;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4492
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4493 unwind_protect frame;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4494
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4495 octave_function *fcn_ptr = nullptr;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4496
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4497 // Open function file and parse.
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4498
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4499 FILE *in_stream = command_editor::get_input_stream ();
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4500
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4501 frame.add_fcn (command_editor::set_input_stream, in_stream);
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4502
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4503 frame.add_fcn (command_history::ignore_entries,
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4504 command_history::ignoring_entries ());
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4505
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4506 command_history::ignore_entries ();
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4507
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4508 FILE *ffile = nullptr;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4509
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4510 if (! full_file.empty ())
25517 7fbc39a46be8 Add wrapper to fopen for files with non-ASCII chars in path on Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25442 diff changeset	4511 ffile = octave::sys::fopen (full_file, "rb");
25442 47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4512
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4513 if (ffile)
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4514 {
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4515 frame.add_fcn (safe_fclose, ffile);
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4516
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4517 interpreter& interp = __get_interpreter__ ("parse_fcn_file");
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4518
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4519 parser parser (ffile, interp);
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4520
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4521 parser.m_curr_class_name = dispatch_type;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4522 parser.m_curr_package_name = package_name;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4523 parser.m_autoloading = autoload;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4524 parser.m_fcn_file_from_relative_lookup = relative_lookup;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4525
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4526 parser.m_lexer.m_force_script = force_script;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4527 parser.m_lexer.prep_for_file ();
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4528 parser.m_lexer.m_parsing_class_method = ! dispatch_type.empty ();
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4529
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4530 parser.m_lexer.m_fcn_file_name = file;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4531 parser.m_lexer.m_fcn_file_full_name = full_file;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4532 parser.m_lexer.m_dir_name = dir_name;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4533 parser.m_lexer.m_package_name = package_name;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4534
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4535 int status = parser.run ();
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4536
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4537 fcn_ptr = parser.m_primary_fcn_ptr;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4538
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4539 if (status == 0)
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4540 {
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4541 if (parser.m_lexer.m_reading_classdef_file
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4542 && parser.m_classdef_object)
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4543 {
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4544 // Convert parse tree for classdef object to
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4545 // meta.class info (and stash it in the symbol
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4546 // table?). Return pointer to constructor?
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4547
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4548 if (fcn_ptr)
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4549 panic_impossible ();
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4550
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4551 bool is_at_folder = ! dispatch_type.empty ();
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4552
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4553 try
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4554 {
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4555 fcn_ptr = parser.m_classdef_object->make_meta_class (interp, is_at_folder);
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4556 }
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4557 catch (const execution_exception&)
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4558 {
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4559 delete parser.m_classdef_object;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4560 throw;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4561 }
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4562
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4563 if (fcn_ptr)
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4564 retval = octave_value (fcn_ptr);
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4565
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4566 delete parser.m_classdef_object;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4567
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4568 parser.m_classdef_object = nullptr;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4569 }
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4570 else if (fcn_ptr)
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4571 {
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4572 retval = octave_value (fcn_ptr);
21589 ad90fb5a139f eliminate memory leaks from classdef parse tree (bug #47372) John W. Eaton <jwe@octave.org> parents: 21581 diff changeset	4573
25442 47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4574 fcn_ptr->maybe_relocate_end ();
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4575
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4576 if (parser.m_parsing_subfunctions)
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4577 {
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4578 if (! parser.m_endfunction_found)
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4579 parser.m_subfunction_names.reverse ();
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4580
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4581 fcn_ptr->stash_subfunction_names (parser.m_subfunction_names);
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4582 }
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4583 }
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4584 }
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4585 else
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4586 error ("parse error while reading file %s", full_file.c_str ());
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4587 }
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4588 else if (require_file)
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4589 error ("no such file, '%s'", full_file.c_str ());
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4590 else if (! warn_for.empty ())
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4591 error ("%s: unable to open file '%s'", warn_for.c_str (),
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4592 full_file.c_str ());
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4593
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4594 return retval;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4595 }
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	4596
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4597 std::string
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4598 get_help_from_file (const std::string& nm, bool& symbol_found,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4599 std::string& full_file)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4600 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4601 std::string retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4602
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4603 full_file = fcn_file_in_path (nm);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4604
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4605 std::string file = full_file;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4606
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4607 size_t file_len = file.length ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4608
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4609 if ((file_len > 4 && file.substr (file_len-4) == ".oct")
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4610 \|\| (file_len > 4 && file.substr (file_len-4) == ".mex")
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4611 \|\| (file_len > 2 && file.substr (file_len-2) == ".m"))
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4612 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4613 file = sys::env::base_pathname (file);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4614 file = file.substr (0, file.find_last_of ('.'));
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4615
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4616 size_t pos = file.find_last_of (sys::file_ops::dir_sep_str ());
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4617 if (pos != std::string::npos)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4618 file = file.substr (pos+1);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4619 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4620
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4621 if (! file.empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4622 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4623 symbol_found = true;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4624
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4625 octave_value ov_fcn
23667 2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	4626 = parse_fcn_file (full_file, file, "", "", "", true,
2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	4627 false, false, false, "");
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4628
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4629 if (ov_fcn.is_defined ())
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4630 {
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4631 octave_function *fcn = ov_fcn.function_value ();
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4632
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4633 if (fcn)
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4634 retval = fcn->doc_string ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4635 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4636 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4637
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4638 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4639 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4640
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4641 std::string
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4642 get_help_from_file (const std::string& nm, bool& symbol_found)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4643 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4644 std::string file;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4645 return get_help_from_file (nm, symbol_found, file);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4646 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4647
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4648 std::string
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4649 lookup_autoload (const std::string& nm)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4650 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4651 std::string retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4652
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4653 typedef std::map<std::string, std::string>::const_iterator am_iter;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4654
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4655 am_iter p = autoload_map.find (nm);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4656
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4657 if (p != autoload_map.end ())
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	4658 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4659 load_path& lp = __get_load_path__ ("lookup_autoload");
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	4660
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	4661 retval = lp.find_file (p->second);
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	4662 }
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4663
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4664 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4665 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4666
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4667 string_vector
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4668 autoloaded_functions (void)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4669 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4670 string_vector names (autoload_map.size ());
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4671
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4672 octave_idx_type i = 0;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4673 for (const auto& fcn_fname : autoload_map)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4674 names[i++] = fcn_fname.first;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4675
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4676 return names;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4677 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4678
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4679 string_vector
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4680 reverse_lookup_autoload (const std::string& nm)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4681 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4682 string_vector names;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4683
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4684 for (const auto& fcn_fname : autoload_map)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4685 if (nm == fcn_fname.second)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4686 names.append (fcn_fname.first);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4687
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4688 return names;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4689 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4690
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4691 octave_value
23667 2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	4692 load_fcn_from_file (const std::string& file_name,
2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	4693 const std::string& dir_name,
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4694 const std::string& dispatch_type,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4695 const std::string& package_name,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4696 const std::string& fcn_name, bool autoload)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4697 {
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4698 octave_value retval;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4699
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4700 unwind_protect frame;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4701
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4702 std::string nm = file_name;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4703
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4704 size_t nm_len = nm.length ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4705
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4706 std::string file;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4707
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4708 bool relative_lookup = false;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4709
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4710 file = nm;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4711
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4712 if ((nm_len > 4 && nm.substr (nm_len-4) == ".oct")
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4713 \|\| (nm_len > 4 && nm.substr (nm_len-4) == ".mex")
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4714 \|\| (nm_len > 2 && nm.substr (nm_len-2) == ".m"))
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4715 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4716 nm = sys::env::base_pathname (file);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4717 nm = nm.substr (0, nm.find_last_of ('.'));
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4718
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4719 size_t pos = nm.find_last_of (sys::file_ops::dir_sep_str ());
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4720 if (pos != std::string::npos)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4721 nm = nm.substr (pos+1);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4722 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4723
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4724 relative_lookup = ! sys::env::absolute_pathname (file);
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4725
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4726 file = sys::env::make_absolute (file);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4727
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4728 int len = file.length ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4729
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4730 dynamic_loader& dyn_loader
23627 0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	4731 = __get_dynamic_loader__ ("~octave_mex_function");
0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	4732
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4733 if (len > 4 && file.substr (len-4, len-1) == ".oct")
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4734 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4735 if (autoload && ! fcn_name.empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4736 nm = fcn_name;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4737
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4738 octave_function *tmpfcn
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4739 = dyn_loader.load_oct (nm, file, relative_lookup);
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4740
25206 cbe53b5ea5ce check success of loading oct-file (bug #52977) Olaf Till <i7tiol@t-online.de> parents: 25193 diff changeset	4741 if (tmpfcn)
cbe53b5ea5ce check success of loading oct-file (bug #52977) Olaf Till <i7tiol@t-online.de> parents: 25193 diff changeset	4742 {
cbe53b5ea5ce check success of loading oct-file (bug #52977) Olaf Till <i7tiol@t-online.de> parents: 25193 diff changeset	4743 tmpfcn->stash_package_name (package_name);
cbe53b5ea5ce check success of loading oct-file (bug #52977) Olaf Till <i7tiol@t-online.de> parents: 25193 diff changeset	4744 retval = octave_value (tmpfcn);
cbe53b5ea5ce check success of loading oct-file (bug #52977) Olaf Till <i7tiol@t-online.de> parents: 25193 diff changeset	4745 }
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4746 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4747 else if (len > 4 && file.substr (len-4, len-1) == ".mex")
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4748 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4749 // Temporarily load m-file version of mex-file, if it exists,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4750 // to get the help-string to use.
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4751
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4752 std::string doc_string;
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4753
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4754 octave_value ov_fcn
23667 2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	4755 = parse_fcn_file (file.substr (0, len - 2), nm, dir_name,
2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	4756 dispatch_type, package_name, false,
2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	4757 autoload, autoload, relative_lookup, "");
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4758
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4759 if (ov_fcn.is_defined ())
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4760 {
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4761 octave_function *tmpfcn = ov_fcn.function_value ();
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4762
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4763 if (tmpfcn)
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4764 doc_string = tmpfcn->doc_string ();
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4765 }
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4766
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4767 octave_function *tmpfcn
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4768 = dyn_loader.load_mex (nm, file, relative_lookup);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4769
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4770 if (tmpfcn)
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4771 {
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4772 tmpfcn->document (doc_string);
25193 6f1fde568e46 make .oct and .mex files in +package dirs work again (bug #51960) John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	4773 tmpfcn->stash_package_name (package_name);
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4774
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4775 retval = octave_value (tmpfcn);
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	4776 }
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4777 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4778 else if (len > 2)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4779 {
23667 2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	4780 retval = parse_fcn_file (file, nm, dir_name, dispatch_type,
2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	4781 package_name, true, autoload, autoload,
2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	4782 relative_lookup, "");
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4783 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4784
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4785 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4786 }
5312 80c1aa832cb2 [project @ 2005-04-28 01:54:46 by jwe] jwe parents: 5309 diff changeset	4787 }
80c1aa832cb2 [project @ 2005-04-28 01:54:46 by jwe] jwe parents: 5309 diff changeset	4788
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	4789 DEFMETHOD (autoload, interp, args, ,
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	4790 doc: /* -- texinfo --
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4791 @deftypefn {} {@var{autoload_map} =} autoload ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4792 @deftypefnx {} {} autoload (@var{function}, @var{file})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4793 @deftypefnx {} {} autoload (@dots{}, "remove")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4794 Define @var{function} to autoload from @var{file}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4795
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4796 The second argument, @var{file}, should be an absolute filename or a file
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4797 name in the same directory as the function or script from which the autoload
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4798 command was run. @var{file} @emph{should not} depend on the Octave load
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4799 path.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4800
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4801 Normally, calls to @code{autoload} appear in PKG_ADD script files that are
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4802 evaluated when a directory is added to Octave's load path. To avoid having
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4803 to hardcode directory names in @var{file}, if @var{file} is in the same
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4804 directory as the PKG_ADD script then
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4805
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4806 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4807 autoload ("foo", "bar.oct");
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4808 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4809
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4810 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4811 will load the function @code{foo} from the file @code{bar.oct}. The above
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4812 usage when @code{bar.oct} is not in the same directory, or usages such as
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4813
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4814 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4815 autoload ("foo", file_in_loadpath ("bar.oct"))
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4816 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4817
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4818 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4819 are strongly discouraged, as their behavior may be unpredictable.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4820
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4821 With no arguments, return a structure containing the current autoload map.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4822
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4823 If a third argument @qcode{"remove"} is given, the function is cleared and
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4824 not loaded anymore during the current Octave session.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4825
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4826 @seealso{PKG_ADD}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4827 @end deftypefn */)
5484 2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	4828 {
5626 3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	4829 octave_value retval;
5484 2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	4830
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	4831 int nargin = args.length ();
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	4832
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	4833 if (nargin == 1 \|\| nargin > 3)
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	4834 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	4835
5626 3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	4836 if (nargin == 0)
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	4837 {
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	4838 Cell func_names (dim_vector (autoload_map.size (), 1));
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	4839 Cell file_names (dim_vector (autoload_map.size (), 1));
5626 3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	4840
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	4841 octave_idx_type i = 0;
22872 551ac93c984c maint: Use C++ range feature to simplify some for loops in libinterp/parse-tree Rik <rik@octave.org> parents: 22785 diff changeset	4842 for (const auto& fcn_fname : autoload_map)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4843 {
22872 551ac93c984c maint: Use C++ range feature to simplify some for loops in libinterp/parse-tree Rik <rik@octave.org> parents: 22785 diff changeset	4844 func_names(i) = fcn_fname.first;
551ac93c984c maint: Use C++ range feature to simplify some for loops in libinterp/parse-tree Rik <rik@octave.org> parents: 22785 diff changeset	4845 file_names(i) = fcn_fname.second;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4846
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4847 i++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4848 }
5626 3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	4849
11060 54697b37d8bf replace Octave_map->octave_scalar_map in oct-parse.yy and ov-fcn-handle.cc Jaroslav Hajek <highegg@gmail.com> parents: 10879 diff changeset	4850 octave_map m;
5626 3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	4851
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	4852 m.assign ("function", func_names);
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	4853 m.assign ("file", file_names);
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	4854
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	4855 retval = m;
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	4856 }
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	4857 else
5484 2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	4858 {
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	4859 string_vector argv = args.make_argv ("autoload");
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	4860
20547 52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4861 std::string nm = argv[2];
52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4862
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21730 diff changeset	4863 if (! octave::sys::env::absolute_pathname (nm))
6380 ac3d67504f85 [project @ 2007-03-02 22:08:06 by jwe] jwe parents: 6379 diff changeset	4864 {
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	4865 octave::call_stack& cs = interp.get_call_stack ();
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	4866
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	4867 octave_user_code *fcn = cs.caller_user_code ();
20547 52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4868
52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4869 bool found = false;
52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4870
52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4871 if (fcn)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4872 {
20547 52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4873 std::string fname = fcn->fcn_file_name ();
52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4874
52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4875 if (! fname.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4876 {
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21730 diff changeset	4877 fname = octave::sys::env::make_absolute (fname);
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	4878 fname = fname.substr (0, fname.find_last_of (octave::sys::file_ops::dir_sep_str ()) + 1);
20547 52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4879
21736 0504351a45e6 use namespace for file_stat classes John W. Eaton <jwe@octave.org> parents: 21733 diff changeset	4880 octave::sys::file_stat fs (fname + nm);
20547 52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4881
52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4882 if (fs.exists ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4883 {
20547 52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4884 nm = fname + nm;
52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4885 found = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4886 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4887 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4888 }
20547 52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4889 if (! found)
52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4890 warning_with_id ("Octave:autoload-relative-file-name",
20713 2469d78a1d8b Consistently use 'filename' rather than 'file name' throughout code base. Rik <rik@octave.org> parents: 20700 diff changeset	4891 "autoload: '%s' is not an absolute filename",
20547 52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4892 nm.c_str ());
52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4893 }
52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4894 if (nargin == 2)
52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4895 autoload_map[argv[1]] = nm;
52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4896 else if (nargin == 3)
52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4897 {
21021 a5b99b09f8fd maint: Use comparison operators rather than compare() for strings. Rik <rik@octave.org> parents: 20957 diff changeset	4898 if (argv[3] != "remove")
20547 52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4899 error_with_id ("Octave:invalid-input-arg",
52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4900 "autoload: third argument can only be 'remove'");
52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4901
52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4902 // Remove function from symbol table and autoload map.
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23673 diff changeset	4903 octave::symbol_table& symtab = interp.get_symbol_table ();
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	4904 symtab.clear_dld_function (argv[1]);
20547 52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4905 autoload_map.erase (argv[1]);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4906 }
5484 2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	4907 }
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	4908
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	4909 return retval;
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	4910 }
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	4911
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4912 namespace octave
4486 6ceba1f351fb [project @ 2003-08-22 16:49:46 by jwe] jwe parents: 4463 diff changeset	4913 {
23845 3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files. John W. Eaton <jwe@octave.org> parents: 23841 diff changeset	4914 // Execute the contents of a script file. For compatibility with
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files. John W. Eaton <jwe@octave.org> parents: 23841 diff changeset	4915 // Matlab, also execute a function file by calling the function it
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files. John W. Eaton <jwe@octave.org> parents: 23841 diff changeset	4916 // defines with no arguments and nargout = 0.
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files. John W. Eaton <jwe@octave.org> parents: 23841 diff changeset	4917
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4918 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4919 source_file (const std::string& file_name, const std::string& context,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4920 bool verbose, bool require_file, const std::string& warn_for)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4921 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4922 // Map from absolute name of script file to recursion level. We
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4923 // use a map instead of simply placing a limit on recursion in the
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4924 // source_file function so that two mutually recursive scripts
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4925 // written as
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4926 //
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4927 // foo1.m:
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4928 // ------
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4929 // foo2
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4930 //
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4931 // foo2.m:
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4932 // ------
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4933 // foo1
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4934 //
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4935 // and called with
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4936 //
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4937 // foo1
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4938 //
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4939 // (for example) will behave the same if they are written as
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4940 //
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4941 // foo1.m:
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4942 // ------
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4943 // source ("foo2.m")
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4944 //
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4945 // foo2.m:
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4946 // ------
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4947 // source ("foo1.m")
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4948 //
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4949 // and called with
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4950 //
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4951 // source ("foo1.m")
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4952 //
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4953 // (for example).
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4954
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4955 static std::map<std::string, int> source_call_depth;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4956
23631 0954bf188bed avoid memory leak in source_file function John W. Eaton <jwe@octave.org> parents: 23628 diff changeset	4957 std::string file_full_name
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4958 = sys::file_ops::tilde_expand (file_name);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4959
23667 2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	4960 size_t pos
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4961 = file_full_name.find_last_of (sys::file_ops::dir_sep_str ());
23667 2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	4962
2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	4963 std::string dir_name = file_full_name.substr (0, pos);
2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	4964
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4965 file_full_name = sys::env::make_absolute (file_full_name);
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4966
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4967 unwind_protect frame;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4968
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4969 if (source_call_depth.find (file_full_name) == source_call_depth.end ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4970 source_call_depth[file_full_name] = -1;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4971
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4972 frame.protect_var (source_call_depth[file_full_name]);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4973
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4974 source_call_depth[file_full_name]++;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4975
23705 4c597585ff52 move Vmax_recursion_depth and Vsilent_functions to tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23702 diff changeset	4976 tree_evaluator& tw = __get_evaluator__ ("source_file");
4c597585ff52 move Vmax_recursion_depth and Vsilent_functions to tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23702 diff changeset	4977
4c597585ff52 move Vmax_recursion_depth and Vsilent_functions to tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23702 diff changeset	4978 if (source_call_depth[file_full_name] >= tw.max_recursion_depth ())
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4979 error ("max_recursion_depth exceeded");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4980
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4981 if (! context.empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4982 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4983 call_stack& cs = __get_call_stack__ ("source_file");
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	4984
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4985 if (context == "caller")
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	4986 cs.goto_caller_frame ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4987 else if (context == "base")
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	4988 cs.goto_base_frame ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4989 else
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4990 error ("source: context must be \"caller\" or \"base\"");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4991
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4992 frame.add_method (cs, &call_stack::pop);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4993 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4994
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4995 // Find symbol name that would be in symbol_table, if it were loaded.
23631 0954bf188bed avoid memory leak in source_file function John W. Eaton <jwe@octave.org> parents: 23628 diff changeset	4996 size_t dir_end
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4997 = file_name.find_last_of (sys::file_ops::dir_sep_chars ());
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4998 dir_end = (dir_end == std::string::npos) ? 0 : dir_end + 1;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4999
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5000 size_t extension = file_name.find_last_of ('.');
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5001 if (extension == std::string::npos)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5002 extension = file_name.length ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5003
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5004 std::string symbol = file_name.substr (dir_end, extension - dir_end);
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	5005 std::string full_name = sys::canonicalize_file_name (file_name);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5006
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5007 // Check if this file is already loaded (or in the path)
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	5008 symbol_table& symtab = __get_symbol_table__ ("source_file");
23631 0954bf188bed avoid memory leak in source_file function John W. Eaton <jwe@octave.org> parents: 23628 diff changeset	5009 octave_value ov_code = symtab.find (symbol);
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5010
23845 3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files. John W. Eaton <jwe@octave.org> parents: 23841 diff changeset	5011 // For compatibility with Matlab, accept both scripts and
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files. John W. Eaton <jwe@octave.org> parents: 23841 diff changeset	5012 // functions.
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files. John W. Eaton <jwe@octave.org> parents: 23841 diff changeset	5013
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files. John W. Eaton <jwe@octave.org> parents: 23841 diff changeset	5014 if (ov_code.is_user_code ())
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5015 {
23845 3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files. John W. Eaton <jwe@octave.org> parents: 23841 diff changeset	5016 octave_user_code *code = ov_code.user_code_value ();
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files. John W. Eaton <jwe@octave.org> parents: 23841 diff changeset	5017
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files. John W. Eaton <jwe@octave.org> parents: 23841 diff changeset	5018 if (! code
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files. John W. Eaton <jwe@octave.org> parents: 23841 diff changeset	5019 \|\| (sys::canonicalize_file_name (code->fcn_file_name ())
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5020 != full_name))
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5021 {
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5022 // Wrong file, so load it below.
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5023 ov_code = octave_value ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5024 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5025 }
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5026 else
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5027 {
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5028 // Not a script, so load it below.
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5029 ov_code = octave_value ();
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5030 }
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5031
23631 0954bf188bed avoid memory leak in source_file function John W. Eaton <jwe@octave.org> parents: 23628 diff changeset	5032 // If no symbol of this name, or the symbol is for a different
0954bf188bed avoid memory leak in source_file function John W. Eaton <jwe@octave.org> parents: 23628 diff changeset	5033 // file, load.
0954bf188bed avoid memory leak in source_file function John W. Eaton <jwe@octave.org> parents: 23628 diff changeset	5034
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5035 if (ov_code.is_undefined ())
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5036 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5037 try
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5038 {
23667 2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	5039 ov_code = parse_fcn_file (file_full_name, file_name, dir_name,
2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	5040 "", "", require_file, true, false,
2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	5041 false, warn_for);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5042 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	5043 catch (execution_exception& e)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5044 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5045 error (e, "source: error sourcing file '%s'",
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5046 file_full_name.c_str ());
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5047 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5048 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5049
23845 3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files. John W. Eaton <jwe@octave.org> parents: 23841 diff changeset	5050 // Return or error if we don't have a valid script or function.
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files. John W. Eaton <jwe@octave.org> parents: 23841 diff changeset	5051
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5052 if (ov_code.is_undefined ())
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5053 return;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5054
23845 3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files. John W. Eaton <jwe@octave.org> parents: 23841 diff changeset	5055 if (! ov_code.is_user_code ())
21707 4c080cbc4ef9 Make source() not re-parse a file if it is already loaded (bug #33411). Lachlan Andrew <lachlanbis@gmail.com> parents: 21589 diff changeset	5056 error ("source: %s is not a script", full_name.c_str ());
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5057
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5058 if (verbose)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5059 {
26009 3fc9d7453ba6 where possible, use octave_stdout and avoid including <iostream> John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	5060 octave_stdout << "executing commands from " << full_name << " ... ";
3fc9d7453ba6 where possible, use octave_stdout and avoid including <iostream> John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	5061 octave_stdout.flush ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5062 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5063
23845 3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files. John W. Eaton <jwe@octave.org> parents: 23841 diff changeset	5064 octave_user_code *code = ov_code.user_code_value ();
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files. John W. Eaton <jwe@octave.org> parents: 23841 diff changeset	5065
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files. John W. Eaton <jwe@octave.org> parents: 23841 diff changeset	5066 code->call (tw, 0, octave_value_list ());
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5067
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5068 if (verbose)
26009 3fc9d7453ba6 where possible, use octave_stdout and avoid including <iostream> John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	5069 octave_stdout << "done." << std::endl;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5070 }
4486 6ceba1f351fb [project @ 2003-08-22 16:49:46 by jwe] jwe parents: 4463 diff changeset	5071 }
6ceba1f351fb [project @ 2003-08-22 16:49:46 by jwe] jwe parents: 4463 diff changeset	5072
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5073 DEFMETHOD (mfilename, interp, args, ,
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5074 doc: /* -- texinfo --
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5075 @deftypefn {} {} mfilename ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5076 @deftypefnx {} {} mfilename ("fullpath")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5077 @deftypefnx {} {} mfilename ("fullpathext")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5078 Return the name of the currently executing file.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5079
25294 01ad54f997f5 Allow filenames which begin with a '.' to be returned from mfilename (bug #53707). Rik <rik@octave.org> parents: 25206 diff changeset	5080 The base name of the currently executing script or function is returned without
01ad54f997f5 Allow filenames which begin with a '.' to be returned from mfilename (bug #53707). Rik <rik@octave.org> parents: 25206 diff changeset	5081 any extension. If called from outside an m-file, such as the command line,
01ad54f997f5 Allow filenames which begin with a '.' to be returned from mfilename (bug #53707). Rik <rik@octave.org> parents: 25206 diff changeset	5082 return the empty string.
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5083
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5084 Given the argument @qcode{"fullpath"}, include the directory part of the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5085 filename, but not the extension.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5086
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5087 Given the argument @qcode{"fullpathext"}, include the directory part of
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5088 the filename and the extension.
25294 01ad54f997f5 Allow filenames which begin with a '.' to be returned from mfilename (bug #53707). Rik <rik@octave.org> parents: 25206 diff changeset	5089 @seealso{inputname, dbstack}
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5090 @end deftypefn */)
5739 d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5091 {
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5092 octave_value retval;
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5093
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5094 int nargin = args.length ();
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5095
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5096 if (nargin > 1)
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5097 print_usage ();
5739 d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5098
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5099 std::string arg;
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5100
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5101 if (nargin == 1)
21861 a55f1fa2c94a oct-parse.in.yy: Shorten lines to < 80 characters where possible. Rik <rik@octave.org> parents: 21748 diff changeset	5102 arg = args(0).xstring_value ("mfilename: argument must be a string");
5739 d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5103
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5104 std::string fname;
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5105
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5106 octave::call_stack& cs = interp.get_call_stack ();
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5107
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5108 octave_user_code *fcn = cs.caller_user_code ();
5743 a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe] jwe parents: 5739 diff changeset	5109
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe] jwe parents: 5739 diff changeset	5110 if (fcn)
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe] jwe parents: 5739 diff changeset	5111 {
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe] jwe parents: 5739 diff changeset	5112 fname = fcn->fcn_file_name ();
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe] jwe parents: 5739 diff changeset	5113
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe] jwe parents: 5739 diff changeset	5114 if (fname.empty ())
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe] jwe parents: 5739 diff changeset	5115 fname = fcn->name ();
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe] jwe parents: 5739 diff changeset	5116 }
5739 d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5117
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5118 if (arg == "fullpathext")
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5119 retval = fname;
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5120 else
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5121 {
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	5122 size_t dpos = fname.rfind (octave::sys::file_ops::dir_sep_char ());
5747 b09d4d0f5b63 [project @ 2006-04-07 06:43:10 by jwe] jwe parents: 5744 diff changeset	5123 size_t epos = fname.rfind ('.');
b09d4d0f5b63 [project @ 2006-04-07 06:43:10 by jwe] jwe parents: 5744 diff changeset	5124
25294 01ad54f997f5 Allow filenames which begin with a '.' to be returned from mfilename (bug #53707). Rik <rik@octave.org> parents: 25206 diff changeset	5125 if (epos <= dpos+1)
8021 85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	5126 epos = std::string::npos;
85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	5127
85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	5128 fname = (epos != std::string::npos) ? fname.substr (0, epos) : fname;
5739 d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5129
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5130 if (arg == "fullpath")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	5131 retval = fname;
5739 d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5132 else
8021 85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	5133 retval = (dpos != std::string::npos) ? fname.substr (dpos+1) : fname;
5739 d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5134 }
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5135
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5136 return retval;
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5137 }
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5138
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5139 DEFUN (source, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5140 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5141 @deftypefn {} {} source (@var{file})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5142 @deftypefnx {} {} source (@var{file}, @var{context})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5143 Parse and execute the contents of @var{file}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5144
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5145 Without specifying @var{context}, this is equivalent to executing commands
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5146 from a script file, but without requiring the file to be named
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5147 @file{@var{file}.m} or to be on the execution path.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5148
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5149 Instead of the current context, the script may be executed in either the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5150 context of the function that called the present function
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5151 (@qcode{"caller"}), or the top-level context (@qcode{"base"}).
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5152 @seealso{run}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5153 @end deftypefn */)
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5154 {
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5155 octave_value_list retval;
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5156
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5157 int nargin = args.length ();
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5158
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5159 if (nargin < 1 \|\| nargin > 2)
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5794 diff changeset	5160 print_usage ();
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5161
21861 a55f1fa2c94a oct-parse.in.yy: Shorten lines to < 80 characters where possible. Rik <rik@octave.org> parents: 21748 diff changeset	5162 std::string file_name = args(0).xstring_value ("source: FILE must be a string");
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5163
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5164 std::string context;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5165
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5166 if (nargin == 2)
21861 a55f1fa2c94a oct-parse.in.yy: Shorten lines to < 80 characters where possible. Rik <rik@octave.org> parents: 21748 diff changeset	5167 context = args(1).xstring_value ("source: CONTEXT must be a string");
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5168
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5169 octave::source_file (file_name, context);
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5170
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5171 return retval;
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5172 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5173
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5174 namespace octave
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5175 {
24624 ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	5176 //! Evaluate an Octave function (built-in or interpreted) and return
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	5177 //! the list of result values.
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	5178 //!
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	5179 //! @param name The name of the function to call.
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	5180 //! @param args The arguments to the function.
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	5181 //! @param nargout The number of output arguments expected.
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	5182 //! @return A list of output values. The length of the list is not
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	5183 //! necessarily the same as @c nargout.
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	5184
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5185 octave_value_list
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5186 feval (const std::string& name, const octave_value_list& args, int nargout)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5187 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5188 octave_value_list retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5189
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	5190 symbol_table& symtab = __get_symbol_table__ ("feval");
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	5191
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	5192 octave_value fcn = symtab.find_function (name, args);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5193
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5194 if (fcn.is_defined ())
23502 c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5195 {
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	5196 tree_evaluator& tw = __get_evaluator__ ("feval");
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	5197
23502 c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5198 octave_function *of = fcn.function_value ();
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5199
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	5200 retval = of->call (tw, nargout, args);
23502 c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5201 }
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5202 else
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5203 error ("feval: function '%s' not found", name.c_str ());
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5204
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5205 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5206 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5207
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5208 octave_value_list
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5209 feval (octave_function *fcn, const octave_value_list& args, int nargout)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5210 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5211 octave_value_list retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5212
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5213 if (fcn)
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	5214 {
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	5215 tree_evaluator& tw = __get_evaluator__ ("feval");
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	5216
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	5217 retval = fcn->call (tw, nargout, args);
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	5218 }
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5219
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5220 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5221 }
23502 c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5222
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5223 octave_value_list
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5224 feval (octave_value& val, const octave_value_list& args, int nargout)
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5225 {
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5226 if (val.is_function ())
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5227 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	5228 return feval (val.function_value (), args, nargout);
23502 c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5229 }
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5230 else if (val.is_function_handle ())
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5231 {
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5232 // This covers function handles, inline functions, and anonymous
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5233 // functions.
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5234
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5235 std::list<octave_value_list> arg_list;
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5236 arg_list.push_back (args);
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5237
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5238 return val.subsref ("(", arg_list, nargout);
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5239 }
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5240 else if (val.is_string ())
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5241 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	5242 return feval (val.string_value (), args, nargout);
23502 c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5243 }
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5244 else
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5245 error ("feval: first argument must be a string, inline function, or a function handle");
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5246
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5247 return ovl ();
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5248 }
25442 47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	5249
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	5250 static octave_value_list
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	5251 get_feval_args (const octave_value_list& args)
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	5252 {
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	5253 return args.slice (1, args.length () - 1, true);
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	5254 }
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	5255
24624 ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	5256 //! Evaluate an Octave function (built-in or interpreted) and return
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	5257 //! the list of result values.
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	5258 //!
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	5259 //! @param args The first element of @c args is the function to call.
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	5260 //! It may be the name of the function as a string, a function
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	5261 //! handle, or an inline function. The remaining arguments are
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	5262 //! passed to the function.
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	5263 //! @param nargout The number of output arguments expected.
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	5264 //! @return A list of output values. The length of the list is not
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	5265 //! necessarily the same as @c nargout.
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	5266
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5267 octave_value_list
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5268 feval (const octave_value_list& args, int nargout)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5269 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5270 if (args.length () > 0)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5271 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5272 octave_value f_arg = args(0);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5273
23502 c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5274 octave_value_list tmp_args = get_feval_args (args);
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5275
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	5276 return feval (f_arg, tmp_args, nargout);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5277 }
23502 c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5278 else
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5279 error ("feval: first argument must be a string, inline function, or a function handle");
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5280
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5281 return ovl ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5282 }
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5283 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5284
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5285 DEFUN (feval, args, nargout,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5286 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5287 @deftypefn {} {} feval (@var{name}, @dots{})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5288 Evaluate the function named @var{name}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5289
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5290 Any arguments after the first are passed as inputs to the named function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5291 For example,
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5292
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5293 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5294 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5295 feval ("acos", -1)
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5296 @result{} 3.1416
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5297 @end group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5298 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5299
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5300 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5301 calls the function @code{acos} with the argument @samp{-1}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5302
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5303 The function @code{feval} can also be used with function handles of any sort
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5304 (@pxref{Function Handles}). Historically, @code{feval} was the only way to
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5305 call user-supplied functions in strings, but function handles are now
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5306 preferred due to the cleaner syntax they offer. For example,
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5307
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5308 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5309 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5310 @var{f} = @@exp;
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5311 feval (@var{f}, 1)
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5312 @result{} 2.7183
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5313 @var{f} (1)
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5314 @result{} 2.7183
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5315 @end group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5316 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5317
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5318 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5319 are equivalent ways to call the function referred to by @var{f}. If it
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5320 cannot be predicted beforehand whether @var{f} is a function handle,
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5321 function name in a string, or inline function then @code{feval} can be used
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5322 instead.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5323 @end deftypefn */)
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5324 {
20818 cef0448a6ed2 eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20798 diff changeset	5325 if (args.length () == 0)
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5794 diff changeset	5326 print_usage ();
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5327
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5328 return octave::feval (args, nargout);
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5329 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5330
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	5331 DEFMETHOD (builtin, interp, args, nargout,
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	5332 doc: /* -- texinfo --
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5333 @deftypefn {} {[@dots{}] =} builtin (@var{f}, @dots{})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5334 Call the base function @var{f} even if @var{f} is overloaded to another
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5335 function for the given type signature.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5336
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5337 This is normally useful when doing object-oriented programming and there is
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5338 a requirement to call one of Octave's base functions rather than the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5339 overloaded one of a new class.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5340
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5341 A trivial example which redefines the @code{sin} function to be the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5342 @code{cos} function shows how @code{builtin} works.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5343
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5344 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5345 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5346 sin (0)
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5347 @result{} 0
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5348 function y = sin (x), y = cos (x); endfunction
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5349 sin (0)
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5350 @result{} 1
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5351 builtin ("sin", 0)
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5352 @result{} 0
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5353 @end group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5354 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5355 @end deftypefn */)
11225 8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	5356 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	5357 octave_value_list retval;
11225 8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	5358
20818 cef0448a6ed2 eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20798 diff changeset	5359 if (args.length () == 0)
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5360 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5361
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5362 const std::string name (args(0).xstring_value ("builtin: function name (F) must be a string"));
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5363
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23673 diff changeset	5364 octave::symbol_table& symtab = interp.get_symbol_table ();
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	5365
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	5366 octave_value fcn = symtab.builtin_find (name);
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5367
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5368 if (fcn.is_defined ())
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5369 retval = octave::feval (fcn.function_value (), args.splice (0, 1), nargout);
11225 8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	5370 else
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5371 error ("builtin: lookup for symbol '%s' failed", name.c_str ());
11225 8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	5372
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	5373 return retval;
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	5374 }
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	5375
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5376 namespace octave
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5377 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5378 octave_value_list
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5379 eval_string (const std::string& eval_str, bool silent,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5380 int& parse_status, int nargout)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5381 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5382 octave_value_list retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5383
25441 143007dad864 store reference instead of pointer to interpreter in lexer John W. Eaton <jwe@octave.org> parents: 25440 diff changeset	5384 parser parser (eval_str, __get_interpreter__ ("eval_string"));
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5385
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5386 do
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5387 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5388 parser.reset ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5389
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5390 parse_status = parser.run ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5391
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5392 if (parse_status == 0)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5393 {
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	5394 if (parser.m_stmt_list)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5395 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	5396 tree_statement *stmt = nullptr;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5397
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	5398 tree_evaluator& tw = __get_evaluator__ ("eval_string");
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	5399
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	5400 if (parser.m_stmt_list->length () == 1
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	5401 && (stmt = parser.m_stmt_list->front ())
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5402 && stmt->is_expression ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5403 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5404 tree_expression *expr = stmt->expression ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5405
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5406 if (silent)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5407 expr->set_print_flag (false);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5408
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5409 bool do_bind_ans = false;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5410
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5411 if (expr->is_identifier ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5412 {
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25294 diff changeset	5413 symbol_scope scope = tw.get_current_scope ();
389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25294 diff changeset	5414
389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25294 diff changeset	5415 symbol_record::context_id context
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	5416 = scope.current_context ();
24356 8b14ba8296af refactor symbol_record object John W. Eaton <jwe@octave.org> parents: 24354 diff changeset	5417
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5418 tree_identifier *id
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5419 = dynamic_cast<tree_identifier *> (expr);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5420
24356 8b14ba8296af refactor symbol_record object John W. Eaton <jwe@octave.org> parents: 24354 diff changeset	5421 do_bind_ans = (! id->is_variable (context));
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5422 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5423 else
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5424 do_bind_ans = (! expr->is_assignment_expression ());
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5425
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	5426 retval = tw.evaluate_n (expr, nargout);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5427
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5428 if (do_bind_ans && ! retval.empty ())
23702 d396b5fd9199 move bind_ans to tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	5429 tw.bind_ans (retval(0), expr->print_result ());
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5430
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5431 if (nargout == 0)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5432 retval = octave_value_list ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5433 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5434 else if (nargout == 0)
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	5435 parser.m_stmt_list->accept (tw);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5436 else
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5437 error ("eval: invalid use of statement list");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5438
25403 2b7d7a3f5f57 move returning, breaking, and continuing flags to evaluator John W. Eaton <jwe@octave.org> parents: 25395 diff changeset	5439 if (tw.returning () \|\| tw.breaking () \|\| tw.continuing ())
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5440 break;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5441 }
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	5442 else if (parser.m_lexer.m_end_of_input)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5443 break;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5444 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5445 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5446 while (parse_status == 0);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5447
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5448 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5449 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5450
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5451 octave_value
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5452 eval_string (const std::string& eval_str, bool silent, int& parse_status)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5453 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5454 octave_value retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5455
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5456 octave_value_list tmp = eval_string (eval_str, silent, parse_status, 1);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5457
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5458 if (! tmp.empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5459 retval = tmp(0);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5460
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5461 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5462 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5463
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5464 static octave_value_list
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5465 eval_string (const octave_value& arg, bool silent, int& parse_status,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5466 int nargout)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5467 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5468 std::string s = arg.xstring_value ("eval: expecting std::string argument");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5469
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5470 return eval_string (s, silent, parse_status, nargout);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5471 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5472
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5473 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5474 cleanup_statement_list (tree_statement_list **lst)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5475 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5476 if (*lst)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5477 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5478 delete *lst;
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	5479 *lst = nullptr;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5480 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5481 }
13970 c93b953f7d54 plug some memory leaks John W. Eaton <jwe@octave.org> parents: 13844 diff changeset	5482 }
c93b953f7d54 plug some memory leaks John W. Eaton <jwe@octave.org> parents: 13844 diff changeset	5483
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5484 DEFUN (eval, args, nargout,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5485 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5486 @deftypefn {} {} eval (@var{try})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5487 @deftypefnx {} {} eval (@var{try}, @var{catch})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5488 Parse the string @var{try} and evaluate it as if it were an Octave
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5489 program.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5490
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5491 If execution fails, evaluate the optional string @var{catch}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5492
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5493 The string @var{try} is evaluated in the current context, so any results
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5494 remain available after @code{eval} returns.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5495
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5496 The following example creates the variable @var{A} with the approximate
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5497 value of 3.1416 in the current workspace.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5498
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5499 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5500 eval ("A = acos(-1);");
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5501 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5502
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5503 If an error occurs during the evaluation of @var{try} then the @var{catch}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5504 string is evaluated, as the following example shows:
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5505
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5506 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5507 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5508 eval ('error ("This is a bad example");',
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5509 'printf ("This error occurred:\n%s\n", lasterr ());');
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5510 @print{} This error occurred:
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5511 This is a bad example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5512 @end group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5513 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5514
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5515 Programming Note: if you are only using @code{eval} as an error-capturing
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5516 mechanism, rather than for the execution of arbitrary code strings,
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5517 Consider using try/catch blocks or unwind_protect/unwind_protect_cleanup
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5518 blocks instead. These techniques have higher performance and don't
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5519 introduce the security considerations that the evaluation of arbitrary code
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5520 does.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5521 @seealso{evalin, evalc, assignin, feval}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5522 @end deftypefn */)
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5523 {
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5524 octave_value_list retval;
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5525
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5526 int nargin = args.length ();
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5527
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5528 if (nargin == 0)
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5529 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5530
21743 f4d7d0eb5b0c use namespace for unwind_protect class John W. Eaton <jwe@octave.org> parents: 21740 diff changeset	5531 octave::unwind_protect frame;
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5532
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5533 if (nargin > 1)
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5534 {
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5535 frame.protect_var (buffer_error_messages);
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5536 buffer_error_messages++;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5537 }
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5538
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5539 int parse_status = 0;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5540
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5541 bool execution_error = false;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5542
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5543 octave_value_list tmp;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5544
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5545 try
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5546 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5547 tmp = octave::eval_string (args(0), nargout > 0, parse_status, nargout);
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5548 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	5549 catch (const octave::execution_exception&)
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5550 {
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	5551 octave::interpreter::recover_from_exception ();
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5552
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5553 execution_error = true;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5554 }
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5555
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5556 if (nargin > 1 && (parse_status != 0 \|\| execution_error))
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5557 {
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5558 // Set up for letting the user print any messages from
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5559 // errors that occurred in the first part of this eval().
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5560
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5561 buffer_error_messages--;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5562
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5563 tmp = octave::eval_string (args(1), nargout > 0, parse_status, nargout);
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5564
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5565 if (nargout > 0)
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5566 retval = tmp;
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5567 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5568 else
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5569 {
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5570 if (nargout > 0)
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5571 retval = tmp;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5572
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5573 // FIXME: we should really be rethrowing whatever exception occurred,
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5574 // not just throwing an execution exception.
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5575 if (execution_error)
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5576 octave_throw_execution_exception ();
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5577 }
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5578
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5579 return retval;
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5580 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5581
7562 c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	5582 /*
c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	5583
14084 5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5584 %!shared x
7562 c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	5585 %! x = 1;
14084 5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5586
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5587 %!assert (eval ("x"), 1)
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5588 %!assert (eval ("x;"))
21317 a4faec57f4c8 maint: remove semicolon after %!assert tests to follow Octave conventions. Rik <rik@octave.org> parents: 21301 diff changeset	5589 %!assert (eval ("x;"), 1)
14084 5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5590
7562 c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	5591 %!test
14084 5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5592 %! y = eval ("x");
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5593 %! assert (y, 1);
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5594
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5595 %!test
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5596 %! y = eval ("x;");
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5597 %! assert (y, 1);
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5598
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5599 %!test
21580 ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 21416 diff changeset	5600 %! eval ("x = 1;");
14084 5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5601 %! assert (x,1);
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5602
7562 c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	5603 %!test
c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	5604 %! eval ("flipud = 2;");
14084 5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5605 %! assert (flipud, 2);
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5606
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5607 %!function y = __f ()
7562 c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	5608 %! eval ("flipud = 2;");
c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	5609 %! y = flipud;
14084 5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5610 %!endfunction
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5611 %!assert (__f(), 2)
7562 c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	5612
14533 e6aa044253eb Allow comma at the end of an assignment list (bug #35645) Max Brister <max@2bass.com> parents: 14512 diff changeset	5613 % bug #35645
e6aa044253eb Allow comma at the end of an assignment list (bug #35645) Max Brister <max@2bass.com> parents: 14512 diff changeset	5614 %!test
e6aa044253eb Allow comma at the end of an assignment list (bug #35645) Max Brister <max@2bass.com> parents: 14512 diff changeset	5615 %! [a,] = gcd (1,2);
e6aa044253eb Allow comma at the end of an assignment list (bug #35645) Max Brister <max@2bass.com> parents: 14512 diff changeset	5616 %! [a,b,] = gcd (1, 2);
e6aa044253eb Allow comma at the end of an assignment list (bug #35645) Max Brister <max@2bass.com> parents: 14512 diff changeset	5617
21581 6fab85c1538f maint: Follow Octave conventions for use of semicolon in BIST tests. Rik <rik@octave.org> parents: 21580 diff changeset	5618 %!error eval ("switch = 13;")
21369 105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21361 diff changeset	5619
7562 c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	5620 */
c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	5621
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5622 DEFMETHOD (assignin, interp, args, ,
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5623 doc: /* -- texinfo --
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5624 @deftypefn {} {} assignin (@var{context}, @var{varname}, @var{value})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5625 Assign @var{value} to @var{varname} in context @var{context}, which
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5626 may be either @qcode{"base"} or @qcode{"caller"}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5627 @seealso{evalin}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5628 @end deftypefn */)
4297 59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	5629 {
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	5630 octave_value_list retval;
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	5631
20818 cef0448a6ed2 eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20798 diff changeset	5632 if (args.length () != 3)
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5633 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5634
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5635 std::string context = args(0).xstring_value ("assignin: CONTEXT must be a string");
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5636
21743 f4d7d0eb5b0c use namespace for unwind_protect class John W. Eaton <jwe@octave.org> parents: 21740 diff changeset	5637 octave::unwind_protect frame;
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5638
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5639 octave::call_stack& cs = interp.get_call_stack ();
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5640
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5641 if (context == "caller")
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5642 cs.goto_caller_frame ();
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5643 else if (context == "base")
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5644 cs.goto_base_frame ();
4297 59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	5645 else
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5646 error ("assignin: CONTEXT must be \"caller\" or \"base\"");
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5647
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5648 frame.add_method (cs, &octave::call_stack::pop);
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5649
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5650 std::string nm = args(1).xstring_value ("assignin: VARNAME must be a string");
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5651
25646 4d565baa475e move libinterp/utils functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 25644 diff changeset	5652 if (octave::valid_identifier (nm))
21369 105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21361 diff changeset	5653 {
105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21361 diff changeset	5654 // Put the check here so that we don't slow down assignments
105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21361 diff changeset	5655 // generally. Any that go through Octave's parser should have
105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21361 diff changeset	5656 // already been checked.
105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21361 diff changeset	5657
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5658 if (octave::is_keyword (nm))
21369 105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21361 diff changeset	5659 error ("assignin: invalid assignment to keyword '%s'", nm.c_str ());
105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21361 diff changeset	5660
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	5661 octave::symbol_scope scope = interp.get_current_scope ();
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	5662
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	5663 if (scope)
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	5664 scope.assign (nm, args(2));
21369 105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21361 diff changeset	5665 }
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5666 else
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5667 error ("assignin: invalid variable name in argument VARNAME");
4297 59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	5668
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	5669 return retval;
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	5670 }
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	5671
21369 105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21361 diff changeset	5672 /*
105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21361 diff changeset	5673
21581 6fab85c1538f maint: Follow Octave conventions for use of semicolon in BIST tests. Rik <rik@octave.org> parents: 21580 diff changeset	5674 %!error assignin ("base", "switch", "13")
21369 105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21361 diff changeset	5675
105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21361 diff changeset	5676 */
105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21361 diff changeset	5677
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5678 DEFMETHOD (evalin, interp, args, nargout,
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5679 doc: /* -- texinfo --
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5680 @deftypefn {} {} evalin (@var{context}, @var{try})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5681 @deftypefnx {} {} evalin (@var{context}, @var{try}, @var{catch})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5682 Like @code{eval}, except that the expressions are evaluated in the context
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5683 @var{context}, which may be either @qcode{"caller"} or @qcode{"base"}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5684 @seealso{eval, assignin}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5685 @end deftypefn */)
4245 610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	5686 {
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	5687 octave_value_list retval;
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	5688
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	5689 int nargin = args.length ();
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	5690
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5691 if (nargin < 2)
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5692 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5693
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5694 std::string context = args(0).xstring_value ("evalin: CONTEXT must be a string");
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5695
21743 f4d7d0eb5b0c use namespace for unwind_protect class John W. Eaton <jwe@octave.org> parents: 21740 diff changeset	5696 octave::unwind_protect frame;
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5697
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5698 octave::call_stack& cs = interp.get_call_stack ();
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5699
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5700 if (context == "caller")
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5701 cs.goto_caller_frame ();
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5702 else if (context == "base")
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5703 cs.goto_base_frame ();
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5704 else
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5705 error ("evalin: CONTEXT must be \"caller\" or \"base\"");
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5706
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5707 frame.add_method (cs, &octave::call_stack::pop);
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5708
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5709 if (nargin > 2)
4245 610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	5710 {
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5711 frame.protect_var (buffer_error_messages);
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5712 buffer_error_messages++;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5713 }
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5714
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5715 int parse_status = 0;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5716
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5717 bool execution_error = false;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5718
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5719 octave_value_list tmp;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5720
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5721 try
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5722 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5723 tmp = octave::eval_string (args(1), nargout > 0,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5724 parse_status, nargout);
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5725 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	5726 catch (const octave::execution_exception&)
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5727 {
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	5728 octave::interpreter::recover_from_exception ();
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5729
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5730 execution_error = true;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5731 }
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5732
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5733 if (nargin > 2 && (parse_status != 0 \|\| execution_error))
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5734 {
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5735 // Set up for letting the user print any messages from
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5736 // errors that occurred in the first part of this eval().
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5737
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5738 buffer_error_messages--;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5739
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5740 tmp = octave::eval_string (args(2), nargout > 0,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5741 parse_status, nargout);
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5742
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5743 retval = (nargout > 0) ? tmp : octave_value_list ();
4245 610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	5744 }
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	5745 else
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5746 {
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5747 if (nargout > 0)
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5748 retval = tmp;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5749
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5750 // FIXME: we should really be rethrowing whatever
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5751 // exception occurred, not just throwing an
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5752 // execution exception.
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5753 if (execution_error)
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5754 octave_throw_execution_exception ();
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5755 }
4245 610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	5756
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	5757 return retval;
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	5758 }
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	5759
22504 2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5760 static void
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5761 maybe_print_last_error_message (bool *doit)
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5762 {
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5763 if (doit && *doit)
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5764 // Print error message again, which was lost because of the stderr buffer
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5765 // Note: this keeps error_state and last_error_stack intact
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5766 message_with_id ("error", last_error_id ().c_str (),
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5767 last_error_message ().c_str ());
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5768 }
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5769
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5770 static void
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5771 restore_octave_stdout (std::streambuf *buf)
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5772 {
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5773 octave_stdout.flush ();
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5774 octave_stdout.rdbuf (buf);
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5775 }
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5776
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5777 static void
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5778 restore_octave_stderr (std::streambuf *buf)
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5779 {
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5780 std::cerr.flush ();
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5781 std::cerr.rdbuf (buf);
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5782 }
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5783
21075 5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5784 DEFUN (evalc, args, nargout,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5785 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5786 @deftypefn {} {@var{s} =} evalc (@var{try})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5787 @deftypefnx {} {@var{s} =} evalc (@var{try}, @var{catch})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5788 Parse and evaluate the string @var{try} as if it were an Octave program,
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5789 while capturing the output into the return variable @var{s}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5790
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5791 If execution fails, evaluate the optional string @var{catch}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5792
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5793 This function behaves like @code{eval}, but any output or warning messages
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5794 which would normally be written to the console are captured and returned in
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5795 the string @var{s}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5796
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5797 The @code{diary} is disabled during the execution of this function. When
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5798 @code{system} is used, any output produced by external programs is
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5799 @emph{not} captured, unless their output is captured by the @code{system}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5800 function itself.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5801
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5802 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5803 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5804 s = evalc ("t = 42"), t
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5805 @result{} s = t = 42
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5806
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5807 @result{} t = 42
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5808 @end group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5809 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5810 @seealso{eval, diary}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5811 @end deftypefn */)
21075 5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5812 {
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5813 int nargin = args.length ();
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5814
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5815 if (nargin == 0 \|\| nargin > 2)
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5816 print_usage ();
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5817
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5818 // redirect stdout/stderr to capturing buffer
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5819 std::ostringstream buffer;
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5820
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5821 std::ostream& out_stream = octave_stdout;
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5822 std::ostream& err_stream = std::cerr;
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5823
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5824 out_stream.flush ();
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5825 err_stream.flush ();
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5826
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5827 std::streambuf* old_out_buf = out_stream.rdbuf (buffer.rdbuf ());
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5828 std::streambuf* old_err_buf = err_stream.rdbuf (buffer.rdbuf ());
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5829
22504 2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5830 bool eval_error_occurred = true;
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5831
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5832 octave::unwind_protect frame;
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5833
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5834 frame.add_fcn (maybe_print_last_error_message, &eval_error_occurred);
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5835 frame.add_fcn (restore_octave_stdout, old_out_buf);
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5836 frame.add_fcn (restore_octave_stderr, old_err_buf);
21075 5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5837
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5838 // call standard eval function
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5839 octave_value_list retval;
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5840 int eval_nargout = std::max (0, nargout - 1);
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5841
22504 2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5842 retval = Feval (args, eval_nargout);
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5843 eval_error_occurred = false;
21075 5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5844
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5845 retval.prepend (buffer.str ());
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5846 return retval;
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5847 }
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5848
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5849 /*
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5850
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5851 %!assert (evalc ("1"), "ans = 1\n")
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5852 %!assert (evalc ("1;"), "")
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5853
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5854 %!test
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5855 %! [s, y] = evalc ("1");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5856 %! assert (s, "");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5857 %! assert (y, 1);
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5858
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5859 %!test
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5860 %! [s, y] = evalc ("1;");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5861 %! assert (s, "");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5862 %! assert (y, 1);
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5863
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5864 %!test
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5865 %! assert (evalc ("y = 2"), "y = 2\n");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5866 %! assert (y, 2);
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5867
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5868 %!test
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5869 %! assert (evalc ("y = 3;"), "");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5870 %! assert (y, 3);
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5871
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5872 %!test
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5873 %! [s, a, b] = evalc ("deal (1, 2)");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5874 %! assert (s, "");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5875 %! assert (a, 1);
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5876 %! assert (b, 2);
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5877
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5878 %!function [a, b] = __f_evalc ()
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5879 %! printf ("foo");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5880 %! fprintf (stdout, "bar");
21580 ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 21416 diff changeset	5881 %! disp (pi);
21075 5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5882 %! a = 1;
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5883 %! b = 2;
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5884 %!endfunction
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5885 %!test
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5886 %! [s, a, b] = evalc ("__f_evalc ()");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5887 %! assert (s, "foobar 3.1416\n");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5888 %! assert (a, 1);
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5889 %! assert (b, 2);
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5890
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5891 %!error <foo> (evalc ("error ('foo')"))
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5892 %!error <bar> (evalc ("error ('foo')", "error ('bar')"))
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5893
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5894 %!test
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5895 %! warning ("off", "quiet", "local");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5896 %! assert (evalc ("warning ('foo')"), "warning: foo\n");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5897
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5898 %!test
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5899 %! warning ("off", "quiet", "local");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5900 %! assert (evalc ("error ('foo')", "warning ('bar')"), "warning: bar\n");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5901
21581 6fab85c1538f maint: Follow Octave conventions for use of semicolon in BIST tests. Rik <rik@octave.org> parents: 21580 diff changeset	5902 %!error evalc ("switch = 13;")
21369 105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21361 diff changeset	5903
21075 5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5904 */
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5905
8311 7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	5906 DEFUN (__parser_debug_flag__, args, nargout,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5907 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5908 @deftypefn {} {@var{val} =} __parser_debug_flag__ ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5909 @deftypefnx {} {@var{old_val} =} __parser_debug_flag__ (@var{new_val})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5910 Query or set the internal flag that determines whether Octave's parser
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5911 prints debug information as it processes an expression.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5912 @seealso{__lexer_debug_flag__}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5913 @end deftypefn */)
8311 7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	5914 {
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	5915 octave_value retval;
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	5916
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	5917 bool debug_flag = octave_debug;
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	5918
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	5919 retval = set_internal_variable (debug_flag, args, nargout,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	5920 "__parser_debug_flag__");
8311 7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	5921
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	5922 octave_debug = debug_flag;
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	5923
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	5924 return retval;
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	5925 }
17342 091e4df179de new function to help with debugging by parsing .m files without executing them John W. Eaton <jwe@octave.org> parents: 17326 diff changeset	5926
17377 15e2ad6372f7 maint: Tweaks to remove compiler warnings. Rik <rik@octave.org> parents: 17342 diff changeset	5927 DEFUN (__parse_file__, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5928 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5929 @deftypefn {} {} __parse_file__ (@var{file}, @var{verbose})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5930 Undocumented internal function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5931 @end deftypefn */)
17342 091e4df179de new function to help with debugging by parsing .m files without executing them John W. Eaton <jwe@octave.org> parents: 17326 diff changeset	5932 {
091e4df179de new function to help with debugging by parsing .m files without executing them John W. Eaton <jwe@octave.org> parents: 17326 diff changeset	5933 octave_value retval;
091e4df179de new function to help with debugging by parsing .m files without executing them John W. Eaton <jwe@octave.org> parents: 17326 diff changeset	5934
091e4df179de new function to help with debugging by parsing .m files without executing them John W. Eaton <jwe@octave.org> parents: 17326 diff changeset	5935 int nargin = args.length ();
091e4df179de new function to help with debugging by parsing .m files without executing them John W. Eaton <jwe@octave.org> parents: 17326 diff changeset	5936
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5937 if (nargin < 1 \|\| nargin > 2)
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5938 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5939
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5940 std::string file = args(0).xstring_value ("__parse_file__: expecting filename as argument");
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5941
23667 2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	5942 std::string full_file
2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	5943 = octave::sys::file_ops::tilde_expand (file);
2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	5944
2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	5945 full_file = octave::sys::env::make_absolute (full_file);
2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	5946
2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	5947 std::string dir_name;
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5948
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5949 size_t file_len = file.length ();
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5950
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5951 if ((file_len > 4 && file.substr (file_len-4) == ".oct")
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5952 \|\| (file_len > 4 && file.substr (file_len-4) == ".mex")
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5953 \|\| (file_len > 2 && file.substr (file_len-2) == ".m"))
17342 091e4df179de new function to help with debugging by parsing .m files without executing them John W. Eaton <jwe@octave.org> parents: 17326 diff changeset	5954 {
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21730 diff changeset	5955 file = octave::sys::env::base_pathname (file);
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5956 file = file.substr (0, file.find_last_of ('.'));
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5957
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	5958 size_t pos = file.find_last_of (octave::sys::file_ops::dir_sep_str ());
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5959 if (pos != std::string::npos)
23667 2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	5960 {
2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	5961 dir_name = file.substr (0, pos);
2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	5962 file = file.substr (pos+1);
2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	5963 }
17342 091e4df179de new function to help with debugging by parsing .m files without executing them John W. Eaton <jwe@octave.org> parents: 17326 diff changeset	5964 }
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5965
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5966 if (nargin == 2)
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5967 octave_stdout << "parsing " << full_file << std::endl;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5968
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5969 octave_value ov_fcn
25442 47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	5970 = octave::parse_fcn_file (full_file, file, dir_name, "", "", true, false,
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	5971 false, false, "__parse_file__");
17342 091e4df179de new function to help with debugging by parsing .m files without executing them John W. Eaton <jwe@octave.org> parents: 17326 diff changeset	5972
091e4df179de new function to help with debugging by parsing .m files without executing them John W. Eaton <jwe@octave.org> parents: 17326 diff changeset	5973 return retval;
091e4df179de new function to help with debugging by parsing .m files without executing them John W. Eaton <jwe@octave.org> parents: 17326 diff changeset	5974 }

Mercurial > octave

annotate libinterp/parse-tree/oct-parse.yy @ 26040:0af4653e48a4