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

annotate libinterp/parse-tree/oct-parse.in.yy @ 23641:be69ea3de7a3

Backed out changeset 2208cc0e89a3

author	John W. Eaton <jwe@octave.org>
date	Sun, 18 Jun 2017 22:26:07 -0400
parents	037d65ae2b60
children	3bb0a937c071

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
23219 3ac9f9ecfae5 maint: Update copyright dates. John W. Eaton <jwe@octave.org> parents: 23049 diff changeset	3 Copyright (C) 1993-2017 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
21075 5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6 Copyright (C) 2016 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
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: 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
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22712 diff changeset	12 the Free Software Foundation; either version 3 of the License, or
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
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	22 <http://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"
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	58 #include "comment-list.h"
4243 7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4240 diff changeset	59 #include "defaults.h"
2166 d68119516779 [project @ 1996-05-13 13:41:55 by jwe] jwe parents: 2124 diff changeset	60 #include "defun.h"
4243 7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4240 diff changeset	61 #include "dirfns.h"
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	62 #include "dynamic-ld.h"
1351 8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	63 #include "error.h"
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	64 #include "input.h"
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	65 #include "interpreter-private.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: 22091 diff changeset	66 #include "interpreter.h"
1351 8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	67 #include "lex.h"
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: 5823 diff changeset	68 #include "load-path.h"
1743 ab8612a09449 [project @ 1996-01-12 11:25:30 by jwe] jwe parents: 1740 diff changeset	69 #include "oct-hist.h"
5626 3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	70 #include "oct-map.h"
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	71 #include "ov-classdef.h"
4935 4fc993a4e072 [project @ 2004-08-06 03:17:12 by jwe] jwe parents: 4930 diff changeset	72 #include "ov-fcn-handle.h"
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	73 #include "ov-usr-fcn.h"
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8064 diff changeset	74 #include "ov-null-mat.h"
1351 8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	75 #include "pager.h"
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	76 #include "parse.h"
2987 ae20b3f37f5e [project @ 1997-05-16 07:05:15 by jwe] jwe parents: 2982 diff changeset	77 #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	78 #include "pt-eval.h"
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	79 #include "pt-funcall.h"
1351 8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	80 #include "symtab.h"
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	81 #include "token.h"
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	82 #include "unwind-prot.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	83 #include "utils.h"
1351 8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	84 #include "variables.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	85
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	86 // 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	87 #include "oct-parse.h"
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	88
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	89 extern int octave_lex (YYSTYPE , void );
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	90
5484 2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	91 // List of autoloads (function -> file mapping).
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	92 static std::map<std::string, std::string> autoload_map;
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	93
496 e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	94 // 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	95 // the file.
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	96
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	97 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	98
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	99 #define lexer parser.lexer
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	100 #define scanner lexer.scanner
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	101
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 21021 diff changeset	102 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 21021 diff changeset	103 // Disable this warning for code that is generated by Bison, including
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 21021 diff changeset	104 // grammar rules. Push the current state so we can restore the warning
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 21021 diff changeset	105 // state prior to functions we define at the bottom of the file.
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 21021 diff changeset	106 #pragma GCC diagnostic push
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 21021 diff changeset	107 #pragma GCC diagnostic ignored "-Wold-style-cast"
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
23600 db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	114 // The grammar currently has 8 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
23600 db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	117 %expect 8
17743 af5ad573c665 oct-parse.in.yy: Add %expect declaration. John W. Eaton <jwe@octave.org> parents: 17731 diff changeset	118
18974 d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18531 diff changeset	119 %API_PREFIX_DECL%
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4699 diff changeset	120
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	121 // 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	122 // 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	123 // reentrant because both still use many global variables. It should be
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	124 // safe to create a parser object and call it while anotehr parser
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	125 // 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	126 // 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	127 // 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	128 // 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	129
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	130 %define api.pure
16174 39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16167 diff changeset	131 %PUSH_PULL_DECL%
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 }
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	133 %lex-param { void *scanner }
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.
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	143 octave_comment_list *comment_type;
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.
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	234 %type <dummy_type> indirect_ref_op decl_param_init push_fcn_symtab
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	235 %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	236 %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	237 %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	238 %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	239 %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	240 %type <tree_type> input
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5848 diff changeset	241 %type <tree_constant_type> string constant magic_colon
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5848 diff changeset	242 %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	243 %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	244 %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	245 %type <tree_cell_type> cell_rows
5102 b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe] jwe parents: 5013 diff changeset	246 %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	247 %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	248 %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	249 %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	250 %type <tree_funcall_type> superclass_identifier meta_identifier
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	251 %type <octave_user_function_type> function1 function2
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
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	253 %type <tree_colon_expression_type> colon_expr1
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3347 diff changeset	254 %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	255 %type <tree_argument_list_type> cell_or_matrix_row
4935 4fc993a4e072 [project @ 2004-08-06 03:17:12 by jwe] jwe parents: 4930 diff changeset	256 %type <tree_parameter_list_type> param_list 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_colon_expression_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	334 %destructor { delete $$; } <tree_argument_list_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	335 %destructor { delete $$; } <tree_parameter_list_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	336 %destructor { delete $$; } <tree_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_command_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	338 %destructor { delete $$; } <tree_if_clause_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	339 %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	340 %destructor { delete $$; } <tree_switch_command_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_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	342 %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	343 %destructor { delete $$; } <tree_decl_elt_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	344 %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	345 %destructor { delete $$; } <tree_decl_command_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	346 %destructor { delete $$; } <tree_statement_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	347 %destructor { delete $$; } <tree_statement_list_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	348 %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	349
18262 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_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_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_attribute_list_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_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_superclass_list_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_body_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_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_property_list_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_properties_block_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_list_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_methods_block_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_event_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_list_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_events_block_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_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_list_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	366 %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	367
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	368 // 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	369 // already explicitly declared for all types.
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	370 //
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	371 // %destructor {
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	372 // warning_with_id
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	373 // ("Octave:parser-destructor",
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	374 // "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	375 // } <*>
17629 1e8f8900a041 clean up partially constructed parse tree objects on parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17622 diff changeset	376
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	377 // Where to start.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	378 %start input
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 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	381
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	382 // ==============================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	383 // Statements and statement lists
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	384 // ==============================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	385
17322 4c1ae06111c9 allow parser to accept empty statements (bug #37099) John W. Eaton <jwe@octave.org> parents: 17317 diff changeset	386 input : simple_list '\n'
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	387 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	388 $$ = 0;
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	389 parser.stmt_list = $1;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	390 YYACCEPT;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	391 }
17322 4c1ae06111c9 allow parser to accept empty statements (bug #37099) John W. Eaton <jwe@octave.org> parents: 17317 diff changeset	392 \| simple_list END_OF_INPUT
4c1ae06111c9 allow parser to accept empty statements (bug #37099) John W. Eaton <jwe@octave.org> parents: 17317 diff changeset	393 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	394 $$ = 0;
17322 4c1ae06111c9 allow parser to accept empty statements (bug #37099) John W. Eaton <jwe@octave.org> parents: 17317 diff changeset	395 lexer.end_of_input = true;
4c1ae06111c9 allow parser to accept empty statements (bug #37099) John W. Eaton <jwe@octave.org> parents: 17317 diff changeset	396 parser.stmt_list = $1;
4c1ae06111c9 allow parser to accept empty statements (bug #37099) John W. Eaton <jwe@octave.org> parents: 17317 diff changeset	397 YYACCEPT;
4c1ae06111c9 allow parser to accept empty statements (bug #37099) John W. Eaton <jwe@octave.org> parents: 17317 diff changeset	398 }
17326 f444e4cef9b9 avoid exiting Octave on parse error (bug #39862) John W. Eaton <jwe@octave.org> parents: 17322 diff changeset	399 \| parse_error
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	400 {
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	401 $$ = 0;
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	402 YYABORT;
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	403 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	404 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	405
17322 4c1ae06111c9 allow parser to accept empty statements (bug #37099) John W. Eaton <jwe@octave.org> parents: 17317 diff changeset	406 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	407 {
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	408 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	409
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	410 $$ = 0;
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	411 }
17322 4c1ae06111c9 allow parser to accept empty statements (bug #37099) John W. Eaton <jwe@octave.org> parents: 17317 diff changeset	412 \| 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	413 { $$ = 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	414 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	415
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	416 simple_list1 : statement
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	417 { $$ = parser.make_statement_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	418 \| 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	419 { $$ = 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	420 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	421
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	422 opt_list : // empty
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	423 { $$ = new octave::tree_statement_list (); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	424 \| list
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	425 { $$ = $1; }
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
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	428 list : list1 opt_sep
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	429 { $$ = 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	430 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	431
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	432 list1 : statement
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	433 { $$ = parser.make_statement_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	434 \| list1 sep statement
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	435 { $$ = 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	436 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	437
23343 49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	438 opt_fcn_list : // empty
23635 b5a9cd6de1b8 avoid possible memory error in parser John W. Eaton <jwe@octave.org> parents: 23631 diff changeset	439 { $$ = new octave::tree_statement_list (); }
23343 49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	440 \| fcn_list
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	441 { $$ = $1; }
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	442 ;
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23343 diff changeset	443
23343 49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	444 fcn_list : fcn_list1 opt_sep
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	445 {
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	446 YYUSE ($2);
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	447
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	448 $$ = $1;
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
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	452 fcn_list1 : function
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	453 {
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	454 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	455 $$ = new octave::tree_statement_list (stmt);
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	456 }
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	457 \| fcn_list1 opt_sep function
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	458 {
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	459 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	460 $$ = 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	461 }
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	462 ;
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	463
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	464 statement : expression
17693 efbe746f8fa8 eliminate octave_comment_buffer singleton John W. Eaton <jwe@octave.org> parents: 17673 diff changeset	465 { $$ = parser.make_statement ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	466 \| command
17693 efbe746f8fa8 eliminate octave_comment_buffer singleton John W. Eaton <jwe@octave.org> parents: 17673 diff changeset	467 { $$ = parser.make_statement ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	468 \| word_list_cmd
17693 efbe746f8fa8 eliminate octave_comment_buffer singleton John W. Eaton <jwe@octave.org> parents: 17673 diff changeset	469 { $$ = parser.make_statement ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	470 ;
8746 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 // =================
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	473 // Word-list command
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
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	476 // 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	477 // 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	478 // WHILE, etc.
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	479
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	480 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	481 {
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	482 $$ = 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	483 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	484 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	485 // 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	486 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	487 }
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	488 }
10315 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
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	491 word_list : string
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	492 { $$ = new octave::tree_argument_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	493 \| word_list string
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	494 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	495 $1->append ($2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	496 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	497 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	498 ;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	499
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	500 // ===========
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	501 // Expressions
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	502 // ===========
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	503
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	504 identifier : NAME
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	505 {
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	506 symbol_table::symbol_record sr = $1->sym_rec ();
214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	507 $$ = 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	508 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	509 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	510
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	511 superclass_identifier
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	512 : SUPERCLASSREF
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	513 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	514 std::string method_nm = $1->superclass_method_name ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	515 std::string class_nm = $1->superclass_class_name ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	516
18927 09eb8a2ddb02 eliminate some unused parameter warnings in parser functions John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	517 $$ = parser.make_superclass_ref (method_nm, class_nm);
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	518 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	519 ;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	520
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	521 meta_identifier : METAQUERY
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	522 {
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18419 diff changeset	523 std::string class_nm = $1->text ();
932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18419 diff changeset	524
18927 09eb8a2ddb02 eliminate some unused parameter warnings in parser functions John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	525 $$ = parser.make_meta_class_query (class_nm);
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	526 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	527 ;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	528
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	529 string : DQ_STRING
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	530 { $$ = parser.make_constant (DQ_STRING, $1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	531 \| SQ_STRING
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	532 { $$ = parser.make_constant (SQ_STRING, $1); }
10315 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
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	535 constant : NUM
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	536 { $$ = parser.make_constant (NUM, $1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	537 \| IMAG_NUM
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	538 { $$ = parser.make_constant (IMAG_NUM, $1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	539 \| string
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	540 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	541 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	542
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	543 matrix : '[' matrix_rows ']'
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	544 { $$ = parser.finish_matrix ($2); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	545 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	546
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	547 matrix_rows : cell_or_matrix_row
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	548 { $$ = $1 ? new octave::tree_matrix ($1) : 0; }
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	549 \| matrix_rows ';' cell_or_matrix_row
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	550 {
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	551 if ($1)
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	552 {
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	553 if ($3)
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	554 $1->append ($3);
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	555
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	556 $$ = $1;
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	557 }
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	558 else
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	559 $$ = $3 ? new octave::tree_matrix ($3) : 0;
10315 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 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	562
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	563 cell : '{' cell_rows '}'
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	564 { $$ = parser.finish_cell ($2); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	565 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	566
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	567 cell_rows : cell_or_matrix_row
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	568 { $$ = $1 ? new octave::tree_cell ($1) : 0; }
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	569 \| cell_rows ';' cell_or_matrix_row
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	570 {
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	571 if ($1)
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	572 {
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	573 if ($3)
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	574 $1->append ($3);
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	575
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	576 $$ = $1;
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	577 }
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	578 else
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	579 $$ = $3 ? new octave::tree_cell ($3) : 0;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	580 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	581 ;
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3347 diff changeset	582
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	583 // 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	584 // 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	585
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3347 diff changeset	586 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	587 : // empty
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	588 { $$ = 0; }
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	589 \| ','
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	590 { $$ = 0; }
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	591 \| arg_list
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16251 diff changeset	592 { $$ = $1; }
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	593 \| arg_list ','
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16251 diff changeset	594 { $$ = $1; }
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	595 \| ',' arg_list
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	596 { $$ = $2; }
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	597 \| ',' arg_list ','
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	598 { $$ = $2; }
10315 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
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	601 fcn_handle : '@' FCN_HANDLE
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	602 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	603 $$ = parser.make_fcn_handle ($2);
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	604 lexer.looking_at_function_handle--;
10315 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 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	607
23600 db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	608 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	609 {
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	610 $$ = parser.make_anon_fcn_handle ($2, $4);
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	611 lexer.nesting_level.remove ();
13237 1bfca2bbea8b fix parsing of anonymous functions inside cell array lists. John W. Eaton <jwe@octave.org> parents: 13125 diff changeset	612 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	613 ;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	614
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	615 primary_expr : identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	616 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	617 \| constant
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	618 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	619 \| fcn_handle
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	620 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	621 \| matrix
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16251 diff changeset	622 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	623 lexer.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	624 $$ = $1;
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16251 diff changeset	625 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	626 \| cell
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 \| meta_identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	629 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	630 \| superclass_identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	631 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	632 \| '(' expression ')'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	633 { $$ = $2->mark_in_parens (); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	634 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	635
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	636 magic_colon : ':'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	637 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	638 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	639
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	640 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	641 $$ = new octave::tree_constant (tmp);
10315 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 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	644
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	645 magic_tilde : EXPR_NOT
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	646 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	647 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	648
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	649 $$ = new octave::tree_black_hole ();
10315 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
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	653 arg_list : expression
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	654 { $$ = new octave::tree_argument_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	655 \| magic_colon
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	656 { $$ = new octave::tree_argument_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	657 \| magic_tilde
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	658 { $$ = new octave::tree_argument_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	659 \| arg_list ',' magic_colon
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	660 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	661 $1->append ($3);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	662 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	663 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	664 \| arg_list ',' magic_tilde
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	665 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	666 $1->append ($3);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	667 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	668 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	669 \| arg_list ',' expression
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 $1->append ($3);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	672 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	673 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	674 ;
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 indirect_ref_op : '.'
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	677 {
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	678 $$ = 0;
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	679 lexer.looking_at_indirect_ref = true;
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	680 }
10315 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
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	683 oper_expr : primary_expr
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	684 { $$ = $1; }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	685 \| oper_expr PLUS_PLUS
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	686 { $$ = 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	687 \| oper_expr MINUS_MINUS
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	688 { $$ = 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	689 \| oper_expr '(' ')'
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	690 {
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	691 $$ = parser.make_index_expression ($1, 0, '(');
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	692 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	693 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	694 // 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	695 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	696 }
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	697 }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	698 \| 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	699 {
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	700 $$ = 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	701 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	702 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	703 // 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	704 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	705 }
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	706 }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	707 \| oper_expr '{' '}'
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	708 {
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	709 $$ = parser.make_index_expression ($1, 0, '{');
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	710 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	711 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	712 // 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	713 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	714 }
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	715 }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	716 \| 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	717 {
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	718 $$ = 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	719 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	720 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	721 // 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	722 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	723 }
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	724 }
16284 09881dab3aaf * lex.ll, oct-parse.in.yy (HERMITIAN): Rename token from QUOTE. John W. Eaton <jwe@octave.org> parents: 16279 diff changeset	725 \| oper_expr HERMITIAN
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	726 { $$ = 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	727 \| oper_expr TRANSPOSE
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	728 { $$ = 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	729 \| 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	730 { $$ = 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	731 \| 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	732 { $$ = 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	733 \| 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	734 { $$ = 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	735 \| 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	736 { $$ = 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	737 \| 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	738 { $$ = 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	739 \| '+' oper_expr %prec UNARY
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	740 { $$ = 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	741 \| '-' oper_expr %prec UNARY
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	742 { $$ = 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	743 \| oper_expr POW power_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	744 { $$ = 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	745 \| oper_expr EPOW power_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	746 { $$ = 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	747 \| oper_expr '+' oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	748 { $$ = 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	749 \| oper_expr '-' oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	750 { $$ = 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	751 \| oper_expr '*' oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	752 { $$ = 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	753 \| oper_expr '/' oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	754 { $$ = 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	755 \| oper_expr EPLUS oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	756 { $$ = 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	757 \| oper_expr EMINUS oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	758 { $$ = 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	759 \| oper_expr EMUL oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	760 { $$ = 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	761 \| oper_expr EDIV oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	762 { $$ = 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	763 \| oper_expr LEFTDIV oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	764 { $$ = 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	765 \| oper_expr ELEFTDIV oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	766 { $$ = 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	767 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	768
17622 fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	769 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	770 { $$ = $1; }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	771 \| 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	772 { $$ = 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	773 \| 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	774 { $$ = 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	775 \| power_expr '(' ')'
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	776 {
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	777 $$ = parser.make_index_expression ($1, 0, '(');
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	778 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	779 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	780 // 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	781 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	782 }
17622 fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	783 }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	784 \| 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	785 {
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	786 $$ = 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	787 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	788 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	789 // 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	790 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	791 }
17622 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 \| power_expr '{' '}'
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	794 {
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	795 $$ = parser.make_index_expression ($1, 0, '{');
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	796 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	797 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	798 // 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	799 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	800 }
17622 fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	801 }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	802 \| 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	803 {
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	804 $$ = 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	805 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	806 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	807 // 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	808 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	809 }
17622 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 \| 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	812 { $$ = 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	813 \| 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	814 { $$ = 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	815 \| 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	816 { $$ = 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	817 \| 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	818 { $$ = 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	819 \| 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	820 { $$ = 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	821 \| '+' 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	822 { $$ = 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	823 \| '-' 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	824 { $$ = 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	825 ;
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	826
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	827 colon_expr : colon_expr1
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	828 { $$ = parser.finish_colon_expression ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	829 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	830
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	831 colon_expr1 : oper_expr
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	832 { $$ = new octave::tree_colon_expression ($1); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	833 \| colon_expr1 ':' oper_expr
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	834 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	835 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	836
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	837 if (! ($$ = $1->append ($3)))
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	838 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	839 delete $1;
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	840 delete $3;
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	841 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	842 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	843 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	844 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	845
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	846 simple_expr : colon_expr
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	847 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	848 \| 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	849 { $$ = 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	850 \| 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	851 { $$ = 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	852 \| 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	853 { $$ = 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	854 \| 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	855 { $$ = 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	856 \| 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	857 { $$ = 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	858 \| 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	859 { $$ = 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	860 \| 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	861 { $$ = 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	862 \| 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	863 { $$ = 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	864 \| 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	865 { $$ = 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	866 \| 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	867 { $$ = 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	868 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	869
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	870 assign_lhs : simple_expr
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	871 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	872 $$ = parser.validate_matrix_for_assignment ($1);
16273 c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	873
c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	874 if ($$)
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	875 { lexer.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	876 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	877 {
16277 8cb65fd72164 eliminate obsolete concepts of "pending local" and "forced" variables John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	878 // 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	879 YYABORT;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	880 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	881 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	882 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	883
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	884 assign_expr : assign_lhs '=' expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	885 { $$ = parser.make_assign_op ('=', $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	886 \| assign_lhs ADD_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	887 { $$ = 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	888 \| assign_lhs SUB_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	889 { $$ = 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	890 \| assign_lhs MUL_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	891 { $$ = 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	892 \| assign_lhs DIV_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	893 { $$ = 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	894 \| assign_lhs LEFTDIV_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	895 { $$ = 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	896 \| assign_lhs POW_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	897 { $$ = 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	898 \| assign_lhs EMUL_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	899 { $$ = 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	900 \| assign_lhs EDIV_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	901 { $$ = 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	902 \| assign_lhs ELEFTDIV_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	903 { $$ = 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	904 \| assign_lhs EPOW_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	905 { $$ = 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	906 \| assign_lhs AND_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	907 { $$ = 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	908 \| assign_lhs OR_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	909 { $$ = 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	910 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	911
23600 db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	912 expr_no_assign : simple_expr
16273 c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	913 {
23576 00e518162fda maint: Deprecate is_cell and replace with iscell. Rik <rik@octave.org> parents: 23553 diff changeset	914 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	915 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	916 if (parser.validate_array_list ($1))
16273 c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	917 $$ = $1;
c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	918 else
c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	919 {
c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	920 delete $1;
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	921 YYABORT;
16273 c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	922 }
c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	923 }
c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	924 else
c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	925 $$ = $1;
c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	926 }
23600 db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	927 \| anon_fcn_handle
db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	928 { $$ = $1; }
db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	929 ;
db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	930
db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	931 expression : expr_no_assign
db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	932 { $$ = $1; }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	933 \| assign_expr
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	934 {
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	935 if (! $1)
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	936 YYABORT;
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	937
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	938 $$ = $1;
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	939 }
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	940
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	941 // ================================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	942 // Commands, declarations, and function definitions
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	943 // ================================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	944
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	945 command : declaration
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	946 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	947 \| select_command
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	948 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	949 \| loop_command
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	950 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	951 \| jump_command
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	952 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	953 \| except_command
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	954 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	955 \| function
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	956 { $$ = $1; }
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	957 \| file
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	958 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	959 ;
2970 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 // =====================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	962 // Declaration statemnts
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	963 // =====================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	964
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	965 declaration : GLOBAL decl1
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	966 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	967 $$ = parser.make_decl_command (GLOBAL, $1, $2);
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	968 lexer.looking_at_decl_list = false;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	969 }
16263 9acb86e6ac90 4/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16259 diff changeset	970 \| PERSISTENT decl1
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	971 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	972 $$ = parser.make_decl_command (PERSISTENT, $1, $2);
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	973 lexer.looking_at_decl_list = false;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	974 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	975 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	976
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	977 decl1 : decl2
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	978 { $$ = new octave::tree_decl_init_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	979 \| decl1 decl2
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	980 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	981 $1->append ($2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	982 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	983 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	984 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	985
7634 ae90e05ad299 fix parameter list initializer bug John W. Eaton <jwe@octave.org> parents: 7587 diff changeset	986 decl_param_init : // empty
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	987 {
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	988 $$ = 0;
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	989 lexer.looking_at_initializer_expression = true;
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	990 }
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 decl2 : identifier
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	993 { $$ = new octave::tree_decl_elt ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	994 \| identifier '=' decl_param_init expression
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	995 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	996 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	997
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	998 lexer.looking_at_initializer_expression = false;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	999 $$ = new octave::tree_decl_elt ($1, $4);
10315 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
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1003 // ====================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1004 // Selection statements
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1005 // ====================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1006
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1007 select_command : if_command
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1008 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1009 \| switch_command
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1010 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1011 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1012
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1013 // ============
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1014 // If statement
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1015 // ============
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1016
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1017 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	1018 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1019 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	1020 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1021 // 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	1022 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1023 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1024 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1025 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1026
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1027 if_cmd_list : if_cmd_list1
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1028 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1029 \| if_cmd_list1 else_clause
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1030 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1031 $1->append ($2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1032 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1033 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1034 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1035
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1036 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	1037 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1038 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1039
18127 d76f790b4eec enable do_braindead_shortcircuit_evaluation by default and deprecate John W. Eaton <jwe@octave.org> parents: 17796 diff changeset	1040 $1->mark_braindead_shortcircuit ();
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1041
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1042 $$ = 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	1043 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1044 \| if_cmd_list1 elseif_clause
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1045 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1046 $1->append ($2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1047 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1048 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1049 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1050
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1051 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	1052 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1053 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1054 YYUSE ($6);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1055
18127 d76f790b4eec enable do_braindead_shortcircuit_evaluation by default and deprecate John W. Eaton <jwe@octave.org> parents: 17796 diff changeset	1056 $4->mark_braindead_shortcircuit ();
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1057
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1058 $$ = 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	1059 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1060 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1061
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1062 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	1063 {
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1064 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1065 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1066
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1067 $$ = 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	1068 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1069 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1070
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1071 // ================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1072 // Switch statement
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1073 // ================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1074
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1075 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	1076 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1077 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1078
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1079 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	1080 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1081 // 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	1082 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1083 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1084 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1085 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1086
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1087 case_list : // empty
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1088 { $$ = 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	1089 \| default_case
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1090 { $$ = new octave::tree_switch_case_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1091 \| case_list1
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1092 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1093 \| case_list1 default_case
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1094 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1095 $1->append ($2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1096 $$ = $1;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	1097 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1098 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1099
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1100 case_list1 : switch_case
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1101 { $$ = new octave::tree_switch_case_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1102 \| case_list1 switch_case
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 $1->append ($2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1105 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1106 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1107 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1108
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1109 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	1110 {
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1111 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1112 YYUSE ($6);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1113
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1114 $$ = 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	1115 }
10315 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
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1118 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	1119 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1120 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1121 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1122
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1123 $$ = new octave::tree_switch_case ($4, $2);
10315 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 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1126
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1127 // =======
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1128 // Looping
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1129 // =======
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1130
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1131 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	1132 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1133 YYUSE ($5);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1134
18127 d76f790b4eec enable do_braindead_shortcircuit_evaluation by default and deprecate John W. Eaton <jwe@octave.org> parents: 17796 diff changeset	1135 $3->mark_braindead_shortcircuit ();
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1136
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1137 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	1138 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1139 // 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	1140 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1141 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1142 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1143 \| 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	1144 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1145 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1146 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1147
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1148 $$ = 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	1149 }
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1150 \| 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	1151 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1152 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1153 YYUSE ($7);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1154
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1155 if (! ($$ = parser.make_for_command (FOR, $1, $3, $5, 0,
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1156 $8, $9, $2)))
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1157 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1158 // 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	1159 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1160 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1161 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1162 \| 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	1163 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1164 YYUSE ($5);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1165 YYUSE ($8);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1166
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1167 if (! ($$ = parser.make_for_command (FOR, $1, $4, $6, 0,
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1168 $9, $10, $2)))
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1169 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1170 // 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	1171 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1172 }
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	1173 }
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1174 \| 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	1175 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1176 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1177 YYUSE ($7);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1178
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1179 if (! ($$ = parser.make_for_command (PARFOR, $1, $3, $5,
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1180 0, $8, $9, $2)))
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1181 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1182 // 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	1183 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1184 }
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	1185 }
027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now John W. Eaton <jwe@octave.org> parents: 13241 diff changeset	1186 \| 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	1187 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1188 YYUSE ($5);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1189 YYUSE ($10);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1190
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1191 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	1192 $8, $11, $12, $2)))
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1193 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1194 // 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	1195 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1196 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1197 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1198 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1199
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1200 // =======
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1201 // Jumping
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1202 // =======
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1203
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1204 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	1205 {
9c6661004167 error if break statement is in script file separate from loop (bug #39168) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1206 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	1207 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	1208 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1209 \| CONTINUE
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1210 { $$ = parser.make_continue_command ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1211 \| FUNC_RET
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1212 { $$ = parser.make_return_command ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1213 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1214
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1215 // ==========
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1216 // Exceptions
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
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1219 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	1220 stash_comment opt_sep opt_list END
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1221 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1222 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1223 YYUSE ($5);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1224 YYUSE ($7);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1225
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1226 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	1227 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1228 // 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	1229 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1230 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1231 }
17283 e6c0ac8ce5b6 eliminate parse conflicts introduced by changeset 923ce8b42db2 John W. Eaton <jwe@octave.org> parents: 17281 diff changeset	1232 \| 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	1233 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	1234 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1235 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1236 YYUSE ($5);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1237 YYUSE ($7);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1238
17283 e6c0ac8ce5b6 eliminate parse conflicts introduced by changeset 923ce8b42db2 John W. Eaton <jwe@octave.org> parents: 17281 diff changeset	1239 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	1240 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1241 // 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	1242 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1243 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1244 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1245 \| TRY stash_comment opt_sep opt_list END
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1246 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1247 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1248
17249 923ce8b42db2 improve try-catch-statement to save exception to a variable (bug #33217) Stefan Mahr <dac922@gmx.de> parents: 17170 diff changeset	1249 if (! ($$ = parser.make_try_command ($1, $4, 0, 0, $5, $2, 0)))
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1250 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1251 // 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	1252 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1253 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1254 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1255 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1256
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1257 // ===========================================
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14189 diff changeset	1258 // Some 'subroutines' for function definitions
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1259 // ===========================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1260
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1261 push_fcn_symtab : // empty
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1262 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1263 $$ = 0;
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1264
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1265 parser.curr_fcn_depth++;
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1266
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1267 if (parser.max_fcn_depth < parser.curr_fcn_depth)
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1268 parser.max_fcn_depth = parser.curr_fcn_depth;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1269
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	1270 lexer.symtab_context.push (new symbol_table::scope ());
16320 09f0cb9cac7d don't modify symbol table scope in the parser John W. Eaton <jwe@octave.org> parents: 16302 diff changeset	1271
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1272 parser.function_scopes.push (lexer.symtab_context.curr_scope ());
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1273
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1274 if (! lexer.reading_script_file
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1275 && parser.curr_fcn_depth == 1
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1276 && ! parser.parsing_subfunctions)
16320 09f0cb9cac7d don't modify symbol table scope in the parser John W. Eaton <jwe@octave.org> parents: 16302 diff changeset	1277 parser.primary_fcn_scope
09f0cb9cac7d don't modify symbol table scope in the parser John W. Eaton <jwe@octave.org> parents: 16302 diff changeset	1278 = lexer.symtab_context.curr_scope ();
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1279
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1280 if (lexer.reading_script_file
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1281 && parser.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	1282 {
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1283 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	1284 YYABORT;
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1285 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1286 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1287 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1288
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1289 // ===========================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1290 // List of function parameters
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1291 // ===========================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1292
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1293 param_list_beg : '('
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1294 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1295 $$ = 0;
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1296 lexer.looking_at_parameter_list = true;
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1297
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1298 if (lexer.looking_at_function_handle)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1299 {
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	1300 lexer.symtab_context.push (new symbol_table::scope ());
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1301 lexer.looking_at_function_handle--;
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1302 lexer.looking_at_anon_fcn_args = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1303 }
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 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1306
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1307 param_list_end : ')'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1308 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1309 $$ = 0;
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1310 lexer.looking_at_parameter_list = false;
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1311 lexer.looking_for_object_index = false;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1312 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1313 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1314
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1315 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	1316 {
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1317 if ($2)
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1318 lexer.mark_as_variables ($2->variable_names ());
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1319
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1320 $$ = $2;
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1321 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1322 \| param_list_beg error
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1323 {
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1324 $$ = 0;
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1325 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	1326 YYABORT;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1327 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1328 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1329
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1330 param_list1 : // empty
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1331 { $$ = 0; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1332 \| param_list2
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1333 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1334 $1->mark_as_formal_parameters ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1335 if ($1->validate (octave::tree_parameter_list::in))
16360 11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1336 {
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1337 lexer.mark_as_variables ($1->variable_names ());
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1338 $$ = $1;
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1339 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1340 else
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1341 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1342 delete $1;
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1343 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1344 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1345 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1346 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1347
17317 56fe31b248de disallow ~ in global and persistent declaration lists John W. Eaton <jwe@octave.org> parents: 17316 diff changeset	1348 param_list2 : param_list_elt
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1349 { $$ = 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	1350 \| param_list2 ',' param_list_elt
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1351 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1352 $1->append ($3);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1353 $$ = $1;
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 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1356
17317 56fe31b248de disallow ~ in global and persistent declaration lists John W. Eaton <jwe@octave.org> parents: 17316 diff changeset	1357 param_list_elt : decl2
56fe31b248de disallow ~ in global and persistent declaration lists John W. Eaton <jwe@octave.org> parents: 17316 diff changeset	1358 { $$ = $1; }
56fe31b248de disallow ~ in global and persistent declaration lists John W. Eaton <jwe@octave.org> parents: 17316 diff changeset	1359 \| magic_tilde
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1360 { $$ = 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	1361 ;
56fe31b248de disallow ~ in global and persistent declaration lists John W. Eaton <jwe@octave.org> parents: 17316 diff changeset	1362
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1363 // ===================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1364 // List of function return value names
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1365 // ===================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1366
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1367 return_list : '[' ']'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1368 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1369 lexer.looking_at_return_list = false;
17316 8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1370
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1371 $$ = new octave::tree_parameter_list ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1372 }
17316 8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1373 \| identifier
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1374 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1375 lexer.looking_at_return_list = false;
17316 8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1376
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1377 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	1378
8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1379 // 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	1380 // 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	1381 // to check for varargin or varargout.
8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1382
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1383 if (tmp->validate (octave::tree_parameter_list::out))
17316 8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1384 $$ = tmp;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1385 else
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1386 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1387 delete tmp;
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1388 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1389 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1390 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1391 \| '[' return_list1 ']'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1392 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1393 lexer.looking_at_return_list = false;
17316 8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1394
8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1395 // Check for duplicate parameter names, varargin,
8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1396 // or varargout.
8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1397
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1398 if ($2->validate (octave::tree_parameter_list::out))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1399 $$ = $2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1400 else
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1401 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1402 delete $2;
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1403 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1404 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1405 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1406 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1407
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1408 return_list1 : identifier
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1409 { $$ = 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	1410 \| return_list1 ',' identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1411 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1412 $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	1413 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1414 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1415 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1416
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1417 // =======================
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1418 // Script or function file
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1419 // =======================
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1420
23343 49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	1421 parsing_local_fcns
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	1422 : // empty
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	1423 { parser.parsing_local_functions = true; }
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	1424 ;
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	1425
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1426 file : INPUT_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	1427 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1428 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1429
17618 77eff9c6fb09 avoid memory leak when parsing function files (bug #40218) John W. Eaton <jwe@octave.org> parents: 17377 diff changeset	1430 if (lexer.reading_fcn_file)
77eff9c6fb09 avoid memory leak when parsing function files (bug #40218) John W. Eaton <jwe@octave.org> parents: 17377 diff changeset	1431 {
77eff9c6fb09 avoid memory leak when parsing function files (bug #40218) John W. Eaton <jwe@octave.org> parents: 17377 diff changeset	1432 // 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	1433 // 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	1434 // 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	1435 // been stored in the symbol table or in
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	1436 // base_parser::primary_fcn_ptr.
17618 77eff9c6fb09 avoid memory leak when parsing function files (bug #40218) John W. Eaton <jwe@octave.org> parents: 17377 diff changeset	1437
77eff9c6fb09 avoid memory leak when parsing function files (bug #40218) John W. Eaton <jwe@octave.org> parents: 17377 diff changeset	1438 delete $3;
77eff9c6fb09 avoid memory leak when parsing function files (bug #40218) John W. Eaton <jwe@octave.org> parents: 17377 diff changeset	1439 }
77eff9c6fb09 avoid memory leak when parsing function files (bug #40218) John W. Eaton <jwe@octave.org> parents: 17377 diff changeset	1440 else
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1441 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1442 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	1443 = parser.make_end ("endscript", true,
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	1444 lexer.input_line_number,
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	1445 lexer.current_input_column);
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1446
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1447 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	1448 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1449
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1450 $$ = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1451 }
23343 49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	1452 \| INPUT_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	1453 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1454 YYUSE ($2);
23343 49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	1455 YYUSE ($5);
23640 037d65ae2b60 Backed out changeset fca2f775ab4c John W. Eaton <jwe@octave.org> parents: 23637 diff changeset	1456 YYUSE ($6);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1457
16289 bde729ba8381 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16286 16288 diff changeset	1458 if (lexer.reading_classdef_file)
bde729ba8381 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16286 16288 diff changeset	1459 parser.classdef_object = $3;
16211 3449bf257514 maint: fix botched merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16205 diff changeset	1460
3449bf257514 maint: fix botched merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16205 diff changeset	1461 $$ = 0;
3449bf257514 maint: fix botched merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16205 diff changeset	1462 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1463 ;
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	1464
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1465 // ===================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1466 // Function definition
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1467 // ===================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1468
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	1469 function_beg : push_fcn_symtab FCN
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1470 {
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	1471 $$ = $2;
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1472 if (lexer.reading_classdef_file
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1473 \|\| lexer.parsing_classdef)
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1474 lexer.maybe_classdef_get_set_method = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1475 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1476 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1477
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	1478 function : function_beg stash_comment function1
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1479 {
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	1480 $$ = parser.finish_function (0, $3, $2, $1->line (),
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	1481 $1->column ());
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1482 parser.recover_from_parsing_function ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1483 }
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	1484 \| function_beg stash_comment return_list '=' function1
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1485 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1486 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1487
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	1488 $$ = parser.finish_function ($3, $5, $2, $1->line (),
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	1489 $1->column ());
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1490 parser.recover_from_parsing_function ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1491 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1492 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1493
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1494 fcn_name : identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1495 {
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1496 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	1497
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1498 if (! parser.function_scopes.name_current_scope (id))
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1499 {
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1500 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	1501 $1->line (), $1->column ());
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1502
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1503 delete $1;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1504
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1505 YYABORT;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1506 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1507
23603 18bd46c4b79a make symbol table context info mostly local to symbol table scopes John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	1508 symbol_table::scope *curr_scope
18bd46c4b79a make symbol table context info mostly local to symbol table scopes John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	1509 = lexer.symtab_context.curr_scope ();
18bd46c4b79a make symbol table context info mostly local to symbol table scopes John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	1510 curr_scope->cache_name (id);
18bd46c4b79a make symbol table context info mostly local to symbol table scopes John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	1511
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1512 lexer.parsed_function_name.top () = true;
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1513 lexer.maybe_classdef_get_set_method = false;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	1514
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1515 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1516 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1517 \| GET '.' identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1518 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1519 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1520
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1521 lexer.parsed_function_name.top () = true;
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1522 lexer.maybe_classdef_get_set_method = false;
16289 bde729ba8381 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16286 16288 diff changeset	1523 lexer.parsing_classdef_get_method = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1524 $$ = $3;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1525 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1526 \| SET '.' identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1527 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1528 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1529
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1530 lexer.parsed_function_name.top () = true;
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1531 lexer.maybe_classdef_get_set_method = false;
16289 bde729ba8381 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16286 16288 diff changeset	1532 lexer.parsing_classdef_set_method = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1533 $$ = $3;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1534 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1535 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1536
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1537 function1 : fcn_name function2
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1538 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1539 std::string fname = $1->name ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1540
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1541 delete $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1542
16698 13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16683 diff changeset	1543 if (lexer.parsing_classdef_get_method)
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16683 diff changeset	1544 fname.insert (0, "get.");
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16683 diff changeset	1545 else if (lexer.parsing_classdef_set_method)
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16683 diff changeset	1546 fname.insert (0, "set.");
13b3b92ea99c Implement property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 16683 diff changeset	1547
18395 2319bf776fa2 Fix parsing of classdef property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 18341 diff changeset	1548 lexer.parsing_classdef_get_method = false;
2319bf776fa2 Fix parsing of classdef property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 18341 diff changeset	1549 lexer.parsing_classdef_set_method = false;
2319bf776fa2 Fix parsing of classdef property accessors. Michael Goffioul <michael.goffioul@gmail.com> parents: 18341 diff changeset	1550
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1551 $$ = parser.frob_function (fname, $2);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1552 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1553 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1554
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1555 function2 : param_list opt_sep opt_list function_end
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1556 {
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1557 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1558
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1559 $$ = parser.start_function ($1, $3, $4);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1560 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1561 \| opt_sep opt_list function_end
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1562 {
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
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1565 $$ = parser.start_function (0, $2, $3);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1566 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1567 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1568
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1569 function_end : END
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1570 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1571 parser.endfunction_found = true;
21071 f25c14056b7c overhaul parser error handling for end token mismatch John W. Eaton <jwe@octave.org> parents: 21066 diff changeset	1572
23398 d4ef04757ead eliminate some compiler warnings John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	1573 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	1574 $$ = 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	1575 $1->line (), $1->column ());
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1576 else
21071 f25c14056b7c overhaul parser error handling for end token mismatch John W. Eaton <jwe@octave.org> parents: 21066 diff changeset	1577 {
23398 d4ef04757ead eliminate some compiler warnings John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	1578 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	1579 YYABORT;
21071 f25c14056b7c overhaul parser error handling for end token mismatch John W. Eaton <jwe@octave.org> parents: 21066 diff changeset	1580 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1581 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1582 \| END_OF_INPUT
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1583 {
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	1584 // A lot of tests are based on the assumption that this is OK
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1585 // if (lexer.reading_script_file)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1586 // {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1587 // 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	1588 // YYABORT;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1589 // }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1590
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1591 if (parser.endfunction_found)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1592 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1593 parser.bison_error ("inconsistent function endings -- "
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1594 "if one function is explicitly ended, "
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1595 "so must all the others");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1596 YYABORT;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1597 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1598
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1599 if (! (lexer.reading_fcn_file \|\| lexer.reading_script_file
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1600 \|\| lexer.input_from_eval_string ()))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1601 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1602 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	1603 YYABORT;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1604 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1605
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1606 if (lexer.reading_classdef_file)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1607 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1608 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	1609 YYABORT;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1610 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1611
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	1612 $$ = parser.make_end ("endfunction", true,
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	1613 lexer.input_line_number,
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	1614 lexer.current_input_column);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1615 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1616 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1617
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1618 // ========
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1619 // Classdef
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1620 // ========
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1621
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1622 classdef_beg : CLASSDEF
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1623 {
16289 bde729ba8381 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16286 16288 diff changeset	1624 if (! lexer.reading_classdef_file)
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1625 {
16289 bde729ba8381 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16286 16288 diff changeset	1626 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	1627 YYABORT;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1628 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1629
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1630 // Create invalid parent scope.
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	1631 lexer.symtab_context.push (0);
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1632 lexer.parsing_classdef = true;
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1633 $$ = $1;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1634 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1635 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1636
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1637 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	1638 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1639 YYUSE ($6);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1640 YYUSE ($8);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1641
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1642 lexer.parsing_classdef = false;
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1643
16289 bde729ba8381 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16286 16288 diff changeset	1644 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	1645 {
2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1646 // 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	1647 YYABORT;
17656 2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1648 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1649 }
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1650 \| 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	1651 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1652 YYUSE ($6);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1653
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1654 lexer.parsing_classdef = false;
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1655
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1656 if (! ($$ = parser.make_classdef ($1, $3, $4, $5, 0, $7, $2)))
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1657 {
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1658 // 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	1659 YYABORT;
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1660 }
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1661 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1662 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1663
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1664 opt_attr_list : // empty
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1665 { $$ = 0; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1666 \| '(' attr_list ')'
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1667 { $$ = $2; }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1668 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1669
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1670 attr_list : attr
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1671 { $$ = new octave::tree_classdef_attribute_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1672 \| attr_list ',' attr
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1673 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1674 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1675 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1676 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1677 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1678
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1679 attr : identifier
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1680 { $$ = new octave::tree_classdef_attribute ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1681 \| identifier '=' decl_param_init expression
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1682 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1683 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1684
16289 bde729ba8381 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16286 16288 diff changeset	1685 lexer.looking_at_initializer_expression = false;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1686 $$ = new octave::tree_classdef_attribute ($1, $4);
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1687 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1688 \| EXPR_NOT identifier
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1689 {
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1690 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1691
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 ($2, false);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1693 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1694 ;
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1695
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1696 opt_superclass_list
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1697 : // empty
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1698 { $$ = 0; }
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1699 \| superclass_list
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1700 { $$ = $1; }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1701 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1702
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18419 diff changeset	1703 superclass_list : EXPR_LT
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1704 {
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1705 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1706
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1707 lexer.enable_fq_identifier ();
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1708 }
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18419 diff changeset	1709 superclass
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1710 { $$ = new octave::tree_classdef_superclass_list ($3); }
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18419 diff changeset	1711 \| superclass_list EXPR_AND
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1712 {
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1713 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1714
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1715 lexer.enable_fq_identifier ();
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1716 }
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18419 diff changeset	1717 superclass
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1718 {
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18419 diff changeset	1719 $1->append ($4);
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1720 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1721 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1722 ;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1723
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18419 diff changeset	1724 superclass : FQ_IDENT
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1725 { $$ = new octave::tree_classdef_superclass ($1->text ()); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1726 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1727
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1728 class_body : properties_block
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1729 { $$ = new octave::tree_classdef_body ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1730 \| methods_block
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1731 { $$ = new octave::tree_classdef_body ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1732 \| events_block
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1733 { $$ = new octave::tree_classdef_body ($1); }
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1734 \| enum_block
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1735 { $$ = 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	1736 \| class_body opt_sep properties_block
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1737 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1738 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1739
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1740 $1->append ($3);
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 }
13250 f6bbdea030b2 use opt_sep instead of literal '\n' in parser rules for classdef John W. Eaton <jwe@octave.org> parents: 13249 diff changeset	1743 \| class_body opt_sep methods_block
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1744 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1745 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1746
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1747 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1748 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1749 }
13250 f6bbdea030b2 use opt_sep instead of literal '\n' in parser rules for classdef John W. Eaton <jwe@octave.org> parents: 13249 diff changeset	1750 \| class_body opt_sep events_block
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1751 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1752 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1753
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1754 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1755 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1756 }
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 enum_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 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1764 ;
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1765
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1766 properties_block
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1767 : 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	1768 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1769 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1770 YYUSE ($6);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1771
16289 bde729ba8381 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16286 16288 diff changeset	1772 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	1773 ($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	1774 {
2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1775 // 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	1776 YYABORT;
17656 2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1777 }
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1778 }
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1779 \| 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	1780 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1781 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1782
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1783 if (! ($$ = parser.make_classdef_properties_block
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1784 ($1, $3, 0, $5, $2)))
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1785 {
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1786 // 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	1787 YYABORT;
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1788 }
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1789 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1790 ;
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1791
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1792 property_list
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1793 : class_property
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1794 { $$ = 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	1795 \| property_list sep class_property
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1796 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1797 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1798
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1799 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1800 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1801 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1802 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1803
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1804 class_property : identifier
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1805 { $$ = 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	1806 \| identifier '=' decl_param_init expression
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1807 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1808 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1809
16289 bde729ba8381 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16286 16288 diff changeset	1810 lexer.looking_at_initializer_expression = false;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1811 $$ = new octave::tree_classdef_property ($1, $4);
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1812 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1813 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1814
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1815 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	1816 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1817 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1818 YYUSE ($6);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1819
16289 bde729ba8381 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16286 16288 diff changeset	1820 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	1821 ($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	1822 {
2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1823 // 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	1824 YYABORT;
17656 2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1825 }
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1826 }
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1827 \| 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	1828 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1829 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1830
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1831 if (! ($$ = parser.make_classdef_methods_block
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1832 ($1, $3, 0, $5, $2)))
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1833 {
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1834 // 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	1835 YYABORT;
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1836 }
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1837 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1838 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1839 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1840
18262 69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	1841 method_decl1 : identifier
18308 c1baf94184af * oct-parse.in.yy: Suppress TAB characters. Michael Goffioul <michael.goffioul@gmail.com> parents: 18304 diff changeset	1842 {
18262 69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	1843 if (! ($$ = parser.start_classdef_external_method ($1, 0)))
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1844 YYABORT;
18262 69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	1845 }
18308 c1baf94184af * oct-parse.in.yy: Suppress TAB characters. Michael Goffioul <michael.goffioul@gmail.com> parents: 18304 diff changeset	1846 \| identifier param_list
18341 02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	1847 {
02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	1848 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	1849 YYABORT;
18262 69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	1850 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1851 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1852
18262 69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	1853 method_decl : stash_comment method_decl1
18308 c1baf94184af * oct-parse.in.yy: Suppress TAB characters. Michael Goffioul <michael.goffioul@gmail.com> parents: 18304 diff changeset	1854 { $$ = parser.finish_classdef_external_method ($2, 0, $1); }
18341 02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	1855 \| stash_comment return_list '='
02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	1856 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1857 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1858
18341 02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	1859 lexer.defining_func++;
02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	1860 lexer.parsed_function_name.push (false);
02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	1861 }
02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	1862 method_decl1
02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	1863 {
02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	1864 lexer.defining_func--;
02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	1865 lexer.parsed_function_name.pop ();
02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	1866 $$ = 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	1867 }
18262 69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	1868 ;
69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	1869
69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	1870 method : method_decl
18308 c1baf94184af * oct-parse.in.yy: Suppress TAB characters. Michael Goffioul <michael.goffioul@gmail.com> parents: 18304 diff changeset	1871 { $$ = $1; }
c1baf94184af * oct-parse.in.yy: Suppress TAB characters. Michael Goffioul <michael.goffioul@gmail.com> parents: 18304 diff changeset	1872 \| function
18262 69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	1873 { $$ = $1; }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1874 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1875
18262 69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	1876 methods_list : method
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1877 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1878 octave_value fcn;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1879 if ($1)
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1880 fcn = $1->function ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1881 delete $1;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1882 $$ = new octave::tree_classdef_methods_list (fcn);
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1883 }
18262 69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	1884 \| methods_list opt_sep method
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1885 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1886 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1887
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1888 octave_value fcn;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1889 if ($3)
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1890 fcn = $3->function ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1891 delete $3;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1892
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1893 $1->append (fcn);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1894 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1895 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1896 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1897
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1898 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	1899 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1900 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1901 YYUSE ($6);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1902
16289 bde729ba8381 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16286 16288 diff changeset	1903 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	1904 ($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	1905 {
2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1906 // 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	1907 YYABORT;
17656 2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1908 }
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1909 }
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1910 \| 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	1911 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1912 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1913
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1914 if (! ($$ = parser.make_classdef_events_block
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1915 ($1, $3, 0, $5, $2)))
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1916 {
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1917 // 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	1918 YYABORT;
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1919 }
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1920 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1921 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1922
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1923 events_list : class_event
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1924 { $$ = 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	1925 \| events_list opt_sep class_event
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1926 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1927 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1928
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1929 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1930 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1931 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1932 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1933
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1934 class_event : identifier
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1935 { $$ = new octave::tree_classdef_event ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1936 ;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	1937
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1938 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	1939 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1940 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1941 YYUSE ($6);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1942
16289 bde729ba8381 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16286 16288 diff changeset	1943 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	1944 ($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	1945 {
2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1946 // 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	1947 YYABORT;
17656 2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1948 }
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1949 }
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1950 \| 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	1951 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1952 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1953
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1954 if (! ($$ = parser.make_classdef_enum_block
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1955 ($1, $3, 0, $5, $2)))
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1956 {
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1957 // 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	1958 YYABORT;
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1959 }
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1960 }
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1961 ;
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1962
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1963 enum_list : class_enum
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1964 { $$ = 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	1965 \| enum_list opt_sep class_enum
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1966 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1967 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1968
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1969 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1970 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1971 }
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1972 ;
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1973
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1974 class_enum : identifier '(' expression ')'
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1975 { $$ = new octave::tree_classdef_enum ($1, $3); }
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1976 ;
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1977
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1978 // =============
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1979 // Miscellaneous
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1980 // =============
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1981
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1982 stmt_begin : // empty
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1983 {
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1984 $$ = 0;
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1985 lexer.at_beginning_of_statement = true;
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1986 }
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1987 ;
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1988
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1989 stash_comment : // empty
17693 efbe746f8fa8 eliminate octave_comment_buffer singleton John W. Eaton <jwe@octave.org> parents: 17673 diff changeset	1990 { $$ = lexer.get_comment (); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1991 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1992
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1993 parse_error : LEXICAL_ERROR
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1994 {
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1995 $$ = 0;
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21063 diff changeset	1996 std::string msg = $1->text ();
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21063 diff changeset	1997 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	1998 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1999 \| error
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2000 { $$ = 0; }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2001 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2002
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2003 sep_no_nl : ','
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2004 { $$ = ','; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2005 \| ';'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2006 { $$ = ';'; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2007 \| sep_no_nl ','
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2008 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2009 \| sep_no_nl ';'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2010 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2011 ;
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 opt_sep_no_nl : // empty
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2014 { $$ = 0; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2015 \| sep_no_nl
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2016 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2017 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2018
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2019 opt_nl : // empty
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2020 { $$ = 0; }
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2021 \| nl
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2022 { $$ = $1; }
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2023 ;
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2024
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2025 nl : '\n'
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2026 { $$ = '\n'; }
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2027 \| nl '\n'
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2028 { $$ = $1; }
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2029 ;
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2030
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2031 sep : ','
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 { $$ = ';'; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2035 \| '\n'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2036 { $$ = '\n'; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2037 \| sep ','
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2038 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2039 \| sep ';'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2040 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2041 \| sep '\n'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2042 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2043 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2044
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2045 opt_sep : // empty
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2046 { $$ = 0; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2047 \| sep
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2048 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2049 ;
2525 8561d88be5f2 [project @ 1996-11-17 21:23:31 by jwe] jwe parents: 2524 diff changeset	2050
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2051 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2052
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 21021 diff changeset	2053 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 21021 diff changeset	2054 // Restore prevailing warning state for remainder of the file.
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 21021 diff changeset	2055 #pragma GCC diagnostic pop
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 21021 diff changeset	2056 #endif
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 21021 diff changeset	2057
666 fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	2058 // Generic error messages.
fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	2059
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	2060 #undef lexer
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	2061
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2062 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	2063 yyerror (octave::base_parser& parser, const char *s)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2064 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	2065 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	2066 }
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	2067
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2068 namespace octave
16157 335041cc657a optionally use push parser interface John W. Eaton <jwe@octave.org> parents: 16153 diff changeset	2069 {
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2070 size_t
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2071 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	2072 {
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2073 return info.size ();
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2074 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2075
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2076 void
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2077 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	2078 {
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2079 info.push_back (elt);
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2080 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2081
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2082 void
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	2083 base_parser::parent_scope_info::push (symbol_table::scope *scope)
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2084 {
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	2085 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	2086 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2087
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2088 void
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2089 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	2090 {
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2091 info.pop_back ();
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2092 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2093
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2094 bool
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2095 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	2096 {
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2097 // 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	2098 // 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	2099 // 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	2100 // 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	2101
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2102 std::string full_name;
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 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	2105 {
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2106 const value_type& elt = info[i];
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2107
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2108 if (name == elt.second)
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2109 return false;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2110
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2111 full_name += elt.second + ">";
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2112 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2113
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2114 full_name += name;
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 if (all_names.find (full_name) != all_names.end ())
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2117 return false;
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 all_names.insert (full_name);
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2120
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2121 return true;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2122 }
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 bool
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2125 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	2126 {
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2127 if (! name_ok (name))
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2128 return false;
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 (size () > 0)
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2131 info.back().second = name;
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 return true;
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
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	2136 symbol_table::scope *
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2137 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	2138 {
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2139 return size () > 1 ? info[size()-2].first : 0;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2140 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2141
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2142 std::string
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2143 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	2144 {
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2145 return info[size()-2].second;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2146 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2147
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2148 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	2149 {
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2150 info.clear ();
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2151 all_names.clear ();
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2152 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2153
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2154 base_parser::base_parser (base_lexer& lxr)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2155 : endfunction_found (false), autoloading (false),
23343 49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	2156 fcn_file_from_relative_lookup (false),
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	2157 parsing_subfunctions (false), parsing_local_functions (false),
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	2158 max_fcn_depth (0), curr_fcn_depth (0), primary_fcn_scope (0),
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2159 curr_class_name (), curr_package_name (), function_scopes (),
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2160 primary_fcn_ptr (0), subfunction_names (), classdef_object (0),
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2161 stmt_list (0), lexer (lxr), parser_state (yypstate_new ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2162 { }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2163
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2164 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	2165 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2166 delete stmt_list;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2167
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2168 delete &lexer;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2169
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2170 // 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	2171 // 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	2172 // 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	2173 // 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	2174 // 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	2175 // 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	2176 // 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	2177
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2178 yypstate_delete (static_cast<yypstate *> (parser_state));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2179 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2180
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2181 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2182 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	2183 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2184 endfunction_found = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2185 autoloading = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2186 fcn_file_from_relative_lookup = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2187 parsing_subfunctions = false;
23343 49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	2188 parsing_local_functions = false;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2189 max_fcn_depth = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2190 curr_fcn_depth = 0;
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	2191 primary_fcn_scope = 0;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2192 curr_class_name = "";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2193 curr_package_name = "";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2194 function_scopes.clear ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2195 primary_fcn_ptr = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2196 subfunction_names.clear ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2197
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2198 delete stmt_list;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2199 stmt_list = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2200
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2201 lexer.reset ();
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 yypstate_delete (static_cast<yypstate *> (parser_state));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2204 parser_state = yypstate_new ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2205 }
16138 284e2ca86ef7 execute parser using member function of octave_parser class John W. Eaton <jwe@octave.org> parents: 16136 diff changeset	2206 }
284e2ca86ef7 execute parser using member function of octave_parser class John W. Eaton <jwe@octave.org> parents: 16136 diff changeset	2207
666 fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	2208 // Error mesages for mismatched end tokens.
fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	2209
21071 f25c14056b7c overhaul parser error handling for end token mismatch John W. Eaton <jwe@octave.org> parents: 21066 diff changeset	2210 static std::string
23398 d4ef04757ead eliminate some compiler warnings John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	2211 end_token_as_string (octave::token::end_tok_type ettype)
496 e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	2212 {
21071 f25c14056b7c overhaul parser error handling for end token mismatch John W. Eaton <jwe@octave.org> parents: 21066 diff changeset	2213 std::string retval = "<unknown>";
496 e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	2214
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	2215 switch (ettype)
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	2216 {
23398 d4ef04757ead eliminate some compiler warnings John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	2217 case octave::token::simple_end:
21071 f25c14056b7c overhaul parser error handling for end token mismatch John W. Eaton <jwe@octave.org> parents: 21066 diff changeset	2218 retval = "end";
496 e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	2219 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	2220
23398 d4ef04757ead eliminate some compiler warnings John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	2221 case octave::token::classdef_end:
21071 f25c14056b7c overhaul parser error handling for end token mismatch John W. Eaton <jwe@octave.org> parents: 21066 diff changeset	2222 retval = "endclassdef";
20075 8aa424ffc076 handle all end token types when reporting parse errors (bug #44824) John W. Eaton <jwe@octave.org> parents: 19849 diff changeset	2223 break;
8aa424ffc076 handle all end token types when reporting parse errors (bug #44824) John W. Eaton <jwe@octave.org> parents: 19849 diff changeset	2224
23398 d4ef04757ead eliminate some compiler warnings John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	2225 case octave::token::enumeration_end:
21071 f25c14056b7c overhaul parser error handling for end token mismatch John W. Eaton <jwe@octave.org> parents: 21066 diff changeset	2226 retval = "endenumeration";
20075 8aa424ffc076 handle all end token types when reporting parse errors (bug #44824) John W. Eaton <jwe@octave.org> parents: 19849 diff changeset	2227 break;
8aa424ffc076 handle all end token types when reporting parse errors (bug #44824) John W. Eaton <jwe@octave.org> parents: 19849 diff changeset	2228
23398 d4ef04757ead eliminate some compiler warnings John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	2229 case octave::token::events_end:
21071 f25c14056b7c overhaul parser error handling for end token mismatch John W. Eaton <jwe@octave.org> parents: 21066 diff changeset	2230 retval = "endevents";
20075 8aa424ffc076 handle all end token types when reporting parse errors (bug #44824) John W. Eaton <jwe@octave.org> parents: 19849 diff changeset	2231 break;
8aa424ffc076 handle all end token types when reporting parse errors (bug #44824) John W. Eaton <jwe@octave.org> parents: 19849 diff changeset	2232
23398 d4ef04757ead eliminate some compiler warnings John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	2233 case octave::token::for_end:
21071 f25c14056b7c overhaul parser error handling for end token mismatch John W. Eaton <jwe@octave.org> parents: 21066 diff changeset	2234 retval = "endfor";
496 e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	2235 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	2236
23398 d4ef04757ead eliminate some compiler warnings John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	2237 case octave::token::function_end:
21071 f25c14056b7c overhaul parser error handling for end token mismatch John W. Eaton <jwe@octave.org> parents: 21066 diff changeset	2238 retval = "endfunction";
496 e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	2239 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	2240
23398 d4ef04757ead eliminate some compiler warnings John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	2241 case octave::token::if_end:
21071 f25c14056b7c overhaul parser error handling for end token mismatch John W. Eaton <jwe@octave.org> parents: 21066 diff changeset	2242 retval = "endif";
496 e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	2243 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	2244
23398 d4ef04757ead eliminate some compiler warnings John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	2245 case octave::token::methods_end:
21071 f25c14056b7c overhaul parser error handling for end token mismatch John W. Eaton <jwe@octave.org> parents: 21066 diff changeset	2246 retval = "endmethods";
20075 8aa424ffc076 handle all end token types when reporting parse errors (bug #44824) John W. Eaton <jwe@octave.org> parents: 19849 diff changeset	2247 break;
8aa424ffc076 handle all end token types when reporting parse errors (bug #44824) John W. Eaton <jwe@octave.org> parents: 19849 diff changeset	2248
23398 d4ef04757ead eliminate some compiler warnings John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	2249 case octave::token::parfor_end:
21071 f25c14056b7c overhaul parser error handling for end token mismatch John W. Eaton <jwe@octave.org> parents: 21066 diff changeset	2250 retval = "endparfor";
20075 8aa424ffc076 handle all end token types when reporting parse errors (bug #44824) John W. Eaton <jwe@octave.org> parents: 19849 diff changeset	2251 break;
8aa424ffc076 handle all end token types when reporting parse errors (bug #44824) John W. Eaton <jwe@octave.org> parents: 19849 diff changeset	2252
23398 d4ef04757ead eliminate some compiler warnings John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	2253 case octave::token::properties_end:
21071 f25c14056b7c overhaul parser error handling for end token mismatch John W. Eaton <jwe@octave.org> parents: 21066 diff changeset	2254 retval = "endproperties";
20075 8aa424ffc076 handle all end token types when reporting parse errors (bug #44824) John W. Eaton <jwe@octave.org> parents: 19849 diff changeset	2255 break;
8aa424ffc076 handle all end token types when reporting parse errors (bug #44824) John W. Eaton <jwe@octave.org> parents: 19849 diff changeset	2256
23398 d4ef04757ead eliminate some compiler warnings John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	2257 case octave::token::switch_end:
21071 f25c14056b7c overhaul parser error handling for end token mismatch John W. Eaton <jwe@octave.org> parents: 21066 diff changeset	2258 retval = "endswitch";
3233 98d0ee053ba4 [project @ 1999-01-27 20:23:40 by jwe] jwe parents: 3216 diff changeset	2259 break;
98d0ee053ba4 [project @ 1999-01-27 20:23:40 by jwe] jwe parents: 3216 diff changeset	2260
23398 d4ef04757ead eliminate some compiler warnings John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	2261 case octave::token::try_catch_end:
21071 f25c14056b7c overhaul parser error handling for end token mismatch John W. Eaton <jwe@octave.org> parents: 21066 diff changeset	2262 retval = "end_try_catch";
5400 c7e3cf2fce3e [project @ 2005-07-05 15:01:32 by jwe] jwe parents: 5397 diff changeset	2263 break;
c7e3cf2fce3e [project @ 2005-07-05 15:01:32 by jwe] jwe parents: 5397 diff changeset	2264
23398 d4ef04757ead eliminate some compiler warnings John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	2265 case octave::token::unwind_protect_end:
21071 f25c14056b7c overhaul parser error handling for end token mismatch John W. Eaton <jwe@octave.org> parents: 21066 diff changeset	2266 retval = "end_unwind_protect";
1371 766af9ca8edb [project @ 1995-09-06 21:36:02 by jwe] jwe parents: 1351 diff changeset	2267 break;
766af9ca8edb [project @ 1995-09-06 21:36:02 by jwe] jwe parents: 1351 diff changeset	2268
23398 d4ef04757ead eliminate some compiler warnings John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	2269 case octave::token::while_end:
21071 f25c14056b7c overhaul parser error handling for end token mismatch John W. Eaton <jwe@octave.org> parents: 21066 diff changeset	2270 retval = "endwhile";
20075 8aa424ffc076 handle all end token types when reporting parse errors (bug #44824) John W. Eaton <jwe@octave.org> parents: 19849 diff changeset	2271 break;
8aa424ffc076 handle all end token types when reporting parse errors (bug #44824) John W. Eaton <jwe@octave.org> parents: 19849 diff changeset	2272
496 e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	2273 default:
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	2274 panic_impossible ();
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	2275 break;
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	2276 }
21071 f25c14056b7c overhaul parser error handling for end token mismatch John W. Eaton <jwe@octave.org> parents: 21066 diff changeset	2277
f25c14056b7c overhaul parser error handling for end token mismatch John W. Eaton <jwe@octave.org> parents: 21066 diff changeset	2278 return retval;
496 e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	2279 }
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	2280
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2281 namespace octave
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2282 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2283 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2284 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	2285 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2286 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	2287 + "' 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	2288 + 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	2289
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2290 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	2291 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2292
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2293 // 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	2294
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2295 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2296 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	2297 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2298 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	2299
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2300 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	2301 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2302
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2303 // 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	2304 // 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	2305
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2306 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2307 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	2308 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2309 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	2310 && 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	2311 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2312 if (lexer.fcn_file_full_name.empty ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2313 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	2314 ("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	2315 "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	2316 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2317 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	2318 ("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	2319 "suggest parenthesis around assignment used as truth value near line %d, column %d in file '%s'",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2320 expr->line (), expr->column (), lexer.fcn_file_full_name.c_str ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2321 }
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 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	2325
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2326 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2327 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	2328 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2329 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	2330 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2331 if (lexer.fcn_file_full_name.empty ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2332 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	2333 "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	2334 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2335 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	2336 ("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	2337 "variable switch label near line %d, column %d in file '%s'",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2338 expr->line (), expr->column (), lexer.fcn_file_full_name.c_str ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2339 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2340 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2341
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2342 // Finish building a range.
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 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2345 base_parser::finish_colon_expression (tree_colon_expression *e)
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 tree_expression *retval = e;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2348
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2349 octave::unwind_protect frame;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2350
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2351 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	2352 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	2353
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2354 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	2355 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	2356
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2357 tree_expression *base = e->base ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2358 tree_expression *limit = e->limit ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2359 tree_expression *incr = e->increment ();
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 if (base)
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 if (limit)
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 if (base->is_constant () && limit->is_constant ()
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2366 && (! incr \|\| (incr && incr->is_constant ())))
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 try
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2369 {
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	2370 octave::tree_evaluator& tw
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	2371 = __get_evaluator__ ("finish_colon_expression");
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	2372
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	2373 octave_value tmp = 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	2374
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2375 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	2376 = new tree_constant (tmp, base->line (), base->column ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2377
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2378 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	2379
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2380 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	2381
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2382 e->accept (tpc);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2383
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2384 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	2385
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2386 delete e;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2387
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2388 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	2389 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2390 catch (const octave::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	2391 {
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	2392 octave::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	2393 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2394 }
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 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2397 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2398 e->preserve_base ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2399 delete e;
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 retval = base;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2402 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2403 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2404
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2405 return retval;
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2408 // 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	2409
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2410 tree_constant *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2411 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	2412 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2413 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	2414 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	2415
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2416 tree_constant *retval = 0;
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 switch (op)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2419 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2420 case NUM:
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 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	2423 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	2424 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	2425 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2426 break;
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 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	2429 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2430 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	2431 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	2432 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	2433 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2434 break;
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 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	2437 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	2438 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2439 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	2440
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2441 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	2442 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	2443
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2444 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	2445 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2446 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	2447 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	2448 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2449 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	2450 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2451
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2452 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	2453
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2454 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	2455 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	2456
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2457 // 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	2458 // 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	2459 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	2460 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2461 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2462
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2463 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2464 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2465 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2466 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2467
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2468 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2469 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2470
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2471 // 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	2472
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2473 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	2474 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	2475 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2476 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	2477 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	2478
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2479 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	2480
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2481 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2482 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2483
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2484 // 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	2485
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2486 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	2487 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	2488 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	2489 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2490 // FIXME: need to get these from the location of the @ symbol.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2491 int l = lexer.input_line_number;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2492 int c = lexer.current_input_column;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2493
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	2494 symbol_table::scope *fcn_scope = lexer.symtab_context.curr_scope ();
214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	2495 symbol_table::scope *parent_scope = lexer.symtab_context.parent_scope ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2496
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2497 lexer.symtab_context.pop ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2498
23600 db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2499 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	2500
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2501 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	2502 = 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	2503 parent_scope, l, c);
23600 db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2504
db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2505 // FIXME: Stash the filename. This does not work and produces
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2506 // errors when executed.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2507 //retval->stash_file_name (lexer.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	2508
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2509 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2510 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2511
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2512 // 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	2513
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2514 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2515 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	2516 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	2517 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2518 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	2519
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2520 switch (op)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2521 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2522 case POW:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2523 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	2524 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2525
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2526 case EPOW:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2527 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	2528 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2529
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2530 case '+':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2531 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	2532 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2533
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2534 case '-':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2535 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	2536 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2537
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2538 case '*':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2539 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	2540 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2541
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2542 case '/':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2543 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	2544 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2545
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2546 case EMUL:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2547 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	2548 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2549
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2550 case EDIV:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2551 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	2552 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2553
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2554 case LEFTDIV:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2555 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	2556 break;
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 case ELEFTDIV:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2559 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	2560 break;
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 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	2563 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	2564 break;
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 EXPR_LE:
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_le;
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 EXPR_EQ:
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_eq;
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 EXPR_GE:
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_ge;
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 EXPR_GT:
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_gt;
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 EXPR_NE:
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_ne;
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 EXPR_AND:
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_el_and;
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 EXPR_OR:
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_or;
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 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2595 panic_impossible ();
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2599 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	2600 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	2601
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2602 return maybe_compound_binary_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	2603 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2604
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2605 // 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	2606
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2607 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2608 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	2609 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	2610 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2611 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	2612
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2613 switch (op)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2614 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2615 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	2616 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	2617 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2618
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2619 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	2620 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	2621 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2622
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2623 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2624 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2625 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2626 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2627
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2628 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	2629 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	2630
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2631 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	2632 }
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 // 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	2635
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2636 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2637 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	2638 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2639 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	2640
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2641 switch (op)
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 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	2644 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	2645 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2646
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2647 case '+':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2648 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	2649 break;
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 case '-':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2652 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	2653 break;
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 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	2656 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	2657 break;
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 MINUS_MINUS:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2660 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	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 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2664 panic_impossible ();
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2668 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	2669 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	2670
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2671 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	2672 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2673
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2674 // 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	2675
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2676 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2677 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	2678 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2679 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	2680
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2681 switch (op)
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 case HERMITIAN:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2684 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	2685 break;
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 TRANSPOSE:
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_transpose;
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 PLUS_PLUS:
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_incr;
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 MINUS_MINUS:
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_decr;
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 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2700 panic_impossible ();
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2704 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	2705 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	2706
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2707 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	2708 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2709
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2710 // 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	2711
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2712 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2713 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	2714 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	2715 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	2716 token *end_tok,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2717 octave_comment_list *lc,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2718 octave_comment_list *mc)
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_command *retval = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2721
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2722 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	2723 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2724 octave_comment_list *tc = lexer.comment_buf.get_comment ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2725
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2726 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	2727 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	2728
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2729 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	2730 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	2731 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2732 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2733 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2734 delete body;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2735 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	2736
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2737 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	2738 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2739
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2740 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2741 }
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 // 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	2744
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2745 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2746 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	2747 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	2748 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	2749 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	2750 token *end_tok,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2751 octave_comment_list *lc,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2752 octave_comment_list *mc)
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 tree_command *retval = 0;
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 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	2757 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2758 octave_comment_list *tc = lexer.comment_buf.get_comment ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2759
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2760 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	2761 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	2762
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2763 tree_identifier *id = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2764
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2765 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	2766 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2767 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	2768
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2769 if (stmt)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2770 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2771 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	2772
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2773 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	2774 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2775 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	2776
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2777 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	2778
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2779 stmt->set_expression (0);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2780 delete stmt;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2781 }
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2785 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	2786 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	2787 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2788 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2789 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2790 delete body;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2791 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	2792
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2793 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	2794 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2795
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2796 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2797 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2798
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2799 // 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	2800
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2801 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2802 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	2803 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	2804 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	2805 token *end_tok,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2806 octave_comment_list *lc)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2807 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2808 tree_command *retval = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2809
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2810 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	2811
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2812 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	2813 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2814 octave_comment_list *tc = lexer.comment_buf.get_comment ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2815
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2816 lexer.looping--;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2817
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2818 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	2819 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	2820
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2821 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	2822 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2823 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2824 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2825 delete expr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2826 delete body;
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 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	2829 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2830
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2831 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2832 }
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 // 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	2835
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2836 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2837 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	2838 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	2839 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	2840 octave_comment_list *lc)
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 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	2843
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2844 octave_comment_list *tc = lexer.comment_buf.get_comment ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2845
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2846 lexer.looping--;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2847
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2848 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	2849 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	2850
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2851 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	2852 }
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 // 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	2855
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2856 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2857 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	2858 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	2859 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	2860 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	2861 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	2862 token *end_tok,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2863 octave_comment_list *lc)
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 tree_command *retval = 0;
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 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	2868
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2869 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	2870 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2871 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	2872
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2873 octave_comment_list *tc = lexer.comment_buf.get_comment ();
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 lexer.looping--;
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 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	2878 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	2879
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2880 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	2881 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2882 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	2883
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2884 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	2885 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	2886
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2887 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2888 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2889 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2890 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2891 if (parfor)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2892 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2893 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2894 delete expr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2895 delete maxproc;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2896 delete body;
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 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	2899 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2900 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2901 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	2902 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	2903 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2904 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2905 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2906 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2907 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2908 delete expr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2909 delete maxproc;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2910 delete body;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2911
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2912 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	2913 }
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 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2916 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2917
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2918 // 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	2919
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2920 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2921 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	2922 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2923 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	2924 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	2925
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	2926 if (! lexer.looping)
9c6661004167 error if break statement is in script file separate from loop (bug #39168) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	2927 {
9c6661004167 error if break statement is in script file separate from loop (bug #39168) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	2928 bison_error ("break must appear in a loop in the same file as loop command");
9c6661004167 error if break statement is in script file separate from loop (bug #39168) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	2929 return 0;
9c6661004167 error if break statement is in script file separate from loop (bug #39168) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	2930 }
9c6661004167 error if break statement is in script file separate from loop (bug #39168) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	2931 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	2932 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	2933 }
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 // 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	2936
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2937 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2938 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	2939 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2940 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	2941 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	2942
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2943 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	2944 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2945
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2946 // 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	2947
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2948 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2949 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	2950 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2951 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	2952 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	2953
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2954 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	2955 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2956
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2957 // 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	2958
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2959 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	2960 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	2961 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	2962 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2963 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	2964
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2965 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	2966
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2967 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	2968 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2969
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2970 // 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	2971
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2972 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	2973 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	2974 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	2975 token *end_tok,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2976 octave_comment_list *lc)
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 tree_if_command *retval = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2979
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2980 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	2981 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2982 octave_comment_list *tc = lexer.comment_buf.get_comment ();
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 = 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	2985 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	2986
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2987 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	2988 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2989 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	2990
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2991 if (elt)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2992 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2993 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	2994 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	2995 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2996 }
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 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	2999 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3000 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3001 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3002 delete list;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3003
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3004 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	3005 }
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 return retval;
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3010 // 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	3011
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3012 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	3013 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	3014 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	3015 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	3016 octave_comment_list *lc)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3017 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3018 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	3019
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3020 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	3021 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	3022
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3023 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	3024 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3025
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3026 // 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	3027
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3028 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	3029 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	3030 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	3031 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	3032 token *end_tok,
04a7953496a7 create base class for parser; use reference for curr_lexer John W. Eaton <jwe@octave.org> parents: 16285 diff changeset	3033 octave_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	3034 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3035 tree_switch_command *retval = 0;
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 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	3038 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3039 octave_comment_list *tc = lexer.comment_buf.get_comment ();
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 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	3042 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	3043
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3044 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	3045 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3046 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	3047
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3048 if (elt)
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 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	3051 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	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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3055 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	3056 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3057 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3058 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3059 delete expr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3060 delete list;
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 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	3063 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3064
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3065 return retval;
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3068 // 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	3069
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3070 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	3071 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	3072 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	3073 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	3074 octave_comment_list *lc)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3075 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3076 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	3077
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3078 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	3079 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	3080
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3081 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	3082 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3083
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3084 // 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	3085
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3086 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3087 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	3088 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	3089 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3090 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	3091
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3092 switch (op)
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 case '=':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3095 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	3096 break;
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 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	3099 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	3100 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3101
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3102 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	3103 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	3104 break;
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 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	3107 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	3108 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3109
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3110 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	3111 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	3112 break;
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 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	3115 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	3116 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3117
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3118 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	3119 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	3120 break;
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 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	3123 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	3124 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3125
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3126 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	3127 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	3128 break;
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 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	3131 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	3132 break;
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 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	3135 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	3136 break;
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 AND_EQ:
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_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	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 OR_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_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	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 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3147 panic_impossible ();
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3151 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	3152 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	3153
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3154 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	3155 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3156 // 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	3157 // '=', not '+=', etc.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3158
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3159 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3160 delete rhs;
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 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	3163
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3164 return 0;
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3167 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	3168 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3169 // 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	3170
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3171 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	3172
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3173 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	3174 && 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	3175 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3176 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	3177
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3178 delete tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3179 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3180 delete rhs;
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 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	3183
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3184 return 0;
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3187 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3188
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3189 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	3190 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3191 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3192 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3193 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	3194
22872 551ac93c984c maint: Use C++ range feature to simplify some for loops in libinterp/parse-tree Rik <rik@octave.org> parents: 22785 diff changeset	3195 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	3196 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3197 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	3198 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3199 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3200 delete rhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3201
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3202 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	3203 l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3204
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3205 return 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3206 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3207 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3208
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3209 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	3210 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3211 }
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 // 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	3214
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3215 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3216 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	3217 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	3218 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3219 if (! cmds)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3220 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	3221
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3222 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	3223
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3224 octave_user_script *script
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3225 = new octave_user_script (lexer.fcn_file_full_name,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3226 lexer.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	3227 cmds, lexer.help_text);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3228
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3229 lexer.help_text = "";
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 octave::sys::time now;
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 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	3234
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3235 primary_fcn_ptr = script;
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3238 // 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	3239
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3240 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	3241 base_parser::start_function (tree_parameter_list *param_list,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3242 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	3243 tree_statement *end_fcn_stmt)
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	3244 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3245 // 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	3246
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3247 if (! body)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3248 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	3249
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3250 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	3251
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3252 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	3253 = new octave_user_function (lexer.symtab_context.curr_scope (),
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3254 param_list, 0, body);
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 if (fcn)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3257 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3258 octave_comment_list *tc = lexer.comment_buf.get_comment ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3259
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3260 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	3261 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	3262 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	3263 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3264
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3265 return fcn;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3266 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3267
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3268 tree_statement *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3269 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	3270 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3271 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	3272 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3273
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3274 // Do most of the work for 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	3275
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3276 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	3277 base_parser::frob_function (const std::string& fname,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3278 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	3279 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3280 std::string id_name = fname;
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 // 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	3283 // 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	3284 // 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	3285 // name).
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3286 if (! autoloading && lexer.reading_fcn_file
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3287 && curr_fcn_depth == 1 && ! parsing_subfunctions)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3288 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3289 // FIXME: should lexer.fcn_file_name already be
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3290 // 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	3291 // 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	3292
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3293 std::string nm = lexer.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	3294
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3295 size_t pos = nm.find_last_of (octave::sys::file_ops::dir_sep_chars ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3296
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3297 if (pos != 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	3298 nm = lexer.fcn_file_name.substr (pos+1);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3299
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3300 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	3301 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3302 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	3303 ("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	3304 "function name '%s' does not agree with function filename '%s'",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3305 id_name.c_str (), lexer.fcn_file_full_name.c_str ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3306
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3307 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	3308 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3309 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3310
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3311 if (lexer.reading_fcn_file \|\| lexer.reading_classdef_file \|\| autoloading)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3312 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3313 octave::sys::time now;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3314
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3315 fcn->stash_fcn_file_name (lexer.fcn_file_full_name);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3316 fcn->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	3317 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	3318
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3319 if (fcn_file_from_relative_lookup)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3320 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	3321
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3322 if (curr_fcn_depth > 1 \|\| parsing_subfunctions)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3323 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3324 fcn->stash_parent_fcn_name (lexer.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	3325
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3326 if (curr_fcn_depth > 1)
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	3327 fcn->stash_parent_fcn_scope (function_scopes.parent_scope ());
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3328 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3329 fcn->stash_parent_fcn_scope (primary_fcn_scope);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3330 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3331
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3332 if (lexer.parsing_class_method)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3333 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3334 if (curr_class_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	3335 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	3336 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3337 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	3338
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3339 fcn->stash_dispatch_class (curr_class_name);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3340 }
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 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	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::sys::file_stat fs (nm);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3345
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3346 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	3347 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	3348 "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	3349 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3350 else if (! input_from_tmp_history_file
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3351 && ! lexer.force_script
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3352 && lexer.reading_script_file
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3353 && lexer.fcn_file_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	3354 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3355 warning ("function '%s' defined within script file '%s'",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3356 id_name.c_str (), lexer.fcn_file_full_name.c_str ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3357 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3358
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3359 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	3360
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3361 if (! lexer.help_text.empty () && curr_fcn_depth == 1
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3362 && ! parsing_subfunctions)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3363 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3364 fcn->document (lexer.help_text);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3365
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3366 lexer.help_text = "";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3367 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3368
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3369 if (lexer.reading_fcn_file && curr_fcn_depth == 1
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3370 && ! parsing_subfunctions)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3371 primary_fcn_ptr = fcn;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3372
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3373 return fcn;
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3376 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	3377 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	3378 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	3379 octave_comment_list *lc,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3380 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	3381 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3382 tree_function_def *retval = 0;
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 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	3385 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	3386
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3387 if (fcn)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3388 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3389 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	3390 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	3391
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3392 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	3393 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	3394 tmp += ": " + file;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3395
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3396 symbol_table& symtab
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3397 = octave::__get_symbol_table__ ("base_parser::finish_function");
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3398
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	3399
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	3400 symbol_table::scope *fcn_scope = fcn->scope ();
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	3401 fcn_scope->cache_name (tmp);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3402
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3403 if (lc)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3404 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	3405
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3406 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	3407
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3408 if (curr_fcn_depth > 1 \|\| parsing_subfunctions)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3409 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3410 fcn->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	3411
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	3412 octave_value ov_fcn (fcn);
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	3413
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3414 if (endfunction_found && function_scopes.size () > 1)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3415 {
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	3416 symbol_table::scope *pscope = function_scopes.parent_scope ();
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3417
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	3418 pscope->install_nestfunction (nm, ov_fcn);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3419 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3420 else
22974 ecc5eeada8dc Don't mark nested functions in primary function as subfunctions. Rik <rik@octave.org> parents: 22880 diff changeset	3421 {
ecc5eeada8dc Don't mark nested functions in primary function as subfunctions. Rik <rik@octave.org> parents: 22880 diff changeset	3422 fcn->mark_as_subfunction ();
ecc5eeada8dc Don't mark nested functions in primary function as subfunctions. Rik <rik@octave.org> parents: 22880 diff changeset	3423 subfunction_names.push_back (nm);
ecc5eeada8dc Don't mark nested functions in primary function as subfunctions. Rik <rik@octave.org> parents: 22880 diff changeset	3424
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	3425 primary_fcn_scope->install_subfunction (nm, ov_fcn);
22974 ecc5eeada8dc Don't mark nested functions in primary function as subfunctions. Rik <rik@octave.org> parents: 22880 diff changeset	3426 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3427 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3428
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	3429 if (parsing_local_functions )
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	3430 symtab.install_local_function (nm, octave_value (fcn), file);
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	3431 else if (curr_fcn_depth == 1)
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	3432 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	3433
23641 be69ea3de7a3 Backed out changeset 2208cc0e89a3 John W. Eaton <jwe@octave.org> parents: 23640 diff changeset	3434 if (! lexer.reading_fcn_file && 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	3435 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3436 // 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	3437 // 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	3438 // 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	3439 // 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	3440 // 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	3441 // or as the primary function for the file, via
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3442 // primary_fcn_ptr (see also load_fcn_from_file,,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3443 // parse_fcn_file, and
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3444 // symbol_table::fcn_info::fcn_info_rep::find_user_function).
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 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	3447 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3448 }
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 retval;
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 void
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::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	3455 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3456 lexer.symtab_context.pop ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3457
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3458 if (lexer.reading_fcn_file && curr_fcn_depth == 1
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3459 && ! parsing_subfunctions)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3460 parsing_subfunctions = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3461
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3462 curr_fcn_depth--;
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	3463 function_scopes.pop ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3464
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3465 lexer.defining_func--;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3466 lexer.parsed_function_name.pop ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3467 lexer.looking_at_return_list = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3468 lexer.looking_at_parameter_list = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3469 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3470
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3471 tree_funcall *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3472 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	3473 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	3474 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3475 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	3476
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3477 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	3478 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	3479
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3480 symbol_table& symtab
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3481 = octave::__get_symbol_table__ ("base_parser::make_superclass_ref");
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3482
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3483 octave_value fcn
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3484 = 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	3485
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3486 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	3487 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3488
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3489 tree_funcall *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3490 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	3491 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3492 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	3493
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3494 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	3495
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3496 symbol_table& symtab
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3497 = octave::__get_symbol_table__ ("base_parser::make_meta_class_query");
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3498
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3499 octave_value fcn
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3500 = 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	3501
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3502 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	3503 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3504
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3505 // 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	3506 // 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	3507 // 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	3508 // 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	3509 // 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	3510
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3511 tree_classdef *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3512 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	3513 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	3514 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	3515 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	3516 tree_classdef_body body, token end_tok,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3517 octave_comment_list *lc)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3518 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3519 tree_classdef *retval = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3520
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3521 lexer.symtab_context.pop ();
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3522
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3523 std::string cls_name = id->name ();
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	3524
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	3525 std::string nm = lexer.fcn_file_name;
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	3526
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	3527 size_t pos = nm.find_last_of (octave::sys::file_ops::dir_sep_chars ());
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	3528
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	3529 if (pos != std::string::npos)
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	3530 nm = lexer.fcn_file_name.substr (pos+1);
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	3531
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3532 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	3533 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3534 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3535 delete id;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3536 delete sc;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3537 delete body;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3538
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3539 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	3540
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3541 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3542 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3543 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3544 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	3545 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3546 octave_comment_list *tc = lexer.comment_buf.get_comment ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3547
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3548 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	3549 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	3550
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3551 if (! body)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3552 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	3553
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3554 retval = new tree_classdef (a, id, sc, body, lc, tc,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3555 curr_package_name, l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3556 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3557 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3558 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3559 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3560 delete id;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3561 delete sc;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3562 delete body;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3563
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3564 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	3565 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3566 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3567
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3568 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3569 }
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 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	3572 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	3573 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	3574 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	3575 token *end_tok,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3576 octave_comment_list *lc)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3577 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3578 tree_classdef_properties_block *retval = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3579
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3580 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	3581 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3582 octave_comment_list *tc = lexer.comment_buf.get_comment ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3583
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3584 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	3585 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	3586
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3587 if (! plist)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3588 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	3589
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3590 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	3591 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3592 else
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 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3595 delete plist;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3596
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3597 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	3598 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3599
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3600 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3601 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3602
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3603 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	3604 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	3605 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	3606 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	3607 token *end_tok,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3608 octave_comment_list *lc)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3609 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3610 tree_classdef_methods_block *retval = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3611
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3612 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	3613 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3614 octave_comment_list *tc = lexer.comment_buf.get_comment ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3615
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3616 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	3617 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	3618
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3619 if (! mlist)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3620 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	3621
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3622 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	3623 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3624 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3625 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3626 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3627 delete mlist;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3628
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3629 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	3630 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3631
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3632 return retval;
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3635 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	3636 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	3637 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	3638 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	3639 token *end_tok,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3640 octave_comment_list *lc)
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 tree_classdef_events_block *retval = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3643
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3644 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	3645 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3646 octave_comment_list *tc = lexer.comment_buf.get_comment ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3647
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3648 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	3649 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	3650
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3651 if (! elist)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3652 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	3653
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3654 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	3655 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3656 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3657 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3658 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3659 delete elist;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3660
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3661 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	3662 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3663
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3664 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3665 }
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 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	3668 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	3669 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	3670 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	3671 token *end_tok,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3672 octave_comment_list *lc)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3673 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3674 tree_classdef_enum_block *retval = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3675
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3676 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	3677 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3678 octave_comment_list *tc = lexer.comment_buf.get_comment ();
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 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	3681 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	3682
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3683 if (! elist)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3684 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	3685
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3686 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	3687 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3688 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3689 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3690 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3691 delete elist;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3692
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3693 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	3694 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3695
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3696 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3697 }
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 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	3700 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	3701 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	3702 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3703 octave_user_function* retval = 0;
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 // External methods are only allowed within @-folders. In this case,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3706 // curr_class_name will be non-empty.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3707
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3708 if (! curr_class_name.empty ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3709 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3710
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3711 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	3712
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3713 // 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	3714 // - 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	3715 // - class constructor
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3716 // - `delete'
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 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	3719 && mname != "delete"
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3720 && mname != curr_class_name)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3721 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3722 // 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	3723 // is loaded.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3724
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	3725 retval = new octave_user_function (0, pl);
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 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	3728
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3729 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	3730 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	3731
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3732 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	3733 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3734 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3735 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	3736 "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	3737 "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	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 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	3741
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3742 if (! retval)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3743 delete id;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3744
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3745 return retval;
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3748 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	3749 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	3750 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	3751 octave_comment_list *cl)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3752 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3753 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	3754 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	3755
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3756 if (cl)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3757 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	3758
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3759 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	3760 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	3761
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3762 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	3763 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3764
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3765 // 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	3766
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3767 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	3768 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	3769 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	3770 char type)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3771 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3772 tree_index_expression *retval = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3773
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3774 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	3775 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3776 delete expr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3777 delete args;
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 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	3780 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3781 else
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	3782 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3783 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	3784 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	3785
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3786 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	3787 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	3788
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3789 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	3790 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3791 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	3792 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	3793
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3794 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	3795
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3796 retval = tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3797 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3798 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3799 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	3800 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3801
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3802 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3803 }
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 // 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	3806
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3807 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	3808 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	3809 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	3810 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3811 tree_index_expression *retval = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3812
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3813 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	3814 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	3815
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3816 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	3817 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	3818
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3819 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	3820 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3821 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	3822
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3823 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	3824
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3825 retval = tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3826 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3827 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3828 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	3829
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3830 lexer.looking_at_indirect_ref = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3831
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3832 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3833 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3834
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3835 // 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	3836
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3837 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	3838 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	3839 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	3840 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3841 tree_index_expression *retval = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3842
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3843 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	3844 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	3845
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3846 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	3847 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	3848
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3849 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	3850 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3851 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	3852
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3853 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	3854
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3855 retval = tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3856 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3857 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3858 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	3859
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3860 lexer.looking_at_indirect_ref = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3861
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3862 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3863 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3864
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3865 // 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	3866
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3867 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	3868 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	3869 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	3870 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3871 tree_decl_command *retval = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3872
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3873 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	3874 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	3875
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3876 switch (tok)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3877 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3878 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	3879 {
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23454 diff changeset	3880 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	3881 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	3882 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3883 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3884
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3885 case PERSISTENT:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3886 if (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	3887 {
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23454 diff changeset	3888 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	3889 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	3890 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3891 else
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 if (lexer.reading_script_file)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3894 warning ("ignoring persistent declaration near line %d of file '%s'",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3895 l, lexer.fcn_file_full_name.c_str ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3896 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3897 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	3898 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3899 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3900
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3901 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3902 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3903 break;
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3906 return retval;
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3909 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3910 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	3911 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3912 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	3913
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3914 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	3915
22872 551ac93c984c maint: Use C++ range feature to simplify some for loops in libinterp/parse-tree Rik <rik@octave.org> parents: 22785 diff changeset	3916 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	3917 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3918 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	3919 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3920 retval = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3921
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3922 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	3923 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	3924 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3925 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	3926
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3927 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3928 }
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3931 return retval;
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3934 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	3935 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	3936 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3937 tree_argument_list *retval = 0;
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 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	3940 {
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	3941 octave::tree_evaluator& tw
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	3942 = __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	3943
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	3944 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	3945
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3946 delete e;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3947
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23576 diff changeset	3948 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	3949 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	3950 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3951 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	3952 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3953 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3954 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3955 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	3956
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3957 tree_argument_list *tmp = 0;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3958
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3959 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	3960 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3961 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	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 (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	3964 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3965 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	3966 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	3967 delete e;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3968 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	3969 }
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 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	3973
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3974 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	3975 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3976 lexer.mark_as_variables (tmp->variable_names ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3977 retval = tmp;
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 else
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 delete tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3982
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3983 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	3984 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3985
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3986 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	3987 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	3988 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3989
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3990 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3991 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3992
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3993 // 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	3994
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3995 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3996 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	3997 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3998 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	3999
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4000 octave::unwind_protect frame;
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 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	4003 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	4004
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4005 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	4006 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	4007
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4008 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	4009 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4010 try
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4011 {
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	4012 octave::tree_evaluator& tw
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	4013 = __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	4014
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	4015 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	4016
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4017 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	4018 = 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	4019 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	4020
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4021 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	4022
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4023 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	4024
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4025 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	4026
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4027 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	4028
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4029 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	4030
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4031 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	4032 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	4033 catch (const octave::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	4034 {
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	4035 octave::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	4036 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4037 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4038
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4039 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4040 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4041
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4042 // 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	4043
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4044 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4045 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	4046 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4047 return (m
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4048 ? 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	4049 : 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	4050 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4051
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4052 // 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	4053
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4054 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4055 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	4056 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4057 return (c
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4058 ? 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	4059 : 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	4060 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4061
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4062 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4063 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	4064 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4065 if (curr_fcn_depth > 0)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4066 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4067 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	4068
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4069 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	4070 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	4071 ("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	4072 "missing semicolon near line %d, column %d in file '%s'",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4073 tmp->line (), tmp->column (), lexer.fcn_file_full_name.c_str ());
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	4074 }
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	4075 }
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	4076
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4077 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	4078 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	4079 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	4080 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4081 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	4082
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4083 switch (sep)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4084 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4085 case ';':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4086 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	4087 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4088
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4089 case 0:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4090 case ',':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4091 case '\n':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4092 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	4093 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	4094 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	4095 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4096
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4097 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4098 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	4099 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4100 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4101
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4102 // 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	4103 // 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	4104
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4105 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	4106 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4107 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	4108 delete tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4109 }
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 return list;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4112 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4113
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4114 // 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	4115 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	4116 tree_statement *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4117 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	4118 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4119 octave_comment_list *comment = lexer.get_comment ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4120
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4121 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	4122 }
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 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	4125 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	4126 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4127 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	4128 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4129
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4130 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	4131 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	4132 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	4133 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	4134 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4135 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	4136
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4137 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	4138
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4139 return list;
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4142 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4143 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	4144 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4145 int err_line = l < 0 ? lexer.input_line_number : l;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4146 int err_col = c < 0 ? lexer.current_input_column - 1 : c;
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 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	4149
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4150 if (lexer.reading_fcn_file \|\| lexer.reading_script_file
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4151 \|\| lexer.reading_classdef_file)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4152 output_buf << "parse error near line " << err_line
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4153 << " of file " << lexer.fcn_file_full_name;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4154 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4155 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	4156
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4157 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	4158 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	4159
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4160 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	4161
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4162 std::string curr_line = lexer.current_input_line;
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 (! 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	4165 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4166 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	4167
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4168 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	4169 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	4170
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4171 // 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	4172
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4173 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	4174
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4175 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	4176 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	4177
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4178 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	4179 output_buf << " ";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4180
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4181 output_buf << "^";
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4184 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	4185
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4186 parse_error_msg = output_buf.str ();
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4189 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4190 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	4191 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4192 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	4193
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4194 yypstate pstate = static_cast<yypstate > (parser_state);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4195
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4196 try
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4197 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4198 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	4199 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	4200 catch (octave::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	4201 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4202 std::string file = lexer.fcn_file_full_name;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4203
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4204 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	4205 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	4206 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4207 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	4208 }
23049 7351f2c93389 rethrow octave::exit_exception (bug #49304) Olaf Till <i7tiol@t-online.de> parents: 22879 diff changeset	4209 catch (const octave::exit_exception&)
7351f2c93389 rethrow octave::exit_exception (bug #49304) Olaf Till <i7tiol@t-online.de> parents: 22879 diff changeset	4210 {
7351f2c93389 rethrow octave::exit_exception (bug #49304) Olaf Till <i7tiol@t-online.de> parents: 22879 diff changeset	4211 throw;
7351f2c93389 rethrow octave::exit_exception (bug #49304) Olaf Till <i7tiol@t-online.de> parents: 22879 diff changeset	4212 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	4213 catch (octave::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	4214 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4215 throw;
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 catch (...)
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 std::string file = lexer.fcn_file_full_name;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4220
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4221 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	4222 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	4223 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4224 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	4225 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4226
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4227 if (status != 0)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4228 parse_error ("%s", parse_error_msg.c_str ());
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 return status;
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4233 // 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	4234 // 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	4235
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4236 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4237 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	4238 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4239 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	4240
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4241 dynamic_cast<push_lexer&> (lexer).append_input (input, eof);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4242
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4243 do
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 YYSTYPE lval;
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 int token = octave_lex (&lval, scanner);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4248
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4249 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	4250 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4251 if (! eof && lexer.at_end_of_buffer ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4252 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4253 status = -1;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4254 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4255 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4256 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4257
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4258 yypstate pstate = static_cast<yypstate > (parser_state);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4259
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4260 try
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4261 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4262 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	4263 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	4264 catch (octave::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	4265 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4266 std::string file = lexer.fcn_file_full_name;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4267
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4268 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	4269 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	4270 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4271 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	4272 }
23049 7351f2c93389 rethrow octave::exit_exception (bug #49304) Olaf Till <i7tiol@t-online.de> parents: 22879 diff changeset	4273 catch (const octave::exit_exception&)
7351f2c93389 rethrow octave::exit_exception (bug #49304) Olaf Till <i7tiol@t-online.de> parents: 22879 diff changeset	4274 {
7351f2c93389 rethrow octave::exit_exception (bug #49304) Olaf Till <i7tiol@t-online.de> parents: 22879 diff changeset	4275 throw;
7351f2c93389 rethrow octave::exit_exception (bug #49304) Olaf Till <i7tiol@t-online.de> parents: 22879 diff changeset	4276 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	4277 catch (octave::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	4278 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4279 throw;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4280 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4281 catch (...)
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 std::string file = lexer.fcn_file_full_name;
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 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	4286 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	4287 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4288 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	4289 }
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 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	4292
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4293 if (status != 0)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4294 parse_error ("%s", parse_error_msg.c_str ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4295
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4296 return status;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4297 }
16294 0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	4298 }
0925d1f6875e push parser/lexer interface John W. Eaton <jwe@octave.org> parents: 16293 diff changeset	4299
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4300 static void
10067 6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	4301 safe_fclose (FILE *f)
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4302 {
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4303 if (f)
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4304 fclose (static_cast<FILE *> (f));
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4305 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4306
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	4307 static octave_function *
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	4308 parse_fcn_file (const std::string& full_file, const std::string& file,
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	4309 const std::string& dispatch_type,
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16644 diff changeset	4310 const std::string& package_name,
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	4311 bool require_file, bool force_script, bool autoload,
16153 a57c2c8c8163 move some variables into the octave_parser class John W. Eaton <jwe@octave.org> parents: 16151 diff changeset	4312 bool relative_lookup, const std::string& warn_for)
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4313 {
21743 f4d7d0eb5b0c use namespace for unwind_protect class John W. Eaton <jwe@octave.org> parents: 21740 diff changeset	4314 octave::unwind_protect frame;
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4315
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	4316 octave_function *fcn_ptr = 0;
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4317
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4318 // Open function file and parse.
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4319
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	4320 FILE *in_stream = octave::command_editor::get_input_stream ();
176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	4321
176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	4322 frame.add_fcn (octave::command_editor::set_input_stream, in_stream);
176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	4323
176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	4324 frame.add_fcn (octave::command_history::ignore_entries,
176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	4325 octave::command_history::ignoring_entries ());
176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	4326
176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	4327 octave::command_history::ignore_entries ();
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	4328
16198 2c5c538be353 clean up input.cc and eliminate ff_instream global variable John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	4329 FILE *ffile = 0;
2c5c538be353 clean up input.cc and eliminate ff_instream global variable John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	4330
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	4331 if (! full_file.empty ())
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21861 diff changeset	4332 ffile = std::fopen (full_file.c_str (), "rb");
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4333
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4334 if (ffile)
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4335 {
19709 5cfb3ccbf24a style fixes for resource management John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	4336 frame.add_fcn (safe_fclose, ffile);
5cfb3ccbf24a style fixes for resource management John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	4337
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4338 octave::parser parser (ffile);
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	4339
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	4340 parser.curr_class_name = dispatch_type;
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16644 diff changeset	4341 parser.curr_package_name = package_name;
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	4342 parser.autoloading = autoload;
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	4343 parser.fcn_file_from_relative_lookup = relative_lookup;
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	4344
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	4345 parser.lexer.force_script = force_script;
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	4346 parser.lexer.prep_for_file ();
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	4347 parser.lexer.parsing_class_method = ! dispatch_type.empty ();
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	4348
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	4349 parser.lexer.fcn_file_name = file;
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	4350 parser.lexer.fcn_file_full_name = full_file;
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	4351
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	4352 int status = parser.run ();
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	4353
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	4354 fcn_ptr = parser.primary_fcn_ptr;
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	4355
16211 3449bf257514 maint: fix botched merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16205 diff changeset	4356 if (status == 0)
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	4357 {
16289 bde729ba8381 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16286 16288 diff changeset	4358 if (parser.lexer.reading_classdef_file
bde729ba8381 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16286 16288 diff changeset	4359 && parser.classdef_object)
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	4360 {
16211 3449bf257514 maint: fix botched merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16205 diff changeset	4361 // Convert parse tree for classdef object to
3449bf257514 maint: fix botched merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16205 diff changeset	4362 // meta.class info (and stash it in the symbol
3449bf257514 maint: fix botched merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16205 diff changeset	4363 // table?). Return pointer to constructor?
3449bf257514 maint: fix botched merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16205 diff changeset	4364
3449bf257514 maint: fix botched merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16205 diff changeset	4365 if (fcn_ptr)
3449bf257514 maint: fix botched merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16205 diff changeset	4366 panic_impossible ();
3449bf257514 maint: fix botched merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16205 diff changeset	4367
18263 b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	4368 bool is_at_folder = ! dispatch_type.empty ();
b5be1a2aa5ab Initial implementation for classdef methods in separate files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18262 diff changeset	4369
23533 8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	4370 octave::interpreter& interp
8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	4371 = octave::__get_interpreter__ ("parse_fcn_file");
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	4372
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	4373 fcn_ptr
23533 8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	4374 = parser.classdef_object->make_meta_class (interp, is_at_folder);
21589 ad90fb5a139f eliminate memory leaks from classdef parse tree (bug #47372) John W. Eaton <jwe@octave.org> parents: 21581 diff changeset	4375
ad90fb5a139f eliminate memory leaks from classdef parse tree (bug #47372) John W. Eaton <jwe@octave.org> parents: 21581 diff changeset	4376 delete (parser.classdef_object);
ad90fb5a139f eliminate memory leaks from classdef parse tree (bug #47372) John W. Eaton <jwe@octave.org> parents: 21581 diff changeset	4377
ad90fb5a139f eliminate memory leaks from classdef parse tree (bug #47372) John W. Eaton <jwe@octave.org> parents: 21581 diff changeset	4378 parser.classdef_object = 0;
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	4379 }
16644 856cb7cba231 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16595 16627 diff changeset	4380 else if (fcn_ptr)
856cb7cba231 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16595 16627 diff changeset	4381 {
856cb7cba231 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16595 16627 diff changeset	4382 fcn_ptr->maybe_relocate_end ();
856cb7cba231 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16595 16627 diff changeset	4383
856cb7cba231 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16595 16627 diff changeset	4384 if (parser.parsing_subfunctions)
856cb7cba231 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16595 16627 diff changeset	4385 {
856cb7cba231 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16595 16627 diff changeset	4386 if (! parser.endfunction_found)
856cb7cba231 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16595 16627 diff changeset	4387 parser.subfunction_names.reverse ();
856cb7cba231 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16595 16627 diff changeset	4388
856cb7cba231 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16595 16627 diff changeset	4389 fcn_ptr->stash_subfunction_names (parser.subfunction_names);
856cb7cba231 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16595 16627 diff changeset	4390 }
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	4391 }
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	4392 }
10872 988d16d5ae34 correctly .m files that are empty or contain only comments John W. Eaton <jwe@octave.org> parents: 10659 diff changeset	4393 else
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	4394 error ("parse error while reading file %s", full_file.c_str ());
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4395 }
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	4396 else if (require_file)
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	4397 error ("no such file, '%s'", full_file.c_str ());
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	4398 else if (! warn_for.empty ())
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	4399 error ("%s: unable to open file '%s'", warn_for.c_str (),
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	4400 full_file.c_str ());
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4401
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	4402 return fcn_ptr;
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4403 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4404
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4405 namespace octave
5592 61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5484 diff changeset	4406 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4407 std::string
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4408 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	4409 std::string& full_file)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4410 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4411 std::string retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4412
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4413 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	4414
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4415 std::string file = full_file;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4416
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4417 size_t file_len = file.length ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4418
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4419 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	4420 \|\| (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	4421 \|\| (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	4422 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4423 file = octave::sys::env::base_pathname (file);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4424 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	4425
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4426 size_t pos = file.find_last_of (octave::sys::file_ops::dir_sep_str ());
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4427 if (pos != std::string::npos)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4428 file = file.substr (pos+1);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4429 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4430
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4431 if (! file.empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4432 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4433 symbol_found = true;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4434
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4435 octave_function *fcn
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4436 = parse_fcn_file (full_file, file, "", "", true, false, false, false,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4437 "");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4438
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4439 if (fcn)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4440 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4441 retval = fcn->doc_string ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4442
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4443 delete fcn;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4444 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4445 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4446
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4447 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4448 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4449
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4450 std::string
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4451 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	4452 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4453 std::string file;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4454 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	4455 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4456
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4457 std::string
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4458 lookup_autoload (const std::string& nm)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4459 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4460 std::string retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4461
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4462 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	4463
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4464 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	4465
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4466 if (p != autoload_map.end ())
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	4467 {
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	4468 load_path& lp = octave::__get_load_path__ ("lookup_autoload");
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	4469
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	4470 retval = lp.find_file (p->second);
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	4471 }
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4472
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4473 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4474 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4475
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4476 string_vector
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4477 autoloaded_functions (void)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4478 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4479 string_vector names (autoload_map.size ());
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4480
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4481 octave_idx_type i = 0;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4482 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	4483 names[i++] = fcn_fname.first;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4484
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4485 return names;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4486 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4487
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4488 string_vector
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4489 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	4490 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4491 string_vector names;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4492
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4493 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	4494 if (nm == fcn_fname.second)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4495 names.append (fcn_fname.first);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4496
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4497 return names;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4498 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4499
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4500 octave_function *
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4501 load_fcn_from_file (const std::string& file_name, const std::string& dir_name,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4502 const std::string& dispatch_type,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4503 const std::string& package_name,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4504 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	4505 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4506 octave_function *retval = 0;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4507
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4508 octave::unwind_protect frame;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4509
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4510 std::string nm = file_name;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4511
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4512 size_t nm_len = nm.length ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4513
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4514 std::string file;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4515
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4516 bool relative_lookup = false;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4517
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4518 file = nm;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4519
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4520 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	4521 \|\| (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	4522 \|\| (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	4523 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4524 nm = octave::sys::env::base_pathname (file);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4525 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	4526
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4527 size_t pos = nm.find_last_of (octave::sys::file_ops::dir_sep_str ());
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4528 if (pos != std::string::npos)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4529 nm = nm.substr (pos+1);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4530 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4531
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4532 relative_lookup = ! octave::sys::env::absolute_pathname (file);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4533
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4534 file = octave::sys::env::make_absolute (file);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4535
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4536 int len = file.length ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4537
23627 0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	4538 octave::dynamic_loader& dyn_loader
0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	4539 = __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	4540
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4541 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	4542 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4543 if (autoload && ! fcn_name.empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4544 nm = fcn_name;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4545
23627 0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	4546 retval = dyn_loader.load_oct (nm, file, relative_lookup);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4547 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4548 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	4549 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4550 // 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	4551 // 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	4552
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4553 octave_function *tmpfcn = parse_fcn_file (file.substr (0, len - 2),
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4554 nm, dispatch_type,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4555 package_name, false,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4556 autoload, autoload,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4557 relative_lookup, "");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4558
23627 0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	4559 retval = 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	4560
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4561 if (tmpfcn)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4562 retval->document (tmpfcn->doc_string ());
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4563 delete tmpfcn;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4564 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4565 else if (len > 2)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4566 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4567 retval = parse_fcn_file (file, nm, dispatch_type, package_name, true,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4568 autoload, autoload, relative_lookup, "");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4569 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4570
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4571 if (retval)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4572 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4573 retval->stash_dir_name (dir_name);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4574 retval->stash_package_name (package_name);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4575
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4576 if (retval->is_user_function ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4577 {
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	4578 symbol_table::scope *scope = retval->scope ();
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	4579
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	4580 scope->stash_dir_name_for_subfunctions (dir_name);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4581 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4582 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4583
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4584 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4585 }
5312 80c1aa832cb2 [project @ 2005-04-28 01:54:46 by jwe] jwe parents: 5309 diff changeset	4586 }
80c1aa832cb2 [project @ 2005-04-28 01:54:46 by jwe] jwe parents: 5309 diff changeset	4587
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	4588 DEFMETHOD (autoload, interp, args, ,
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	4589 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	4590 @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	4591 @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	4592 @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	4593 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	4594
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4595 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	4596 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	4597 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	4598 path.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4599
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4600 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	4601 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	4602 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	4603 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	4604
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4605 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4606 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	4607 @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	4608
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4609 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4610 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	4611 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	4612
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4613 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4614 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	4615 @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	4616
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4617 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4618 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	4619
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4620 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	4621
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4622 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	4623 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	4624
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4625 @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	4626 @end deftypefn */)
5484 2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	4627 {
5626 3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	4628 octave_value retval;
5484 2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	4629
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	4630 int nargin = args.length ();
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	4631
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	4632 if (nargin == 1 \|\| nargin > 3)
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	4633 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	4634
5626 3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	4635 if (nargin == 0)
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	4636 {
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	4637 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	4638 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	4639
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	4640 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	4641 for (const auto& fcn_fname : autoload_map)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4642 {
22872 551ac93c984c maint: Use C++ range feature to simplify some for loops in libinterp/parse-tree Rik <rik@octave.org> parents: 22785 diff changeset	4643 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	4644 file_names(i) = fcn_fname.second;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4645
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4646 i++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4647 }
5626 3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	4648
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	4649 octave_map m;
5626 3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	4650
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	4651 m.assign ("function", func_names);
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	4652 m.assign ("file", file_names);
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	4653
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	4654 retval = m;
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	4655 }
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	4656 else
5484 2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	4657 {
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	4658 string_vector argv = args.make_argv ("autoload");
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	4659
20547 52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4660 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	4661
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21730 diff changeset	4662 if (! octave::sys::env::absolute_pathname (nm))
6380 ac3d67504f85 [project @ 2007-03-02 22:08:06 by jwe] jwe parents: 6379 diff changeset	4663 {
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	4664 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	4665
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	4666 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	4667
52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4668 bool found = false;
52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4669
52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4670 if (fcn)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4671 {
20547 52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4672 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	4673
52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4674 if (! fname.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4675 {
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21730 diff changeset	4676 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	4677 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	4678
21736 0504351a45e6 use namespace for file_stat classes John W. Eaton <jwe@octave.org> parents: 21733 diff changeset	4679 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	4680
52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4681 if (fs.exists ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4682 {
20547 52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4683 nm = fname + nm;
52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4684 found = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4685 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4686 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4687 }
20547 52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4688 if (! found)
52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4689 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	4690 "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	4691 nm.c_str ());
52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4692 }
52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4693 if (nargin == 2)
52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4694 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	4695 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	4696 {
21021 a5b99b09f8fd maint: Use comparison operators rather than compare() for strings. Rik <rik@octave.org> parents: 20957 diff changeset	4697 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	4698 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	4699 "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	4700
52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	4701 // Remove function from symbol table and autoload map.
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	4702 symbol_table& symtab = interp.get_symbol_table ();
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	4703 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	4704 autoload_map.erase (argv[1]);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4705 }
5484 2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	4706 }
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	4707
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	4708 return retval;
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	4709 }
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	4710
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4711 namespace octave
4486 6ceba1f351fb [project @ 2003-08-22 16:49:46 by jwe] jwe parents: 4463 diff changeset	4712 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4713 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4714 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	4715 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	4716 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4717 // 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	4718 // 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	4719 // 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	4720 // written as
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4721 //
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4722 // foo1.m:
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4723 // ------
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4724 // foo2
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4725 //
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4726 // foo2.m:
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 // foo1
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4729 //
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4730 // and called with
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4731 //
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4732 // foo1
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4733 //
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4734 // (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	4735 //
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4736 // foo1.m:
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4737 // ------
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4738 // source ("foo2.m")
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4739 //
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4740 // foo2.m:
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4741 // ------
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4742 // source ("foo1.m")
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4743 //
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4744 // and called with
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4745 //
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4746 // source ("foo1.m")
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4747 //
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4748 // (for example).
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4749
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4750 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	4751
23631 0954bf188bed avoid memory leak in source_file function John W. Eaton <jwe@octave.org> parents: 23628 diff changeset	4752 std::string file_full_name
0954bf188bed avoid memory leak in source_file function John W. Eaton <jwe@octave.org> parents: 23628 diff changeset	4753 = octave::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	4754
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4755 file_full_name = octave::sys::env::make_absolute (file_full_name);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4756
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4757 octave::unwind_protect frame;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4758
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4759 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	4760 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	4761
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4762 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	4763
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4764 source_call_depth[file_full_name]++;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4765
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4766 if (source_call_depth[file_full_name] >= Vmax_recursion_depth)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4767 error ("max_recursion_depth exceeded");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4768
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4769 if (! context.empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4770 {
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	4771 octave::call_stack& cs = octave::__get_call_stack__ ("source_file");
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	4772
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4773 if (context == "caller")
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	4774 cs.goto_caller_frame ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4775 else if (context == "base")
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	4776 cs.goto_base_frame ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4777 else
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4778 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	4779
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	4780 frame.add_method (cs, &octave::call_stack::pop);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4781 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4782
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4783 octave_function *fcn = 0;
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 // 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	4786 size_t dir_end
0954bf188bed avoid memory leak in source_file function John W. Eaton <jwe@octave.org> parents: 23628 diff changeset	4787 = file_name.find_last_of (octave::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	4788 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	4789
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4790 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	4791 if (extension == std::string::npos)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4792 extension = file_name.length ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4793
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4794 std::string symbol = file_name.substr (dir_end, extension - dir_end);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4795 std::string full_name = octave::sys::canonicalize_file_name (file_name);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4796
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4797 // Check if this file is already loaded (or in the path)
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	4798 symbol_table& symtab = octave::__get_symbol_table__ ("source_file");
23631 0954bf188bed avoid memory leak in source_file function John W. Eaton <jwe@octave.org> parents: 23628 diff changeset	4799 octave_value ov_code = symtab.find (symbol);
0954bf188bed avoid memory leak in source_file function John W. Eaton <jwe@octave.org> parents: 23628 diff changeset	4800 if (ov_code.is_function ())
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4801 {
23631 0954bf188bed avoid memory leak in source_file function John W. Eaton <jwe@octave.org> parents: 23628 diff changeset	4802 fcn = ov_code.function_value ();
0954bf188bed avoid memory leak in source_file function John W. Eaton <jwe@octave.org> parents: 23628 diff changeset	4803
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4804 if (fcn)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4805 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4806 if (octave::sys::canonicalize_file_name (fcn->fcn_file_name ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4807 != full_name)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4808 {
23631 0954bf188bed avoid memory leak in source_file function John W. Eaton <jwe@octave.org> parents: 23628 diff changeset	4809 // wrong file, so load it below.
0954bf188bed avoid memory leak in source_file function John W. Eaton <jwe@octave.org> parents: 23628 diff changeset	4810 fcn = 0;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4811 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4812 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4813 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4814
23631 0954bf188bed avoid memory leak in source_file function John W. Eaton <jwe@octave.org> parents: 23628 diff changeset	4815 // 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	4816 // file, load.
0954bf188bed avoid memory leak in source_file function John W. Eaton <jwe@octave.org> parents: 23628 diff changeset	4817
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4818 if (! fcn)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4819 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4820 try
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4821 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4822 fcn = parse_fcn_file (file_full_name, file_name, "", "",
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4823 require_file, true, false, false, warn_for);
23631 0954bf188bed avoid memory leak in source_file function John W. Eaton <jwe@octave.org> parents: 23628 diff changeset	4824
0954bf188bed avoid memory leak in source_file function John W. Eaton <jwe@octave.org> parents: 23628 diff changeset	4825 if (fcn)
0954bf188bed avoid memory leak in source_file function John W. Eaton <jwe@octave.org> parents: 23628 diff changeset	4826 {
0954bf188bed avoid memory leak in source_file function John W. Eaton <jwe@octave.org> parents: 23628 diff changeset	4827 // Ensure that FCN will be deleted.
0954bf188bed avoid memory leak in source_file function John W. Eaton <jwe@octave.org> parents: 23628 diff changeset	4828 ov_code = octave_value (fcn);
0954bf188bed avoid memory leak in source_file function John W. Eaton <jwe@octave.org> parents: 23628 diff changeset	4829 }
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4830 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4831 catch (octave::execution_exception& e)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4832 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4833 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	4834 file_full_name.c_str ());
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4835 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4836 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4837
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4838 // Return or error if we don't have a valid script
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4839 if (! fcn)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4840 return;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4841
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4842 if (! fcn->is_user_code ())
23631 0954bf188bed avoid memory leak in source_file function John W. Eaton <jwe@octave.org> parents: 23628 diff changeset	4843 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	4844
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4845 if (verbose)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4846 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4847 std::cout << "executing commands from " << full_name << " ... ";
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4848 std::cout.flush ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4849 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4850
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	4851 tree_evaluator& tw = __get_evaluator__ ("source");
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	4852
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	4853 fcn->call (tw, 0);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4854
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4855 if (verbose)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4856 std::cout << "done." << std::endl;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4857 }
4486 6ceba1f351fb [project @ 2003-08-22 16:49:46 by jwe] jwe parents: 4463 diff changeset	4858 }
6ceba1f351fb [project @ 2003-08-22 16:49:46 by jwe] jwe parents: 4463 diff changeset	4859
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	4860 DEFMETHOD (mfilename, interp, args, ,
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	4861 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	4862 @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	4863 @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	4864 @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	4865 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	4866
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4867 When called from outside an m-file return the empty string.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4868
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4869 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	4870 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	4871
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4872 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	4873 the filename and 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	4874 @end deftypefn */)
5739 d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4875 {
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4876 octave_value retval;
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4877
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4878 int nargin = args.length ();
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4879
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4880 if (nargin > 1)
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	4881 print_usage ();
5739 d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4882
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4883 std::string arg;
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4884
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4885 if (nargin == 1)
21861 a55f1fa2c94a oct-parse.in.yy: Shorten lines to < 80 characters where possible. Rik <rik@octave.org> parents: 21748 diff changeset	4886 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	4887
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4888 std::string fname;
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4889
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	4890 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	4891
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	4892 octave_user_code *fcn = cs.caller_user_code ();
5743 a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe] jwe parents: 5739 diff changeset	4893
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe] jwe parents: 5739 diff changeset	4894 if (fcn)
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe] jwe parents: 5739 diff changeset	4895 {
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe] jwe parents: 5739 diff changeset	4896 fname = fcn->fcn_file_name ();
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe] jwe parents: 5739 diff changeset	4897
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe] jwe parents: 5739 diff changeset	4898 if (fname.empty ())
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe] jwe parents: 5739 diff changeset	4899 fname = fcn->name ();
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe] jwe parents: 5739 diff changeset	4900 }
5739 d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4901
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4902 if (arg == "fullpathext")
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4903 retval = fname;
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4904 else
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4905 {
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	4906 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	4907 size_t epos = fname.rfind ('.');
b09d4d0f5b63 [project @ 2006-04-07 06:43:10 by jwe] jwe parents: 5744 diff changeset	4908
b09d4d0f5b63 [project @ 2006-04-07 06:43:10 by jwe] jwe parents: 5744 diff changeset	4909 if (epos <= dpos)
8021 85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	4910 epos = std::string::npos;
85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	4911
85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	4912 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	4913
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4914 if (arg == "fullpath")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4915 retval = fname;
5739 d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4916 else
8021 85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	4917 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	4918 }
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4919
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4920 return retval;
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4921 }
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4922
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4923 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	4924 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	4925 @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	4926 @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	4927 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	4928
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4929 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	4930 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	4931 @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	4932
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4933 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	4934 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	4935 (@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	4936 @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	4937 @end deftypefn */)
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4938 {
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4939 octave_value_list retval;
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4940
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4941 int nargin = args.length ();
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4942
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	4943 if (nargin < 1 \|\| nargin > 2)
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5794 diff changeset	4944 print_usage ();
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4945
21861 a55f1fa2c94a oct-parse.in.yy: Shorten lines to < 80 characters where possible. Rik <rik@octave.org> parents: 21748 diff changeset	4946 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	4947
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	4948 std::string context;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	4949
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	4950 if (nargin == 2)
21861 a55f1fa2c94a oct-parse.in.yy: Shorten lines to < 80 characters where possible. Rik <rik@octave.org> parents: 21748 diff changeset	4951 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	4952
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4953 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	4954
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4955 return retval;
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4956 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4957
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4958 namespace octave
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4959 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4960 /*!
22298 18535a29a8e8 doc: improve documentation on oct-parse.in.yy(feval) (patch #9082) Ernst Reissner <rei3ner@arcor.de> parents: 22196 diff changeset	4961 Evaluate an Octave function (built-in or interpreted) and return
18535a29a8e8 doc: improve documentation on oct-parse.in.yy(feval) (patch #9082) Ernst Reissner <rei3ner@arcor.de> parents: 22196 diff changeset	4962 the list of result values.
18535a29a8e8 doc: improve documentation on oct-parse.in.yy(feval) (patch #9082) Ernst Reissner <rei3ner@arcor.de> parents: 22196 diff changeset	4963
22300 aa5360a5cd3b doc fix John W. Eaton <jwe@octave.org> parents: 22298 diff changeset	4964 @param name The name of the function to call.
aa5360a5cd3b doc fix John W. Eaton <jwe@octave.org> parents: 22298 diff changeset	4965 @param args The arguments to the function.
aa5360a5cd3b doc fix John W. Eaton <jwe@octave.org> parents: 22298 diff changeset	4966 @param nargout The number of output arguments expected.
aa5360a5cd3b doc fix John W. Eaton <jwe@octave.org> parents: 22298 diff changeset	4967 @return A list of output values. The length of the list is not
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4968 necessarily the same as @c nargout.
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4969
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4970 */
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4971 octave_value_list
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4972 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	4973 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4974 octave_value_list retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4975
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	4976 symbol_table& symtab = octave::__get_symbol_table__ ("feval");
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	4977
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	4978 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	4979
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4980 if (fcn.is_defined ())
23502 c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	4981 {
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	4982 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	4983
23502 c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	4984 octave_function *of = fcn.function_value ();
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	4985
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	4986 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	4987 }
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4988 else
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4989 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	4990
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4991 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4992 }
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 octave_value_list
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4995 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	4996 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4997 octave_value_list retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4998
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	4999 if (fcn)
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	5000 {
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	5001 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	5002
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	5003 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	5004 }
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5005
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5006 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5007 }
23502 c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5008
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5009 octave_value_list
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5010 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	5011 {
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5012 if (val.is_function ())
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5013 {
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5014 return octave::feval (val.function_value (), args, nargout);
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5015 }
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5016 else if (val.is_function_handle ())
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5017 {
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5018 // 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	5019 // functions.
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5020
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5021 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	5022 arg_list.push_back (args);
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5023
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5024 return val.subsref ("(", arg_list, nargout);
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5025 }
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5026 else if (val.is_string ())
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5027 {
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5028 return octave::feval (val.string_value (), args, nargout);
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5029 }
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5030 else
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5031 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	5032
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5033 return ovl ();
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5034 }
4342 813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	5035 }
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	5036
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	5037 static octave_value_list
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	5038 get_feval_args (const octave_value_list& args)
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	5039 {
10659 8baff2aceabc fix slicing value lists with name tags (bug #29960) Jaroslav Hajek <highegg@gmail.com> parents: 10578 diff changeset	5040 return args.slice (1, args.length () - 1, true);
4342 813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	5041 }
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	5042
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5043 namespace octave
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 /*!
22298 18535a29a8e8 doc: improve documentation on oct-parse.in.yy(feval) (patch #9082) Ernst Reissner <rei3ner@arcor.de> parents: 22196 diff changeset	5046 Evaluate an Octave function (built-in or interpreted) and return
18535a29a8e8 doc: improve documentation on oct-parse.in.yy(feval) (patch #9082) Ernst Reissner <rei3ner@arcor.de> parents: 22196 diff changeset	5047 the list of result values.
18535a29a8e8 doc: improve documentation on oct-parse.in.yy(feval) (patch #9082) Ernst Reissner <rei3ner@arcor.de> parents: 22196 diff changeset	5048
22300 aa5360a5cd3b doc fix John W. Eaton <jwe@octave.org> parents: 22298 diff changeset	5049 @param args The first element of @c args is the function to call.
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5050 It may be the name of the function as a string, a function
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5051 handle, or an inline function. The remaining arguments are
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5052 passed to the function.
22300 aa5360a5cd3b doc fix John W. Eaton <jwe@octave.org> parents: 22298 diff changeset	5053 @param nargout The number of output arguments expected.
aa5360a5cd3b doc fix John W. Eaton <jwe@octave.org> parents: 22298 diff changeset	5054 @return A list of output values. The length of the list is not
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5055 necessarily the same as @c nargout.
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5056 */
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5057 octave_value_list
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5058 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	5059 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5060 if (args.length () > 0)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5061 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5062 octave_value f_arg = args(0);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5063
23502 c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5064 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	5065
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5066 return octave::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	5067 }
23502 c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5068 else
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5069 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	5070
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	5071 return ovl ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5072 }
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5073 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5074
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5075 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	5076 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	5077 @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	5078 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	5079
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5080 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	5081 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	5082
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5083 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5084 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5085 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	5086 @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	5087 @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	5088 @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	5089
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5090 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5091 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	5092
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5093 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	5094 (@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	5095 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	5096 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	5097
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5098 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5099 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5100 @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	5101 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	5102 @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	5103 @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	5104 @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	5105 @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	5106 @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	5107
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5108 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5109 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	5110 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	5111 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	5112 instead.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5113 @end deftypefn */)
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5114 {
20818 cef0448a6ed2 eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20798 diff changeset	5115 if (args.length () == 0)
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5794 diff changeset	5116 print_usage ();
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5117
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5118 return octave::feval (args, nargout);
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5119 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5120
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	5121 DEFMETHOD (builtin, interp, args, nargout,
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	5122 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	5123 @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	5124 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	5125 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	5126
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5127 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	5128 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	5129 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	5130
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5131 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	5132 @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	5133
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5134 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5135 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5136 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	5137 @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	5138 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	5139 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	5140 @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	5141 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	5142 @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	5143 @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	5144 @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	5145 @end deftypefn */)
11225 8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	5146 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	5147 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	5148
20818 cef0448a6ed2 eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20798 diff changeset	5149 if (args.length () == 0)
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5150 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5151
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5152 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	5153
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	5154 symbol_table& symtab = interp.get_symbol_table ();
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	5155
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	5156 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	5157
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5158 if (fcn.is_defined ())
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5159 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	5160 else
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5161 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	5162
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	5163 return retval;
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	5164 }
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	5165
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5166 namespace octave
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5167 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5168 octave_value_list
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5169 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	5170 int& parse_status, int nargout)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5171 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5172 octave_value_list retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5173
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5174 octave::parser parser (eval_str);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5175
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5176 do
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5177 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5178 parser.reset ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5179
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5180 parse_status = parser.run ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5181
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5182 if (parse_status == 0)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5183 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5184 if (parser.stmt_list)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5185 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5186 tree_statement *stmt = 0;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5187
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	5188 octave::tree_evaluator& tw = __get_evaluator__ ("eval_string");
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	5189
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5190 if (parser.stmt_list->length () == 1
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5191 && (stmt = parser.stmt_list->front ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5192 && stmt->is_expression ())
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 tree_expression *expr = stmt->expression ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5195
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5196 if (silent)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5197 expr->set_print_flag (false);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5198
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5199 bool do_bind_ans = false;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5200
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5201 if (expr->is_identifier ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5202 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5203 tree_identifier *id
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5204 = dynamic_cast<tree_identifier *> (expr);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5205
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5206 do_bind_ans = (! id->is_variable ());
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 else
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5209 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	5210
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	5211 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	5212
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5213 if (do_bind_ans && ! retval.empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5214 bind_ans (retval(0), expr->print_result ());
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5215
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5216 if (nargout == 0)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5217 retval = octave_value_list ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5218 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5219 else if (nargout == 0)
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	5220 parser.stmt_list->accept (tw);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5221 else
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5222 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	5223
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5224 if (tree_return_command::returning
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5225 \|\| tree_break_command::breaking
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5226 \|\| tree_continue_command::continuing)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5227 break;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5228 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5229 else if (parser.lexer.end_of_input)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5230 break;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5231 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5232 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5233 while (parse_status == 0);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5234
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5235 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5236 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5237
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5238 octave_value
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5239 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	5240 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5241 octave_value retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5242
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5243 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	5244
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5245 if (! tmp.empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5246 retval = tmp(0);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5247
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5248 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5249 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5250
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5251 static octave_value_list
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5252 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	5253 int nargout)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5254 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5255 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	5256
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5257 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	5258 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5259
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5260 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5261 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	5262 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5263 if (*lst)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5264 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5265 delete *lst;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5266 *lst = 0;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5267 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5268 }
13970 c93b953f7d54 plug some memory leaks John W. Eaton <jwe@octave.org> parents: 13844 diff changeset	5269 }
c93b953f7d54 plug some memory leaks John W. Eaton <jwe@octave.org> parents: 13844 diff changeset	5270
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5271 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	5272 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	5273 @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	5274 @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	5275 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	5276 program.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5277
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5278 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	5279
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5280 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	5281 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	5282
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5283 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	5284 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	5285
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5286 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5287 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	5288 @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	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 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	5291 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	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 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	5296 '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	5297 @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	5298 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	5299 @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	5300 @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	5301
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5302 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	5303 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	5304 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	5305 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	5306 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	5307 does.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5308 @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	5309 @end deftypefn */)
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5310 {
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5311 octave_value_list retval;
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5312
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5313 int nargin = args.length ();
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5314
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5315 if (nargin == 0)
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5316 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5317
21743 f4d7d0eb5b0c use namespace for unwind_protect class John W. Eaton <jwe@octave.org> parents: 21740 diff changeset	5318 octave::unwind_protect frame;
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5319
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5320 if (nargin > 1)
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5321 {
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5322 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	5323 buffer_error_messages++;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5324 }
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5325
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5326 int parse_status = 0;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5327
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5328 bool execution_error = false;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5329
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5330 octave_value_list tmp;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5331
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5332 try
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5333 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5334 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	5335 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	5336 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	5337 {
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	5338 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	5339
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5340 execution_error = true;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5341 }
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5342
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5343 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	5344 {
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5345 // 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	5346 // 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	5347
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5348 buffer_error_messages--;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5349
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5350 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	5351
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5352 if (nargout > 0)
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5353 retval = tmp;
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5354 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5355 else
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5356 {
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5357 if (nargout > 0)
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5358 retval = tmp;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5359
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5360 // 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	5361 // 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	5362 if (execution_error)
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5363 octave_throw_execution_exception ();
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5364 }
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5365
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5366 return retval;
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5367 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5368
7562 c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	5369 /*
c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	5370
14084 5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5371 %!shared x
7562 c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	5372 %! x = 1;
14084 5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5373
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5374 %!assert (eval ("x"), 1)
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5375 %!assert (eval ("x;"))
21317 a4faec57f4c8 maint: remove semicolon after %!assert tests to follow Octave conventions. Rik <rik@octave.org> parents: 21301 diff changeset	5376 %!assert (eval ("x;"), 1)
14084 5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5377
7562 c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	5378 %!test
14084 5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5379 %! y = eval ("x");
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5380 %! assert (y, 1);
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5381
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5382 %!test
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5383 %! y = eval ("x;");
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5384 %! assert (y, 1);
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5385
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5386 %!test
21580 ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 21416 diff changeset	5387 %! eval ("x = 1;");
14084 5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5388 %! assert (x,1);
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5389
7562 c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	5390 %!test
c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	5391 %! eval ("flipud = 2;");
14084 5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5392 %! assert (flipud, 2);
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5393
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5394 %!function y = __f ()
7562 c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	5395 %! eval ("flipud = 2;");
c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	5396 %! y = flipud;
14084 5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5397 %!endfunction
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	5398 %!assert (__f(), 2)
7562 c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	5399
14533 e6aa044253eb Allow comma at the end of an assignment list (bug #35645) Max Brister <max@2bass.com> parents: 14512 diff changeset	5400 % bug #35645
e6aa044253eb Allow comma at the end of an assignment list (bug #35645) Max Brister <max@2bass.com> parents: 14512 diff changeset	5401 %!test
e6aa044253eb Allow comma at the end of an assignment list (bug #35645) Max Brister <max@2bass.com> parents: 14512 diff changeset	5402 %! [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	5403 %! [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	5404
21581 6fab85c1538f maint: Follow Octave conventions for use of semicolon in BIST tests. Rik <rik@octave.org> parents: 21580 diff changeset	5405 %!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	5406
7562 c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	5407 */
c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	5408
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5409 DEFMETHOD (assignin, interp, args, ,
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5410 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	5411 @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	5412 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	5413 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	5414 @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	5415 @end deftypefn */)
4297 59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	5416 {
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	5417 octave_value_list retval;
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	5418
20818 cef0448a6ed2 eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20798 diff changeset	5419 if (args.length () != 3)
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5420 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5421
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5422 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	5423
21743 f4d7d0eb5b0c use namespace for unwind_protect class John W. Eaton <jwe@octave.org> parents: 21740 diff changeset	5424 octave::unwind_protect frame;
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5425
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5426 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	5427
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5428 if (context == "caller")
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5429 cs.goto_caller_frame ();
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5430 else if (context == "base")
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5431 cs.goto_base_frame ();
4297 59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	5432 else
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5433 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	5434
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5435 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	5436
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5437 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	5438
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5439 if (valid_identifier (nm))
21369 105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21361 diff changeset	5440 {
105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21361 diff changeset	5441 // 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	5442 // 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	5443 // already been checked.
105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21361 diff changeset	5444
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5445 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	5446 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	5447
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	5448 symbol_table::scope *scope = interp.get_current_scope ();
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	5449
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	5450 if (scope)
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	5451 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	5452 }
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5453 else
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5454 error ("assignin: invalid variable name in argument VARNAME");
4297 59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	5455
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	5456 return retval;
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	5457 }
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	5458
21369 105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21361 diff changeset	5459 /*
105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21361 diff changeset	5460
21581 6fab85c1538f maint: Follow Octave conventions for use of semicolon in BIST tests. Rik <rik@octave.org> parents: 21580 diff changeset	5461 %!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	5462
105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21361 diff changeset	5463 */
105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21361 diff changeset	5464
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5465 DEFMETHOD (evalin, interp, args, nargout,
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5466 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	5467 @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	5468 @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	5469 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	5470 @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	5471 @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	5472 @end deftypefn */)
4245 610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	5473 {
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	5474 octave_value_list retval;
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	5475
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	5476 int nargin = args.length ();
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	5477
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5478 if (nargin < 2)
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5479 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5480
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5481 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	5482
21743 f4d7d0eb5b0c use namespace for unwind_protect class John W. Eaton <jwe@octave.org> parents: 21740 diff changeset	5483 octave::unwind_protect frame;
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5484
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5485 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	5486
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5487 if (context == "caller")
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5488 cs.goto_caller_frame ();
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5489 else if (context == "base")
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5490 cs.goto_base_frame ();
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5491 else
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5492 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	5493
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5494 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	5495
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5496 if (nargin > 2)
4245 610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	5497 {
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5498 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	5499 buffer_error_messages++;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5500 }
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5501
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5502 int parse_status = 0;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5503
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5504 bool execution_error = false;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5505
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5506 octave_value_list tmp;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5507
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5508 try
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5509 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5510 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	5511 parse_status, nargout);
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5512 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	5513 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	5514 {
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	5515 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	5516
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5517 execution_error = true;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5518 }
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5519
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5520 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	5521 {
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5522 // 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	5523 // 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	5524
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5525 buffer_error_messages--;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5526
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5527 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	5528 parse_status, nargout);
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5529
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5530 retval = (nargout > 0) ? tmp : octave_value_list ();
4245 610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	5531 }
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	5532 else
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5533 {
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5534 if (nargout > 0)
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5535 retval = tmp;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5536
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5537 // 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	5538 // 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	5539 // execution exception.
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5540 if (execution_error)
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5541 octave_throw_execution_exception ();
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5542 }
4245 610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	5543
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	5544 return retval;
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	5545 }
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	5546
22504 2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5547 static void
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5548 maybe_print_last_error_message (bool *doit)
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5549 {
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5550 if (doit && *doit)
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5551 // 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	5552 // 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	5553 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	5554 last_error_message ().c_str ());
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5555 }
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5556
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5557 static void
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5558 restore_octave_stdout (std::streambuf *buf)
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5559 {
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5560 octave_stdout.flush ();
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5561 octave_stdout.rdbuf (buf);
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5562 }
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5563
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5564 static void
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5565 restore_octave_stderr (std::streambuf *buf)
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5566 {
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5567 std::cerr.flush ();
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5568 std::cerr.rdbuf (buf);
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5569 }
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5570
21075 5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5571 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	5572 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	5573 @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	5574 @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	5575 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	5576 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	5577
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5578 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	5579
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5580 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	5581 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	5582 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	5583
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5584 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	5585 @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	5586 @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	5587 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	5588
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5589 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5590 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5591 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	5592 @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	5593
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5594 @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	5595 @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	5596 @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	5597 @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	5598 @end deftypefn */)
21075 5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5599 {
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5600 int nargin = args.length ();
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5601
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5602 if (nargin == 0 \|\| nargin > 2)
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5603 print_usage ();
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5604
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5605 // redirect stdout/stderr to capturing buffer
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5606 std::ostringstream buffer;
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5607
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5608 std::ostream& out_stream = octave_stdout;
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5609 std::ostream& err_stream = std::cerr;
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5610
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5611 out_stream.flush ();
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5612 err_stream.flush ();
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5613
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5614 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	5615 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	5616
22504 2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5617 bool eval_error_occurred = true;
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5618
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5619 octave::unwind_protect frame;
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5620
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5621 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	5622 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	5623 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	5624
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5625 // call standard eval function
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5626 octave_value_list retval;
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5627 int eval_nargout = std::max (0, nargout - 1);
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5628
22504 2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5629 retval = Feval (args, eval_nargout);
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	5630 eval_error_occurred = false;
21075 5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5631
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5632 retval.prepend (buffer.str ());
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5633 return retval;
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5634 }
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5635
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5636 /*
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5637
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5638 %!assert (evalc ("1"), "ans = 1\n")
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5639 %!assert (evalc ("1;"), "")
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5640
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5641 %!test
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5642 %! [s, y] = evalc ("1");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5643 %! assert (s, "");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5644 %! assert (y, 1);
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5645
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5646 %!test
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5647 %! [s, y] = evalc ("1;");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5648 %! assert (s, "");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5649 %! assert (y, 1);
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5650
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5651 %!test
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5652 %! assert (evalc ("y = 2"), "y = 2\n");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5653 %! assert (y, 2);
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5654
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5655 %!test
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5656 %! assert (evalc ("y = 3;"), "");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5657 %! assert (y, 3);
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5658
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5659 %!test
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5660 %! [s, a, b] = evalc ("deal (1, 2)");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5661 %! assert (s, "");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5662 %! assert (a, 1);
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5663 %! assert (b, 2);
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5664
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5665 %!function [a, b] = __f_evalc ()
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5666 %! printf ("foo");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5667 %! fprintf (stdout, "bar");
21580 ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 21416 diff changeset	5668 %! disp (pi);
21075 5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5669 %! a = 1;
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5670 %! b = 2;
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5671 %!endfunction
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5672 %!test
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5673 %! [s, a, b] = evalc ("__f_evalc ()");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5674 %! assert (s, "foobar 3.1416\n");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5675 %! assert (a, 1);
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5676 %! assert (b, 2);
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5677
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5678 %!error <foo> (evalc ("error ('foo')"))
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5679 %!error <bar> (evalc ("error ('foo')", "error ('bar')"))
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5680
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5681 %!test
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5682 %! warning ("off", "quiet", "local");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5683 %! assert (evalc ("warning ('foo')"), "warning: foo\n");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5684
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5685 %!test
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5686 %! warning ("off", "quiet", "local");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5687 %! 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	5688
21581 6fab85c1538f maint: Follow Octave conventions for use of semicolon in BIST tests. Rik <rik@octave.org> parents: 21580 diff changeset	5689 %!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	5690
21075 5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5691 */
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	5692
8311 7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	5693 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	5694 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	5695 @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	5696 @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	5697 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	5698 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	5699 @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	5700 @end deftypefn */)
8311 7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	5701 {
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	5702 octave_value retval;
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	5703
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	5704 bool debug_flag = octave_debug;
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	5705
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	5706 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	5707 "__parser_debug_flag__");
8311 7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	5708
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	5709 octave_debug = debug_flag;
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	5710
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	5711 return retval;
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	5712 }
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	5713
17377 15e2ad6372f7 maint: Tweaks to remove compiler warnings. Rik <rik@octave.org> parents: 17342 diff changeset	5714 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	5715 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	5716 @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	5717 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	5718 @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	5719 {
091e4df179de new function to help with debugging by parsing .m files without executing them John W. Eaton <jwe@octave.org> parents: 17326 diff changeset	5720 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	5721
091e4df179de new function to help with debugging by parsing .m files without executing them John W. Eaton <jwe@octave.org> parents: 17326 diff changeset	5722 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	5723
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5724 if (nargin < 1 \|\| nargin > 2)
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5725 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5726
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5727 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	5728
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21730 diff changeset	5729 std::string full_file = octave::sys::env::make_absolute (file);
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5730
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5731 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	5732
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5733 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	5734 \|\| (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	5735 \|\| (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	5736 {
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21730 diff changeset	5737 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	5738 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	5739
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	5740 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	5741 if (pos != std::string::npos)
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5742 file = file.substr (pos+1);
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	5743 }
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5744
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5745 if (nargin == 2)
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5746 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	5747
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5748 octave_function *fcn = parse_fcn_file (full_file, file, "", "",
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5749 true, false, false,
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5750 false, "__parse_file__");
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5751
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5752 if (fcn)
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5753 delete fcn;
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	5754
091e4df179de new function to help with debugging by parsing .m files without executing them John W. Eaton <jwe@octave.org> parents: 17326 diff changeset	5755 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	5756 }

Mercurial > octave

annotate libinterp/parse-tree/oct-parse.in.yy @ 23641:be69ea3de7a3