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

annotate libinterp/parse-tree/oct-parse.yy @ 30108:3efce22b7350

eliminate duplicate parent function name info in symbol scope objects * symscope.h, symscope.cc (symbol_scope_rep::m_parent_fcn_names): Delete member variable. (symbol_scope_rep::cache_parent_fcn_names): Delete function and all uses. (symbol_scope_rep::parent_fcn_names): Generate list of parent function names from parent scope info as needed.

author	John W. Eaton <jwe@octave.org>
date	Thu, 02 Sep 2021 11:20:53 -0400
parents	67994b92a613
children	a9e3e1c96c47

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
29358 0a5b15007766 update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 29322 diff changeset	3 // Copyright (C) 1993-2021 The Octave Project Developers
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
1 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"
27728 5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255) John W. Eaton <jwe@octave.org> parents: 27516 diff changeset	56 #include "anon-fcn-validator.h"
23454 30b6eccd6708 use builtin-defun-decls.h to ensure declarations of interpreter functions John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	57 #include "builtin-defun-decls.h"
2166 d68119516779 [project @ 1996-05-13 13:41:55 by jwe] jwe parents: 2124 diff changeset	58 #include "defun.h"
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	59 #include "dynamic-ld.h"
1351 8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	60 #include "error.h"
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	61 #include "input.h"
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	62 #include "interpreter-private.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: 22091 diff changeset	63 #include "interpreter.h"
1351 8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	64 #include "lex.h"
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: 5823 diff changeset	65 #include "load-path.h"
25517 7fbc39a46be8 Add wrapper to fopen for files with non-ASCII chars in path on Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25442 diff changeset	66 #include "lo-sysdep.h"
1743 ab8612a09449 [project @ 1996-01-12 11:25:30 by jwe] jwe parents: 1740 diff changeset	67 #include "oct-hist.h"
5626 3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	68 #include "oct-map.h"
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	69 #include "ov-classdef.h"
4935 4fc993a4e072 [project @ 2004-08-06 03:17:12 by jwe] jwe parents: 4930 diff changeset	70 #include "ov-fcn-handle.h"
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	71 #include "ov-usr-fcn.h"
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8064 diff changeset	72 #include "ov-null-mat.h"
1351 8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	73 #include "pager.h"
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	74 #include "parse.h"
2987 ae20b3f37f5e [project @ 1997-05-16 07:05:15 by jwe] jwe parents: 2982 diff changeset	75 #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	76 #include "pt-eval.h"
1351 8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	77 #include "symtab.h"
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	78 #include "token.h"
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	79 #include "unwind-prot.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	80 #include "utils.h"
1351 8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	81 #include "variables.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	82
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	83 // 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	84 #include "oct-parse.h"
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	85
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	86 extern int octave_lex (YYSTYPE , void );
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	87
496 e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	88 // 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	89 // the file.
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	90
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	91 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	92
27510 5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	93 #define lexer (parser.get_lexer ())
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	94 #define scanner lexer.m_scanner
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	95
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	96 // Previous versions of Octave used Bison's YYUSE macro to avoid
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	97 // warnings about unused values in rules. But that Bison macro was
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	98 // apparently never intended to be public. So define our own. All we
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	99 // need to do is mention the symantic value somewhere in the rule. It
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	100 // doesn't actually need to be used to avoid the Bison warning, so just
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	101 // define this macro to discard its parameter.
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	102 #define OCTAVE_YYUSE(X)
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	103
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 21021 diff changeset	104 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
24444 53ca76c5cc8d maint: Indent pragmas as other preprocessor directives. John W. Eaton <jwe@octave.org> parents: 24377 diff changeset	105 // Disable this warning for code that is generated by Bison,
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives. John W. Eaton <jwe@octave.org> parents: 24377 diff changeset	106 // including grammar rules. Push the current state so we can
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives. John W. Eaton <jwe@octave.org> parents: 24377 diff changeset	107 // restore the warning state prior to functions we define at
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives. John W. Eaton <jwe@octave.org> parents: 24377 diff changeset	108 // the bottom of the file.
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives. John W. Eaton <jwe@octave.org> parents: 24377 diff changeset	109 # pragma GCC diagnostic push
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives. John W. Eaton <jwe@octave.org> parents: 24377 diff changeset	110 # pragma GCC diagnostic ignored "-Wold-style-cast"
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 21021 diff changeset	111 #endif
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 21021 diff changeset	112
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	113 %}
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	114
666 fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	115 // Bison declarations.
fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	116
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	117 // The grammar currently has 9 shift/reduce conflicts. Ensure that
17743 af5ad573c665 oct-parse.in.yy: Add %expect declaration. John W. Eaton <jwe@octave.org> parents: 17731 diff changeset	118 // we notice if that number changes.
af5ad573c665 oct-parse.in.yy: Add %expect declaration. John W. Eaton <jwe@octave.org> parents: 17731 diff changeset	119
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	120 %expect 9
17743 af5ad573c665 oct-parse.in.yy: Add %expect declaration. John W. Eaton <jwe@octave.org> parents: 17731 diff changeset	121
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	122 // 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	123 // 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	124 // reentrant because both still use many global variables. It should be
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	125 // safe to create a parser object and call it while another parser
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	126 // 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	127 // 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	128 // 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	129 // 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	130
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	131 %define api.pure
25640 7aaf091d39fc one more fix for parser change... Doh! John W. Eaton <jwe@octave.org> parents: 25638 diff changeset	132 // No spaces inside the braces for the prefix and push-pull definitions!
7aaf091d39fc one more fix for parser change... Doh! John W. Eaton <jwe@octave.org> parents: 25638 diff changeset	133 %define api.prefix {octave_}
25644 bee8d60413f3 avoid bison warning about deprecated syntax John W. Eaton <jwe@octave.org> parents: 25640 diff changeset	134 %define api.push-pull both
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	135 %parse-param { octave::base_parser& parser }
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	136 %lex-param { void *lexer.scanner }
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	137
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	138 %union
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	139 {
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	140 int dummy_type;
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	141
2891 1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2884 diff changeset	142 // 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	143 octave::token *tok_val;
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	144
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	145 // Comment strings that we need to deal with mid-rule.
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	146 octave::comment_list *comment_type;
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	147
2891 1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2884 diff changeset	148 // 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	149 char punct_type;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	150 octave::tree *tree_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	151 octave::tree_matrix *tree_matrix_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	152 octave::tree_cell *tree_cell_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	153 octave::tree_expression *tree_expression_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	154 octave::tree_constant *tree_constant_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	155 octave::tree_fcn_handle *tree_fcn_handle_type;
26686 581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26662 diff changeset	156 octave::tree_superclass_ref *tree_superclass_ref_type;
581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26662 diff changeset	157 octave::tree_metaclass_query *tree_metaclass_query_type;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	158 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	159 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	160 octave::tree_identifier *tree_identifier_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	161 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	162 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	163 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	164 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	165 octave::tree_command *tree_command_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	166 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	167 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	168 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	169 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	170 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	171 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	172 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	173 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	174 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	175 octave::tree_statement *tree_statement_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	176 octave::tree_statement_list *tree_statement_list_type;
29724 c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	177 octave::tree_arguments_block *tree_arguments_block_type;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	178 octave::tree_args_block_attribute_list *tree_args_block_attribute_list_type;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	179 octave::tree_args_block_validation_list *tree_args_block_validation_list_type;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	180 octave::tree_arg_size_spec *tree_arg_size_spec_type;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	181 octave::tree_arg_validation *tree_arg_validation_type;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	182 octave::tree_arg_validation_fcns *tree_arg_validation_fcns_type;
2891 1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2884 diff changeset	183 octave_user_function *octave_user_function_type;
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	184
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	185 octave::tree_classdef *tree_classdef_type;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	186 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	187 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	188 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	189 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	190 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	191 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	192 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	193 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	194 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	195 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	196 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	197 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	198 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	199 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	200 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	201 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	202 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	203
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	204 // Tokens with line and column information.
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	205 %token <tok_val> '=' ':' '-' '+' '*' '/'
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	206 %token <tok_val> '(' ')' '[' ']' '{' '}' '.' '@'
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	207 %token <tok_val> ',' ';' '\n'
4018 a8621d87fbf5 [project @ 2002-08-05 03:17:25 by jwe] jwe parents: 4009 diff changeset	208 %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	209 %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	210 %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	211 %token <tok_val> EXPR_AND EXPR_OR EXPR_NOT
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	212 %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	213 %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	214 %token <tok_val> HERMITIAN TRANSPOSE
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	215 %token <tok_val> PLUS_PLUS MINUS_MINUS POW EPOW
28582 dc8de424fc72 use octave_value object to store numeric tokens in the lexer John W. Eaton <jwe@octave.org> parents: 28548 diff changeset	216 %token <tok_val> NUMBER
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	217 %token <tok_val> STRUCT_ELT
2883 0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	218 %token <tok_val> NAME
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	219 %token <tok_val> END
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5189 diff changeset	220 %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	221 %token <tok_val> FOR PARFOR WHILE DO UNTIL
28517 6e8a9845d118 Add 'spmd' as interpreter keyword for Matlab compatibility (bug #58676). Rik <rik@octave.org> parents: 28516 diff changeset	222 %token <tok_val> SPMD
1491 893b416bb919 [project @ 1995-09-29 04:03:01 by jwe] jwe parents: 1489 diff changeset	223 %token <tok_val> IF ELSEIF ELSE
2764 2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	224 %token <tok_val> SWITCH CASE OTHERWISE
1491 893b416bb919 [project @ 1995-09-29 04:03:01 by jwe] jwe parents: 1489 diff changeset	225 %token <tok_val> BREAK CONTINUE FUNC_RET
924 8b0920cc1d64 [project @ 1994-11-15 00:40:50 by jwe] jwe parents: 922 diff changeset	226 %token <tok_val> UNWIND CLEANUP
1489 3e705c864019 [project @ 1995-09-28 05:38:26 by jwe] jwe parents: 1371 diff changeset	227 %token <tok_val> TRY CATCH
14294 9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14293 diff changeset	228 %token <tok_val> GLOBAL PERSISTENT
4342 813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	229 %token <tok_val> FCN_HANDLE
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	230 %token <tok_val> CLASSDEF
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	231 %token <tok_val> PROPERTIES METHODS EVENTS ENUMERATION
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	232 %token <tok_val> METAQUERY
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	233 %token <tok_val> SUPERCLASSREF
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18419 diff changeset	234 %token <tok_val> FQ_IDENT
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	235 %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	236 %token <tok_val> FCN
29724 c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	237 %token <tok_val> ARGUMENTS
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21063 diff changeset	238 %token <tok_val> LEXICAL_ERROR
27778 2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	239 %token <tok_val> END_OF_INPUT
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	240
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	241 // Other tokens.
27778 2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	242 %token <dummy_type> INPUT_FILE
7587 1f662945c2be handle varargin and varargout without keywords John W. Eaton <jwe@octave.org> parents: 7562 diff changeset	243 // %token VARARGIN VARARGOUT
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	244
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	245 // Nonterminals we construct.
29727 05d7b7e64811 eliminate unused lexical feedback flag John W. Eaton <jwe@octave.org> parents: 29724 diff changeset	246 %type <dummy_type> indirect_ref_op
24037 21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	247 %type <dummy_type> push_fcn_symtab push_script_symtab begin_file
27736 bd80e14f268a improve parse error message for @()x+=expr (bug #57255) John W. Eaton <jwe@octave.org> parents: 27729 diff changeset	248 %type <dummy_type> param_list_beg param_list_end stmt_begin anon_fcn_begin
29724 c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	249 %type <dummy_type> parsing_local_fcns parse_error at_first_executable_stmt
16644 856cb7cba231 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16595 16627 diff changeset	250 %type <comment_type> stash_comment
29724 c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	251 %type <tok_val> function_beg classdef_beg arguments_beg
29759 ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	252 %type <tok_val> properties_beg methods_beg events_beg enumeration_beg
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	253 %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	254 %type <tree_type> input
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5848 diff changeset	255 %type <tree_constant_type> string constant magic_colon
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5848 diff changeset	256 %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	257 %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	258 %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	259 %type <tree_cell_type> cell_rows
5102 b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe] jwe parents: 5013 diff changeset	260 %type <tree_expression_type> matrix cell
27729 718845eb3c7a eliminate unnecessary expr_no_assign non-terminal in parser John W. Eaton <jwe@octave.org> parents: 27728 diff changeset	261 %type <tree_expression_type> primary_expr oper_expr power_expr
4207 fa3482b34599 [project @ 2002-12-03 18:22:05 by jwe] jwe parents: 4186 diff changeset	262 %type <tree_expression_type> simple_expr colon_expr assign_expr expression
29729 d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	263 %type <tree_expression_type> arg_name
17283 e6c0ac8ce5b6 eliminate parse conflicts introduced by changeset 923ce8b42db2 John W. Eaton <jwe@octave.org> parents: 17281 diff changeset	264 %type <tree_identifier_type> identifier fcn_name magic_tilde
26686 581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26662 diff changeset	265 %type <tree_superclass_ref_type> superclass_identifier
581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26662 diff changeset	266 %type <tree_metaclass_query_type> meta_identifier
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	267 %type <tree_index_expression_type> word_list_cmd
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3347 diff changeset	268 %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	269 %type <tree_argument_list_type> cell_or_matrix_row
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	270 %type <tree_parameter_list_type> opt_param_list param_list
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	271 %type <tree_parameter_list_type> param_list1 param_list2
723 1c072f20b522 [project @ 1994-09-21 16:00:10 by jwe] jwe parents: 666 diff changeset	272 %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	273 %type <tree_command_type> command select_command loop_command
28518 b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	274 %type <tree_command_type> jump_command spmd_command except_command
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	275 %type <tree_function_def_type> function
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	276 %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	277 %type <tree_command_type> file
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	278 %type <tree_if_command_type> if_command
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	279 %type <tree_if_clause_type> elseif_clause else_clause
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	280 %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	281 %type <tree_switch_command_type> switch_command
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	282 %type <tree_switch_case_type> switch_case default_case
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	283 %type <tree_switch_case_list_type> case_list1 case_list
29728 287fde79ffa2 rename some non-terminal symbols in the parser John W. Eaton <jwe@octave.org> parents: 29727 diff changeset	284 %type <tree_decl_elt_type> decl_elt param_list_elt
287fde79ffa2 rename some non-terminal symbols in the parser John W. Eaton <jwe@octave.org> parents: 29727 diff changeset	285 %type <tree_decl_init_list_type> decl_init_list
2846 52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	286 %type <tree_decl_command_type> declaration
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	287 %type <tree_statement_type> statement function_end
627 739d16c30481 [project @ 1994-08-19 13:23:14 by jwe] jwe parents: 620 diff changeset	288 %type <tree_statement_list_type> simple_list simple_list1 list list1
29724 c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	289 %type <tree_statement_list_type> opt_list function_body function_body1
23343 49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	290 %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	291 %type <tree_classdef_attribute_type> attr
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	292 %type <tree_classdef_attribute_list_type> attr_list attr_list1
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	293 %type <tree_classdef_superclass_type> superclass
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	294 %type <tree_classdef_superclass_list_type> superclass_list superclass_list1
06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	295 %type <tree_classdef_body_type> class_body class_body1
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	296 %type <tree_classdef_property_type> class_property
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	297 %type <tree_classdef_property_list_type> property_list property_list1
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	298 %type <tree_classdef_properties_block_type> properties_block
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	299 %type <tree_classdef_methods_list_type> methods_list methods_list1
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	300 %type <tree_classdef_methods_block_type> methods_block
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	301 %type <tree_classdef_event_type> class_event
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	302 %type <tree_classdef_events_list_type> events_list events_list1
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	303 %type <tree_classdef_events_block_type> events_block
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	304 %type <tree_classdef_enum_type> class_enum
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	305 %type <tree_classdef_enum_list_type> enum_list enum_list1
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	306 %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	307 %type <tree_function_def_type> method_decl method
29724 c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	308 %type <tree_arguments_block_type> arguments_block
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	309 %type <tree_args_block_attribute_list_type> args_attr_list
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	310 %type <tree_args_block_validation_list_type> args_validation_list
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	311 %type <tree_arg_validation_type> arg_validation
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	312 %type <tree_arg_size_spec_type> size_spec
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	313 %type <tree_identifier_type> class_name
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	314 %type <tree_arg_validation_fcns_type> validation_fcns
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	315 %type <tree_expression_type> default_value
18262 69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	316 %type <octave_user_function_type> method_decl1
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	317
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	318 // Precedence and associativity.
21294 3d375b0905a0 eliminate unused << and >> operators from Octave scripting language John W. Eaton <jwe@octave.org> parents: 21159 diff changeset	319 %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	320 %left EXPR_OR_OR
ef3caf27cb9c [project @ 2002-08-07 06:54:41 by jwe] jwe parents: 4018 diff changeset	321 %left EXPR_AND_AND
ef3caf27cb9c [project @ 2002-08-07 06:54:41 by jwe] jwe parents: 4018 diff changeset	322 %left EXPR_OR
ef3caf27cb9c [project @ 2002-08-07 06:54:41 by jwe] jwe parents: 4018 diff changeset	323 %left EXPR_AND
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	324 %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	325 %left ':'
1276 cbdf7db98554 [project @ 1995-04-24 15:31:24 by jwe] jwe parents: 1266 diff changeset	326 %left '-' '+' EPLUS EMINUS
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	327 %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	328 %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	329 %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	330 %right PLUS_PLUS MINUS_MINUS
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3347 diff changeset	331 %left '(' '.' '{'
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	332
17629 1e8f8900a041 clean up partially constructed parse tree objects on parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17622 diff changeset	333 // How to clean up if there is a parse error. We handle deleting tokens
27956 2310164737b3 fix many spelling errors (bug #57613) John W. Eaton <jwe@octave.org> parents: 26585 diff changeset	334 // and comments separately and separators are just characters. The
17629 1e8f8900a041 clean up partially constructed parse tree objects on parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17622 diff changeset	335 // 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	336 // 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	337 // 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	338 // here).
0c5f50706ba3 attempt to catch possible memory leaks in parser cleanup John W. Eaton <jwe@octave.org> parents: 17632 diff changeset	339
0c5f50706ba3 attempt to catch possible memory leaks in parser cleanup John W. Eaton <jwe@octave.org> parents: 17632 diff changeset	340 %destructor { } <tok_val>
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	341 %destructor { } <punct_type>
17658 0c5f50706ba3 attempt to catch possible memory leaks in parser cleanup John W. Eaton <jwe@octave.org> parents: 17632 diff changeset	342 %destructor { } <comment_type>
0c5f50706ba3 attempt to catch possible memory leaks in parser cleanup John W. Eaton <jwe@octave.org> parents: 17632 diff changeset	343 %destructor { } <>
0c5f50706ba3 attempt to catch possible memory leaks in parser cleanup John W. Eaton <jwe@octave.org> parents: 17632 diff changeset	344
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	345 %destructor { delete $$; } <tree_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	346 %destructor { delete $$; } <tree_matrix_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	347 %destructor { delete $$; } <tree_cell_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	348 %destructor { delete $$; } <tree_expression_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	349 %destructor { delete $$; } <tree_constant_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	350 %destructor { delete $$; } <tree_fcn_handle_type>
26686 581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26662 diff changeset	351 %destructor { delete $$; } <tree_superclass_ref_type>
581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26662 diff changeset	352 %destructor { delete $$; } <tree_metaclass_query_type>
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	353 %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	354 %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	355 %destructor { delete $$; } <tree_identifier_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	356 %destructor { delete $$; } <tree_index_expression_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	357 %destructor { delete $$; } <tree_argument_list_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	358 %destructor { delete $$; } <tree_parameter_list_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	359 %destructor { delete $$; } <tree_command_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	360 %destructor { delete $$; } <tree_if_command_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	361 %destructor { delete $$; } <tree_if_clause_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	362 %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	363 %destructor { delete $$; } <tree_switch_command_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	364 %destructor { delete $$; } <tree_switch_case_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	365 %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	366 %destructor { delete $$; } <tree_decl_elt_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	367 %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	368 %destructor { delete $$; } <tree_decl_command_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	369 %destructor { delete $$; } <tree_statement_type>
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	370 %destructor { delete $$; } <tree_statement_list_type>
29724 c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	371 %destructor { delete $$; } <tree_arguments_block_type>
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	372 %destructor { delete $$; } <tree_args_block_attribute_list_type>
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	373 %destructor { delete $$; } <tree_args_block_validation_list_type>
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	374 %destructor { delete $$; } <tree_arg_validation_type>
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	375 %destructor { delete $$; } <tree_arg_size_spec_type>
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	376 %destructor { delete $$; } <tree_arg_validation_fcns_type>
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	377 %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	378
18262 69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	379 %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	380 %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	381 %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	382 %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	383 %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	384 %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	385 %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	386 %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	387 %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	388 %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	389 %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	390 %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	391 %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	392 %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	393 %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	394 %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	395 %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	396
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	397 // 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	398 // already explicitly declared for all types.
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	399 //
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	400 // %destructor {
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	401 // warning_with_id
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	402 // ("Octave:parser-destructor",
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	403 // "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	404 // } <*>
17629 1e8f8900a041 clean up partially constructed parse tree objects on parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17622 diff changeset	405
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	406 // Where to start.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	407 %start input
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	408
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	409 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	410
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	411 // ==============================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	412 // Statements and statement lists
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	413 // ==============================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	414
17322 4c1ae06111c9 allow parser to accept empty statements (bug #37099) John W. Eaton <jwe@octave.org> parents: 17317 diff changeset	415 input : simple_list '\n'
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	416 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	417 OCTAVE_YYUSE ($2);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	418
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	419 $$ = nullptr;
29864 e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	420
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	421 if (! parser.finish_input ($1))
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	422 YYABORT;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	423 else
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	424 YYACCEPT;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	425 }
17322 4c1ae06111c9 allow parser to accept empty statements (bug #37099) John W. Eaton <jwe@octave.org> parents: 17317 diff changeset	426 \| simple_list END_OF_INPUT
4c1ae06111c9 allow parser to accept empty statements (bug #37099) John W. Eaton <jwe@octave.org> parents: 17317 diff changeset	427 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	428 OCTAVE_YYUSE ($2);
27778 2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	429
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	430 $$ = nullptr;
29864 e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	431
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	432 if (! parser.finish_input ($1, true))
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	433 YYABORT;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	434 else
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	435 YYACCEPT;
17322 4c1ae06111c9 allow parser to accept empty statements (bug #37099) John W. Eaton <jwe@octave.org> parents: 17317 diff changeset	436 }
17326 f444e4cef9b9 avoid exiting Octave on parse error (bug #39862) John W. Eaton <jwe@octave.org> parents: 17322 diff changeset	437 \| parse_error
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	438 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	439 $$ = nullptr;
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	440 YYABORT;
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	441 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	442 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	443
17322 4c1ae06111c9 allow parser to accept empty statements (bug #37099) John W. Eaton <jwe@octave.org> parents: 17317 diff changeset	444 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	445 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	446 OCTAVE_YYUSE ($1);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	447
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	448 $$ = nullptr;
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	449 }
17322 4c1ae06111c9 allow parser to accept empty statements (bug #37099) John W. Eaton <jwe@octave.org> parents: 17317 diff changeset	450 \| 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	451 { $$ = 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	452 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	453
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	454 simple_list1 : statement
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	455 { $$ = parser.make_statement_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	456 \| 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	457 { $$ = 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	458 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	459
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	460 opt_list : // empty
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	461 { $$ = new octave::tree_statement_list (); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	462 \| list
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	463 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	464 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	465
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	466 list : list1 opt_sep
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	467 { $$ = 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	468 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	469
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	470 list1 : statement
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	471 { $$ = parser.make_statement_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	472 \| list1 sep statement
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	473 { $$ = 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	474 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	475
23343 49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	476 opt_fcn_list : // empty
23635 b5a9cd6de1b8 avoid possible memory error in parser John W. Eaton <jwe@octave.org> parents: 23631 diff changeset	477 { $$ = new octave::tree_statement_list (); }
23343 49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	478 \| fcn_list
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	479 { $$ = $1; }
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	480 ;
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23343 diff changeset	481
23343 49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	482 fcn_list : fcn_list1 opt_sep
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	483 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	484 OCTAVE_YYUSE ($2);
23343 49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	485
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	486 $$ = $1;
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	487 }
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	488 ;
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	489
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	490 fcn_list1 : function
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	491 {
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	492 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	493 $$ = new octave::tree_statement_list (stmt);
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	494 }
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	495 \| fcn_list1 opt_sep function
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	496 {
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	497 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	498 $$ = 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	499 }
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	500 ;
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	501
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	502 statement : expression
17693 efbe746f8fa8 eliminate octave_comment_buffer singleton John W. Eaton <jwe@octave.org> parents: 17673 diff changeset	503 { $$ = parser.make_statement ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	504 \| command
17693 efbe746f8fa8 eliminate octave_comment_buffer singleton John W. Eaton <jwe@octave.org> parents: 17673 diff changeset	505 { $$ = parser.make_statement ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	506 \| word_list_cmd
17693 efbe746f8fa8 eliminate octave_comment_buffer singleton John W. Eaton <jwe@octave.org> parents: 17673 diff changeset	507 { $$ = parser.make_statement ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	508 ;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	509
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	510 // =================
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	511 // Word-list command
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	512 // =================
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	513
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	514 // 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	515 // 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	516 // WHILE, etc.
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	517
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	518 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	519 {
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	520 $$ = 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	521 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	522 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	523 // 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	524 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	525 }
26662 05fc703b419a update handling of command-style function call syntax in eval John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	526 $$->mark_word_list_cmd ();
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 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
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	530 word_list : string
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	531 { $$ = new octave::tree_argument_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	532 \| word_list string
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 $1->append ($2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	535 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	536 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	537 ;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	538
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	539 // ===========
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	540 // Expressions
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	541 // ===========
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	542
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	543 identifier : NAME
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	544 {
29723 6858992dfadf enter symbols into current scope in parser instead of lexer John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	545 // Find the token in the symbol table.
6858992dfadf enter symbols into current scope in parser instead of lexer John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	546 octave::symbol_scope scope
6858992dfadf enter symbols into current scope in parser instead of lexer John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	547 = lexer.m_symtab_context.curr_scope ();
6858992dfadf enter symbols into current scope in parser instead of lexer John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	548
6858992dfadf enter symbols into current scope in parser instead of lexer John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	549 std::string nm = $1->text ();
6858992dfadf enter symbols into current scope in parser instead of lexer John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	550
6858992dfadf enter symbols into current scope in parser instead of lexer John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	551 octave::symbol_record sr
6858992dfadf enter symbols into current scope in parser instead of lexer John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	552 = (scope
6858992dfadf enter symbols into current scope in parser instead of lexer John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	553 ? scope.insert (nm) : octave::symbol_record (nm));
6858992dfadf enter symbols into current scope in parser instead of lexer John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	554
6858992dfadf enter symbols into current scope in parser instead of lexer John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	555
6858992dfadf enter symbols into current scope in parser instead of lexer John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	556 $$ = new octave::tree_identifier (sr, $1->line (),
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26595 diff changeset	557 $1->column ());
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	558 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	559 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	560
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	561 superclass_identifier
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	562 : SUPERCLASSREF
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	563 {
26718 9b0335f4bc74 revise naming of the parts of a superclass reference John W. Eaton <jwe@octave.org> parents: 26716 diff changeset	564 std::string meth = $1->superclass_method_name ();
26686 581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26662 diff changeset	565 std::string cls = $1->superclass_class_name ();
581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26662 diff changeset	566
26718 9b0335f4bc74 revise naming of the parts of a superclass reference John W. Eaton <jwe@octave.org> parents: 26716 diff changeset	567 $$ = new octave::tree_superclass_ref (meth, cls,
26686 581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26662 diff changeset	568 $1->line (),
581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26662 diff changeset	569 $1->column ());
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	570 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	571 ;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	572
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	573 meta_identifier : METAQUERY
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	574 {
26686 581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26662 diff changeset	575 std::string cls = $1->text ();
581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26662 diff changeset	576
581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26662 diff changeset	577 $$ = new octave::tree_metaclass_query (cls, $1->line (),
581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26662 diff changeset	578 $1->column ());
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	579 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	580 ;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	581
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	582 string : DQ_STRING
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	583 { $$ = parser.make_constant (DQ_STRING, $1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	584 \| SQ_STRING
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	585 { $$ = parser.make_constant (SQ_STRING, $1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	586 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	587
28582 dc8de424fc72 use octave_value object to store numeric tokens in the lexer John W. Eaton <jwe@octave.org> parents: 28548 diff changeset	588 constant : NUMBER
dc8de424fc72 use octave_value object to store numeric tokens in the lexer John W. Eaton <jwe@octave.org> parents: 28548 diff changeset	589 { $$ = parser.make_constant (NUMBER, $1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	590 \| string
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	591 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	592 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	593
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	594 matrix : '[' matrix_rows ']'
27764 f64e399b6dda report missing semicolon location for array expressions (bug #57159) John W. Eaton <jwe@octave.org> parents: 27762 diff changeset	595 { $$ = parser.finish_matrix ($2, $1, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	596 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	597
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	598 matrix_rows : cell_or_matrix_row
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	599 { $$ = $1 ? new octave::tree_matrix ($1) : nullptr; }
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	600 \| matrix_rows ';' cell_or_matrix_row
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	601 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	602 OCTAVE_YYUSE ($2);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	603
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	604 if ($1)
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	605 {
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	606 if ($3)
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	607 $1->append ($3);
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	608
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	609 $$ = $1;
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	610 }
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	611 else
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	612 $$ = $3 ? new octave::tree_matrix ($3) : nullptr;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	613 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	614 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	615
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	616 cell : '{' cell_rows '}'
27764 f64e399b6dda report missing semicolon location for array expressions (bug #57159) John W. Eaton <jwe@octave.org> parents: 27762 diff changeset	617 { $$ = parser.finish_cell ($2, $1, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	618 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	619
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	620 cell_rows : cell_or_matrix_row
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	621 { $$ = $1 ? new octave::tree_cell ($1) : nullptr; }
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	622 \| cell_rows ';' cell_or_matrix_row
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	623 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	624 OCTAVE_YYUSE ($2);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	625
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	626 if ($1)
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	627 {
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	628 if ($3)
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	629 $1->append ($3);
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	630
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	631 $$ = $1;
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	632 }
aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	633 else
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	634 $$ = $3 ? new octave::tree_cell ($3) : nullptr;
10315 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 ;
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3347 diff changeset	637
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	638 // 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	639 // 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	640
28804 3719f5d452d4 refactor implementation of END indexing in interpreter (bug #58953) John W. Eaton <jwe@octave.org> and Fernando Alvarruiz parents: 28700 diff changeset	641 // FIXME: is tree_argument_list the best object for this purpose, or
3719f5d452d4 refactor implementation of END indexing in interpreter (bug #58953) John W. Eaton <jwe@octave.org> and Fernando Alvarruiz parents: 28700 diff changeset	642 // should we have a separate one intended specifically to represent the
3719f5d452d4 refactor implementation of END indexing in interpreter (bug #58953) John W. Eaton <jwe@octave.org> and Fernando Alvarruiz parents: 28700 diff changeset	643 // list of objects that make up elements in cell and matrix expressions?
3719f5d452d4 refactor implementation of END indexing in interpreter (bug #58953) John W. Eaton <jwe@octave.org> and Fernando Alvarruiz parents: 28700 diff changeset	644
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3347 diff changeset	645 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	646 : // empty
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	647 { $$ = nullptr; }
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	648 \| ','
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	649 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	650 OCTAVE_YYUSE ($1);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	651
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	652 $$ = nullptr;
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	653 }
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	654 \| arg_list
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16251 diff changeset	655 { $$ = $1; }
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	656 \| arg_list ','
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	657 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	658 OCTAVE_YYUSE ($2);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	659
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	660 $$ = $1;
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	661 }
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	662 \| ',' arg_list
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	663 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	664 OCTAVE_YYUSE ($1);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	665
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	666 $$ = $2;
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	667 }
16924 aebb54d99dba improve compatibility of parsing of matrices and cell arrays John W. Eaton <jwe@octave.org> parents: 16850 diff changeset	668 \| ',' arg_list ','
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	669 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	670 OCTAVE_YYUSE ($1);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	671 OCTAVE_YYUSE ($3);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	672
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	673 $$ = $2;
10315 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
26740 cf271740922a allow parsing of function handles of the form @foo.bar John W. Eaton <jwe@octave.org> parents: 26718 diff changeset	677 fcn_handle : FCN_HANDLE
cf271740922a allow parsing of function handles of the form @foo.bar John W. Eaton <jwe@octave.org> parents: 26718 diff changeset	678 { $$ = parser.make_fcn_handle ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	679 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	680
27736 bd80e14f268a improve parse error message for @()x+=expr (bug #57255) John W. Eaton <jwe@octave.org> parents: 27729 diff changeset	681 // Note that we are deliberately not setting the beginning of statement
bd80e14f268a improve parse error message for @()x+=expr (bug #57255) John W. Eaton <jwe@octave.org> parents: 27729 diff changeset	682 // flag after recognizing the parameter list because we don't want to
bd80e14f268a improve parse error message for @()x+=expr (bug #57255) John W. Eaton <jwe@octave.org> parents: 27729 diff changeset	683 // accept word list commands in anonymous function bodies.
bd80e14f268a improve parse error message for @()x+=expr (bug #57255) John W. Eaton <jwe@octave.org> parents: 27729 diff changeset	684
bd80e14f268a improve parse error message for @()x+=expr (bug #57255) John W. Eaton <jwe@octave.org> parents: 27729 diff changeset	685 anon_fcn_handle : '@' param_list anon_fcn_begin expression
13237 1bfca2bbea8b fix parsing of anonymous functions inside cell array lists. John W. Eaton <jwe@octave.org> parents: 13125 diff changeset	686 {
27778 2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	687 $$ = parser.make_anon_fcn_handle ($2, $4, $1->beg_pos ());
27728 5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255) John W. Eaton <jwe@octave.org> parents: 27516 diff changeset	688 if (! $$)
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255) John W. Eaton <jwe@octave.org> parents: 27516 diff changeset	689 {
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255) John W. Eaton <jwe@octave.org> parents: 27516 diff changeset	690 // make_anon_fcn_handle deleted $2 and $4.
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255) John W. Eaton <jwe@octave.org> parents: 27516 diff changeset	691 YYABORT;
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255) John W. Eaton <jwe@octave.org> parents: 27516 diff changeset	692 }
27736 bd80e14f268a improve parse error message for @()x+=expr (bug #57255) John W. Eaton <jwe@octave.org> parents: 27729 diff changeset	693
bd80e14f268a improve parse error message for @()x+=expr (bug #57255) John W. Eaton <jwe@octave.org> parents: 27729 diff changeset	694 lexer.m_parsing_anon_fcn_body = false;
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	695 lexer.m_nesting_level.remove ();
13237 1bfca2bbea8b fix parsing of anonymous functions inside cell array lists. John W. Eaton <jwe@octave.org> parents: 13125 diff changeset	696 }
27736 bd80e14f268a improve parse error message for @()x+=expr (bug #57255) John W. Eaton <jwe@octave.org> parents: 27729 diff changeset	697 \| '@' param_list anon_fcn_begin error
24283 81557c74be7f improve error message for invalid anonymous functions John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	698 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	699 OCTAVE_YYUSE ($1);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	700 OCTAVE_YYUSE ($2);
24283 81557c74be7f improve error message for invalid anonymous functions John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	701
27736 bd80e14f268a improve parse error message for @()x+=expr (bug #57255) John W. Eaton <jwe@octave.org> parents: 27729 diff changeset	702 lexer.m_parsing_anon_fcn_body = false;
bd80e14f268a improve parse error message for @()x+=expr (bug #57255) John W. Eaton <jwe@octave.org> parents: 27729 diff changeset	703
24283 81557c74be7f improve error message for invalid anonymous functions John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	704 $$ = nullptr;
81557c74be7f improve error message for invalid anonymous functions John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	705 parser.bison_error ("anonymous function bodies must be single expressions");
81557c74be7f improve error message for invalid anonymous functions John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	706 YYABORT;
81557c74be7f improve error message for invalid anonymous functions John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	707 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	708 ;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	709
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	710 primary_expr : identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	711 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	712 \| constant
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	713 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	714 \| fcn_handle
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	715 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	716 \| matrix
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16251 diff changeset	717 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	718 lexer.m_looking_at_matrix_or_assign_lhs = false;
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16251 diff changeset	719 $$ = $1;
db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16251 diff changeset	720 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	721 \| cell
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	722 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	723 \| meta_identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	724 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	725 \| superclass_identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	726 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	727 \| '(' expression ')'
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	728 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	729 OCTAVE_YYUSE ($1);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	730 OCTAVE_YYUSE ($3);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	731
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	732 $$ = $2->mark_in_parens ();
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	733 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	734 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	735
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	736 magic_colon : ':'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	737 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	738 OCTAVE_YYUSE ($1);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	739
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	740 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	741 $$ = new octave::tree_constant (tmp);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	742 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	743 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	744
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	745 magic_tilde : EXPR_NOT
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	746 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	747 OCTAVE_YYUSE ($1);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	748
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	749 $$ = new octave::tree_black_hole ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	750 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	751 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	752
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	753 arg_list : expression
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	754 { $$ = new octave::tree_argument_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	755 \| magic_colon
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	756 { $$ = new octave::tree_argument_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	757 \| magic_tilde
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	758 { $$ = new octave::tree_argument_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	759 \| arg_list ',' magic_colon
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	760 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	761 OCTAVE_YYUSE ($2);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	762
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	763 $1->append ($3);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	764 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	765 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	766 \| arg_list ',' magic_tilde
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	767 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	768 OCTAVE_YYUSE ($2);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	769
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	770 $1->append ($3);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	771 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	772 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	773 \| arg_list ',' expression
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	774 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	775 OCTAVE_YYUSE ($2);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	776
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	777 $1->append ($3);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	778 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	779 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	780 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	781
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	782 indirect_ref_op : '.'
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	783 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	784 OCTAVE_YYUSE ($1);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	785
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	786 $$ = 0;
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	787 lexer.m_looking_at_indirect_ref = true;
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	788 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	789 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	790
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	791 oper_expr : primary_expr
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	792 { $$ = $1; }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	793 \| oper_expr PLUS_PLUS
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	794 { $$ = 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	795 \| oper_expr MINUS_MINUS
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	796 { $$ = 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	797 \| oper_expr '(' ')'
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	798 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	799 OCTAVE_YYUSE ($2);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	800 OCTAVE_YYUSE ($3);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	801
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	802 $$ = parser.make_index_expression ($1, nullptr, '(');
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	803 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	804 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	805 // make_index_expression deleted $1.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	806 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	807 }
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	808 }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	809 \| 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	810 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	811 OCTAVE_YYUSE ($2);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	812 OCTAVE_YYUSE ($4);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	813
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	814 $$ = 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	815 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	816 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	817 // 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	818 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	819 }
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	820 }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	821 \| oper_expr '{' '}'
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	822 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	823 OCTAVE_YYUSE ($2);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	824 OCTAVE_YYUSE ($3);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	825
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	826 $$ = parser.make_index_expression ($1, nullptr, '{');
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	827 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	828 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	829 // 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	830 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	831 }
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	832 }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	833 \| 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	834 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	835 OCTAVE_YYUSE ($2);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	836 OCTAVE_YYUSE ($4);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	837
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	838 $$ = 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	839 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	840 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	841 // 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	842 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	843 }
16302 a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804) Max Brister <max@2bass.com> parents: 16294 diff changeset	844 }
16284 09881dab3aaf * lex.ll, oct-parse.in.yy (HERMITIAN): Rename token from QUOTE. John W. Eaton <jwe@octave.org> parents: 16279 diff changeset	845 \| oper_expr HERMITIAN
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	846 { $$ = 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	847 \| oper_expr TRANSPOSE
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	848 { $$ = 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	849 \| 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	850 { $$ = 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	851 \| oper_expr indirect_ref_op '(' expression ')'
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	852 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	853 OCTAVE_YYUSE ($3);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	854 OCTAVE_YYUSE ($5);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	855
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	856 $$ = parser.make_indirect_ref ($1, $4);
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	857 }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	858 \| 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	859 { $$ = 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	860 \| 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	861 { $$ = 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	862 \| 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	863 { $$ = 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	864 \| '+' oper_expr %prec UNARY
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	865 { $$ = 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	866 \| '-' oper_expr %prec UNARY
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	867 { $$ = 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	868 \| oper_expr POW power_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	869 { $$ = 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	870 \| oper_expr EPOW power_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	871 { $$ = 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	872 \| oper_expr '+' oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	873 { $$ = 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	874 \| oper_expr '-' oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	875 { $$ = 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	876 \| oper_expr '*' oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	877 { $$ = 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	878 \| oper_expr '/' oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	879 { $$ = 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	880 \| oper_expr EPLUS oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	881 { $$ = 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	882 \| oper_expr EMINUS oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	883 { $$ = 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	884 \| oper_expr EMUL oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	885 { $$ = 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	886 \| oper_expr EDIV oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	887 { $$ = 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	888 \| oper_expr LEFTDIV oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	889 { $$ = 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	890 \| oper_expr ELEFTDIV oper_expr
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	891 { $$ = 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	892 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	893
17622 fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	894 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	895 { $$ = $1; }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	896 \| 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	897 { $$ = 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	898 \| 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	899 { $$ = 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	900 \| power_expr '(' ')'
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	901 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	902 OCTAVE_YYUSE ($2);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	903 OCTAVE_YYUSE ($3);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	904
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	905 $$ = parser.make_index_expression ($1, nullptr, '(');
17622 fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	906 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	907 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	908 // 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	909 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	910 }
17622 fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	911 }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	912 \| 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	913 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	914 OCTAVE_YYUSE ($2);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	915 OCTAVE_YYUSE ($4);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	916
17622 fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	917 $$ = 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	918 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	919 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	920 // 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	921 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	922 }
17622 fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	923 }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	924 \| power_expr '{' '}'
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	925 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	926 OCTAVE_YYUSE ($2);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	927 OCTAVE_YYUSE ($3);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	928
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	929 $$ = parser.make_index_expression ($1, nullptr, '{');
17622 fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	930 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	931 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	932 // 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	933 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	934 }
17622 fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	935 }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	936 \| 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	937 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	938 OCTAVE_YYUSE ($2);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	939 OCTAVE_YYUSE ($4);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	940
17622 fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	941 $$ = 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	942 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	943 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	944 // 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	945 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	946 }
17622 fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	947 }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	948 \| 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	949 { $$ = 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	950 \| power_expr indirect_ref_op '(' expression ')'
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	951 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	952 OCTAVE_YYUSE ($3);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	953 OCTAVE_YYUSE ($5);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	954
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	955 $$ = parser.make_indirect_ref ($1, $4);
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	956 }
17622 fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	957 \| 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	958 { $$ = 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	959 \| 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	960 { $$ = 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	961 \| 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	962 { $$ = 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	963 \| '+' 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	964 { $$ = 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	965 \| '-' 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	966 { $$ = 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	967 ;
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304) Axel Mathéi <axel.mathei@gmail.com> parents: 17618 diff changeset	968
23655 bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	969 colon_expr : oper_expr ':' oper_expr
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	970 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	971 OCTAVE_YYUSE ($2);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	972
23655 bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	973 $$ = parser.make_colon_expression ($1, $3);
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	974
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	975 if (! $$)
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	976 {
23655 bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	977 // finish_colon_expression deleted $1 and $3.
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	978 YYABORT;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	979 }
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	980 }
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	981 \| oper_expr ':' oper_expr ':' oper_expr
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	982 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	983 OCTAVE_YYUSE ($2);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	984 OCTAVE_YYUSE ($4);
23655 bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	985
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	986 $$ = parser.make_colon_expression ($1, $5, $3);
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	987
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	988 if (! $$)
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	989 {
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	990 // finish_colon_expression deleted $1, $3, and $5.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	991 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	992 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	993 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	994 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	995
23655 bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	996 simple_expr : oper_expr
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	997 { $$ = $1; }
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	998 \| colon_expr
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	999 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1000 \| 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	1001 { $$ = 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	1002 \| 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	1003 { $$ = 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	1004 \| 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	1005 { $$ = 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	1006 \| 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	1007 { $$ = 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	1008 \| 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	1009 { $$ = 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	1010 \| 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	1011 { $$ = 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	1012 \| 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	1013 { $$ = 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	1014 \| 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	1015 { $$ = 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	1016 \| 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	1017 { $$ = 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	1018 \| 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	1019 { $$ = 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	1020 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1021
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1022 assign_lhs : simple_expr
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1023 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1024 $$ = parser.validate_matrix_for_assignment ($1);
16273 c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1025
c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1026 if ($$)
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1027 { lexer.m_looking_at_matrix_or_assign_lhs = false; }
16273 c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1028 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1029 {
16277 8cb65fd72164 eliminate obsolete concepts of "pending local" and "forced" variables John W. Eaton <jwe@octave.org> parents: 16273 diff changeset	1030 // 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	1031 YYABORT;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1032 }
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
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1036 assign_expr : assign_lhs '=' expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1037 { $$ = parser.make_assign_op ('=', $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1038 \| assign_lhs ADD_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1039 { $$ = 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	1040 \| assign_lhs SUB_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1041 { $$ = 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	1042 \| assign_lhs MUL_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1043 { $$ = 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	1044 \| assign_lhs DIV_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1045 { $$ = 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	1046 \| assign_lhs LEFTDIV_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1047 { $$ = 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	1048 \| assign_lhs POW_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1049 { $$ = 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	1050 \| assign_lhs EMUL_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1051 { $$ = 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	1052 \| assign_lhs EDIV_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1053 { $$ = 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	1054 \| assign_lhs ELEFTDIV_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1055 { $$ = 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	1056 \| assign_lhs EPOW_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1057 { $$ = 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	1058 \| assign_lhs AND_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1059 { $$ = 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	1060 \| assign_lhs OR_EQ expression
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1061 { $$ = 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	1062 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1063
27729 718845eb3c7a eliminate unnecessary expr_no_assign non-terminal in parser John W. Eaton <jwe@octave.org> parents: 27728 diff changeset	1064 expression : simple_expr
16273 c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1065 {
23576 00e518162fda maint: Deprecate is_cell and replace with iscell. Rik <rik@octave.org> parents: 23553 diff changeset	1066 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	1067 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1068 if (parser.validate_array_list ($1))
16273 c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1069 $$ = $1;
c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1070 else
c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1071 {
c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1072 delete $1;
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1073 YYABORT;
16273 c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1074 }
c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1075 }
c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1076 else
c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1077 $$ = $1;
c5e5f6ccac5d 9/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16265 diff changeset	1078 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1079 \| assign_expr
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1080 {
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1081 if (! $1)
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1082 YYABORT;
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1083
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1084 $$ = $1;
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1085 }
27729 718845eb3c7a eliminate unnecessary expr_no_assign non-terminal in parser John W. Eaton <jwe@octave.org> parents: 27728 diff changeset	1086 \| anon_fcn_handle
718845eb3c7a eliminate unnecessary expr_no_assign non-terminal in parser John W. Eaton <jwe@octave.org> parents: 27728 diff changeset	1087 { $$ = $1; }
718845eb3c7a eliminate unnecessary expr_no_assign non-terminal in parser John W. Eaton <jwe@octave.org> parents: 27728 diff changeset	1088 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1089
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1090 // ================================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1091 // Commands, declarations, and function definitions
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1092 // ================================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1093
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1094 command : declaration
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1095 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1096 \| select_command
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1097 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1098 \| loop_command
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1099 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1100 \| jump_command
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1101 { $$ = $1; }
28518 b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	1102 \| spmd_command
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	1103 { $$ = $1; }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1104 \| except_command
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 \| function
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1107 { $$ = $1; }
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1108 \| file
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1109 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1110 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1111
27956 2310164737b3 fix many spelling errors (bug #57613) John W. Eaton <jwe@octave.org> parents: 26585 diff changeset	1112 // ======================
2310164737b3 fix many spelling errors (bug #57613) John W. Eaton <jwe@octave.org> parents: 26585 diff changeset	1113 // Declaration statements
2310164737b3 fix many spelling errors (bug #57613) John W. Eaton <jwe@octave.org> parents: 26585 diff changeset	1114 // ======================
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1115
29728 287fde79ffa2 rename some non-terminal symbols in the parser John W. Eaton <jwe@octave.org> parents: 29727 diff changeset	1116 declaration : GLOBAL decl_init_list
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1117 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1118 $$ = parser.make_decl_command (GLOBAL, $1, $2);
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1119 lexer.m_looking_at_decl_list = false;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1120 }
29728 287fde79ffa2 rename some non-terminal symbols in the parser John W. Eaton <jwe@octave.org> parents: 29727 diff changeset	1121 \| PERSISTENT decl_init_list
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1122 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1123 $$ = parser.make_decl_command (PERSISTENT, $1, $2);
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1124 lexer.m_looking_at_decl_list = false;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1125 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1126 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1127
29728 287fde79ffa2 rename some non-terminal symbols in the parser John W. Eaton <jwe@octave.org> parents: 29727 diff changeset	1128 decl_init_list : decl_elt
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1129 { $$ = new octave::tree_decl_init_list ($1); }
29728 287fde79ffa2 rename some non-terminal symbols in the parser John W. Eaton <jwe@octave.org> parents: 29727 diff changeset	1130 \| decl_init_list decl_elt
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1131 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1132 $1->append ($2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1133 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1134 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1135 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1136
29728 287fde79ffa2 rename some non-terminal symbols in the parser John W. Eaton <jwe@octave.org> parents: 29727 diff changeset	1137 decl_elt : identifier
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1138 { $$ = new octave::tree_decl_elt ($1); }
29727 05d7b7e64811 eliminate unused lexical feedback flag John W. Eaton <jwe@octave.org> parents: 29724 diff changeset	1139 \| identifier '=' expression
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1140 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1141 OCTAVE_YYUSE ($2);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1142
29727 05d7b7e64811 eliminate unused lexical feedback flag John W. Eaton <jwe@octave.org> parents: 29724 diff changeset	1143 $$ = new octave::tree_decl_elt ($1, $3);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1144 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1145 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1146
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1147 // ====================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1148 // Selection statements
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1149 // ====================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1150
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1151 select_command : if_command
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1152 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1153 \| switch_command
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1154 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1155 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1156
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1157 // ============
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1158 // If statement
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1159 // ============
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1160
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1161 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	1162 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1163 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	1164 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1165 // 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	1166 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1167 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1168 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1169 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1170
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1171 if_cmd_list : if_cmd_list1
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1172 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1173 \| if_cmd_list1 else_clause
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1174 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1175 $1->append ($2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1176 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1177 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1178 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1179
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1180 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	1181 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1182 OCTAVE_YYUSE ($3);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1183
18127 d76f790b4eec enable do_braindead_shortcircuit_evaluation by default and deprecate John W. Eaton <jwe@octave.org> parents: 17796 diff changeset	1184 $1->mark_braindead_shortcircuit ();
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1185
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1186 $$ = 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	1187 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1188 \| if_cmd_list1 elseif_clause
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1189 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1190 $1->append ($2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1191 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1192 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1193 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1194
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1195 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	1196 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1197 OCTAVE_YYUSE ($3);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1198 OCTAVE_YYUSE ($6);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1199
18127 d76f790b4eec enable do_braindead_shortcircuit_evaluation by default and deprecate John W. Eaton <jwe@octave.org> parents: 17796 diff changeset	1200 $4->mark_braindead_shortcircuit ();
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1201
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1202 $$ = 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	1203 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1204 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1205
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1206 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	1207 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1208 OCTAVE_YYUSE ($1);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1209 OCTAVE_YYUSE ($3);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1210
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1211 $$ = 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	1212 }
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 // Switch statement
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 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	1220 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1221 OCTAVE_YYUSE ($4);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1222
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1223 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	1224 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1225 // 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	1226 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1227 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1228 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1229 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1230
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1231 case_list : // empty
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1232 { $$ = 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	1233 \| default_case
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1234 { $$ = new octave::tree_switch_case_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1235 \| case_list1
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1236 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1237 \| case_list1 default_case
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1238 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1239 $1->append ($2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1240 $$ = $1;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	1241 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1242 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1243
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1244 case_list1 : switch_case
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1245 { $$ = new octave::tree_switch_case_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1246 \| case_list1 switch_case
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1247 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1248 $1->append ($2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1249 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1250 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1251 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1252
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1253 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	1254 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1255 OCTAVE_YYUSE ($3);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1256 OCTAVE_YYUSE ($6);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1257
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1258 $$ = 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	1259 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1260 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1261
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1262 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	1263 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1264 OCTAVE_YYUSE ($1);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1265 OCTAVE_YYUSE ($3);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1266
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1267 $$ = new octave::tree_switch_case ($4, $2);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1268 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1269 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1270
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1271 // =======
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1272 // Looping
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1273 // =======
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1274
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1275 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	1276 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1277 OCTAVE_YYUSE ($5);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1278
18127 d76f790b4eec enable do_braindead_shortcircuit_evaluation by default and deprecate John W. Eaton <jwe@octave.org> parents: 17796 diff changeset	1279 $3->mark_braindead_shortcircuit ();
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1280
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1281 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	1282 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1283 // 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	1284 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 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 \| 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	1288 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1289 OCTAVE_YYUSE ($1);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1290 OCTAVE_YYUSE ($3);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1291
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1292 $$ = 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	1293 }
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1294 \| 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	1295 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1296 OCTAVE_YYUSE ($4);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1297 OCTAVE_YYUSE ($7);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1298
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1299 if (! ($$ = parser.make_for_command (FOR, $1, $3, $5,
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1300 nullptr, $8, $9, $2)))
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1301 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1302 // 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	1303 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1304 }
10315 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 \| 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	1307 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1308 OCTAVE_YYUSE ($3);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1309 OCTAVE_YYUSE ($5);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1310 OCTAVE_YYUSE ($7);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1311 OCTAVE_YYUSE ($8);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1312
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1313 if (! ($$ = parser.make_for_command (FOR, $1, $4, $6,
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1314 nullptr, $9, $10, $2)))
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1315 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1316 // 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	1317 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1318 }
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	1319 }
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	1320 \| 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	1321 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1322 OCTAVE_YYUSE ($4);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1323 OCTAVE_YYUSE ($7);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1324
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1325 if (! ($$ = parser.make_for_command (PARFOR, $1, $3, $5,
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1326 nullptr, $8, $9, $2)))
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1327 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1328 // 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	1329 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1330 }
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	1331 }
027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now John W. Eaton <jwe@octave.org> parents: 13241 diff changeset	1332 \| 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	1333 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1334 OCTAVE_YYUSE ($3);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1335 OCTAVE_YYUSE ($5);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1336 OCTAVE_YYUSE ($7);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1337 OCTAVE_YYUSE ($9);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1338 OCTAVE_YYUSE ($10);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1339
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1340 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	1341 $8, $11, $12, $2)))
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1342 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1343 // 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	1344 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1345 }
10315 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 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1348
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1349 // =======
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1350 // Jumping
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1351 // =======
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1352
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1353 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	1354 {
9c6661004167 error if break statement is in script file separate from loop (bug #39168) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1355 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	1356 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	1357 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1358 \| CONTINUE
26981 12532d392693 error if continue is used outside of a for loop (bug #55995) John W. Eaton <jwe@octave.org> parents: 26906 diff changeset	1359 {
12532d392693 error if continue is used outside of a for loop (bug #55995) John W. Eaton <jwe@octave.org> parents: 26906 diff changeset	1360 if (! ($$ = parser.make_continue_command ($1)))
12532d392693 error if continue is used outside of a for loop (bug #55995) John W. Eaton <jwe@octave.org> parents: 26906 diff changeset	1361 YYABORT;
12532d392693 error if continue is used outside of a for loop (bug #55995) John W. Eaton <jwe@octave.org> parents: 26906 diff changeset	1362 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1363 \| FUNC_RET
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1364 { $$ = parser.make_return_command ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1365 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1366
28518 b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	1367 // =======================
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	1368 // Parallel execution pool
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	1369 // =======================
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	1370
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	1371 spmd_command : SPMD stash_comment opt_sep opt_list END
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	1372 {
29283 aa645ebc7b29 eliminate extra YYUSE on default missed when merging 59696b24ea53 from stable John W. Eaton <jwe@octave.org> parents: 29273 diff changeset	1373 OCTAVE_YYUSE ($3);
28518 b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	1374
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	1375 octave::comment_list *lc = $2;
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	1376 octave::comment_list *tc = lexer.get_comment ();
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	1377
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	1378 if (! ($$ = parser.make_spmd_command ($1, $4, $5, lc, tc)))
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	1379 {
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	1380 // make_spmd_command deleted $4, LC, and TC.
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	1381 YYABORT;
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	1382 }
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	1383 }
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	1384 ;
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	1385
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1386 // ==========
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1387 // Exceptions
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1388 // ==========
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1389
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1390 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	1391 stash_comment opt_sep opt_list END
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1392 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1393 OCTAVE_YYUSE ($3);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1394 OCTAVE_YYUSE ($5);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1395 OCTAVE_YYUSE ($7);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1396
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1397 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	1398 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1399 // 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	1400 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1401 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1402 }
17283 e6c0ac8ce5b6 eliminate parse conflicts introduced by changeset 923ce8b42db2 John W. Eaton <jwe@octave.org> parents: 17281 diff changeset	1403 \| 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	1404 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	1405 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1406 OCTAVE_YYUSE ($3);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1407 OCTAVE_YYUSE ($5);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1408 OCTAVE_YYUSE ($7);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1409
17283 e6c0ac8ce5b6 eliminate parse conflicts introduced by changeset 923ce8b42db2 John W. Eaton <jwe@octave.org> parents: 17281 diff changeset	1410 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	1411 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1412 // 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	1413 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1414 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1415 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1416 \| TRY stash_comment opt_sep opt_list END
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1417 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1418 OCTAVE_YYUSE ($3);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1419
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1420 if (! ($$ = parser.make_try_command ($1, $4, 0, nullptr,
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1421 $5, $2, nullptr)))
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1422 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1423 // 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	1424 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1425 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1426 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1427 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1428
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1429 // ===========================================
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14189 diff changeset	1430 // Some 'subroutines' for function definitions
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1431 // ===========================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1432
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1433 push_fcn_symtab : // empty
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1434 {
27510 5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	1435 if (! parser.push_fcn_symtab ())
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	1436 YYABORT;
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	1437
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1438 $$ = 0;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1439 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1440 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1441
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1442 // ===========================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1443 // List of function parameters
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1444 // ===========================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1445
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1446 param_list_beg : '('
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1447 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1448 OCTAVE_YYUSE ($1);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	1449
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1450 $$ = 0;
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1451 lexer.m_looking_at_parameter_list = true;
29724 c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1452 lexer.m_arguments_is_keyword = false;
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1453
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1454 if (lexer.m_looking_at_function_handle)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1455 {
24354 11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	1456 // Will get a real name later.
29857 0b01806bb663 fix command syntax parsing error (bug #60882) John W. Eaton <jwe@octave.org> parents: 29759 diff changeset	1457 lexer.m_symtab_context.push (octave::symbol_scope ("parser:param_list_beg"));
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1458 lexer.m_looking_at_function_handle--;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1459 lexer.m_looking_at_anon_fcn_args = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1460 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1461 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1462 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1463
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1464 param_list_end : ')'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1465 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1466 OCTAVE_YYUSE ($1);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	1467
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1468 $$ = 0;
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1469 lexer.m_looking_at_parameter_list = false;
29724 c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1470 lexer.m_arguments_is_keyword = true;
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1471 lexer.m_looking_for_object_index = false;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1472 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1473 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1474
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1475 opt_param_list : // empty
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1476 { $$ = nullptr; }
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1477 \| param_list
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1478 { $$ = $1; }
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1479 ;
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1480
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1481 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	1482 {
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1483 if ($2)
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1484 lexer.mark_as_variables ($2->variable_names ());
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1485
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1486 $$ = $2;
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1487 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1488 \| param_list_beg error
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1489 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1490 $$ = nullptr;
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1491 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	1492 YYABORT;
10315 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 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1495
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1496 param_list1 : // empty
28257 ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28149 diff changeset	1497 { $$ = new octave::tree_parameter_list (octave::tree_parameter_list::in); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1498 \| param_list2
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1499 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1500 $1->mark_as_formal_parameters ();
23654 da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	1501
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	1502 if (parser.validate_param_list ($1, octave::tree_parameter_list::in))
16360 11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1503 {
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1504 lexer.mark_as_variables ($1->variable_names ());
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1505 $$ = $1;
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1506 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1507 else
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1508 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1509 delete $1;
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1510 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1511 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1512 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1513 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1514
17317 56fe31b248de disallow ~ in global and persistent declaration lists John W. Eaton <jwe@octave.org> parents: 17316 diff changeset	1515 param_list2 : param_list_elt
28257 ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28149 diff changeset	1516 { $$ = new octave::tree_parameter_list (octave::tree_parameter_list::in, $1); }
17317 56fe31b248de disallow ~ in global and persistent declaration lists John W. Eaton <jwe@octave.org> parents: 17316 diff changeset	1517 \| param_list2 ',' param_list_elt
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1518 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1519 OCTAVE_YYUSE ($2);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	1520
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1521 $1->append ($3);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1522 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1523 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1524 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1525
29728 287fde79ffa2 rename some non-terminal symbols in the parser John W. Eaton <jwe@octave.org> parents: 29727 diff changeset	1526 param_list_elt : decl_elt
17317 56fe31b248de disallow ~ in global and persistent declaration lists John W. Eaton <jwe@octave.org> parents: 17316 diff changeset	1527 { $$ = $1; }
56fe31b248de disallow ~ in global and persistent declaration lists John W. Eaton <jwe@octave.org> parents: 17316 diff changeset	1528 \| magic_tilde
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1529 { $$ = 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	1530 ;
56fe31b248de disallow ~ in global and persistent declaration lists John W. Eaton <jwe@octave.org> parents: 17316 diff changeset	1531
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1532 // ===================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1533 // List of function return value names
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1534 // ===================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1535
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1536 return_list : '[' ']'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1537 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1538 OCTAVE_YYUSE ($1);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1539 OCTAVE_YYUSE ($2);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	1540
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1541 lexer.m_looking_at_return_list = false;
17316 8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1542
28257 ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28149 diff changeset	1543 $$ = new octave::tree_parameter_list (octave::tree_parameter_list::out);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1544 }
17316 8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1545 \| identifier
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1546 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1547 lexer.m_looking_at_return_list = false;
17316 8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1548
28257 ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28149 diff changeset	1549 octave::tree_parameter_list *tmp
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28149 diff changeset	1550 = new octave::tree_parameter_list (octave::tree_parameter_list::out, $1);
17316 8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1551
8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1552 // 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	1553 // 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	1554 // to check for varargin or varargout.
8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1555
23654 da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	1556 if (parser.validate_param_list (tmp, octave::tree_parameter_list::out))
17316 8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1557 $$ = tmp;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1558 else
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1559 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1560 delete tmp;
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1561 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1562 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1563 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1564 \| '[' return_list1 ']'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1565 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1566 OCTAVE_YYUSE ($1);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1567 OCTAVE_YYUSE ($3);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	1568
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1569 lexer.m_looking_at_return_list = false;
17316 8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1570
8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1571 // Check for duplicate parameter names, varargin,
8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1572 // or varargout.
8e2906e2fb26 avoid reduce/reduce conflict in parser rules John W. Eaton <jwe@octave.org> parents: 17283 diff changeset	1573
23654 da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	1574 if (parser.validate_param_list ($2, octave::tree_parameter_list::out))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1575 $$ = $2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1576 else
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1577 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 diff changeset	1578 delete $2;
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1579 YYABORT;
17632 bd0a84de3375 further reduce memory leaks from parse errors (bug #40231) John W. Eaton <jwe@octave.org> parents: 17629 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 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1583
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1584 return_list1 : identifier
28257 ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28149 diff changeset	1585 {
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28149 diff changeset	1586 $$ = new octave::tree_parameter_list (octave::tree_parameter_list::out, new octave::tree_decl_elt ($1));
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28149 diff changeset	1587 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1588 \| return_list1 ',' identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1589 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1590 OCTAVE_YYUSE ($2);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	1591
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1592 $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	1593 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1594 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1595 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1596
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1597 // =======================
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1598 // Script or function file
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1599 // =======================
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1600
23343 49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	1601 parsing_local_fcns
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	1602 : // empty
27510 5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	1603 { parser.parsing_local_functions (true); }
23343 49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	1604 ;
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23342 diff changeset	1605
24037 21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1606 push_script_symtab : // empty
21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1607 {
21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1608 $$ = 0;
21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1609
24377 ea3458c1d884 improve handling of invalid symbol_scope objects (bug #52607) John W. Eaton <jwe@octave.org> parents: 24361 diff changeset	1610 // This scope may serve as the parent scope for local
ea3458c1d884 improve handling of invalid symbol_scope objects (bug #52607) John W. Eaton <jwe@octave.org> parents: 24361 diff changeset	1611 // functions in classdef files..
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1612 lexer.m_symtab_context.push (octave::symbol_scope ("parser:push_script_symtab"));
24037 21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1613 }
21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1614 ;
21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1615
21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1616 begin_file : push_script_symtab INPUT_FILE
21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1617 { $$ = 0; }
21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1618 ;
21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1619
21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1620 file : begin_file opt_nl opt_list END_OF_INPUT
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1621 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1622 OCTAVE_YYUSE ($2);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1623
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1624 if (lexer.m_reading_fcn_file)
17618 77eff9c6fb09 avoid memory leak when parsing function files (bug #40218) John W. Eaton <jwe@octave.org> parents: 17377 diff changeset	1625 {
77eff9c6fb09 avoid memory leak when parsing function files (bug #40218) John W. Eaton <jwe@octave.org> parents: 17377 diff changeset	1626 // 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	1627 // 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	1628 // 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	1629 // been stored in the symbol table or in
27505 c409d16b7190 eliminate some uses of bare pointers to octave_function objects John W. Eaton <jwe@octave.org> parents: 27504 diff changeset	1630 // base_parser::m_primary_fcn.
17618 77eff9c6fb09 avoid memory leak when parsing function files (bug #40218) John W. Eaton <jwe@octave.org> parents: 17377 diff changeset	1631
24037 21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1632 // Unused symbol table context.
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1633 lexer.m_symtab_context.pop ();
17618 77eff9c6fb09 avoid memory leak when parsing function files (bug #40218) John W. Eaton <jwe@octave.org> parents: 17377 diff changeset	1634
77eff9c6fb09 avoid memory leak when parsing function files (bug #40218) John W. Eaton <jwe@octave.org> parents: 17377 diff changeset	1635 delete $3;
29864 e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	1636
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	1637 if (! parser.validate_primary_fcn ())
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	1638 YYABORT;
17618 77eff9c6fb09 avoid memory leak when parsing function files (bug #40218) John W. Eaton <jwe@octave.org> parents: 17377 diff changeset	1639 }
77eff9c6fb09 avoid memory leak when parsing function files (bug #40218) John W. Eaton <jwe@octave.org> parents: 17377 diff changeset	1640 else
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1641 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	1642 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	1643 = parser.make_end ("endscript", true,
27778 2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	1644 $4->beg_pos (), $4->end_pos ());
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1645
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1646 parser.make_script ($3, end_of_script);
29864 e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	1647
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	1648 if (! parser.validate_primary_fcn ())
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	1649 YYABORT;
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1650 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1651
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1652 $$ = nullptr;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1653 }
24037 21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1654 \| begin_file opt_nl classdef parsing_local_fcns opt_sep opt_fcn_list END_OF_INPUT
16211 3449bf257514 maint: fix botched merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16205 diff changeset	1655 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1656 OCTAVE_YYUSE ($2);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1657 OCTAVE_YYUSE ($5);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1658 OCTAVE_YYUSE ($7);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1659
24037 21915520ac7b use more direct method for non-local symbol access (bug #38236) John W. Eaton <jwe@octave.org> parents: 23850 diff changeset	1660 // Unused symbol table context.
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1661 lexer.m_symtab_context.pop ();
29864 e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	1662
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	1663 if (! parser.finish_classdef_file ($3, $6))
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	1664 YYABORT;
16211 3449bf257514 maint: fix botched merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16205 diff changeset	1665
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1666 $$ = nullptr;
16211 3449bf257514 maint: fix botched merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16205 diff changeset	1667 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1668 ;
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	1669
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1670 // ===================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1671 // Function definition
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1672 // ===================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1673
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	1674 function_beg : push_fcn_symtab FCN
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1675 {
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	1676 $$ = $2;
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1677 if (lexer.m_reading_classdef_file
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1678 \|\| lexer.m_parsing_classdef)
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1679 lexer.m_maybe_classdef_get_set_method = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1680 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1681 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1682
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1683 fcn_name : identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1684 {
29724 c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1685 if (! ($$ = parser.make_fcn_name ($1)))
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1686 {
27510 5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	1687 // make_fcn_name deleted $1.
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1688 YYABORT;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1689 }
29724 c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1690
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1691 lexer.m_arguments_is_keyword = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1692 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1693 \| GET '.' identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1694 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1695 OCTAVE_YYUSE ($1);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1696 OCTAVE_YYUSE ($2);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1697
29724 c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1698 $$ = $3;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1699
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1700 lexer.m_parsed_function_name.top () = true;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1701 lexer.m_maybe_classdef_get_set_method = false;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1702 lexer.m_parsing_classdef_get_method = true;
29724 c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1703 lexer.m_arguments_is_keyword = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1704 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1705 \| SET '.' identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1706 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1707 OCTAVE_YYUSE ($1);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1708 OCTAVE_YYUSE ($2);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1709
29724 c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1710 $$ = $3;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1711
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1712 lexer.m_parsed_function_name.top () = true;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1713 lexer.m_maybe_classdef_get_set_method = false;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1714 lexer.m_parsing_classdef_set_method = true;
29724 c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1715 lexer.m_arguments_is_keyword = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1716 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1717 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1718
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1719 function_end : END
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1720 {
27510 5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	1721 parser.endfunction_found (true);
21071 f25c14056b7c overhaul parser error handling for end token mismatch John W. Eaton <jwe@octave.org> parents: 21066 diff changeset	1722
23398 d4ef04757ead eliminate some compiler warnings John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	1723 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	1724 $$ = parser.make_end ("endfunction", false,
27778 2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	1725 $1->beg_pos (), $1->end_pos ());
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1726 else
21071 f25c14056b7c overhaul parser error handling for end token mismatch John W. Eaton <jwe@octave.org> parents: 21066 diff changeset	1727 {
23398 d4ef04757ead eliminate some compiler warnings John W. Eaton <jwe@octave.org> parents: 23396 diff changeset	1728 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	1729 YYABORT;
21071 f25c14056b7c overhaul parser error handling for end token mismatch John W. Eaton <jwe@octave.org> parents: 21066 diff changeset	1730 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1731 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1732 \| END_OF_INPUT
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1733 {
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	1734 // A lot of tests are based on the assumption that this is OK
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1735 // if (lexer.m_reading_script_file)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1736 // {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1737 // 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	1738 // YYABORT;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1739 // }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1740
27510 5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	1741 if (parser.endfunction_found ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1742 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1743 parser.bison_error ("inconsistent function endings -- "
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1744 "if one function is explicitly ended, "
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1745 "so must all the others");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1746 YYABORT;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1747 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1748
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1749 if (! (lexer.m_reading_fcn_file \|\| lexer.m_reading_script_file
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1750 \|\| lexer.input_from_eval_string ()))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1751 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1752 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	1753 YYABORT;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1754 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1755
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1756 if (lexer.m_reading_classdef_file)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1757 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1758 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	1759 YYABORT;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1760 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1761
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	1762 $$ = parser.make_end ("endfunction", true,
27778 2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	1763 $1->beg_pos (), $1->end_pos ());
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1764 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1765 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1766
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1767 function : function_beg stash_comment fcn_name
29724 c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1768 opt_param_list opt_sep function_body function_end
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1769 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1770 OCTAVE_YYUSE ($5);
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1771
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1772 $$ = parser.make_function ($1, nullptr, $3, $4, $6, $7, $2);
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1773 }
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1774 \| function_beg stash_comment return_list '=' fcn_name
29724 c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1775 opt_param_list opt_sep function_body function_end
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1776 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1777 OCTAVE_YYUSE ($4);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1778 OCTAVE_YYUSE ($7);
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1779
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1780 $$ = parser.make_function ($1, $3, $5, $6, $8, $9, $2);
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1781 }
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1782 ;
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1783
29724 c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1784 function_body : at_first_executable_stmt opt_list
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1785 {
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1786 OCTAVE_YYUSE ($1);
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1787
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1788 $$ = $2;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1789 }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1790 \| function_body1 opt_sep at_first_executable_stmt opt_list
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1791 {
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1792 OCTAVE_YYUSE ($2);
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1793
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1794 if ($4)
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1795 {
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1796 for (const auto& elt : *($4))
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1797 $1->append (elt);
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1798 }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1799
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1800 $4->clear ();
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1801 delete ($4);
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1802
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1803 $$ = $1;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1804 }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1805 ;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1806
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1807 at_first_executable_stmt
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1808 : // empty
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1809 {
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1810 $$ = 0;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1811 lexer.m_arguments_is_keyword = false;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1812 }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1813 ;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1814
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1815 function_body1 : arguments_block
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1816 {
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1817 octave::tree_statement *stmt = parser.make_statement ($1);
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1818
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1819 $$ = parser.make_statement_list (stmt);
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1820 }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1821 \| function_body1 opt_sep arguments_block
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1822 {
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1823 octave::tree_statement *stmt = parser.make_statement ($3);
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1824
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1825 $$ = parser.append_statement_list ($1, $2, stmt, false);
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1826 }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1827 ;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1828
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1829 arguments_block : arguments_beg stash_comment opt_sep args_attr_list
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1830 args_validation_list opt_sep END
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1831 {
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1832 OCTAVE_YYUSE ($3);
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1833 OCTAVE_YYUSE ($6);
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1834
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1835 octave::comment_list *lc = $2;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1836 octave::comment_list *tc = lexer.get_comment ();
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1837
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1838 if (! ($$ = parser.make_arguments_block ($1, $4, $5, $7, lc, tc)))
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1839 {
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1840 // make_arguments_block deleted $4, $5, LC, and TC.
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1841 YYABORT;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1842 }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1843
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1844 lexer.m_arguments_is_keyword = true;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1845 }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1846 ;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1847
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1848 arguments_beg : ARGUMENTS
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1849 {
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1850 $$ = $1;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1851 lexer.m_arguments_is_keyword = false;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1852 }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1853 ;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1854
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1855 args_attr_list : // empty
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1856 { $$ = nullptr; }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1857 \| '(' identifier ')'
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1858 {
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1859 OCTAVE_YYUSE ($1);
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1860 OCTAVE_YYUSE ($3);
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1861
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1862 // Error if $$ is nullptr.
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1863 if (! ($$ = parser.make_args_attribute_list ($2)))
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1864 {
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1865 // make_args_attribute_list deleted $2.
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1866 YYABORT;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1867 }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1868 }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1869 ;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1870
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1871 args_validation_list
29729 d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	1872 : arg_name arg_validation
d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	1873 {
d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	1874 $2->arg_name ($1);
d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	1875 $$ = parser.make_args_validation_list ($2);
d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	1876 }
d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	1877 \| args_validation_list sep arg_name arg_validation
29724 c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1878 {
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1879 OCTAVE_YYUSE ($2);
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1880
29729 d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	1881 $4->arg_name ($3);
d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	1882 $$ = parser.append_args_validation_list ($1, $4);
29724 c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1883 }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1884 ;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1885
29729 d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	1886 // FIXME: Change grammar to allow IDENTIFIER to be be either
d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	1887 // "NAME" or "NAME '.' NAME", possibly not entered in the symbol
d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	1888 // table for the current scope. Also stash comments before identifier.
d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	1889
d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	1890 arg_name : identifier
d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	1891 { $$ = $1; }
d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	1892 ;
d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	1893
d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	1894 arg_validation : size_spec class_name validation_fcns default_value
29724 c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1895 {
29729 d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	1896 if (! ($$ = parser.make_arg_validation ($1, $2, $3, $4)))
29724 c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1897 {
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1898 // make_arg_validation deleted ...
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1899 YYABORT;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1900 }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1901 }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1902 ;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1903
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1904 size_spec : // empty
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1905 { $$ = nullptr; }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1906 \| '(' arg_list ')'
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1907 {
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1908 OCTAVE_YYUSE ($1);
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1909 OCTAVE_YYUSE ($3);
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1910
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1911 if (! ($$ = parser.make_arg_size_spec ($2)))
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1912 {
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1913 // make_arg_size_spec deleted $2.
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1914 YYABORT;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1915 }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1916 }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1917 ;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1918
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1919 class_name : // empty
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1920 { $$ = nullptr; }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1921 \| identifier
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1922 { $$ = $1; }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1923 ;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1924
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1925 // Use argument list so we can accept anonymous functions.
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1926 validation_fcns : // empty
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1927 { $$ = nullptr; }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1928 \| '{' arg_list '}'
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1929 {
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1930 OCTAVE_YYUSE ($1);
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1931 OCTAVE_YYUSE ($3);
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1932
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1933 if (! ($$ = parser.make_arg_validation_fcns ($2)))
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1934 {
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1935 // make_arg_validation_fcns deleted $2.
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1936 YYABORT;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1937 }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1938 }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1939 ;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1940
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1941 default_value : // empty
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1942 { $$ = nullptr; }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1943 \| '=' expression
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1944 {
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1945 OCTAVE_YYUSE ($1);
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1946
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1947 $$ = $2;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1948 }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1949 ;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	1950
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1951 // ========
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1952 // Classdef
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1953 // ========
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1954
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1955 classdef_beg : CLASSDEF
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1956 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1957 if (! lexer.m_reading_classdef_file)
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1958 {
16289 bde729ba8381 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16286 16288 diff changeset	1959 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	1960 YYABORT;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1961 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1962
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1963 // Create invalid parent scope.
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1964 lexer.m_symtab_context.push (octave::symbol_scope ());
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1965 lexer.m_parsing_classdef = true;
26709 17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26707 diff changeset	1966 lexer.m_parsing_classdef_decl = true;
29759 ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	1967 lexer.m_classdef_element_names_are_keywords = true;
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	1968
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1969 $$ = $1;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1970 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1971 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1972
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	1973 classdef : classdef_beg stash_comment attr_list identifier opt_sep superclass_list class_body END
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1974 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1975 OCTAVE_YYUSE ($5);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	1976
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	1977 octave::comment_list *lc = $2;
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	1978 octave::comment_list *tc = lexer.get_comment ();
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	1979
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	1980 lexer.m_parsing_classdef = false;
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	1981
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	1982 if (! ($$ = parser.make_classdef ($1, $3, $4, $6, $7, $8,
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	1983 lc, tc)))
17656 2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	1984 {
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	1985 // make_classdef deleted $3, $4, $6, $7, LC, and
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	1986 // TC.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	1987 YYABORT;
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1988 }
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	1989 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1990 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1991
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	1992 attr_list : // empty
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	1993 { $$ = nullptr; }
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	1994 \| '(' attr_list1 ')' opt_sep
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	1995 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1996 OCTAVE_YYUSE ($1);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1997 OCTAVE_YYUSE ($3);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	1998 OCTAVE_YYUSE ($4);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	1999
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2000 $$ = $2;
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2001 }
10315 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
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2004 attr_list1 : attr
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	2005 { $$ = new octave::tree_classdef_attribute_list ($1); }
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2006 \| attr_list1 ',' attr
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2007 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2008 OCTAVE_YYUSE ($2);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2009
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2010 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2011 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2012 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2013 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2014
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2015 attr : identifier
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	2016 { $$ = new octave::tree_classdef_attribute ($1); }
29727 05d7b7e64811 eliminate unused lexical feedback flag John W. Eaton <jwe@octave.org> parents: 29724 diff changeset	2017 \| identifier '=' expression
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2018 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2019 OCTAVE_YYUSE ($2);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2020
29727 05d7b7e64811 eliminate unused lexical feedback flag John W. Eaton <jwe@octave.org> parents: 29724 diff changeset	2021 $$ = new octave::tree_classdef_attribute ($1, $3);
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2022 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2023 \| EXPR_NOT identifier
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2024 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2025 OCTAVE_YYUSE ($1);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2026
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	2027 $$ = 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	2028 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2029 ;
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2030
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2031 superclass_list : // empty
26709 17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26707 diff changeset	2032 {
17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26707 diff changeset	2033 lexer.m_parsing_classdef_decl = false;
17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26707 diff changeset	2034 lexer.m_parsing_classdef_superclass = false;
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2035
26709 17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26707 diff changeset	2036 $$ = nullptr;
17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26707 diff changeset	2037 }
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2038 \| superclass_list1 opt_sep
26709 17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26707 diff changeset	2039 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2040 OCTAVE_YYUSE ($2);
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2041
26709 17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26707 diff changeset	2042 lexer.m_parsing_classdef_decl = false;
17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26707 diff changeset	2043 lexer.m_parsing_classdef_superclass = false;
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2044
26709 17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26707 diff changeset	2045 $$ = $1;
17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26707 diff changeset	2046 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2047 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2048
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2049 superclass_list1
06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2050 : EXPR_LT superclass
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2051 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2052 OCTAVE_YYUSE ($1);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2053
26709 17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26707 diff changeset	2054 $$ = new octave::tree_classdef_superclass_list ($2);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2055 }
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2056 \| superclass_list1 EXPR_AND superclass
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2057 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2058 OCTAVE_YYUSE ($2);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2059
26709 17e7d310def8 revamp parsing of superclass identifiers in classdef decls John W. Eaton <jwe@octave.org> parents: 26707 diff changeset	2060 $1->append ($3);
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2061 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2062 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2063 ;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2064
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 18419 diff changeset	2065 superclass : FQ_IDENT
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	2066 { $$ = new octave::tree_classdef_superclass ($1->text ()); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2067 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2068
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2069 class_body : // empty
29759 ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2070 {
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2071 lexer.m_classdef_element_names_are_keywords = false;
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2072 $$ = nullptr;
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2073 }
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2074 \| class_body1 opt_sep
06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2075 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2076 OCTAVE_YYUSE ($2);
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2077
29759 ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2078 lexer.m_classdef_element_names_are_keywords = false;
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2079 $$ = $1;
06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2080 }
06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2081 ;
06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2082
06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2083 class_body1 : properties_block
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	2084 { $$ = new octave::tree_classdef_body ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2085 \| methods_block
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	2086 { $$ = new octave::tree_classdef_body ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2087 \| events_block
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	2088 { $$ = new octave::tree_classdef_body ($1); }
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	2089 \| enum_block
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	2090 { $$ = new octave::tree_classdef_body ($1); }
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2091 \| class_body1 opt_sep properties_block
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2092 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2093 OCTAVE_YYUSE ($2);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2094
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2095 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2096 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2097 }
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2098 \| class_body1 opt_sep methods_block
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2099 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2100 OCTAVE_YYUSE ($2);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2101
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2102 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2103 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2104 }
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2105 \| class_body1 opt_sep events_block
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2106 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2107 OCTAVE_YYUSE ($2);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2108
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2109 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2110 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2111 }
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2112 \| class_body1 opt_sep enum_block
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2113 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2114 OCTAVE_YYUSE ($2);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2115
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2116 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2117 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2118 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2119 ;
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2120
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2121 properties_block
29759 ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2122 : properties_beg stash_comment opt_sep attr_list property_list END
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2123 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2124 OCTAVE_YYUSE ($3);
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2125
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2126 octave::comment_list *lc = $2;
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2127 octave::comment_list *tc = lexer.get_comment ();
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2128
16289 bde729ba8381 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16286 16288 diff changeset	2129 if (! ($$ = parser.make_classdef_properties_block
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2130 ($1, $4, $5, $6, lc, tc)))
17656 2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	2131 {
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2132 // make_classdef_properties_block deleted $4,
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2133 // $5, LC, and TC.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	2134 YYABORT;
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	2135 }
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	2136 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2137 ;
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	2138
29759 ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2139 properties_beg : PROPERTIES
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2140 {
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2141 lexer.m_classdef_element_names_are_keywords = false;
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2142 $$ = $1;
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2143 }
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2144 ;
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2145
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2146 property_list : // empty
29759 ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2147 {
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2148 lexer.m_classdef_element_names_are_keywords = true;
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2149 $$ = nullptr;
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2150 }
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2151 \| property_list1 opt_sep
06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2152 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2153 OCTAVE_YYUSE ($2);
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2154
29759 ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2155 lexer.m_classdef_element_names_are_keywords = true;
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2156 $$ = $1;
06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2157 }
06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2158 ;
06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2159
06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2160 property_list1
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2161 : class_property
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	2162 { $$ = new octave::tree_classdef_property_list ($1); }
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2163 \| property_list1 sep class_property
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2164 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2165 OCTAVE_YYUSE ($2);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2166
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2167 // We don't look ahead to grab end-of-line comments.
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2168 // Instead, they are grabbed when we see the
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2169 // identifier that becomes the next element in the
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2170 // list. If the element at the end of the list
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2171 // doesn't have a doc string, see whether the
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2172 // element we are adding is stroing an end-of-line
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2173 // comment for us to use.
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2174
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2175 octave::tree_classdef_property *last_elt = $1->back ();
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2176
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2177 if (! last_elt->have_doc_string ())
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2178 {
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2179 octave::comment_list *cl = $3->comments ();
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2180
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2181 if (cl)
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2182 {
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2183 octave::comment_elt elt = cl->front ();
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2184
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2185 if (elt.is_end_of_line ())
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2186 last_elt->doc_string (elt.text ());
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2187 }
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2188 }
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2189
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2190 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2191 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2192 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2193 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2194
29729 d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	2195 class_property : stash_comment identifier arg_validation
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2196 {
29729 d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	2197 // FIXME: Maybe this should be in a separate
d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	2198 // base_parser::make_classdef_property function?
d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	2199
d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	2200 octave::tree_arg_validation *av = $3;
d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	2201
d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	2202 av->arg_name ($2);
d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	2203
d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	2204 if (av->size_spec () \|\| av->class_name ()
d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	2205 \|\| av->validation_fcns ())
d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	2206 warning ("size, class, and validation function specifications are not yet supported for classdef properties; INCORRECT RESULTS ARE POSSIBLE!");
d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	2207
d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	2208 $$ = new octave::tree_classdef_property (av, $1);
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2209 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2210 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2211
29759 ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2212 methods_block : methods_beg stash_comment opt_sep attr_list methods_list END
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2213 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2214 OCTAVE_YYUSE ($3);
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2215
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2216 octave::comment_list *lc = $2;
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2217 octave::comment_list *tc = lexer.get_comment ();
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2218
16289 bde729ba8381 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16286 16288 diff changeset	2219 if (! ($$ = parser.make_classdef_methods_block
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2220 ($1, $4, $5, $6, lc, tc)))
17656 2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	2221 {
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2222 // make_classdef_methods_block deleted $4, $5,
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2223 // LC, and TC.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	2224 YYABORT;
17656 2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	2225 }
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2226 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2227 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2228
29759 ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2229 methods_beg : METHODS
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2230 {
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2231 lexer.m_classdef_element_names_are_keywords = false;
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2232 $$ = $1;
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2233 }
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2234 ;
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2235
18262 69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	2236 method_decl1 : identifier
18308 c1baf94184af * oct-parse.in.yy: Suppress TAB characters. Michael Goffioul <michael.goffioul@gmail.com> parents: 18304 diff changeset	2237 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	2238 if (! ($$ = parser.start_classdef_external_method ($1, nullptr)))
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	2239 YYABORT;
18262 69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	2240 }
18308 c1baf94184af * oct-parse.in.yy: Suppress TAB characters. Michael Goffioul <michael.goffioul@gmail.com> parents: 18304 diff changeset	2241 \| identifier param_list
18341 02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	2242 {
02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	2243 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	2244 YYABORT;
18262 69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	2245 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2246 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2247
18262 69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	2248 method_decl : stash_comment method_decl1
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	2249 { $$ = parser.finish_classdef_external_method ($2, nullptr, $1); }
18341 02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	2250 \| stash_comment return_list '='
02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	2251 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2252 OCTAVE_YYUSE ($3);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2253
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2254 lexer.m_defining_func++;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2255 lexer.m_parsed_function_name.push (false);
18341 02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	2256 }
02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	2257 method_decl1
02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	2258 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2259 lexer.m_defining_func--;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2260 lexer.m_parsed_function_name.pop ();
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2261
18341 02b349ccf0ec Allow "end" method declaration/definition in classde files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18308 diff changeset	2262 $$ = 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	2263 }
18262 69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	2264 ;
69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	2265
69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	2266 method : method_decl
18308 c1baf94184af * oct-parse.in.yy: Suppress TAB characters. Michael Goffioul <michael.goffioul@gmail.com> parents: 18304 diff changeset	2267 { $$ = $1; }
c1baf94184af * oct-parse.in.yy: Suppress TAB characters. Michael Goffioul <michael.goffioul@gmail.com> parents: 18304 diff changeset	2268 \| function
18262 69990d5edcc2 Allow to parse external methods declaration in classdef files. Michael Goffioul <michael.goffioul@gmail.com> parents: 18158 diff changeset	2269 { $$ = $1; }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2270 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2271
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2272 methods_list : // empty
29759 ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2273 {
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2274 lexer.m_classdef_element_names_are_keywords = true;
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2275 $$ = nullptr;
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2276 }
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2277 \| methods_list1 opt_sep
06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2278 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2279 OCTAVE_YYUSE ($2);
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2280
29759 ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2281 lexer.m_classdef_element_names_are_keywords = true;
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2282 $$ = $1;
06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2283 }
06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2284 ;
06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2285
06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2286 methods_list1 : method
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2287 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2288 octave_value fcn;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2289 if ($1)
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2290 fcn = $1->function ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2291 delete $1;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	2292 $$ = new octave::tree_classdef_methods_list (fcn);
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2293 }
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2294 \| methods_list1 opt_sep method
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2295 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2296 OCTAVE_YYUSE ($2);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2297
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2298 octave_value fcn;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2299 if ($3)
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2300 fcn = $3->function ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2301 delete $3;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2302
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2303 $1->append (fcn);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2304 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2305 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2306 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2307
29759 ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2308 events_block : events_beg stash_comment opt_sep attr_list events_list END
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2309 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2310 OCTAVE_YYUSE ($3);
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2311
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2312 octave::comment_list *lc = $2;
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2313 octave::comment_list *tc = lexer.get_comment ();
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2314
16289 bde729ba8381 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16286 16288 diff changeset	2315 if (! ($$ = parser.make_classdef_events_block
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2316 ($1, $4, $5, $6, lc, tc)))
17656 2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	2317 {
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2318 // make_classdef_events_block deleted $4, $5,
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2319 // LC, and TC.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	2320 YYABORT;
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	2321 }
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	2322 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2323 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2324
29759 ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2325 events_beg : EVENTS
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2326 {
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2327 lexer.m_classdef_element_names_are_keywords = false;
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2328 $$ = $1;
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2329 }
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2330 ;
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2331
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2332 events_list : // empty
29759 ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2333 {
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2334 lexer.m_classdef_element_names_are_keywords = true;
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2335 $$ = nullptr;
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2336 }
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2337 \| events_list1 opt_sep
06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2338 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2339 OCTAVE_YYUSE ($2);
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2340
29759 ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2341 lexer.m_classdef_element_names_are_keywords = true;
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2342 $$ = $1;
06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2343 }
06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2344 ;
06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2345
06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2346 events_list1 : class_event
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	2347 { $$ = new octave::tree_classdef_events_list ($1); }
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2348 \| events_list1 opt_sep class_event
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2349 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2350 OCTAVE_YYUSE ($2);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2351
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2352 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2353 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2354 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2355 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2356
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2357 class_event : stash_comment identifier
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2358 { $$ = new octave::tree_classdef_event ($2, $1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2359 ;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	2360
29759 ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2361 enum_block : enumeration_beg stash_comment opt_sep attr_list enum_list END
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2362 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2363 OCTAVE_YYUSE ($3);
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2364
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2365 octave::comment_list *lc = $2;
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2366 octave::comment_list *tc = lexer.get_comment ();
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2367
16289 bde729ba8381 maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16286 16288 diff changeset	2368 if (! ($$ = parser.make_classdef_enum_block
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2369 ($1, $4, $5, $6, lc, tc)))
17656 2b1047efc4fb don't leak memory when parsing classdef objects fails John W. Eaton <jwe@octave.org> parents: 17654 diff changeset	2370 {
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2371 // make_classdef_enum_block deleted $4, $5, LC,
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2372 // and TC.
21073 f7cc48f601d2 additional reworking of error handling in the parser (bug #46877) John W. Eaton <jwe@octave.org> parents: 21071 diff changeset	2373 YYABORT;
18419 9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	2374 }
9154dc252f47 Allow empty classdef or methods/properties/... blocks Michael Goffioul <michael.goffioul@gmail.com> parents: 18395 diff changeset	2375 }
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	2376 ;
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	2377
29759 ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2378 enumeration_beg : ENUMERATION
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2379 {
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2380 lexer.m_classdef_element_names_are_keywords = false;
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2381 $$ = $1;
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2382 }
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2383 ;
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2384
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2385 enum_list : // empty
29759 ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2386 {
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2387 lexer.m_classdef_element_names_are_keywords = true;
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2388 $$ = nullptr;
ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2389 }
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2390 \| enum_list1 opt_sep
06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2391 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2392 OCTAVE_YYUSE ($2);
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2393
29759 ad1491462d13 allow properties function to be called inside classdef method (bug #60763) John W. Eaton <jwe@octave.org> parents: 29729 diff changeset	2394 lexer.m_classdef_element_names_are_keywords = true;
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2395 $$ = $1;
06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2396 }
06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2397 ;
06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2398
06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2399 enum_list1 : class_enum
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	2400 { $$ = new octave::tree_classdef_enum_list ($1); }
28509 06bc2f0bf760 refactor some classdef parsing rules John W. Eaton <jwe@octave.org> parents: 28432 diff changeset	2401 \| enum_list1 opt_sep class_enum
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2402 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2403 OCTAVE_YYUSE ($2);
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2404
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2405 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2406 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	2407 }
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	2408 ;
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	2409
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2410 class_enum : stash_comment identifier '(' expression ')'
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2411 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2412 OCTAVE_YYUSE ($3);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2413 OCTAVE_YYUSE ($5);
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2414
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	2415 $$ = new octave::tree_classdef_enum ($2, $4, $1);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2416 }
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	2417 ;
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	2418
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	2419 // =============
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	2420 // Miscellaneous
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	2421 // =============
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	2422
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	2423 stmt_begin : // empty
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2424 {
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2425 $$ = 0;
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	2426 lexer.m_at_beginning_of_statement = true;
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2427 }
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	2428 ;
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 16627 diff changeset	2429
27736 bd80e14f268a improve parse error message for @()x+=expr (bug #57255) John W. Eaton <jwe@octave.org> parents: 27729 diff changeset	2430 anon_fcn_begin : // empty
bd80e14f268a improve parse error message for @()x+=expr (bug #57255) John W. Eaton <jwe@octave.org> parents: 27729 diff changeset	2431 {
bd80e14f268a improve parse error message for @()x+=expr (bug #57255) John W. Eaton <jwe@octave.org> parents: 27729 diff changeset	2432 $$ = 0;
bd80e14f268a improve parse error message for @()x+=expr (bug #57255) John W. Eaton <jwe@octave.org> parents: 27729 diff changeset	2433 lexer.m_at_beginning_of_statement = true;
bd80e14f268a improve parse error message for @()x+=expr (bug #57255) John W. Eaton <jwe@octave.org> parents: 27729 diff changeset	2434 lexer.m_parsing_anon_fcn_body = true;
bd80e14f268a improve parse error message for @()x+=expr (bug #57255) John W. Eaton <jwe@octave.org> parents: 27729 diff changeset	2435 }
bd80e14f268a improve parse error message for @()x+=expr (bug #57255) John W. Eaton <jwe@octave.org> parents: 27729 diff changeset	2436 ;
bd80e14f268a improve parse error message for @()x+=expr (bug #57255) John W. Eaton <jwe@octave.org> parents: 27729 diff changeset	2437
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2438 stash_comment : // empty
17693 efbe746f8fa8 eliminate octave_comment_buffer singleton John W. Eaton <jwe@octave.org> parents: 17673 diff changeset	2439 { $$ = lexer.get_comment (); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2440 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2441
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2442 parse_error : LEXICAL_ERROR
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2443 {
bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2444 $$ = 0;
21064 a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21063 diff changeset	2445 std::string msg = $1->text ();
a9f2c2d72892 handle lexical errors as parser errors (bug #46877) John W. Eaton <jwe@octave.org> parents: 21063 diff changeset	2446 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	2447 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2448 \| error
19778 bf737d927707 eliminate bison warnings from oct-parse.yy John W. Eaton <jwe@octave.org> parents: 19709 diff changeset	2449 { $$ = 0; }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2450 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2451
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2452 sep_no_nl : ','
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2453 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2454 OCTAVE_YYUSE ($1);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2455
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2456 $$ = ',';
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2457 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2458 \| ';'
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2459 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2460 OCTAVE_YYUSE ($1);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2461
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2462 $$ = ';';
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2463 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2464 \| sep_no_nl ','
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2465 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2466 OCTAVE_YYUSE ($2);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2467
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2468 $$ = $1;
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2469 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2470 \| sep_no_nl ';'
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2471 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2472 OCTAVE_YYUSE ($2);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2473
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2474 $$ = $1;
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2475 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2476 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2477
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2478 opt_sep_no_nl : // empty
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2479 { $$ = 0; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2480 \| sep_no_nl
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2481 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2482 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2483
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2484 opt_nl : // empty
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2485 { $$ = 0; }
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2486 \| nl
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2487 { $$ = $1; }
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2488 ;
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2489
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2490 nl : '\n'
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2491 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2492 OCTAVE_YYUSE ($1);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2493
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2494 $$ = '\n';
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2495 }
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2496 \| nl '\n'
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2497 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2498 OCTAVE_YYUSE ($2);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2499
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2500 $$ = $1;
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2501 }
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2502 ;
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2503
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2504 sep : ','
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2505 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2506 OCTAVE_YYUSE ($1);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2507
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2508 $$ = ',';
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2509 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2510 \| ';'
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2511 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2512 OCTAVE_YYUSE ($1);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2513
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2514 $$ = ';';
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2515 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2516 \| '\n'
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2517 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2518 OCTAVE_YYUSE ($1);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2519
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2520 $$ = '\n';
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2521 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2522 \| sep ','
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2523 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2524 OCTAVE_YYUSE ($2);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2525
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2526 $$ = $1;
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2527 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2528 \| sep ';'
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2529 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2530 OCTAVE_YYUSE ($2);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2531
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2532 $$ = $1;
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2533 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2534 \| sep '\n'
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2535 {
29272 59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806) John W. Eaton <jwe@octave.org> parents: 29006 diff changeset	2536 OCTAVE_YYUSE ($2);
27762 80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2537
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2538 $$ = $1;
80d68a3e8ec0 make location info available for more tokens in parser John W. Eaton <jwe@octave.org> parents: 27745 diff changeset	2539 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2540 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2541
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2542 opt_sep : // empty
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2543 { $$ = 0; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2544 \| sep
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2545 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2546 ;
2525 8561d88be5f2 [project @ 1996-11-17 21:23:31 by jwe] jwe parents: 2524 diff changeset	2547
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2548 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2549
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 21021 diff changeset	2550 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
24444 53ca76c5cc8d maint: Indent pragmas as other preprocessor directives. John W. Eaton <jwe@octave.org> parents: 24377 diff changeset	2551 // Restore prevailing warning state for remainder of the file.
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives. John W. Eaton <jwe@octave.org> parents: 24377 diff changeset	2552 # pragma GCC diagnostic pop
21023 ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 21021 diff changeset	2553 #endif
ec532a439c6f rework method of disabling warnings from GCC John W. Eaton <jwe@octave.org> parents: 21021 diff changeset	2554
666 fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	2555 // Generic error messages.
fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	2556
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	2557 #undef lexer
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2558 #undef scanner
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	2559
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2560 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	2561 yyerror (octave::base_parser& parser, const char *s)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2562 {
16288 fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER John W. Eaton <jwe@octave.org> parents: 16287 diff changeset	2563 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	2564 }
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	2565
29960 939bef0b66e0 merge "namespace octave" and OCTAVE_NAMESPACE_BEGIN/END blocks John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	2566 OCTAVE_NAMESPACE_BEGIN
939bef0b66e0 merge "namespace octave" and OCTAVE_NAMESPACE_BEGIN/END blocks John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	2567
29864 e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2568 class parse_exception : public std::runtime_error
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2569 {
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2570 public:
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2571
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2572 parse_exception (const std::string& message,
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2573 const std::string& fcn_name = "",
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2574 const std::string& file_name = "",
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2575 int line = -1, int column = -1)
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2576 : runtime_error (message), m_message (message),
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2577 m_fcn_name (fcn_name), m_file_name (file_name),
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2578 m_line (line), m_column (column)
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2579 { }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2580
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2581 parse_exception (const parse_exception&) = default;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2582
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2583 parse_exception& operator = (const parse_exception&) = default;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2584
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2585 ~parse_exception (void) = default;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2586
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2587 std::string message (void) const { return m_message; }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2588
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2589 // Provided for std::exception interface.
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2590 const char * what (void) const noexcept { return m_message.c_str (); }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2591
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2592 std::string fcn_name (void) const { return m_fcn_name; }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2593 std::string file_name (void) const { return m_file_name; }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2594
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2595 int line (void) const { return m_line; }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2596 int column (void) const { return m_column; }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2597
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2598 // virtual void display (std::ostream& os) const;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2599
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2600 private:
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2601
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2602 std::string m_message;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2603
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2604 std::string m_fcn_name;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2605 std::string m_file_name;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2606 int m_line;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2607 int m_column;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2608 };
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2609
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2610 class parse_tree_validator : public tree_walker
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2611 {
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2612 public:
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2613
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2614 parse_tree_validator (void)
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2615 : m_scope (), m_error_list ()
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2616 { }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2617
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2618 parse_tree_validator (const parse_tree_validator&) = delete;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2619
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2620 parse_tree_validator& operator = (const parse_tree_validator&) = delete;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2621
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2622 ~parse_tree_validator (void) = default;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2623
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2624 symbol_scope get_scope (void) const { return m_scope; }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2625
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2626 bool ok (void) const { return m_error_list.empty (); }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2627
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2628 std::list<parse_exception> error_list (void) const
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2629 {
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2630 return m_error_list;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2631 }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2632
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2633 void visit_octave_user_script (octave_user_script& script)
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2634 {
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2635 unwind_protect_var<symbol_scope> restore_var (m_scope, script.scope ());
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2636
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2637 tree_statement_list *stmt_list = script.body ();
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2638
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2639 if (stmt_list)
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2640 stmt_list->accept (*this);
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2641 }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2642
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2643 void visit_octave_user_function (octave_user_function& fcn)
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2644 {
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2645 unwind_protect_var<symbol_scope> restore_var (m_scope, fcn.scope ());
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2646
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2647 tree_statement_list *stmt_list = fcn.body ();
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2648
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2649 if (stmt_list)
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2650 stmt_list->accept (*this);
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2651
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2652 std::map<std::string, octave_value> subfcns = fcn.subfunctions ();
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2653
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2654 if (! subfcns.empty ())
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2655 {
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2656 for (auto& nm_val : subfcns)
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2657 {
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2658 octave_user_function *subfcn
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2659 = nm_val.second.user_function_value ();
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2660
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2661 if (subfcn)
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2662 subfcn->accept (*this);
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2663 }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2664 }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2665 }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2666
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2667 void visit_index_expression (tree_index_expression& idx_expr)
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2668 {
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2669 if (idx_expr.is_word_list_cmd ())
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2670 {
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2671 std::string sym_nm = idx_expr.name ();
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2672
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2673 if (m_scope.is_variable (sym_nm))
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2674 {
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2675 std::string message
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2676 = sym_nm + ": invalid use of symbol as both variable and command";
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2677 parse_exception pe (message, m_scope.fcn_name (),
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2678 m_scope.fcn_file_name (),
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2679 idx_expr.line (), idx_expr.column ());
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2680
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2681 m_error_list.push_back (pe);
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2682 }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2683 }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2684 }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2685
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2686 private:
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2687
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2688 symbol_scope m_scope;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2689
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2690 std::list<parse_exception> m_error_list;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2691 };
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	2692
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	2693 std::size_t
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2694 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	2695 {
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2696 return m_info.size ();
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2697 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2698
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2699 void
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2700 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	2701 {
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2702 m_info.push_back (elt);
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2703 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2704
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2705 void
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	2706 base_parser::parent_scope_info::push (const symbol_scope& scope)
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2707 {
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	2708 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	2709 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2710
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2711 void
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2712 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	2713 {
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2714 m_info.pop_back ();
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2715 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2716
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2717 bool
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2718 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	2719 {
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2720 // 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	2721 // 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	2722 // 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	2723 // 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	2724
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2725 std::string full_name;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2726
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	2727 for (std::size_t i = 0; i < size()-1; i++)
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2728 {
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2729 const value_type& elt = m_info[i];
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2730
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2731 if (name == elt.second)
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2732 return false;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2733
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2734 full_name += elt.second + ">";
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2735 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2736
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2737 full_name += name;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2738
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2739 if (m_all_names.find (full_name) != m_all_names.end ())
28698 d45d1b4bb919 allow functions to be redefined in scripts (bug #52851) John W. Eaton <jwe@octave.org> parents: 28545 diff changeset	2740 {
d45d1b4bb919 allow functions to be redefined in scripts (bug #52851) John W. Eaton <jwe@octave.org> parents: 28545 diff changeset	2741 // Return false (failure) if we are parsing a subfunction, local
d45d1b4bb919 allow functions to be redefined in scripts (bug #52851) John W. Eaton <jwe@octave.org> parents: 28545 diff changeset	2742 // function, or nested function. Otherwise, it is OK to have a
d45d1b4bb919 allow functions to be redefined in scripts (bug #52851) John W. Eaton <jwe@octave.org> parents: 28545 diff changeset	2743 // duplicate name.
d45d1b4bb919 allow functions to be redefined in scripts (bug #52851) John W. Eaton <jwe@octave.org> parents: 28545 diff changeset	2744
d45d1b4bb919 allow functions to be redefined in scripts (bug #52851) John W. Eaton <jwe@octave.org> parents: 28545 diff changeset	2745 return ! (m_parser.parsing_subfunctions ()
d45d1b4bb919 allow functions to be redefined in scripts (bug #52851) John W. Eaton <jwe@octave.org> parents: 28545 diff changeset	2746 \|\| m_parser.parsing_local_functions ()
d45d1b4bb919 allow functions to be redefined in scripts (bug #52851) John W. Eaton <jwe@octave.org> parents: 28545 diff changeset	2747 \|\| m_parser.curr_fcn_depth () > 0);
d45d1b4bb919 allow functions to be redefined in scripts (bug #52851) John W. Eaton <jwe@octave.org> parents: 28545 diff changeset	2748 }
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2749
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2750 m_all_names.insert (full_name);
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2751
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2752 return true;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2753 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2754
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2755 bool
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2756 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	2757 {
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2758 if (! name_ok (name))
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2759 return false;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2760
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2761 if (size () > 0)
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2762 m_info.back().second = name;
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2763
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2764 return true;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2765 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2766
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	2767 symbol_scope
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2768 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	2769 {
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	2770 return size () > 1 ? m_info[size()-2].first : symbol_scope ();
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2771 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2772
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2773 std::string
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2774 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	2775 {
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2776 return m_info[size()-2].second;
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2777 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2778
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2779 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	2780 {
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2781 m_info.clear ();
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2782 m_all_names.clear ();
23054 564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2783 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014) John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	2784
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2785 base_parser::base_parser (base_lexer& lxr)
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2786 : m_endfunction_found (false), m_autoloading (false),
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2787 m_fcn_file_from_relative_lookup (false),
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2788 m_parsing_subfunctions (false), m_parsing_local_functions (false),
26060 edcb09d4b1f5 store nesting depth and primary parent info in nested function scopes John W. Eaton <jwe@octave.org> parents: 26059 diff changeset	2789 m_max_fcn_depth (-1), m_curr_fcn_depth (-1), m_primary_fcn_scope (),
28698 d45d1b4bb919 allow functions to be redefined in scripts (bug #52851) John W. Eaton <jwe@octave.org> parents: 28545 diff changeset	2790 m_curr_class_name (), m_curr_package_name (), m_function_scopes (*this),
27505 c409d16b7190 eliminate some uses of bare pointers to octave_function objects John W. Eaton <jwe@octave.org> parents: 27504 diff changeset	2791 m_primary_fcn (), m_subfunction_names (), m_classdef_object (),
c409d16b7190 eliminate some uses of bare pointers to octave_function objects John W. Eaton <jwe@octave.org> parents: 27504 diff changeset	2792 m_stmt_list (), m_lexer (lxr), m_parser_state (yypstate_new ())
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2793 { }
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 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	2796 {
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2797 delete &m_lexer;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2798
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2799 // 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	2800 // 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	2801 // 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	2802 // 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	2803 // 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	2804 // 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	2805 // 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	2806
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2807 yypstate_delete (static_cast<yypstate *> (m_parser_state));
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2808 }
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 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2811 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	2812 {
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2813 m_endfunction_found = false;
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2814 m_autoloading = false;
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2815 m_fcn_file_from_relative_lookup = false;
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2816 m_parsing_subfunctions = false;
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2817 m_parsing_local_functions = false;
26060 edcb09d4b1f5 store nesting depth and primary parent info in nested function scopes John W. Eaton <jwe@octave.org> parents: 26059 diff changeset	2818 m_max_fcn_depth = -1;
edcb09d4b1f5 store nesting depth and primary parent info in nested function scopes John W. Eaton <jwe@octave.org> parents: 26059 diff changeset	2819 m_curr_fcn_depth = -1;
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	2820 m_primary_fcn_scope = symbol_scope ();
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2821 m_curr_class_name = "";
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2822 m_curr_package_name = "";
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2823 m_function_scopes.clear ();
27505 c409d16b7190 eliminate some uses of bare pointers to octave_function objects John W. Eaton <jwe@octave.org> parents: 27504 diff changeset	2824 m_primary_fcn = octave_value ();
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2825 m_subfunction_names.clear ();
27504 7a31b25e3252 use shared_ptr for storing classdef and statement_list objects in parser John W. Eaton <jwe@octave.org> parents: 27481 diff changeset	2826 m_classdef_object.reset ();
7a31b25e3252 use shared_ptr for storing classdef and statement_list objects in parser John W. Eaton <jwe@octave.org> parents: 27481 diff changeset	2827 m_stmt_list.reset ();
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2828
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2829 m_lexer.reset ();
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2830
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2831 yypstate_delete (static_cast<yypstate *> (m_parser_state));
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	2832 m_parser_state = yypstate_new ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2833 }
25442 47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2834
27956 2310164737b3 fix many spelling errors (bug #57613) John W. Eaton <jwe@octave.org> parents: 26585 diff changeset	2835 // Error messages for mismatched end tokens.
25442 47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2836
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2837 static std::string
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2838 end_token_as_string (token::end_tok_type ettype)
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2839 {
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2840 std::string retval = "<unknown>";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2841
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2842 switch (ettype)
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2843 {
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2844 case token::simple_end:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2845 retval = "end";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2846 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2847
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2848 case token::classdef_end:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2849 retval = "endclassdef";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2850 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2851
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2852 case token::enumeration_end:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2853 retval = "endenumeration";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2854 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2855
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2856 case token::events_end:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2857 retval = "endevents";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2858 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2859
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2860 case token::for_end:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2861 retval = "endfor";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2862 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2863
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2864 case token::function_end:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2865 retval = "endfunction";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2866 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2867
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2868 case token::if_end:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2869 retval = "endif";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2870 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2871
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2872 case token::methods_end:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2873 retval = "endmethods";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2874 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2875
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2876 case token::parfor_end:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2877 retval = "endparfor";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2878 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2879
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2880 case token::properties_end:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2881 retval = "endproperties";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2882 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2883
28517 6e8a9845d118 Add 'spmd' as interpreter keyword for Matlab compatibility (bug #58676). Rik <rik@octave.org> parents: 28516 diff changeset	2884 case token::spmd_end:
6e8a9845d118 Add 'spmd' as interpreter keyword for Matlab compatibility (bug #58676). Rik <rik@octave.org> parents: 28516 diff changeset	2885 retval = "endspmd";
6e8a9845d118 Add 'spmd' as interpreter keyword for Matlab compatibility (bug #58676). Rik <rik@octave.org> parents: 28516 diff changeset	2886 break;
6e8a9845d118 Add 'spmd' as interpreter keyword for Matlab compatibility (bug #58676). Rik <rik@octave.org> parents: 28516 diff changeset	2887
25442 47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2888 case token::switch_end:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2889 retval = "endswitch";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2890 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2891
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2892 case token::try_catch_end:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2893 retval = "end_try_catch";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2894 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2895
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2896 case token::unwind_protect_end:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2897 retval = "end_unwind_protect";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2898 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2899
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2900 case token::while_end:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2901 retval = "endwhile";
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2902 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2903
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2904 default:
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2905 panic_impossible ();
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2906 break;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2907 }
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2908
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2909 return retval;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2910 }
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	2911
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2912 void
28407 808e3964987b accept multi-line interactive input (bug #58370) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	2913 base_parser::statement_list (std::shared_ptr<tree_statement_list>& lst)
808e3964987b accept multi-line interactive input (bug #58370) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	2914 {
29322 6264fb660f72 avoid crash on null statement list (bug #59938) John W. Eaton <jwe@octave.org> parents: 29272 diff changeset	2915 if (! lst)
6264fb660f72 avoid crash on null statement list (bug #59938) John W. Eaton <jwe@octave.org> parents: 29272 diff changeset	2916 return;
6264fb660f72 avoid crash on null statement list (bug #59938) John W. Eaton <jwe@octave.org> parents: 29272 diff changeset	2917
28407 808e3964987b accept multi-line interactive input (bug #58370) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	2918 if (m_stmt_list)
808e3964987b accept multi-line interactive input (bug #58370) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	2919 {
808e3964987b accept multi-line interactive input (bug #58370) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	2920 // Append additional code to existing statement list.
808e3964987b accept multi-line interactive input (bug #58370) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	2921
808e3964987b accept multi-line interactive input (bug #58370) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	2922 while (! lst->empty ())
808e3964987b accept multi-line interactive input (bug #58370) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	2923 {
808e3964987b accept multi-line interactive input (bug #58370) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	2924 m_stmt_list->push_back (lst->front ());
808e3964987b accept multi-line interactive input (bug #58370) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	2925 lst->pop_front ();
808e3964987b accept multi-line interactive input (bug #58370) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	2926 }
808e3964987b accept multi-line interactive input (bug #58370) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	2927 }
808e3964987b accept multi-line interactive input (bug #58370) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	2928 else
808e3964987b accept multi-line interactive input (bug #58370) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	2929 m_stmt_list = lst;
808e3964987b accept multi-line interactive input (bug #58370) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	2930 }
808e3964987b accept multi-line interactive input (bug #58370) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	2931
808e3964987b accept multi-line interactive input (bug #58370) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	2932 void
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2933 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	2934 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2935 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	2936 + "' 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	2937 + 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	2938
27778 2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	2939 bison_error (msg, tok->beg_pos ());
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2940 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2941
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2942 // 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	2943
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2944 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2945 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	2946 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2947 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	2948
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2949 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	2950 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2951
27510 5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	2952 bool
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	2953 base_parser::push_fcn_symtab (void)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2954 {
27510 5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	2955 m_curr_fcn_depth++;
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	2956
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	2957 if (m_max_fcn_depth < m_curr_fcn_depth)
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	2958 m_max_fcn_depth = m_curr_fcn_depth;
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	2959
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	2960 // Will get a real name later.
28857 43ad651cf5a0 eliminate unnecessary uses of octave:: namespace qualifier John W. Eaton <jwe@octave.org> parents: 28851 diff changeset	2961 m_lexer.m_symtab_context.push (symbol_scope ("parser:push_fcn_symtab"));
27510 5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	2962 m_function_scopes.push (m_lexer.m_symtab_context.curr_scope ());
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	2963
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	2964 if (! m_lexer.m_reading_script_file && m_curr_fcn_depth == 0
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	2965 && ! m_parsing_subfunctions)
28432 71c34141cc2d refactor handling of parent functions and localfunctions John W. Eaton <jwe@octave.org> parents: 28407 diff changeset	2966 {
71c34141cc2d refactor handling of parent functions and localfunctions John W. Eaton <jwe@octave.org> parents: 28407 diff changeset	2967 m_primary_fcn_scope = m_lexer.m_symtab_context.curr_scope ();
71c34141cc2d refactor handling of parent functions and localfunctions John W. Eaton <jwe@octave.org> parents: 28407 diff changeset	2968 m_primary_fcn_scope.mark_primary_fcn_scope ();
71c34141cc2d refactor handling of parent functions and localfunctions John W. Eaton <jwe@octave.org> parents: 28407 diff changeset	2969 }
27510 5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	2970
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	2971 if (m_lexer.m_reading_script_file && m_curr_fcn_depth > 0)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2972 {
27510 5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	2973 bison_error ("nested functions not implemented in this context");
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	2974
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	2975 return false;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2976 }
27510 5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	2977
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	2978 return true;
22196 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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2981 // 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	2982
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2983 tree_constant *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2984 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	2985 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2986 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	2987 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	2988
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	2989 tree_constant *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2990
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2991 switch (op)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2992 {
28582 dc8de424fc72 use octave_value object to store numeric tokens in the lexer John W. Eaton <jwe@octave.org> parents: 28548 diff changeset	2993 case NUMBER:
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2994 {
28582 dc8de424fc72 use octave_value object to store numeric tokens in the lexer John W. Eaton <jwe@octave.org> parents: 28548 diff changeset	2995 retval = new tree_constant (tok_val->number (), 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	2996 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	2997 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	2998 break;
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 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	3001 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	3002 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3003 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	3004
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3005 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	3006 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	3007
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3008 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	3009 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3010 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	3011 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	3012 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3013 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	3014 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3015
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3016 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	3017
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3018 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	3019 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	3020
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3021 // 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	3022 // 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	3023 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	3024 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3025 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3026
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3027 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3028 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3029 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3030 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3031
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3032 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3033 }
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 // 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	3036
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3037 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	3038 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	3039 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3040 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	3041 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	3042
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3043 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	3044
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3045 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3046 }
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 // 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	3049
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3050 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	3051 base_parser::make_anon_fcn_handle (tree_parameter_list *param_list,
27778 2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	3052 tree_expression *expr,
2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	3053 const filepos& at_pos)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3054 {
27728 5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255) John W. Eaton <jwe@octave.org> parents: 27516 diff changeset	3055 // FIXME: We need to examine EXPR and issue an error if any
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255) John W. Eaton <jwe@octave.org> parents: 27516 diff changeset	3056 // sub-expression contains an assignment, compound assignment,
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255) John W. Eaton <jwe@octave.org> parents: 27516 diff changeset	3057 // increment, or decrement operator.
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255) John W. Eaton <jwe@octave.org> parents: 27516 diff changeset	3058
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255) John W. Eaton <jwe@octave.org> parents: 27516 diff changeset	3059 anon_fcn_validator validator (param_list, expr);
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255) John W. Eaton <jwe@octave.org> parents: 27516 diff changeset	3060
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255) John W. Eaton <jwe@octave.org> parents: 27516 diff changeset	3061 if (! validator.ok ())
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255) John W. Eaton <jwe@octave.org> parents: 27516 diff changeset	3062 {
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255) John W. Eaton <jwe@octave.org> parents: 27516 diff changeset	3063 delete param_list;
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255) John W. Eaton <jwe@octave.org> parents: 27516 diff changeset	3064 delete expr;
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255) John W. Eaton <jwe@octave.org> parents: 27516 diff changeset	3065
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255) John W. Eaton <jwe@octave.org> parents: 27516 diff changeset	3066 bison_error (validator.message (), validator.line (),
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255) John W. Eaton <jwe@octave.org> parents: 27516 diff changeset	3067 validator.column ());
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255) John W. Eaton <jwe@octave.org> parents: 27516 diff changeset	3068
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255) John W. Eaton <jwe@octave.org> parents: 27516 diff changeset	3069 return nullptr;
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255) John W. Eaton <jwe@octave.org> parents: 27516 diff changeset	3070 }
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3071
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3072 symbol_scope fcn_scope = m_lexer.m_symtab_context.curr_scope ();
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3073 symbol_scope parent_scope = m_lexer.m_symtab_context.parent_scope ();
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3074
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3075 m_lexer.m_symtab_context.pop ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3076
23600 db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	3077 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	3078
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	3079 fcn_scope.mark_static ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3080
27778 2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	3081 int at_line = at_pos.line ();
2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	3082 int at_column = at_pos.column ();
2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	3083
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3084 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	3085 = new tree_anon_fcn_handle (param_list, expr, fcn_scope,
27778 2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	3086 parent_scope, at_line, at_column);
23600 db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	3087
24354 11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	3088 std::ostringstream buf;
11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	3089
11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	3090 tree_print_code tpc (buf);
11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	3091
11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	3092 retval->accept (tpc);
11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	3093
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3094 std::string file = m_lexer.m_fcn_file_full_name;
24354 11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	3095 if (! file.empty ())
11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	3096 buf << ": file: " << file;
11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	3097 else if (m_lexer.input_from_terminal ())
11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	3098 buf << ": terminal input";
11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	3099 else if (m_lexer.input_from_eval_string ())
11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	3100 buf << ": eval string";
27778 2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	3101 buf << ": line: " << at_line << " column: " << at_column;
24354 11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	3102
11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	3103 std::string scope_name = buf.str ();
11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	3104
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	3105 fcn_scope.cache_name (scope_name);
24354 11d3603dd880 give names to anonymous function scopes John W. Eaton <jwe@octave.org> parents: 24297 diff changeset	3106
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3107 // FIXME: Stash the filename. This does not work and produces
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3108 // errors when executed.
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3109 //retval->stash_file_name (m_lexer.m_fcn_file_name);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3110
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3111 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3112 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3113
23655 bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3114 // Build a colon expression.
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3115
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3116 tree_expression *
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3117 base_parser::make_colon_expression (tree_expression *base,
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3118 tree_expression *limit,
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3119 tree_expression *incr)
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3120 {
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3121 tree_expression *retval = nullptr;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3122
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3123 if (! base \|\| ! limit)
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3124 {
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3125 delete base;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3126 delete limit;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3127 delete incr;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3128
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3129 return retval;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3130 }
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3131
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3132 int l = base->line ();
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3133 int c = base->column ();
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3134
27516 c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3135 tree_colon_expression *expr
23655 bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3136 = new tree_colon_expression (base, limit, incr, l, c);
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3137
27516 c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3138 retval = expr;
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3139
23655 bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3140 if (base->is_constant () && limit->is_constant ()
26404 abca0c2690b7 oct-parse.yy: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	3141 && (! incr \|\| incr->is_constant ()))
23655 bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3142 {
27516 c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3143 interpreter& interp = __get_interpreter__ ("finish_colon_expression");
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3144
23655 bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3145 try
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3146 {
27516 c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3147 // If the evaluation generates a warning message, restore
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3148 // the previous value of last_warning_message and skip the
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3149 // conversion to a constant value.
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3150
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3151 error_system& es = interp.get_error_system ();
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3152
29253 28913793f678 prefer unwind_action over unwind_protect in more places John W. Eaton <jwe@octave.org> parents: 29007 diff changeset	3153 unwind_action restore_last_warning_message
28913793f678 prefer unwind_action over unwind_protect in more places John W. Eaton <jwe@octave.org> parents: 29007 diff changeset	3154 (&error_system::set_last_warning_message, &es,
28913793f678 prefer unwind_action over unwind_protect in more places John W. Eaton <jwe@octave.org> parents: 29007 diff changeset	3155 es.last_warning_message (""));
28913793f678 prefer unwind_action over unwind_protect in more places John W. Eaton <jwe@octave.org> parents: 29007 diff changeset	3156
28913793f678 prefer unwind_action over unwind_protect in more places John W. Eaton <jwe@octave.org> parents: 29007 diff changeset	3157 unwind_action restore_discard_warning_messages
28913793f678 prefer unwind_action over unwind_protect in more places John W. Eaton <jwe@octave.org> parents: 29007 diff changeset	3158 (&error_system::set_discard_warning_messages, &es,
28913793f678 prefer unwind_action over unwind_protect in more places John W. Eaton <jwe@octave.org> parents: 29007 diff changeset	3159 es.discard_warning_messages (true));
27516 c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3160
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	3161 tree_evaluator& tw = interp.get_evaluator ();
23655 bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3162
27516 c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3163 octave_value tmp = expr->evaluate (tw);
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3164
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3165 std::string msg = es.last_warning_message ();
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3166
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3167 if (msg.empty ())
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3168 {
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3169 tree_constant *tc_retval
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3170 = new tree_constant (tmp, expr->line (), expr->column ());
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3171
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3172 std::ostringstream buf;
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3173
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3174 tree_print_code tpc (buf);
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3175
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3176 expr->accept (tpc);
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3177
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3178 tc_retval->stash_original_text (buf.str ());
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3179
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3180 delete expr;
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3181
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3182 retval = tc_retval;
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	3183 }
23655 bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3184 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	3185 catch (const execution_exception&)
23655 bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3186 {
27474 3fec8e9fa2aa make recover_from_exception a member function John W. Eaton <jwe@octave.org> parents: 27471 diff changeset	3187 interp.recover_from_exception ();
23655 bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3188 }
bbcc1e08aaed improve colon expression construction and avoid possible memory leak John W. Eaton <jwe@octave.org> parents: 23654 diff changeset	3189 }
22196 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 return retval;
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3194 // 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	3195
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3196 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3197 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	3198 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	3199 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3200 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	3201
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3202 switch (op)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3203 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3204 case POW:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3205 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	3206 break;
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 case EPOW:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3209 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	3210 break;
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 case '+':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3213 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	3214 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3215
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3216 case '-':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3217 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	3218 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3219
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3220 case '*':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3221 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	3222 break;
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 case '/':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3225 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	3226 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3227
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3228 case EMUL:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3229 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	3230 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3231
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3232 case EDIV:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3233 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	3234 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3235
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3236 case LEFTDIV:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3237 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	3238 break;
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 case ELEFTDIV:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3241 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	3242 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3243
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3244 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	3245 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	3246 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3247
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3248 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	3249 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	3250 break;
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 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	3253 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	3254 break;
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 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	3257 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	3258 break;
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 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	3261 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	3262 break;
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 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	3265 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	3266 break;
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 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	3269 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	3270 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3271
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3272 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	3273 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	3274 break;
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 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3277 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3278 break;
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3281 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	3282 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	3283
25829 8ac4bfa55053 restore optimization for compound transpose-mul/div ops (bug #45890) John W. Eaton <jwe@octave.org> parents: 25753 diff changeset	3284 return maybe_compound_binary_expression (op1, op2, l, c, t);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3285 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3286
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3287 // 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	3288
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3289 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3290 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	3291 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	3292 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3293 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	3294
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3295 switch (op)
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 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	3298 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	3299 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3300
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3301 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	3302 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	3303 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3304
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3305 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3306 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3307 break;
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 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	3311 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	3312
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3313 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	3314 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3315
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3316 // 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	3317
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3318 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3319 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	3320 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3321 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	3322
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3323 switch (op)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3324 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3325 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	3326 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	3327 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3328
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3329 case '+':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3330 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	3331 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3332
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3333 case '-':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3334 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	3335 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3336
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3337 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	3338 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	3339 break;
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 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	3342 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	3343 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3344
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3345 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3346 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3347 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3348 }
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 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	3351 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	3352
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3353 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	3354 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3355
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3356 // 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	3357
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3358 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3359 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	3360 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3361 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	3362
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3363 switch (op)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3364 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3365 case HERMITIAN:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3366 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	3367 break;
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 case TRANSPOSE:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3370 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	3371 break;
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 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	3374 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	3375 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3376
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3377 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	3378 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	3379 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3380
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3381 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3382 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3383 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3384 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3385
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3386 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	3387 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	3388
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3389 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	3390 }
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 // 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	3393
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3394 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3395 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	3396 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	3397 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	3398 token *end_tok,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	3399 comment_list *lc,
ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	3400 comment_list *mc)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3401 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3402 tree_command *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3403
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3404 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	3405 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3406 comment_list *tc = m_lexer.m_comment_buf.get_comment ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3407
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3408 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	3409 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	3410
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3411 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	3412 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	3413 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3414 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3415 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3416 delete body;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3417 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	3418
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3419 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	3420 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3421
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3422 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3423 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3424
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3425 // 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	3426
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3427 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3428 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	3429 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	3430 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	3431 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	3432 token *end_tok,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	3433 comment_list *lc,
ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	3434 comment_list *mc)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3435 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3436 tree_command *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3437
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3438 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	3439 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3440 comment_list *tc = m_lexer.m_comment_buf.get_comment ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3441
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3442 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	3443 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	3444
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3445 tree_identifier *id = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3446
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3447 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	3448 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3449 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	3450
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3451 if (stmt)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3452 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3453 tree_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	3454
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3455 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	3456 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3457 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	3458
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3459 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	3460
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3461 stmt->set_expression (nullptr);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3462 delete stmt;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3463 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3464 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3465 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3466
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3467 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	3468 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	3469 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3470 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3471 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3472 delete body;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3473 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	3474
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3475 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	3476 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3477
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3478 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3479 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3480
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3481 // 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	3482
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3483 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3484 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	3485 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	3486 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	3487 token *end_tok,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	3488 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	3489 {
23798 771310737137 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23796 diff changeset	3490 tree_command *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3491
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3492 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	3493
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3494 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	3495 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3496 comment_list *tc = m_lexer.m_comment_buf.get_comment ();
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3497
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3498 m_lexer.m_looping--;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3499
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3500 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	3501 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	3502
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3503 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	3504 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3505 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3506 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3507 delete expr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3508 delete body;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3509
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3510 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	3511 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3512
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3513 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3514 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3515
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3516 // 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	3517
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3518 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3519 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	3520 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	3521 tree_expression *expr,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	3522 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	3523 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3524 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	3525
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3526 comment_list *tc = m_lexer.m_comment_buf.get_comment ();
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3527
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3528 m_lexer.m_looping--;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3529
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3530 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	3531 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	3532
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3533 return 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	3534 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3535
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3536 // 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	3537
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3538 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3539 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	3540 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	3541 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	3542 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	3543 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	3544 token *end_tok,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	3545 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	3546 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3547 tree_command *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3548
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3549 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	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 (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	3552 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3553 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	3554
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3555 comment_list *tc = m_lexer.m_comment_buf.get_comment ();
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3556
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3557 m_lexer.m_looping--;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3558
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3559 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	3560 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	3561
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3562 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	3563 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3564 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	3565
29857 0b01806bb663 fix command syntax parsing error (bug #60882) John W. Eaton <jwe@octave.org> parents: 29759 diff changeset	3566 m_lexer.mark_as_variable (tmp->name ());
0b01806bb663 fix command syntax parsing error (bug #60882) John W. Eaton <jwe@octave.org> parents: 29759 diff changeset	3567
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3568 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	3569 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	3570
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3571 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3572 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3573 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3574 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3575 if (parfor)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3576 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3577 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3578 delete expr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3579 delete maxproc;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3580 delete body;
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 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	3583 }
29857 0b01806bb663 fix command syntax parsing error (bug #60882) John W. Eaton <jwe@octave.org> parents: 29759 diff changeset	3584
0b01806bb663 fix command syntax parsing error (bug #60882) John W. Eaton <jwe@octave.org> parents: 29759 diff changeset	3585 m_lexer.mark_as_variables (lhs->variable_names ());
0b01806bb663 fix command syntax parsing error (bug #60882) John W. Eaton <jwe@octave.org> parents: 29759 diff changeset	3586
0b01806bb663 fix command syntax parsing error (bug #60882) John W. Eaton <jwe@octave.org> parents: 29759 diff changeset	3587 retval = new tree_complex_for_command (lhs, expr, body,
0b01806bb663 fix command syntax parsing error (bug #60882) John W. Eaton <jwe@octave.org> parents: 29759 diff changeset	3588 lc, tc, 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	3589 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3590 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3591 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3592 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3593 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3594 delete expr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3595 delete maxproc;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3596 delete body;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3597
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3598 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	3599 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3600
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3601 return retval;
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3604 // 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	3605
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3606 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3607 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	3608 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3609 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	3610 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	3611
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3612 if (! m_lexer.m_looping)
22785 9c6661004167 error if break statement is in script file separate from loop (bug #39168) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	3613 {
26998 258195ea1a76 Simplify error messages when break or continue statements fail to parse (bug #55995). Rik <rik@octave.org> parents: 26981 diff changeset	3614 bison_error ("break must appear within a loop");
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3615 return nullptr;
22785 9c6661004167 error if break statement is in script file separate from loop (bug #39168) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	3616 }
9c6661004167 error if break statement is in script file separate from loop (bug #39168) John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	3617 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	3618 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	3619 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3620
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3621 // 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	3622
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3623 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3624 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	3625 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3626 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	3627 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	3628
26981 12532d392693 error if continue is used outside of a for loop (bug #55995) John W. Eaton <jwe@octave.org> parents: 26906 diff changeset	3629 if (! m_lexer.m_looping)
12532d392693 error if continue is used outside of a for loop (bug #55995) John W. Eaton <jwe@octave.org> parents: 26906 diff changeset	3630 {
26998 258195ea1a76 Simplify error messages when break or continue statements fail to parse (bug #55995). Rik <rik@octave.org> parents: 26981 diff changeset	3631 bison_error ("continue must appear within a loop");
26981 12532d392693 error if continue is used outside of a for loop (bug #55995) John W. Eaton <jwe@octave.org> parents: 26906 diff changeset	3632 return nullptr;
12532d392693 error if continue is used outside of a for loop (bug #55995) John W. Eaton <jwe@octave.org> parents: 26906 diff changeset	3633 }
12532d392693 error if continue is used outside of a for loop (bug #55995) John W. Eaton <jwe@octave.org> parents: 26906 diff changeset	3634 else
12532d392693 error if continue is used outside of a for loop (bug #55995) John W. Eaton <jwe@octave.org> parents: 26906 diff changeset	3635 return new tree_continue_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	3636 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3637
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3638 // 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	3639
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3640 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3641 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	3642 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3643 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	3644 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	3645
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3646 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	3647 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3648
28518 b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	3649 // Build an spmd command.
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	3650
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	3651 tree_spmd_command *
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	3652 base_parser::make_spmd_command (token spmd_tok, tree_statement_list body,
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	3653 token end_tok, comment_list lc,
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	3654 comment_list *tc)
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	3655 {
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	3656 tree_spmd_command *retval = nullptr;
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	3657
28522 a5541f5a78dd make parsing of spmd and endspmd keywords work properly (bug #58676) John W. Eaton <jwe@octave.org> parents: 28518 diff changeset	3658 if (end_token_ok (end_tok, token::spmd_end))
28518 b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	3659 {
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	3660 int l = spmd_tok->line ();
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	3661 int c = spmd_tok->column ();
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	3662
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	3663 retval = new tree_spmd_command (body, lc, tc, l, c);
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	3664 }
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	3665 else
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	3666 {
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	3667 delete body;
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	3668 delete lc;
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	3669 delete tc;
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	3670
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	3671 end_token_error (end_tok, token::spmd_end);
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	3672 }
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	3673
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	3674 return retval;
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	3675 }
b8ab8b58547d accept spmd command blocks as language elements (bug #58676) John W. Eaton <jwe@octave.org> parents: 28517 diff changeset	3676
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3677 // 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	3678
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3679 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	3680 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	3681 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	3682 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3683 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	3684
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3685 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	3686
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3687 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	3688 }
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 // 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	3691
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3692 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	3693 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	3694 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	3695 token *end_tok,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	3696 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	3697 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3698 tree_if_command *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3699
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3700 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	3701 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3702 comment_list *tc = m_lexer.m_comment_buf.get_comment ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3703
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3704 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	3705 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	3706
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3707 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	3708 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3709 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	3710
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3711 if (elt)
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 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	3714 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	3715 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3716 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3717
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3718 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	3719 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3720 else
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 delete list;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3723
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3724 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	3725 }
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 return retval;
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3730 // 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	3731
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3732 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	3733 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	3734 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	3735 tree_statement_list *list,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	3736 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	3737 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3738 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	3739
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3740 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	3741 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	3742
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3743 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	3744 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3745
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3746 // 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	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_switch_command *
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_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	3750 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	3751 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	3752 token *end_tok,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	3753 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	3754 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3755 tree_switch_command *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3756
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3757 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	3758 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3759 comment_list *tc = m_lexer.m_comment_buf.get_comment ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3760
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3761 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	3762 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	3763
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3764 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	3765 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3766 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	3767
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3768 if (elt)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3769 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3770 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	3771 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	3772 }
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3775 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	3776 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3777 else
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 delete expr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3780 delete list;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3781
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3782 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	3783 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3784
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3785 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3786 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3787
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3788 // 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	3789
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3790 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	3791 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	3792 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	3793 tree_statement_list *list,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	3794 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	3795 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3796 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	3797
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3798 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	3799 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	3800
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3801 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	3802 }
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 // 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	3805
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3806 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3807 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	3808 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	3809 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3810 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	3811
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3812 switch (op)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3813 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3814 case '=':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3815 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	3816 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3817
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3818 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	3819 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	3820 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3821
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3822 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	3823 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	3824 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3825
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3826 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	3827 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	3828 break;
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 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	3831 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	3832 break;
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 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	3835 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	3836 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3837
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3838 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	3839 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	3840 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3841
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3842 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	3843 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	3844 break;
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 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	3847 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	3848 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3849
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3850 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	3851 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	3852 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3853
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3854 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	3855 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	3856 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3857
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3858 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	3859 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	3860 break;
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 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	3863 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	3864 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3865
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3866 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3867 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3868 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3869 }
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 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	3872 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	3873
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3874 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	3875 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3876 // 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	3877 // '=', not '+=', etc.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3878
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3879 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3880 delete rhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3881
27778 2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	3882 bison_error ("computed multiple assignment not allowed",
2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	3883 eq_tok->beg_pos ());
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3884
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3885 return nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3886 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3887
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3888 if (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	3889 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3890 // 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	3891
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3892 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	3893
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3894 if ((tmp->is_identifier () \|\| tmp->is_index_expression ())
26059 da2bbcf1fbcd Deprecate C++ function is_keyword in favor of iskeyword for readability. Rik <rik@octave.org> parents: 26040 diff changeset	3895 && iskeyword (tmp->name ()))
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3896 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3897 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	3898
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3899 delete tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3900 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3901 delete rhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3902
27778 2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	3903 bison_error ("invalid assignment to keyword \"" + kw + "\"",
2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	3904 eq_tok->beg_pos ());
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3905
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3906 return nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	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 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3910
29857 0b01806bb663 fix command syntax parsing error (bug #60882) John W. Eaton <jwe@octave.org> parents: 29759 diff changeset	3911 m_lexer.mark_as_variable (tmp->name ());
0b01806bb663 fix command syntax parsing error (bug #60882) John W. Eaton <jwe@octave.org> parents: 29759 diff changeset	3912
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3913 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	3914 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3915 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3916 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3917 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	3918
22872 551ac93c984c maint: Use C++ range feature to simplify some for loops in libinterp/parse-tree Rik <rik@octave.org> parents: 22785 diff changeset	3919 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	3920 {
26059 da2bbcf1fbcd Deprecate C++ function is_keyword in favor of iskeyword for readability. Rik <rik@octave.org> parents: 26040 diff changeset	3921 if (iskeyword (kw))
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3922 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3923 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3924 delete rhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3925
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3926 bison_error ("invalid assignment to keyword \"" + kw + "\"",
27778 2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	3927 eq_tok->beg_pos ());
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3928
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	3929 return nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3930 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3931 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3932
29857 0b01806bb663 fix command syntax parsing error (bug #60882) John W. Eaton <jwe@octave.org> parents: 29759 diff changeset	3933 m_lexer.mark_as_variables (names);
0b01806bb663 fix command syntax parsing error (bug #60882) John W. Eaton <jwe@octave.org> parents: 29759 diff changeset	3934
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3935 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	3936 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3937 }
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 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3940 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	3941 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	3942 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3943 if (! cmds)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3944 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	3945
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3946 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	3947
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3948 symbol_scope script_scope = m_lexer.m_symtab_context.curr_scope ();
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3949
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3950 script_scope.cache_name (m_lexer.m_fcn_file_full_name);
28026 262cdfc6faf9 allow reloading of handles to private functions (bug #57439) John W. Eaton <jwe@octave.org> parents: 27957 diff changeset	3951 script_scope.cache_fcn_file_name (m_lexer.m_fcn_file_full_name);
262cdfc6faf9 allow reloading of handles to private functions (bug #57439) John W. Eaton <jwe@octave.org> parents: 27957 diff changeset	3952 script_scope.cache_dir_name (m_lexer.m_dir_name);
24063 c81ed514ca2c give script scopes names John W. Eaton <jwe@octave.org> parents: 24045 diff changeset	3953
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3954 octave_user_script *script
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3955 = new octave_user_script (m_lexer.m_fcn_file_full_name,
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3956 m_lexer.m_fcn_file_name, script_scope,
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3957 cmds, m_lexer.m_help_text);
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3958
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3959 m_lexer.m_symtab_context.pop ();
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	3960 m_lexer.m_help_text = "";
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3961
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	3962 sys::time now;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3963
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3964 script->stash_fcn_file_time (now);
27745 7a45100a40c4 allow private scripts to be called from other private scripts John W. Eaton <jwe@octave.org> parents: 27736 diff changeset	3965 script->stash_dir_name (m_lexer.m_dir_name);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3966
27505 c409d16b7190 eliminate some uses of bare pointers to octave_function objects John W. Eaton <jwe@octave.org> parents: 27504 diff changeset	3967 m_primary_fcn = octave_value (script);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3968 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3969
27510 5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	3970 tree_identifier *
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	3971 base_parser::make_fcn_name (tree_identifier *id)
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	3972 {
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	3973 std::string id_name = id->name ();
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	3974
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	3975 // Make classdef local functions unique from classdef methods.
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	3976
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	3977 if (m_parsing_local_functions && m_curr_fcn_depth == 0)
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	3978 id_name = m_lexer.m_fcn_file_name + ">" + id_name;
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	3979
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	3980 if (! m_function_scopes.name_current_scope (id_name))
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	3981 {
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	3982 bison_error ("duplicate subfunction or nested function name",
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	3983 id->line (), id->column ());
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	3984
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	3985 delete id;
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	3986 return nullptr;
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	3987 }
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	3988
28857 43ad651cf5a0 eliminate unnecessary uses of octave:: namespace qualifier John W. Eaton <jwe@octave.org> parents: 28851 diff changeset	3989 symbol_scope curr_scope = m_lexer.m_symtab_context.curr_scope ();
27510 5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	3990 curr_scope.cache_name (id_name);
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	3991
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	3992 m_lexer.m_parsed_function_name.top () = true;
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	3993 m_lexer.m_maybe_classdef_get_set_method = false;
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	3994
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	3995 return id;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3996 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3997
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3998 // Define a function.
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	3999
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4000 // FIXME: combining start_function, finish_function, and
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4001 // recover_from_parsing_function should be possible, but it makes
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4002 // for a large mess. Maybe this could be a bit better organized?
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4003
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4004 tree_function_def *
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4005 base_parser::make_function (token *fcn_tok,
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4006 tree_parameter_list *ret_list,
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4007 tree_identifier *id,
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4008 tree_parameter_list *param_list,
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4009 tree_statement_list *body,
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4010 tree_statement *end_fcn_stmt,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	4011 comment_list *lc)
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4012 {
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4013 int l = fcn_tok->line ();
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4014 int c = fcn_tok->column ();
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4015
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4016 octave_user_function *tmp_fcn
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4017 = start_function (id, param_list, body, end_fcn_stmt);
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4018
26404 abca0c2690b7 oct-parse.yy: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	4019 tree_function_def *retval = finish_function (ret_list, tmp_fcn, lc, l, c);
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4020
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4021 recover_from_parsing_function ();
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4022
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4023 return retval;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4024 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4025
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4026 // 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	4027
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4028 octave_user_function *
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4029 base_parser::start_function (tree_identifier *id,
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4030 tree_parameter_list *param_list,
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4031 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	4032 tree_statement *end_fcn_stmt)
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	4033 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4034 // 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	4035
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4036 std::string id_name = id->name ();
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4037
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4038 delete id;
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4039
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4040 if (m_lexer.m_parsing_classdef_get_method)
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4041 id_name.insert (0, "get.");
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4042 else if (m_lexer.m_parsing_classdef_set_method)
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4043 id_name.insert (0, "set.");
1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4044
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4045 m_lexer.m_parsing_classdef_get_method = false;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4046 m_lexer.m_parsing_classdef_set_method = false;
23673 1d1ce4df5255 refactor bison rules for parsing functions John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	4047
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4048 if (! body)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4049 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	4050
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4051 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	4052
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4053 octave_user_function *fcn
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4054 = new octave_user_function (m_lexer.m_symtab_context.curr_scope (),
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	4055 param_list, nullptr, body);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4056
26369 0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26149 diff changeset	4057 comment_list *tc = m_lexer.m_comment_buf.get_comment ();
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26149 diff changeset	4058
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26149 diff changeset	4059 fcn->stash_trailing_comment (tc);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26149 diff changeset	4060 fcn->stash_fcn_end_location (end_fcn_stmt->line (),
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26149 diff changeset	4061 end_fcn_stmt->column ());
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4062
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4063 // 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	4064 // 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	4065 // 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	4066 // name).
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4067 if (! m_autoloading && m_lexer.m_reading_fcn_file
26060 edcb09d4b1f5 store nesting depth and primary parent info in nested function scopes John W. Eaton <jwe@octave.org> parents: 26059 diff changeset	4068 && m_curr_fcn_depth == 0 && ! m_parsing_subfunctions)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4069 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4070 // FIXME: should m_lexer.m_fcn_file_name already be
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4071 // 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	4072 // 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	4073
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4074 std::string nm = m_lexer.m_fcn_file_name;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4075
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	4076 std::size_t pos = nm.find_last_of (sys::file_ops::dir_sep_chars ());
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4077
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4078 if (pos != std::string::npos)
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4079 nm = m_lexer.m_fcn_file_name.substr (pos+1);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4080
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4081 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	4082 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4083 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	4084 ("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	4085 "function name '%s' does not agree with function filename '%s'",
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4086 id_name.c_str (), m_lexer.m_fcn_file_full_name.c_str ());
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4087
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4088 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	4089 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4090 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4091
28700 7d63f42e94be allow keboard to work in functions defined in script files (bug #54789) John W. Eaton <jwe@octave.org> parents: 28698 diff changeset	4092 sys::time now;
7d63f42e94be allow keboard to work in functions defined in script files (bug #54789) John W. Eaton <jwe@octave.org> parents: 28698 diff changeset	4093
7d63f42e94be allow keboard to work in functions defined in script files (bug #54789) John W. Eaton <jwe@octave.org> parents: 28698 diff changeset	4094 fcn->stash_fcn_file_name (m_lexer.m_fcn_file_full_name);
7d63f42e94be allow keboard to work in functions defined in script files (bug #54789) John W. Eaton <jwe@octave.org> parents: 28698 diff changeset	4095 fcn->stash_fcn_file_time (now);
7d63f42e94be allow keboard to work in functions defined in script files (bug #54789) John W. Eaton <jwe@octave.org> parents: 28698 diff changeset	4096 fcn->stash_dir_name (m_lexer.m_dir_name);
7d63f42e94be allow keboard to work in functions defined in script files (bug #54789) John W. Eaton <jwe@octave.org> parents: 28698 diff changeset	4097 fcn->stash_package_name (m_lexer.m_package_name);
7d63f42e94be allow keboard to work in functions defined in script files (bug #54789) John W. Eaton <jwe@octave.org> parents: 28698 diff changeset	4098 fcn->mark_as_system_fcn_file ();
7d63f42e94be allow keboard to work in functions defined in script files (bug #54789) John W. Eaton <jwe@octave.org> parents: 28698 diff changeset	4099 fcn->stash_function_name (id_name);
7d63f42e94be allow keboard to work in functions defined in script files (bug #54789) John W. Eaton <jwe@octave.org> parents: 28698 diff changeset	4100
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4101 if (m_lexer.m_reading_fcn_file \|\| m_lexer.m_reading_classdef_file \|\| m_autoloading)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4102 {
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	4103 if (m_fcn_file_from_relative_lookup)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4104 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	4105
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4106 if (m_lexer.m_parsing_class_method)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4107 {
26794 287eba9ed14b refactor predicates for classdef methods/constructors John W. Eaton <jwe@octave.org> parents: 26740 diff changeset	4108 if (m_lexer.m_parsing_classdef)
287eba9ed14b refactor predicates for classdef methods/constructors John W. Eaton <jwe@octave.org> parents: 26740 diff changeset	4109 {
287eba9ed14b refactor predicates for classdef methods/constructors John W. Eaton <jwe@octave.org> parents: 26740 diff changeset	4110 if (m_curr_class_name == id_name)
26799 0b17abf0ee9d fix error introduced in changeset 287eba9ed14b John W. Eaton <jwe@octave.org> parents: 26794 diff changeset	4111 fcn->mark_as_classdef_constructor ();
26794 287eba9ed14b refactor predicates for classdef methods/constructors John W. Eaton <jwe@octave.org> parents: 26740 diff changeset	4112 else
26799 0b17abf0ee9d fix error introduced in changeset 287eba9ed14b John W. Eaton <jwe@octave.org> parents: 26794 diff changeset	4113 fcn->mark_as_classdef_method ();
26794 287eba9ed14b refactor predicates for classdef methods/constructors John W. Eaton <jwe@octave.org> parents: 26740 diff changeset	4114 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4115 else
26794 287eba9ed14b refactor predicates for classdef methods/constructors John W. Eaton <jwe@octave.org> parents: 26740 diff changeset	4116 {
287eba9ed14b refactor predicates for classdef methods/constructors John W. Eaton <jwe@octave.org> parents: 26740 diff changeset	4117 if (m_curr_class_name == id_name)
26799 0b17abf0ee9d fix error introduced in changeset 287eba9ed14b John W. Eaton <jwe@octave.org> parents: 26794 diff changeset	4118 fcn->mark_as_legacy_constructor ();
26794 287eba9ed14b refactor predicates for classdef methods/constructors John W. Eaton <jwe@octave.org> parents: 26740 diff changeset	4119 else
26799 0b17abf0ee9d fix error introduced in changeset 287eba9ed14b John W. Eaton <jwe@octave.org> parents: 26794 diff changeset	4120 fcn->mark_as_legacy_method ();
26794 287eba9ed14b refactor predicates for classdef methods/constructors John W. Eaton <jwe@octave.org> parents: 26740 diff changeset	4121 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4122
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	4123 fcn->stash_dispatch_class (m_curr_class_name);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4124 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4125
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4126 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	4127
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	4128 sys::file_stat fs (nm);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4129
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4130 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	4131 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	4132 "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	4133 }
25994 f881d3e271d2 eliminate global and file-scope static variables in oct-hist.cc John W. Eaton <jwe@octave.org> parents: 25830 diff changeset	4134 else if (! m_lexer.input_from_tmp_history_file ()
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4135 && ! m_lexer.m_force_script
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4136 && m_lexer.m_reading_script_file
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4137 && m_lexer.m_fcn_file_name == id_name)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4138 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4139 warning ("function '%s' defined within script file '%s'",
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4140 id_name.c_str (), m_lexer.m_fcn_file_full_name.c_str ());
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4141 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4142
24297 9a1b193ddd01 Recognize docstrings from subfunctions (bug #46008). Rik <rik@octave.org> parents: 24283 diff changeset	4143 // Record help text for functions other than nested functions.
9a1b193ddd01 Recognize docstrings from subfunctions (bug #46008). Rik <rik@octave.org> parents: 24283 diff changeset	4144 // We cannot currently record help for nested functions (bug #46008)
9a1b193ddd01 Recognize docstrings from subfunctions (bug #46008). Rik <rik@octave.org> parents: 24283 diff changeset	4145 // because the doc_string of the outermost function is read first,
9a1b193ddd01 Recognize docstrings from subfunctions (bug #46008). Rik <rik@octave.org> parents: 24283 diff changeset	4146 // whereas this function is called for the innermost function first.
9a1b193ddd01 Recognize docstrings from subfunctions (bug #46008). Rik <rik@octave.org> parents: 24283 diff changeset	4147 // We could have a stack of help_text in lexer.
26060 edcb09d4b1f5 store nesting depth and primary parent info in nested function scopes John W. Eaton <jwe@octave.org> parents: 26059 diff changeset	4148 if (! m_lexer.m_help_text.empty () && m_curr_fcn_depth == 0)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4149 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4150 fcn->document (m_lexer.m_help_text);
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4151
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4152 m_lexer.m_help_text = "";
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4153 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4154
26060 edcb09d4b1f5 store nesting depth and primary parent info in nested function scopes John W. Eaton <jwe@octave.org> parents: 26059 diff changeset	4155 if (m_lexer.m_reading_fcn_file && m_curr_fcn_depth == 0
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	4156 && ! m_parsing_subfunctions)
27505 c409d16b7190 eliminate some uses of bare pointers to octave_function objects John W. Eaton <jwe@octave.org> parents: 27504 diff changeset	4157 m_primary_fcn = octave_value (fcn);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4158
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4159 return fcn;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4160 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4161
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4162 tree_statement *
27778 2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	4163 base_parser::make_end (const std::string& type, bool eof,
2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	4164 const filepos& beg_pos, const filepos& /end_pos/)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4165 {
27778 2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	4166 int l = beg_pos.line ();
2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	4167 int c = beg_pos.column ();
2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	4168
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4169 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	4170 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4171
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4172 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	4173 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	4174 octave_user_function *fcn,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	4175 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	4176 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	4177 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	4178 tree_function_def *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4179
28545 3dae50cf0bc5 don't allow function return_list objects to be null John W. Eaton <jwe@octave.org> parents: 28511 diff changeset	4180 if (! ret_list)
3dae50cf0bc5 don't allow function return_list objects to be null John W. Eaton <jwe@octave.org> parents: 28511 diff changeset	4181 ret_list = new tree_parameter_list (tree_parameter_list::out);
3dae50cf0bc5 don't allow function return_list objects to be null John W. Eaton <jwe@octave.org> parents: 28511 diff changeset	4182
3dae50cf0bc5 don't allow function return_list objects to be null John W. Eaton <jwe@octave.org> parents: 28511 diff changeset	4183 ret_list->mark_as_formal_parameters ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4184
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4185 if (fcn)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4186 {
28432 71c34141cc2d refactor handling of parent functions and localfunctions John W. Eaton <jwe@octave.org> parents: 28407 diff changeset	4187 std::string fcn_nm = fcn->name ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4188 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	4189
28432 71c34141cc2d refactor handling of parent functions and localfunctions John W. Eaton <jwe@octave.org> parents: 28407 diff changeset	4190 std::string tmp = fcn_nm;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4191 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	4192 tmp += ": " + file;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4193
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	4194 symbol_scope fcn_scope = fcn->scope ();
8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	4195 fcn_scope.cache_name (tmp);
28432 71c34141cc2d refactor handling of parent functions and localfunctions John W. Eaton <jwe@octave.org> parents: 28407 diff changeset	4196 fcn_scope.cache_fcn_name (fcn_nm);
28026 262cdfc6faf9 allow reloading of handles to private functions (bug #57439) John W. Eaton <jwe@octave.org> parents: 27957 diff changeset	4197 fcn_scope.cache_fcn_file_name (file);
262cdfc6faf9 allow reloading of handles to private functions (bug #57439) John W. Eaton <jwe@octave.org> parents: 27957 diff changeset	4198 fcn_scope.cache_dir_name (m_lexer.m_dir_name);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4199
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4200 if (lc)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4201 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	4202
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4203 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	4204
26060 edcb09d4b1f5 store nesting depth and primary parent info in nested function scopes John W. Eaton <jwe@octave.org> parents: 26059 diff changeset	4205 if (m_curr_fcn_depth > 0 \|\| m_parsing_subfunctions)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4206 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4207 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	4208
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	4209 octave_value ov_fcn (fcn);
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23603 diff changeset	4210
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	4211 if (m_endfunction_found && m_function_scopes.size () > 1)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4212 {
24705 8b346a19108e mark objects as nested or subfunctions when parsing John W. Eaton <jwe@octave.org> parents: 24624 diff changeset	4213 fcn->mark_as_nested_function ();
26060 edcb09d4b1f5 store nesting depth and primary parent info in nested function scopes John W. Eaton <jwe@octave.org> parents: 26059 diff changeset	4214 fcn_scope.set_nesting_depth (m_curr_fcn_depth);
24705 8b346a19108e mark objects as nested or subfunctions when parsing John W. Eaton <jwe@octave.org> parents: 24624 diff changeset	4215
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	4216 symbol_scope pscope = m_function_scopes.parent_scope ();
24705 8b346a19108e mark objects as nested or subfunctions when parsing John W. Eaton <jwe@octave.org> parents: 24624 diff changeset	4217 fcn_scope.set_parent (pscope);
26060 edcb09d4b1f5 store nesting depth and primary parent info in nested function scopes John W. Eaton <jwe@octave.org> parents: 26059 diff changeset	4218 fcn_scope.set_primary_parent (m_primary_fcn_scope);
30108 3efce22b7350 eliminate duplicate parent function name info in symbol scope objects John W. Eaton <jwe@octave.org> parents: 30105 diff changeset	4219
28432 71c34141cc2d refactor handling of parent functions and localfunctions John W. Eaton <jwe@octave.org> parents: 28407 diff changeset	4220 pscope.install_nestfunction (fcn_nm, ov_fcn, fcn_scope);
71c34141cc2d refactor handling of parent functions and localfunctions John W. Eaton <jwe@octave.org> parents: 28407 diff changeset	4221
71c34141cc2d refactor handling of parent functions and localfunctions John W. Eaton <jwe@octave.org> parents: 28407 diff changeset	4222 // For nested functions, the list of parent functions is
71c34141cc2d refactor handling of parent functions and localfunctions John W. Eaton <jwe@octave.org> parents: 28407 diff changeset	4223 // set in symbol_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	4224 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4225 else
22974 ecc5eeada8dc Don't mark nested functions in primary function as subfunctions. Rik <rik@octave.org> parents: 22880 diff changeset	4226 {
ecc5eeada8dc Don't mark nested functions in primary function as subfunctions. Rik <rik@octave.org> parents: 22880 diff changeset	4227 fcn->mark_as_subfunction ();
28432 71c34141cc2d refactor handling of parent functions and localfunctions John W. Eaton <jwe@octave.org> parents: 28407 diff changeset	4228 m_subfunction_names.push_back (fcn_nm);
30108 3efce22b7350 eliminate duplicate parent function name info in symbol scope objects John W. Eaton <jwe@octave.org> parents: 30105 diff changeset	4229
24705 8b346a19108e mark objects as nested or subfunctions when parsing John W. Eaton <jwe@octave.org> parents: 24624 diff changeset	4230 fcn_scope.set_parent (m_primary_fcn_scope);
28432 71c34141cc2d refactor handling of parent functions and localfunctions John W. Eaton <jwe@octave.org> parents: 28407 diff changeset	4231 if (m_parsing_subfunctions)
71c34141cc2d refactor handling of parent functions and localfunctions John W. Eaton <jwe@octave.org> parents: 28407 diff changeset	4232 fcn_scope.set_primary_parent (m_primary_fcn_scope);
30108 3efce22b7350 eliminate duplicate parent function name info in symbol scope objects John W. Eaton <jwe@octave.org> parents: 30105 diff changeset	4233
28432 71c34141cc2d refactor handling of parent functions and localfunctions John W. Eaton <jwe@octave.org> parents: 28407 diff changeset	4234 m_primary_fcn_scope.install_subfunction (fcn_nm, ov_fcn);
24705 8b346a19108e mark objects as nested or subfunctions when parsing John W. Eaton <jwe@octave.org> parents: 24624 diff changeset	4235 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4236 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4237
26060 edcb09d4b1f5 store nesting depth and primary parent info in nested function scopes John W. Eaton <jwe@octave.org> parents: 26059 diff changeset	4238 if (m_curr_fcn_depth == 0)
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	4239 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	4240
26060 edcb09d4b1f5 store nesting depth and primary parent info in nested function scopes John W. Eaton <jwe@octave.org> parents: 26059 diff changeset	4241 if (! m_lexer.m_reading_fcn_file && m_curr_fcn_depth == 0)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4242 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4243 // 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	4244 // 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	4245 // 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	4246 // 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	4247 // 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	4248 // or as the primary function for the file, via
27505 c409d16b7190 eliminate some uses of bare pointers to octave_function objects John W. Eaton <jwe@octave.org> parents: 27504 diff changeset	4249 // m_primary_fcn (see also load_fcn_from_file,,
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4250 // parse_fcn_file, and
24270 bc3819b7cca1 don't use symbol_table:: nesting for symbol_record, symbol_scope, or fcn_info John W. Eaton <jwe@octave.org> parents: 24216 diff changeset	4251 // fcn_info::fcn_info_rep::find_user_function).
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4252
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4253 if (m_lexer.m_buffer_function_text)
23730 85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23705 diff changeset	4254 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4255 fcn->cache_function_text (m_lexer.m_function_text,
23730 85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23705 diff changeset	4256 fcn->time_parsed ());
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4257 m_lexer.m_buffer_function_text = false;
23730 85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23705 diff changeset	4258 }
85f1d31956c0 make echo work for command-line functions John W. Eaton <jwe@octave.org> parents: 23705 diff changeset	4259
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4260 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	4261 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4262 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4263
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4264 return retval;
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
29724 c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4267 tree_arguments_block *
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4268 base_parser::make_arguments_block (token *arguments_tok,
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4269 tree_args_block_attribute_list *attr_list,
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4270 tree_args_block_validation_list *validation_list,
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4271 token *end_tok,
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4272 comment_list lc, comment_list tc)
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4273 {
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4274 tree_arguments_block *retval = nullptr;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4275
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4276 if (end_token_ok (end_tok, token::arguments_end))
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4277 {
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4278 filepos beg_pos = arguments_tok->beg_pos ();
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4279
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4280 int l = beg_pos.line ();
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4281 int c = beg_pos.column ();
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4282
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4283 retval = new tree_arguments_block (attr_list, validation_list, l, c);
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4284 }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4285 else
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4286 {
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4287 delete attr_list;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4288 delete validation_list;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4289
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4290 delete lc;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4291 delete tc;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4292 }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4293
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4294 return retval;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4295 }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4296
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4297 tree_arg_validation *
29729 d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	4298 base_parser::make_arg_validation (tree_arg_size_spec *size_spec,
29724 c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4299 tree_identifier *class_name,
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4300 tree_arg_validation_fcns *validation_fcns,
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4301 tree_expression *default_value)
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4302 {
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4303 // FIXME: Validate arguments and convert to more specific types
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4304 // (std::string for arg_name and class_name, etc).
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4305
29729 d0ce7260978d also accept validation syntax for classdef properties John W. Eaton <jwe@octave.org> parents: 29728 diff changeset	4306 return new tree_arg_validation (size_spec, class_name,
29724 c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4307 validation_fcns, default_value);
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4308 }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4309
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4310 tree_args_block_attribute_list *
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4311 base_parser::make_args_attribute_list (tree_identifier *attribute_name)
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4312 {
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4313 // FIXME: Validate argument and convert to more specific type
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4314 // (std::string for attribute_name).
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4315
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4316 return new tree_args_block_attribute_list (attribute_name);
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4317 }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4318
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4319 tree_args_block_validation_list *
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4320 base_parser::make_args_validation_list (tree_arg_validation *arg_validation)
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4321 {
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4322 return new tree_args_block_validation_list (arg_validation);
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4323 }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4324
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4325 tree_args_block_validation_list *
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4326 base_parser::append_args_validation_list (tree_args_block_validation_list *list,
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4327 tree_arg_validation *arg_validation)
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4328 {
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4329 list->append (arg_validation);
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4330
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4331 return list;
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4332 }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4333
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4334 tree_arg_size_spec *
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4335 base_parser::make_arg_size_spec (tree_argument_list *size_args)
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4336 {
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4337 // FIXME: Validate argument.
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4338
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4339 return new tree_arg_size_spec (size_args);
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4340 }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4341
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4342 tree_arg_validation_fcns *
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4343 base_parser::make_arg_validation_fcns (tree_argument_list *fcn_args)
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4344 {
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4345 // FIXME: Validate argument.
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4346
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4347 return new tree_arg_validation_fcns (fcn_args);
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4348 }
c19f8cbe0fd5 initial implementation of parsing for arguments validaton block (bug #59405) John W. Eaton <jwe@octave.org> parents: 29723 diff changeset	4349
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4350 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4351 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	4352 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4353 m_lexer.m_symtab_context.pop ();
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4354
26060 edcb09d4b1f5 store nesting depth and primary parent info in nested function scopes John W. Eaton <jwe@octave.org> parents: 26059 diff changeset	4355 if (m_lexer.m_reading_fcn_file && m_curr_fcn_depth == 0
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	4356 && ! m_parsing_subfunctions)
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	4357 m_parsing_subfunctions = true;
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	4358
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	4359 m_curr_fcn_depth--;
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	4360 m_function_scopes.pop ();
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	4361
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4362 m_lexer.m_defining_func--;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4363 m_lexer.m_parsed_function_name.pop ();
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4364 m_lexer.m_looking_at_return_list = false;
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4365 m_lexer.m_looking_at_parameter_list = false;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4366 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4367
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4368 // 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	4369 // 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	4370 // 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	4371 // 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	4372 // 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	4373
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4374 // LC contains comments appearing before the classdef keyword.
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4375 // TC contains comments appearing between the classdef elements
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4376 // and the final end token for the classdef block.
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4377
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4378 tree_classdef *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4379 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	4380 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	4381 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	4382 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	4383 tree_classdef_body body, token end_tok,
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4384 comment_list lc, comment_list tc)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4385 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	4386 tree_classdef *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4387
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4388 m_lexer.m_symtab_context.pop ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4389
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4390 std::string cls_name = id->name ();
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	4391
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4392 std::string nm = m_lexer.m_fcn_file_name;
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	4393
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	4394 std::size_t pos = nm.find_last_of (sys::file_ops::dir_sep_chars ());
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	4395
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	4396 if (pos != std::string::npos)
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4397 nm = m_lexer.m_fcn_file_name.substr (pos+1);
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	4398
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4399 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	4400 {
27050 69082b3b99a0 use correct line in classdef file name mismatch error message (bug #55812) John W. Eaton <jwe@octave.org> parents: 27049 diff changeset	4401 int l = id->line ();
69082b3b99a0 use correct line in classdef file name mismatch error message (bug #55812) John W. Eaton <jwe@octave.org> parents: 27049 diff changeset	4402 int c = id->column ();
69082b3b99a0 use correct line in classdef file name mismatch error message (bug #55812) John W. Eaton <jwe@octave.org> parents: 27049 diff changeset	4403
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4404 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4405 delete id;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4406 delete sc;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4407 delete body;
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4408 delete lc;
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4409 delete tc;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4410
27050 69082b3b99a0 use correct line in classdef file name mismatch error message (bug #55812) John W. Eaton <jwe@octave.org> parents: 27049 diff changeset	4411 bison_error ("invalid classdef definition, the class name must match the filename", 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	4412
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4413 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4414 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4415 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4416 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	4417 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4418 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	4419 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	4420
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4421 if (! body)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4422 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	4423
27189 946c6f117091 use dummy stack frame when creating meta class (bug #55766 and #55768) John W. Eaton <jwe@octave.org> parents: 27165 diff changeset	4424 retval = new tree_classdef (m_lexer.m_symtab_context.curr_scope (),
946c6f117091 use dummy stack frame when creating meta class (bug #55766 and #55768) John W. Eaton <jwe@octave.org> parents: 27165 diff changeset	4425 a, id, sc, body, lc, tc,
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	4426 m_curr_package_name, l, c);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4427 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4428 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4429 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4430 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4431 delete id;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4432 delete sc;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4433 delete body;
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4434 delete lc;
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4435 delete tc;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4436
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4437 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	4438 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4439 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4440
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4441 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4442 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4443
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4444 // LC contains comments appearing before the properties keyword.
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4445 // If this properties block appears first in the list of classdef
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4446 // elements, this comment list will be used for the help text for the
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4447 // classdef block.
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4448
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4449 // TC contains comments appearing between the list of properties
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4450 // and the final end token for the properties block and may be used to
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4451 // find the doc string for the final property in the list.
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4452
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4453 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	4454 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	4455 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	4456 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	4457 token *end_tok,
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4458 comment_list *lc,
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4459 comment_list *tc)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4460 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	4461 tree_classdef_properties_block *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4462
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4463 if (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	4464 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4465 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	4466 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	4467
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4468 if (plist)
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4469 {
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4470 // If the element at the end of the list doesn't have a doc
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4471 // string, see whether the first element of TC is an
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4472 // end-of-line comment for us to use.
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4473
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4474 if (tc)
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4475 {
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4476 tree_classdef_property *last_elt = plist->back ();
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4477
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4478 if (! last_elt->have_doc_string ())
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4479 {
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4480 comment_elt first_comment_elt = tc->front ();
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4481
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4482 if (first_comment_elt.is_end_of_line ())
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4483 {
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4484 std::string eol_comment = first_comment_elt.text ();
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4485
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4486 last_elt->doc_string (eol_comment);
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4487 }
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4488 }
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4489 }
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4490 }
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4491 else
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4492 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	4493
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4494 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	4495 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4496 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4497 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4498 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4499 delete plist;
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4500 delete lc;
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4501 delete tc;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4502
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4503 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	4504 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4505
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4506 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4507 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4508
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4509 // LC contains comments appearing before the methods keyword.
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4510 // If this methods block appears first in the list of classdef
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4511 // elements, this comment list will be used for the help text for the
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4512 // classdef block.
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4513
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4514 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	4515 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	4516 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	4517 tree_classdef_methods_list *mlist,
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4518 token end_tok, comment_list lc,
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4519 comment_list *tc)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4520 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	4521 tree_classdef_methods_block *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4522
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4523 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	4524 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4525 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	4526 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	4527
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4528 if (! mlist)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4529 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	4530
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4531 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	4532 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4533 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4534 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4535 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4536 delete mlist;
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4537 delete lc;
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4538 delete tc;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4539
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4540 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	4541 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4542
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4543 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4544 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4545
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4546 // LC contains comments appearing before the events keyword.
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4547 // If this events block appears first in the list of classdef
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4548 // elements, this comment list will be used for the help text for the
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4549 // classdef block.
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4550
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4551 // TC contains comments appearing between the list of events and
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4552 // the final end token for the events block and may be used to find
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4553 // the doc string for the final event in the list.
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4554
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4555 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	4556 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	4557 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	4558 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	4559 token *end_tok,
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4560 comment_list *lc,
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4561 comment_list *tc)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4562 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	4563 tree_classdef_events_block *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4564
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4565 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	4566 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4567 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	4568 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	4569
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4570 if (! elist)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4571 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	4572
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4573 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	4574 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4575 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4576 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4577 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4578 delete elist;
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4579 delete lc;
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4580 delete tc;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4581
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4582 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	4583 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4584
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4585 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4586 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4587
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4588 // LC contains comments appearing before the enumeration keyword.
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4589 // If this enumeration block appears first in the list of classdef
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4590 // elements, this comment list will be used for the help text for the
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4591 // classdef block.
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4592
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4593 // TC contains comments appearing between the list of
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4594 // enumerations and the final end token for the enumeration block and
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4595 // may be used to find the doc string for the final enumeration in the
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4596 // list.
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4597
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4598 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	4599 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	4600 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	4601 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	4602 token *end_tok,
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4603 comment_list *lc,
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4604 comment_list *tc)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4605 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	4606 tree_classdef_enum_block *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4607
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4608 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	4609 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4610 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	4611 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	4612
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4613 if (! elist)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4614 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	4615
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4616 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	4617 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4618 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4619 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4620 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4621 delete elist;
28511 59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4622 delete lc;
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations John W. Eaton <jwe@octave.org> parents: 28509 diff changeset	4623 delete tc;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4624
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4625 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	4626 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4627
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4628 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4629 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4630
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4631 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	4632 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	4633 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	4634 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	4635 octave_user_function* retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4636
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4637 // External methods are only allowed within @-folders. In this case,
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	4638 // m_curr_class_name will be non-empty.
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	4639
4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	4640 if (! m_curr_class_name.empty ())
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4641 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4642
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4643 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	4644
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4645 // 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	4646 // - 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	4647 // - class constructor
27216 823b4bcf79fc unless necessary for formatting or code, use ' instead of ` John W. Eaton <jwe@octave.org> parents: 27189 diff changeset	4648 // - 'delete'
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4649
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4650 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	4651 && mname != "delete"
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	4652 && mname != m_curr_class_name)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4653 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4654 // 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	4655 // is loaded.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4656
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24356 diff changeset	4657 retval = new octave_user_function (symbol_scope (), pl);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4658
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4659 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	4660
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4661 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	4662 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	4663
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4664 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	4665 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4666 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4667 bison_error ("invalid external method declaration, an external "
27216 823b4bcf79fc unless necessary for formatting or code, use ' instead of ` John W. Eaton <jwe@octave.org> parents: 27189 diff changeset	4668 "method cannot be the class constructor, 'delete' "
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4669 "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	4670 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4671 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4672 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	4673
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4674 if (! retval)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4675 delete id;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4676
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4677 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4678 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4679
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4680 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	4681 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	4682 tree_parameter_list *ret_list,
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	4683 comment_list *cl)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4684 {
28545 3dae50cf0bc5 don't allow function return_list objects to be null John W. Eaton <jwe@octave.org> parents: 28511 diff changeset	4685 if (! ret_list)
3dae50cf0bc5 don't allow function return_list objects to be null John W. Eaton <jwe@octave.org> parents: 28511 diff changeset	4686 ret_list = new tree_parameter_list (tree_parameter_list::out);
3dae50cf0bc5 don't allow function return_list objects to be null John W. Eaton <jwe@octave.org> parents: 28511 diff changeset	4687
3dae50cf0bc5 don't allow function return_list objects to be null John W. Eaton <jwe@octave.org> parents: 28511 diff changeset	4688 fcn->define_ret_list (ret_list);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4689
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4690 if (cl)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4691 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	4692
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4693 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	4694 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	4695
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4696 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	4697 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4698
29864 e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4699 bool
24067 5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	4700 base_parser::finish_classdef_file (tree_classdef *cls,
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	4701 tree_statement_list *local_fcns)
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	4702 {
29864 e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4703 parse_tree_validator validator;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4704
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4705 cls->accept (validator);
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4706
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4707 if (local_fcns)
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4708 {
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4709 for (tree_statement elt : local_fcns)
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4710 {
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4711 tree_command *cmd = elt->command ();
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4712
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4713 tree_function_def *fcn_def
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4714 = dynamic_cast<tree_function_def *> (cmd);
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4715
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4716 fcn_def->accept (validator);
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4717 }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4718 }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4719
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4720 if (! validator.ok ())
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4721 {
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4722 delete cls;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4723 delete local_fcns;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4724
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4725 bison_error (validator.error_list ());
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4726
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4727 return false;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4728 }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4729
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4730 // Require all validations to succeed before installing any local
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4731 // functions or defining the classdef object for later use.
24067 5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	4732
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	4733 if (local_fcns)
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	4734 {
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	4735 symbol_table& symtab
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	4736 = __get_symbol_table__ ("base_parser::finish_classdef_file");
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	4737
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	4738 for (tree_statement elt : local_fcns)
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	4739 {
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	4740 tree_command *cmd = elt->command ();
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	4741
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	4742 tree_function_def *fcn_def
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	4743 = dynamic_cast<tree_function_def *> (cmd);
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	4744
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	4745 octave_value ov_fcn = fcn_def->function ();
29864 e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4746 octave_user_function *fcn = ov_fcn.user_function_value ();
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4747
24067 5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	4748 std::string nm = fcn->name ();
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	4749 std::string file = fcn->fcn_file_name ();
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	4750
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	4751 symtab.install_local_function (nm, ov_fcn, file);
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	4752 }
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	4753
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	4754 delete local_fcns;
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	4755 }
29864 e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4756
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4757 // FIXME: Is it possible for the following condition to be false?
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4758 if (m_lexer.m_reading_classdef_file)
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4759 m_classdef_object = std::shared_ptr<tree_classdef> (cls);
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4760
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	4761 return true;
24067 5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	4762 }
5b88383b9a69 install local functions after classdef parse is complete (bug #52080) John W. Eaton <jwe@octave.org> parents: 24063 diff changeset	4763
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4764 // 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	4765
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4766 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	4767 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	4768 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	4769 char type)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4770 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	4771 tree_index_expression *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4772
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4773 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	4774 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4775 delete expr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4776 delete args;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4777
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4778 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	4779 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4780 else
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	4781 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4782 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	4783 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	4784
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4785 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	4786 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	4787
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4788 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	4789 {
26707 f35db7d5b7a4 use dynamic_cast instead of static_cast as appropriate parser John W. Eaton <jwe@octave.org> parents: 26686 diff changeset	4790 tree_index_expression *tmp
f35db7d5b7a4 use dynamic_cast instead of static_cast as appropriate parser John W. Eaton <jwe@octave.org> parents: 26686 diff changeset	4791 = dynamic_cast<tree_index_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	4792
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4793 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	4794
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4795 retval = tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4796 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4797 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4798 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	4799 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4800
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4801 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4802 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4803
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4804 // 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	4805
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4806 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	4807 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	4808 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	4809 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	4810 tree_index_expression *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4811
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4812 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	4813 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	4814
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4815 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	4816 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	4817
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4818 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	4819 {
26707 f35db7d5b7a4 use dynamic_cast instead of static_cast as appropriate parser John W. Eaton <jwe@octave.org> parents: 26686 diff changeset	4820 tree_index_expression *tmp
f35db7d5b7a4 use dynamic_cast instead of static_cast as appropriate parser John W. Eaton <jwe@octave.org> parents: 26686 diff changeset	4821 = dynamic_cast<tree_index_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	4822
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4823 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	4824
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4825 retval = tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4826 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4827 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4828 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	4829
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4830 m_lexer.m_looking_at_indirect_ref = false;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4831
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4832 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4833 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4834
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4835 // 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	4836
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4837 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	4838 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	4839 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	4840 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	4841 tree_index_expression *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4842
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4843 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	4844 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	4845
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4846 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	4847 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	4848
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4849 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	4850 {
26707 f35db7d5b7a4 use dynamic_cast instead of static_cast as appropriate parser John W. Eaton <jwe@octave.org> parents: 26686 diff changeset	4851 tree_index_expression *tmp
f35db7d5b7a4 use dynamic_cast instead of static_cast as appropriate parser John W. Eaton <jwe@octave.org> parents: 26686 diff changeset	4852 = dynamic_cast<tree_index_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	4853
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4854 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	4855
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4856 retval = tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4857 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4858 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4859 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	4860
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4861 m_lexer.m_looking_at_indirect_ref = false;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4862
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4863 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4864 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4865
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4866 // 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	4867
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4868 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	4869 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	4870 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	4871 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	4872 tree_decl_command *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4873
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4874 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	4875 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	4876
24216 81d723f0cdfe clean up change merged from stable John W. Eaton <jwe@octave.org> parents: 24215 diff changeset	4877 if (lst)
81d723f0cdfe clean up change merged from stable John W. Eaton <jwe@octave.org> parents: 24215 diff changeset	4878 m_lexer.mark_as_variables (lst->variable_names ());
24213 d2cfaaa57677 tag global and persistent symbols as variables when parsing (bug #52363) John W. Eaton <jwe@octave.org> parents: 23219 diff changeset	4879
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4880 switch (tok)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4881 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4882 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	4883 {
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23454 diff changeset	4884 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	4885 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	4886 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4887 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4888
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4889 case PERSISTENT:
26060 edcb09d4b1f5 store nesting depth and primary parent info in nested function scopes John W. Eaton <jwe@octave.org> parents: 26059 diff changeset	4890 if (m_curr_fcn_depth >= 0)
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23454 diff changeset	4891 {
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23454 diff changeset	4892 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	4893 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	4894 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4895 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4896 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4897 if (m_lexer.m_reading_script_file)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4898 warning ("ignoring persistent declaration near line %d of file '%s'",
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	4899 l, m_lexer.m_fcn_file_full_name.c_str ());
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4900 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4901 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	4902 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4903 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4904
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4905 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4906 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4907 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4908 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4909
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4910 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4911 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4912
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4913 bool
23654 da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4914 base_parser::validate_param_list (tree_parameter_list *lst,
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4915 tree_parameter_list::in_or_out type)
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4916 {
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4917 std::set<std::string> dict;
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4918
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4919 for (tree_decl_elt elt : lst)
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4920 {
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4921 tree_identifier *id = elt->ident ();
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4922
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4923 if (id)
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4924 {
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4925 std::string name = id->name ();
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4926
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4927 if (id->is_black_hole ())
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4928 {
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4929 if (type != tree_parameter_list::in)
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4930 {
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4931 bison_error ("invalid use of ~ in output list");
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4932 return false;
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4933 }
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4934 }
28647 f0414ee0fefe disallow keywords in function parameter lists (bug #58945) John W. Eaton <jwe@octave.org> parents: 28582 diff changeset	4935 else if (iskeyword (name))
f0414ee0fefe disallow keywords in function parameter lists (bug #58945) John W. Eaton <jwe@octave.org> parents: 28582 diff changeset	4936 {
f0414ee0fefe disallow keywords in function parameter lists (bug #58945) John W. Eaton <jwe@octave.org> parents: 28582 diff changeset	4937 bison_error ("invalid use of keyword '" + name
f0414ee0fefe disallow keywords in function parameter lists (bug #58945) John W. Eaton <jwe@octave.org> parents: 28582 diff changeset	4938 + "' in parameter list");
f0414ee0fefe disallow keywords in function parameter lists (bug #58945) John W. Eaton <jwe@octave.org> parents: 28582 diff changeset	4939 return false;
f0414ee0fefe disallow keywords in function parameter lists (bug #58945) John W. Eaton <jwe@octave.org> parents: 28582 diff changeset	4940 }
23654 da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4941 else if (dict.find (name) != dict.end ())
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4942 {
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4943 bison_error ("'" + name
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4944 + "' appears more than once in parameter list");
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4945 return false;
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4946 }
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4947 else
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4948 dict.insert (name);
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4949 }
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4950 }
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4951
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4952 std::string va_type = (type == tree_parameter_list::in
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4953 ? "varargin" : "varargout");
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4954
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	4955 std::size_t len = lst->length ();
23654 da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4956
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4957 if (len > 0)
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4958 {
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4959 tree_decl_elt *elt = lst->back ();
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4960
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4961 tree_identifier *id = elt->ident ();
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4962
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4963 if (id && id->name () == va_type)
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4964 {
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4965 if (len == 1)
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4966 lst->mark_varargs_only ();
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4967 else
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4968 lst->mark_varargs ();
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4969
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4970 tree_parameter_list::iterator p = lst->end ();
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4971 --p;
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4972 delete *p;
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4973 lst->erase (p);
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4974 }
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4975 }
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4976
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4977 return true;
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4978 }
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4979
da89ce0d49eb avoid possible memory leak in parser John W. Eaton <jwe@octave.org> parents: 23653 diff changeset	4980 bool
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4981 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	4982 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4983 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	4984
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4985 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	4986
22872 551ac93c984c maint: Use C++ range feature to simplify some for loops in libinterp/parse-tree Rik <rik@octave.org> parents: 22785 diff changeset	4987 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	4988 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4989 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	4990 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4991 retval = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4992
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4993 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	4994 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	4995 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4996 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	4997
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4998 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	4999 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5000 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5001
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5002 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5003 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5004
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5005 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	5006 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	5007 {
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	5008 tree_argument_list *retval = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5009
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5010 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	5011 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	5012 tree_evaluator& tw
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	5013 = __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	5014
27371 fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752) John W. Eaton <jwe@octave.org> parents: 27216 diff changeset	5015 octave_value ov = e->evaluate (tw);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5016
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5017 delete e;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5018
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23576 diff changeset	5019 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	5020 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	5021 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5022 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	5023 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5024 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5025 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5026 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	5027
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	5028 tree_argument_list *tmp = nullptr;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5029
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5030 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	5031 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5032 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	5033
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5034 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	5035 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5036 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	5037 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	5038 delete e;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5039 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	5040 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5041 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5042 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5043 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	5044
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5045 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	5046 {
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	5047 m_lexer.mark_as_variables (tmp->variable_names ());
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5048 retval = tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5049 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5050 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5051 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5052 delete tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5053
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5054 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	5055 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5056
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5057 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	5058 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	5059 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5060
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5061 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5062 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5063
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5064 // 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	5065
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5066 tree_expression *
27764 f64e399b6dda report missing semicolon location for array expressions (bug #57159) John W. Eaton <jwe@octave.org> parents: 27762 diff changeset	5067 base_parser::finish_array_list (tree_array_list *array_list,
f64e399b6dda report missing semicolon location for array expressions (bug #57159) John W. Eaton <jwe@octave.org> parents: 27762 diff changeset	5068 token /open_delim/, token close_delim)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5069 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5070 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	5071
27764 f64e399b6dda report missing semicolon location for array expressions (bug #57159) John W. Eaton <jwe@octave.org> parents: 27762 diff changeset	5072 array_list->set_location (close_delim->line (), close_delim->column ());
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5073
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5074 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	5075 {
27516 c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	5076 interpreter& interp = __get_interpreter__ ("finish_array_list");
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	5077
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5078 try
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5079 {
27516 c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	5080 // If the evaluation generates a warning message, restore
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	5081 // the previous value of last_warning_message and skip the
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	5082 // conversion to a constant value.
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	5083
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	5084 error_system& es = interp.get_error_system ();
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	5085
29253 28913793f678 prefer unwind_action over unwind_protect in more places John W. Eaton <jwe@octave.org> parents: 29007 diff changeset	5086 unwind_action restore_last_warning_message
28913793f678 prefer unwind_action over unwind_protect in more places John W. Eaton <jwe@octave.org> parents: 29007 diff changeset	5087 (&error_system::set_last_warning_message, &es,
28913793f678 prefer unwind_action over unwind_protect in more places John W. Eaton <jwe@octave.org> parents: 29007 diff changeset	5088 es.last_warning_message (""));
28913793f678 prefer unwind_action over unwind_protect in more places John W. Eaton <jwe@octave.org> parents: 29007 diff changeset	5089
28913793f678 prefer unwind_action over unwind_protect in more places John W. Eaton <jwe@octave.org> parents: 29007 diff changeset	5090 unwind_action restore_discard_warning_messages
28913793f678 prefer unwind_action over unwind_protect in more places John W. Eaton <jwe@octave.org> parents: 29007 diff changeset	5091 (&error_system::set_discard_warning_messages, &es,
28913793f678 prefer unwind_action over unwind_protect in more places John W. Eaton <jwe@octave.org> parents: 29007 diff changeset	5092 es.discard_warning_messages (true));
27516 c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	5093
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	5094 tree_evaluator& tw = interp.get_evaluator ();
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23502 diff changeset	5095
27371 fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752) John W. Eaton <jwe@octave.org> parents: 27216 diff changeset	5096 octave_value tmp = array_list->evaluate (tw);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5097
27516 c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	5098 std::string msg = es.last_warning_message ();
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	5099
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	5100 if (msg.empty ())
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	5101 {
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	5102 tree_constant *tc_retval
27764 f64e399b6dda report missing semicolon location for array expressions (bug #57159) John W. Eaton <jwe@octave.org> parents: 27762 diff changeset	5103 = new tree_constant (tmp, close_delim->line (),
f64e399b6dda report missing semicolon location for array expressions (bug #57159) John W. Eaton <jwe@octave.org> parents: 27762 diff changeset	5104 close_delim->column ());
27516 c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	5105
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	5106 std::ostringstream buf;
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	5107
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	5108 tree_print_code tpc (buf);
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	5109
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	5110 array_list->accept (tpc);
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	5111
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	5112 tc_retval->stash_original_text (buf.str ());
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	5113
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	5114 delete array_list;
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	5115
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	5116 retval = tc_retval;
c3e24c82157f skip constant folding if expression evaluation generates warning John W. Eaton <jwe@octave.org> parents: 27511 diff changeset	5117 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5118 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	5119 catch (const execution_exception&)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5120 {
27474 3fec8e9fa2aa make recover_from_exception a member function John W. Eaton <jwe@octave.org> parents: 27471 diff changeset	5121 interp.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	5122 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5123 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5124
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5125 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5126 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5127
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5128 // 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	5129
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5130 tree_expression *
27764 f64e399b6dda report missing semicolon location for array expressions (bug #57159) John W. Eaton <jwe@octave.org> parents: 27762 diff changeset	5131 base_parser::finish_matrix (tree_matrix m, token open_delim,
f64e399b6dda report missing semicolon location for array expressions (bug #57159) John W. Eaton <jwe@octave.org> parents: 27762 diff changeset	5132 token *close_delim)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5133 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5134 return (m
27764 f64e399b6dda report missing semicolon location for array expressions (bug #57159) John W. Eaton <jwe@octave.org> parents: 27762 diff changeset	5135 ? finish_array_list (m, open_delim, close_delim)
f64e399b6dda report missing semicolon location for array expressions (bug #57159) John W. Eaton <jwe@octave.org> parents: 27762 diff changeset	5136 : new tree_constant (octave_null_matrix::instance,
f64e399b6dda report missing semicolon location for array expressions (bug #57159) John W. Eaton <jwe@octave.org> parents: 27762 diff changeset	5137 close_delim->line (), close_delim->column ()));
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5138 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5139
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5140 // 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	5141
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5142 tree_expression *
27764 f64e399b6dda report missing semicolon location for array expressions (bug #57159) John W. Eaton <jwe@octave.org> parents: 27762 diff changeset	5143 base_parser::finish_cell (tree_cell c, token open_delim,
f64e399b6dda report missing semicolon location for array expressions (bug #57159) John W. Eaton <jwe@octave.org> parents: 27762 diff changeset	5144 token *close_delim)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5145 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5146 return (c
27764 f64e399b6dda report missing semicolon location for array expressions (bug #57159) John W. Eaton <jwe@octave.org> parents: 27762 diff changeset	5147 ? finish_array_list (c, open_delim, close_delim)
f64e399b6dda report missing semicolon location for array expressions (bug #57159) John W. Eaton <jwe@octave.org> parents: 27762 diff changeset	5148 : new tree_constant (octave_value (Cell ()),
f64e399b6dda report missing semicolon location for array expressions (bug #57159) John W. Eaton <jwe@octave.org> parents: 27762 diff changeset	5149 close_delim->line (), close_delim->column ()));
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	5150 }
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	5151
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5152 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	5153 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	5154 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	5155 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5156 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	5157
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5158 switch (sep)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5159 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5160 case ';':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5161 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	5162 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5163
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5164 case 0:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5165 case ',':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5166 case '\n':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5167 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	5168 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	5169 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	5170 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5171
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5172 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5173 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	5174 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5175 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5176
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5177 // 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	5178 // 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	5179
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5180 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	5181 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5182 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	5183 delete tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5184 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5185
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5186 return list;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5187 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5188
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5189 // 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	5190 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	5191 tree_statement *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5192 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	5193 {
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23730 diff changeset	5194 comment_list *comment = m_lexer.get_comment ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5195
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5196 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	5197 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5198
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5199 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	5200 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	5201 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5202 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	5203 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5204
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5205 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	5206 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	5207 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	5208 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	5209 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5210 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	5211
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5212 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	5213
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5214 return list;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5215 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5216
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5217 void
26662 05fc703b419a update handling of command-style function call syntax in eval John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	5218 base_parser::disallow_command_syntax (void)
05fc703b419a update handling of command-style function call syntax in eval John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	5219 {
05fc703b419a update handling of command-style function call syntax in eval John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	5220 m_lexer.m_allow_command_syntax = false;
05fc703b419a update handling of command-style function call syntax in eval John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	5221 }
05fc703b419a update handling of command-style function call syntax in eval John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	5222
27049 eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5223 // FIXME: this function partially duplicates do_dbtype in debug.cc.
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5224 static std::string
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5225 get_file_line (const std::string& name, int line)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5226 {
27049 eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5227 // NAME should be an absolute file name and the file should exist.
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5228
29006 139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28804 diff changeset	5229 std::ifstream fs = sys::ifstream (name.c_str (), std::ios::in);
27049 eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5230
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5231 std::string text;
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5232
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5233 if (fs)
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5234 {
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5235 int i = 1;
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5236
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5237 do
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5238 {
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5239 if (! std::getline (fs, text))
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5240 {
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5241 text = "";
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5242 break;
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5243 }
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5244 }
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5245 while (i++ < line);
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5246 }
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5247
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5248 return text;
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5249 }
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5250
26662 05fc703b419a update handling of command-style function call syntax in eval John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	5251 void
27778 2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	5252 base_parser::bison_error (const std::string& str)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5253 {
27778 2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	5254 bison_error (str, m_lexer.m_filepos);
2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	5255 }
2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	5256
2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	5257 void
2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	5258 base_parser::bison_error (const std::string& str, const filepos& pos)
2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	5259 {
2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	5260 bison_error (str, pos.line (), pos.column ());
2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	5261 }
2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	5262
2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	5263 void
2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	5264 base_parser::bison_error (const std::string& str, int err_line, int err_col)
2f8559459314 store beginning and ending location info for tokens recognized by lexer John W. Eaton <jwe@octave.org> parents: 27766 diff changeset	5265 {
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5266 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	5267
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	5268 if (m_lexer.m_reading_fcn_file \|\| m_lexer.m_reading_script_file
7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	5269 \|\| m_lexer.m_reading_classdef_file)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5270 output_buf << "parse error near line " << err_line
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	5271 << " of file " << m_lexer.m_fcn_file_full_name;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5272 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5273 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	5274
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5275 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	5276 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	5277
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5278 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	5279
27049 eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5280 std::string curr_line;
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5281
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5282 if (m_lexer.m_reading_fcn_file \|\| m_lexer.m_reading_script_file
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5283 \|\| m_lexer.m_reading_classdef_file)
27077 4e69b99978b0 display correct source line for parse errors in scripts (bug #56266) John W. Eaton <jwe@octave.org> parents: 27050 diff changeset	5284 curr_line = get_file_line (m_lexer.m_fcn_file_full_name, err_line);
28145 9e983eb1749d display code and error location when input is from terminal (bug #57536) John W. Eaton <jwe@octave.org> parents: 28026 diff changeset	5285 else
9e983eb1749d display code and error location when input is from terminal (bug #57536) John W. Eaton <jwe@octave.org> parents: 28026 diff changeset	5286 curr_line = m_lexer.m_current_input_line;
9e983eb1749d display code and error location when input is from terminal (bug #57536) John W. Eaton <jwe@octave.org> parents: 28026 diff changeset	5287
9e983eb1749d display code and error location when input is from terminal (bug #57536) John W. Eaton <jwe@octave.org> parents: 28026 diff changeset	5288 // Adjust the error column for display because it is 1-based in the
28149 026bff6a54d7 improve position tracking in the lexer (bug #57924) John W. Eaton <jwe@octave.org> parents: 28147 diff changeset	5289 // lexer for easier reporting.
026bff6a54d7 improve position tracking in the lexer (bug #57924) John W. Eaton <jwe@octave.org> parents: 28147 diff changeset	5290 err_col--;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5291
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5292 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	5293 {
27049 eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5294 // FIXME: we could do better if we just cached lines from the
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5295 // input file in a list. See also functions for managing input
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5296 // buffers in lex.ll.
eb522480d44c improve error reporting for parse errors when reading from files John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	5297
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	5298 std::size_t len = curr_line.length ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5299
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5300 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	5301 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	5302
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5303 // 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	5304
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5305 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	5306
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5307 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	5308 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	5309
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5310 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	5311 output_buf << " ";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5312
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5313 output_buf << "^";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5314 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5315
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5316 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	5317
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	5318 m_parse_error_msg = output_buf.str ();
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5319 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5320
29864 e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5321 void
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5322 base_parser::bison_error (const parse_exception& pe)
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5323 {
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5324 bison_error (pe.message (), pe.line (), pe.column ());
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5325 }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5326
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5327 void
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5328 base_parser::bison_error (const std::list<parse_exception>& pe_list)
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5329 {
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5330 // For now, we just report the first error found. Reporting all
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5331 // errors will require a bit more refactoring.
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5332
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5333 parse_exception pe = pe_list.front ();
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5334
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5335 bison_error (pe.message (), pe.line (), pe.column ());
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5336 }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5337
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5338 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5339 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	5340 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5341 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	5342
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	5343 yypstate pstate = static_cast<yypstate > (m_parser_state);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5344
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5345 try
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5346 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5347 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	5348 }
27481 458adc344819 avoid possible crash due to execution_exception in GUI thread John W. Eaton <jwe@octave.org> parents: 27474 diff changeset	5349 catch (const execution_exception&)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5350 {
27481 458adc344819 avoid possible crash due to execution_exception in GUI thread John W. Eaton <jwe@octave.org> parents: 27474 diff changeset	5351 // FIXME: In previous versions, we emitted a parse error here
458adc344819 avoid possible crash due to execution_exception in GUI thread John W. Eaton <jwe@octave.org> parents: 27474 diff changeset	5352 // but that is not always correct because the error could have
458adc344819 avoid possible crash due to execution_exception in GUI thread John W. Eaton <jwe@octave.org> parents: 27474 diff changeset	5353 // happened inside a GUI callback functions executing in the
458adc344819 avoid possible crash due to execution_exception in GUI thread John W. Eaton <jwe@octave.org> parents: 27474 diff changeset	5354 // readline event_hook loop. Maybe we need a separate exception
458adc344819 avoid possible crash due to execution_exception in GUI thread John W. Eaton <jwe@octave.org> parents: 27474 diff changeset	5355 // class for parse errors?
458adc344819 avoid possible crash due to execution_exception in GUI thread John W. Eaton <jwe@octave.org> parents: 27474 diff changeset	5356
458adc344819 avoid possible crash due to execution_exception in GUI thread John W. Eaton <jwe@octave.org> parents: 27474 diff changeset	5357 throw;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5358 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	5359 catch (const exit_exception&)
23049 7351f2c93389 rethrow octave::exit_exception (bug #49304) Olaf Till <i7tiol@t-online.de> parents: 22879 diff changeset	5360 {
7351f2c93389 rethrow octave::exit_exception (bug #49304) Olaf Till <i7tiol@t-online.de> parents: 22879 diff changeset	5361 throw;
7351f2c93389 rethrow octave::exit_exception (bug #49304) Olaf Till <i7tiol@t-online.de> parents: 22879 diff changeset	5362 }
27481 458adc344819 avoid possible crash due to execution_exception in GUI thread John W. Eaton <jwe@octave.org> parents: 27474 diff changeset	5363 catch (const 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	5364 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5365 throw;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5366 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5367 catch (...)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5368 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	5369 std::string file = m_lexer.m_fcn_file_full_name;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5370
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5371 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	5372 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	5373 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5374 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	5375 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5376
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5377 if (status != 0)
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	5378 parse_error ("%s", m_parse_error_msg.c_str ());
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5379
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5380 return status;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5381 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5382
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5383 // 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	5384 // 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	5385
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5386 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5387 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	5388 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5389 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	5390
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	5391 dynamic_cast<push_lexer&> (m_lexer).append_input (input, eof);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5392
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5393 do
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5394 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5395 YYSTYPE lval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5396
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	5397 int token = octave_lex (&lval, m_lexer.m_scanner);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5398
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5399 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	5400 {
28147 648202bebcb0 improve treatment of comments at interactive command line (bug #57924) John W. Eaton <jwe@octave.org> parents: 28145 diff changeset	5401 // TOKEN == -2 means that the lexer recognized a comment
648202bebcb0 improve treatment of comments at interactive command line (bug #57924) John W. Eaton <jwe@octave.org> parents: 28145 diff changeset	5402 // and we should be at the end of the buffer but not the
648202bebcb0 improve treatment of comments at interactive command line (bug #57924) John W. Eaton <jwe@octave.org> parents: 28145 diff changeset	5403 // end of the file so we should return 0 to indicate
648202bebcb0 improve treatment of comments at interactive command line (bug #57924) John W. Eaton <jwe@octave.org> parents: 28145 diff changeset	5404 // "complete input" instead of -1 to request more input.
648202bebcb0 improve treatment of comments at interactive command line (bug #57924) John W. Eaton <jwe@octave.org> parents: 28145 diff changeset	5405
648202bebcb0 improve treatment of comments at interactive command line (bug #57924) John W. Eaton <jwe@octave.org> parents: 28145 diff changeset	5406 status = (token == -2 ? 0 : -1);
27511 257105b5193a fix push parser to return status indicating more input is needed John W. Eaton <jwe@octave.org> parents: 27510 diff changeset	5407
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	5408 if (! eof && m_lexer.at_end_of_buffer ())
27511 257105b5193a fix push parser to return status indicating more input is needed John W. Eaton <jwe@octave.org> parents: 27510 diff changeset	5409 return status;
257105b5193a fix push parser to return status indicating more input is needed John W. Eaton <jwe@octave.org> parents: 27510 diff changeset	5410
257105b5193a fix push parser to return status indicating more input is needed John W. Eaton <jwe@octave.org> parents: 27510 diff changeset	5411 break;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5412 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5413
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	5414 yypstate pstate = static_cast<yypstate > (m_parser_state);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5415
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5416 try
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5417 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5418 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	5419 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	5420 catch (execution_exception& e)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5421 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	5422 std::string file = m_lexer.m_fcn_file_full_name;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5423
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5424 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	5425 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	5426 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5427 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	5428 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	5429 catch (const exit_exception&)
23049 7351f2c93389 rethrow octave::exit_exception (bug #49304) Olaf Till <i7tiol@t-online.de> parents: 22879 diff changeset	5430 {
7351f2c93389 rethrow octave::exit_exception (bug #49304) Olaf Till <i7tiol@t-online.de> parents: 22879 diff changeset	5431 throw;
7351f2c93389 rethrow octave::exit_exception (bug #49304) Olaf Till <i7tiol@t-online.de> parents: 22879 diff changeset	5432 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	5433 catch (interrupt_exception &)
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5434 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5435 throw;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5436 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5437 catch (...)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5438 {
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24705 diff changeset	5439 std::string file = m_lexer.m_fcn_file_full_name;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5440
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5441 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	5442 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	5443 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5444 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	5445 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5446 }
28407 808e3964987b accept multi-line interactive input (bug #58370) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	5447 while (status == YYPUSH_MORE \|\| ! m_lexer.at_end_of_buffer ());
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5448
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5449 if (status != 0)
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	5450 parse_error ("%s", m_parse_error_msg.c_str ());
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5451
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5452 return status;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	5453 }
25442 47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	5454
28266 ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5455 int
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5456 push_parser::run (void)
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5457 {
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5458 if (! m_reader)
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5459 error ("push_parser::run requires valid input_reader");
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5460
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5461 int exit_status = 0;
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5462
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5463 input_system& input_sys = m_interpreter.get_input_system ();
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5464
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5465 std::string prompt
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5466 = command_editor::decode_prompt_string (input_sys.PS1 ());
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5467
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5468 do
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5469 {
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5470 // Reset status each time through the read loop so that
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5471 // it won't be set to -1 and cause us to exit the outer
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5472 // loop early if there is an exception while reading
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5473 // input or parsing.
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5474
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5475 exit_status = 0;
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5476
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5477 bool eof = false;
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5478 std::string input_line = m_reader->get_input (prompt, eof);
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5479
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5480 if (eof)
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5481 {
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5482 exit_status = EOF;
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5483 break;
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5484 }
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5485
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5486 exit_status = run (input_line, false);
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5487
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5488 prompt = command_editor::decode_prompt_string (input_sys.PS2 ());
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5489 }
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5490 while (exit_status < 0);
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5491
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5492 return exit_status;
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5493 }
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198) John W. Eaton <jwe@octave.org> parents: 28257 diff changeset	5494
27509 fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5495 octave_value
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5496 parse_fcn_file (interpreter& interp, const std::string& full_file,
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5497 const std::string& file, const std::string& dir_name,
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5498 const std::string& dispatch_type,
25442 47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	5499 const std::string& package_name, bool require_file,
27509 fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5500 bool force_script, bool autoload, bool relative_lookup)
25442 47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	5501 {
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	5502 octave_value retval;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	5503
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	5504 FILE *ffile = nullptr;
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	5505
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	5506 if (! full_file.empty ())
28368 6870068fb34e Emit an error if m-file size is >512 MB to prevent segfault in interpreter (bug #58345). Rik <rik@octave.org> parents: 28267 diff changeset	5507 {
6870068fb34e Emit an error if m-file size is >512 MB to prevent segfault in interpreter (bug #58345). Rik <rik@octave.org> parents: 28267 diff changeset	5508 // Check that m-file is not overly large which can segfault interpreter.
6870068fb34e Emit an error if m-file size is >512 MB to prevent segfault in interpreter (bug #58345). Rik <rik@octave.org> parents: 28267 diff changeset	5509 const int max_file_size = 512 * 1024 * 1024; // 512 MB
6870068fb34e Emit an error if m-file size is >512 MB to prevent segfault in interpreter (bug #58345). Rik <rik@octave.org> parents: 28267 diff changeset	5510 sys::file_stat fs (full_file);
6870068fb34e Emit an error if m-file size is >512 MB to prevent segfault in interpreter (bug #58345). Rik <rik@octave.org> parents: 28267 diff changeset	5511
6870068fb34e Emit an error if m-file size is >512 MB to prevent segfault in interpreter (bug #58345). Rik <rik@octave.org> parents: 28267 diff changeset	5512 if (fs && fs.size () > max_file_size)
6870068fb34e Emit an error if m-file size is >512 MB to prevent segfault in interpreter (bug #58345). Rik <rik@octave.org> parents: 28267 diff changeset	5513 {
6870068fb34e Emit an error if m-file size is >512 MB to prevent segfault in interpreter (bug #58345). Rik <rik@octave.org> parents: 28267 diff changeset	5514 error ("file '%s' is too large, > 512 MB", full_file.c_str ());
6870068fb34e Emit an error if m-file size is >512 MB to prevent segfault in interpreter (bug #58345). Rik <rik@octave.org> parents: 28267 diff changeset	5515
6870068fb34e Emit an error if m-file size is >512 MB to prevent segfault in interpreter (bug #58345). Rik <rik@octave.org> parents: 28267 diff changeset	5516 return octave_value ();
6870068fb34e Emit an error if m-file size is >512 MB to prevent segfault in interpreter (bug #58345). Rik <rik@octave.org> parents: 28267 diff changeset	5517 }
6870068fb34e Emit an error if m-file size is >512 MB to prevent segfault in interpreter (bug #58345). Rik <rik@octave.org> parents: 28267 diff changeset	5518
27509 fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5519 ffile = sys::fopen (full_file, "rb");
28368 6870068fb34e Emit an error if m-file size is >512 MB to prevent segfault in interpreter (bug #58345). Rik <rik@octave.org> parents: 28267 diff changeset	5520 }
27509 fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5521
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5522 if (! ffile)
25442 47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	5523 {
27509 fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5524 if (require_file)
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5525 error ("no such file, '%s'", full_file.c_str ());
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5526
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5527 return octave_value ();
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5528 }
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5529
28851 1ac5a76ae91d use [=] capture default specification where possible John W. Eaton <jwe@octave.org> parents: 28806 diff changeset	5530 unwind_action act ([=] (void) { ::fclose (ffile); });
27509 fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5531
28953 dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685). Markus Mützel <markus.muetzel@gmx.de> parents: 28857 diff changeset	5532 // get the encoding for this folder
29950 6549fa7558ba eliminate some unnecessary octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 29864 diff changeset	5533 input_system& input_sys = interp.get_input_system ();
28953 dff830c84726 Add function "dir_encoding" to set a file encoding per directory (bug #49685). Markus Mützel <markus.muetzel@gmx.de> parents: 28857 diff changeset	5534 parser parser (ffile, interp, input_sys.dir_encoding (dir_name));
27509 fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5535
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5536 parser.m_curr_class_name = dispatch_type;
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5537 parser.m_curr_package_name = package_name;
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5538 parser.m_autoloading = autoload;
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5539 parser.m_fcn_file_from_relative_lookup = relative_lookup;
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5540
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5541 parser.m_lexer.m_force_script = force_script;
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5542 parser.m_lexer.prep_for_file ();
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5543 parser.m_lexer.m_parsing_class_method = ! dispatch_type.empty ();
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5544
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5545 parser.m_lexer.m_fcn_file_name = file;
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5546 parser.m_lexer.m_fcn_file_full_name = full_file;
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5547 parser.m_lexer.m_dir_name = dir_name;
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5548 parser.m_lexer.m_package_name = package_name;
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5549
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5550 int err = parser.run ();
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5551
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5552 if (err)
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5553 error ("parse error while reading file %s", full_file.c_str ());
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5554
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5555 octave_value ov_fcn = parser.m_primary_fcn;
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5556
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5557 if (parser.m_lexer.m_reading_classdef_file
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5558 && parser.classdef_object ())
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5559 {
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5560 // Convert parse tree for classdef object to
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5561 // meta.class info (and stash it in the symbol
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5562 // table?). Return pointer to constructor?
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5563
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5564 if (ov_fcn.is_defined ())
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5565 panic_impossible ();
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5566
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5567 bool is_at_folder = ! dispatch_type.empty ();
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5568
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5569 std::shared_ptr<tree_classdef> cdef_obj
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5570 = parser.classdef_object();
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5571
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5572 return cdef_obj->make_meta_class (interp, is_at_folder);
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5573 }
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5574 else if (ov_fcn.is_defined ())
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5575 {
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5576 octave_function *fcn = ov_fcn.function_value ();
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5577
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5578 fcn->maybe_relocate_end ();
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5579
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5580 if (parser.m_parsing_subfunctions)
25442 47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	5581 {
27509 fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5582 if (! parser.m_endfunction_found)
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5583 parser.m_subfunction_names.reverse ();
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5584
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5585 fcn->stash_subfunction_names (parser.m_subfunction_names);
25442 47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	5586 }
27509 fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5587
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5588 return ov_fcn;
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5589 }
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5590
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5591 return octave_value ();
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5592 }
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5593
29864 e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5594 bool
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5595 base_parser::finish_input (tree_statement_list *lst, bool at_eof)
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5596 {
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5597 m_lexer.m_end_of_input = at_eof;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5598
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5599 if (lst)
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5600 {
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5601 parse_tree_validator validator;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5602
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5603 lst->accept (validator);
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5604
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5605 if (! validator.ok ())
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5606 {
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5607 delete lst;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5608
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5609 bison_error (validator.error_list ());
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5610
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5611 return false;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5612 }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5613 }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5614
29950 6549fa7558ba eliminate some unnecessary octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 29864 diff changeset	5615 std::shared_ptr<tree_statement_list> tmp_lst (lst);
29864 e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5616
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5617 statement_list (tmp_lst);
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5618
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5619 return true;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5620 }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5621
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5622 // Check script or function for semantic errors.
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5623 bool
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5624 base_parser::validate_primary_fcn (void)
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5625 {
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5626 octave_user_code *code = m_primary_fcn.user_code_value ();
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5627
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5628 if (code)
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5629 {
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5630 parse_tree_validator validator;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5631
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5632 code->accept (validator);
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5633
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5634 if (! validator.ok ())
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5635 {
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5636 bison_error (validator.error_list ());
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5637
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5638 return false;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5639 }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5640 }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5641
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5642 return true;
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5643 }
e2e493712818 improve previous change for command syntax parsing (bug #60882) John W. Eaton <jwe@octave.org> parents: 29857 diff changeset	5644
27510 5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5645 // Maybe print a warning if an assignment expression is used as the
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5646 // test in a logical expression.
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5647
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5648 void
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5649 base_parser::maybe_warn_assign_as_truth_value (tree_expression *expr)
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5650 {
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5651 if (expr->is_assignment_expression ()
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5652 && expr->paren_count () < 2)
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5653 {
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5654 if (m_lexer.m_fcn_file_full_name.empty ())
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5655 warning_with_id
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5656 ("Octave:assign-as-truth-value",
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5657 "suggest parenthesis around assignment used as truth value");
25442 47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	5658 else
27510 5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5659 warning_with_id
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5660 ("Octave:assign-as-truth-value",
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5661 "suggest parenthesis around assignment used as truth value near line %d, column %d in file '%s'",
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5662 expr->line (), expr->column (), m_lexer.m_fcn_file_full_name.c_str ());
25442 47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	5663 }
27510 5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5664 }
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5665
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5666 // Maybe print a warning about switch labels that aren't constants.
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5667
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5668 void
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5669 base_parser::maybe_warn_variable_switch_label (tree_expression *expr)
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5670 {
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5671 if (! expr->is_constant ())
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5672 {
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5673 if (m_lexer.m_fcn_file_full_name.empty ())
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5674 warning_with_id ("Octave:variable-switch-label",
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5675 "variable switch label");
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5676 else
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5677 warning_with_id
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5678 ("Octave:variable-switch-label",
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5679 "variable switch label near line %d, column %d in file '%s'",
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5680 expr->line (), expr->column (), m_lexer.m_fcn_file_full_name.c_str ());
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5681 }
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5682 }
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5683
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5684 void
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5685 base_parser::maybe_warn_missing_semi (tree_statement_list *t)
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5686 {
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5687 if (m_curr_fcn_depth >= 0)
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5688 {
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5689 tree_statement *tmp = t->back ();
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5690
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5691 if (tmp->is_expression ())
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5692 warning_with_id
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5693 ("Octave:missing-semicolon",
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5694 "missing semicolon near line %d, column %d in file '%s'",
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5695 tmp->line (), tmp->column (), m_lexer.m_fcn_file_full_name.c_str ());
5438a82a18fb declare base_parser class data protected John W. Eaton <jwe@octave.org> parents: 27509 diff changeset	5696 }
25442 47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	5697 }
47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	5698
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5699 std::string
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5700 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	5701 std::string& full_file)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5702 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5703 std::string retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5704
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5705 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	5706
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5707 std::string file = full_file;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5708
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	5709 std::size_t file_len = file.length ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5710
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5711 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	5712 \|\| (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	5713 \|\| (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	5714 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	5715 file = sys::env::base_pathname (file);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5716 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	5717
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	5718 std::size_t pos = file.find_last_of (sys::file_ops::dir_sep_str ());
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5719 if (pos != std::string::npos)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5720 file = file.substr (pos+1);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5721 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5722
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5723 if (! file.empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5724 {
27017 24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	5725 interpreter& interp = __get_interpreter__ ("get_help_from_file");
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	5726
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5727 symbol_found = true;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5728
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5729 octave_value ov_fcn
27509 fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5730 = parse_fcn_file (interp, full_file, file, "", "", "", true,
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5731 false, false, false);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5732
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5733 if (ov_fcn.is_defined ())
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5734 {
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5735 octave_function *fcn = ov_fcn.function_value ();
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5736
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5737 if (fcn)
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5738 retval = fcn->doc_string ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5739 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5740 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5741
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5742 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5743 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5744
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5745 std::string
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5746 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	5747 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5748 std::string file;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5749 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	5750 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5751
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5752 octave_value
23667 2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	5753 load_fcn_from_file (const std::string& file_name,
2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	5754 const std::string& dir_name,
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5755 const std::string& dispatch_type,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5756 const std::string& package_name,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5757 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	5758 {
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5759 octave_value retval;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5760
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	5761 unwind_protect frame;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5762
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5763 std::string nm = file_name;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5764
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	5765 std::size_t nm_len = nm.length ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5766
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5767 std::string file;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5768
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5769 bool relative_lookup = false;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5770
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5771 file = nm;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5772
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5773 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	5774 \|\| (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	5775 \|\| (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	5776 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	5777 nm = sys::env::base_pathname (file);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5778 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	5779
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	5780 std::size_t pos = nm.find_last_of (sys::file_ops::dir_sep_str ());
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5781 if (pos != std::string::npos)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5782 nm = nm.substr (pos+1);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5783 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5784
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	5785 relative_lookup = ! sys::env::absolute_pathname (file);
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	5786
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	5787 file = sys::env::make_absolute (file);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5788
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5789 int len = file.length ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5790
27017 24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	5791 interpreter& interp = __get_interpreter__ ("load_fcn_from_file");
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	5792
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	5793 dynamic_loader& dyn_loader = interp.get_dynamic_loader ();
23627 0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	5794
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5795 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	5796 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5797 if (autoload && ! fcn_name.empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5798 nm = fcn_name;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5799
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5800 octave_function *tmpfcn
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5801 = dyn_loader.load_oct (nm, file, relative_lookup);
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5802
25206 cbe53b5ea5ce check success of loading oct-file (bug #52977) Olaf Till <i7tiol@t-online.de> parents: 25193 diff changeset	5803 if (tmpfcn)
cbe53b5ea5ce check success of loading oct-file (bug #52977) Olaf Till <i7tiol@t-online.de> parents: 25193 diff changeset	5804 {
cbe53b5ea5ce check success of loading oct-file (bug #52977) Olaf Till <i7tiol@t-online.de> parents: 25193 diff changeset	5805 tmpfcn->stash_package_name (package_name);
cbe53b5ea5ce check success of loading oct-file (bug #52977) Olaf Till <i7tiol@t-online.de> parents: 25193 diff changeset	5806 retval = octave_value (tmpfcn);
cbe53b5ea5ce check success of loading oct-file (bug #52977) Olaf Till <i7tiol@t-online.de> parents: 25193 diff changeset	5807 }
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5808 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5809 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	5810 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5811 // 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	5812 // 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	5813
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5814 std::string doc_string;
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5815
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5816 octave_value ov_fcn
27509 fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5817 = parse_fcn_file (interp, file.substr (0, len - 2), nm, dir_name,
23667 2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	5818 dispatch_type, package_name, false,
27509 fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5819 autoload, autoload, relative_lookup);
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5820
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5821 if (ov_fcn.is_defined ())
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5822 {
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5823 octave_function *tmpfcn = ov_fcn.function_value ();
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5824
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5825 if (tmpfcn)
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5826 doc_string = tmpfcn->doc_string ();
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5827 }
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5828
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5829 octave_function *tmpfcn
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5830 = 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	5831
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5832 if (tmpfcn)
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5833 {
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5834 tmpfcn->document (doc_string);
25193 6f1fde568e46 make .oct and .mex files in +package dirs work again (bug #51960) John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	5835 tmpfcn->stash_package_name (package_name);
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5836
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5837 retval = octave_value (tmpfcn);
3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	5838 }
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5839 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5840 else if (len > 2)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5841 {
27509 fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5842 retval = parse_fcn_file (interp, file, nm, dir_name,
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5843 dispatch_type, package_name, true,
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	5844 autoload, autoload, relative_lookup);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5845 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5846
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5847 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	5848 }
29958 32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29950 diff changeset	5849
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5850 DEFMETHOD (autoload, interp, args, ,
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5851 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	5852 @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	5853 @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	5854 @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	5855 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	5856
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5857 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	5858 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	5859 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	5860 path.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5861
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5862 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	5863 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	5864 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	5865 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	5866
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5867 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5868 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	5869 @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	5870
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5871 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5872 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	5873 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	5874
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5875 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5876 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	5877 @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	5878
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5879 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5880 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	5881
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5882 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	5883
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5884 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	5885 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	5886
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5887 @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	5888 @end deftypefn */)
5484 2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	5889 {
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	5890 int nargin = args.length ();
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	5891
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5892 if (nargin == 1 \|\| nargin > 3)
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5893 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5894
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29960 diff changeset	5895 tree_evaluator& tw = interp.get_evaluator ();
27016 9b261300a001 move file-scope static autoload map variable and functions to evaluator John W. Eaton <jwe@octave.org> parents: 27015 diff changeset	5896
5626 3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	5897 if (nargin == 0)
27016 9b261300a001 move file-scope static autoload map variable and functions to evaluator John W. Eaton <jwe@octave.org> parents: 27015 diff changeset	5898 return octave_value (tw.get_autoload_map ());
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5899 else
5484 2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	5900 {
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	5901 string_vector argv = args.make_argv ("autoload");
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	5902
20547 52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	5903 if (nargin == 2)
27016 9b261300a001 move file-scope static autoload map variable and functions to evaluator John W. Eaton <jwe@octave.org> parents: 27015 diff changeset	5904 tw.add_autoload (argv[1], argv[2]);
20547 52ce821a52fd eliminate simple uses of error_state in parser and lexer John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	5905 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	5906 {
21021 a5b99b09f8fd maint: Use comparison operators rather than compare() for strings. Rik <rik@octave.org> parents: 20957 diff changeset	5907 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	5908 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	5909 "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	5910
27016 9b261300a001 move file-scope static autoload map variable and functions to evaluator John W. Eaton <jwe@octave.org> parents: 27015 diff changeset	5911 tw.remove_autoload (argv[1], argv[2]);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	5912 }
5484 2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	5913 }
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	5914
27016 9b261300a001 move file-scope static autoload map variable and functions to evaluator John W. Eaton <jwe@octave.org> parents: 27015 diff changeset	5915 return octave_value_list ();
4486 6ceba1f351fb [project @ 2003-08-22 16:49:46 by jwe] jwe parents: 4463 diff changeset	5916 }
6ceba1f351fb [project @ 2003-08-22 16:49:46 by jwe] jwe parents: 4463 diff changeset	5917
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5918 DEFMETHOD (mfilename, interp, args, ,
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	5919 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	5920 @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	5921 @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	5922 @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	5923 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	5924
25294 01ad54f997f5 Allow filenames which begin with a '.' to be returned from mfilename (bug #53707). Rik <rik@octave.org> parents: 25206 diff changeset	5925 The base name of the currently executing script or function is returned without
01ad54f997f5 Allow filenames which begin with a '.' to be returned from mfilename (bug #53707). Rik <rik@octave.org> parents: 25206 diff changeset	5926 any extension. If called from outside an m-file, such as the command line,
01ad54f997f5 Allow filenames which begin with a '.' to be returned from mfilename (bug #53707). Rik <rik@octave.org> parents: 25206 diff changeset	5927 return the empty string.
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5928
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5929 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	5930 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	5931
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5932 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	5933 the filename and the extension.
25294 01ad54f997f5 Allow filenames which begin with a '.' to be returned from mfilename (bug #53707). Rik <rik@octave.org> parents: 25206 diff changeset	5934 @seealso{inputname, dbstack}
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5935 @end deftypefn */)
5739 d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5936 {
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5937 int nargin = args.length ();
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5938
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5939 if (nargin > 1)
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5940 print_usage ();
5739 d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5941
27015 4d9e1a832a55 move core of mfilename function to evaluator John W. Eaton <jwe@octave.org> parents: 27014 diff changeset	5942 std::string opt;
5739 d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5943
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5944 if (nargin == 1)
27015 4d9e1a832a55 move core of mfilename function to evaluator John W. Eaton <jwe@octave.org> parents: 27014 diff changeset	5945 opt = args(0).xstring_value ("mfilename: option argument must be a string");
4d9e1a832a55 move core of mfilename function to evaluator John W. Eaton <jwe@octave.org> parents: 27014 diff changeset	5946
4d9e1a832a55 move core of mfilename function to evaluator John W. Eaton <jwe@octave.org> parents: 27014 diff changeset	5947 return octave_value (interp.mfilename (opt));
5739 d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5948 }
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	5949
27017 24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	5950 // Execute the contents of a script file. For compatibility with
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	5951 // Matlab, also execute a function file by calling the function it
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	5952 // defines with no arguments and nargout = 0.
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	5953
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	5954 void
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	5955 source_file (const std::string& file_name, const std::string& context,
27507 2d537a089e5d eliminate warn_for argument for source_file and parse_fcn_file functions John W. Eaton <jwe@octave.org> parents: 27505 diff changeset	5956 bool verbose, bool require_file)
27017 24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	5957 {
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	5958 interpreter& interp = __get_interpreter__ ("source_file");
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	5959
27507 2d537a089e5d eliminate warn_for argument for source_file and parse_fcn_file functions John W. Eaton <jwe@octave.org> parents: 27505 diff changeset	5960 interp.source_file (file_name, context, verbose, require_file);
27017 24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	5961 }
29958 32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29950 diff changeset	5962
27017 24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	5963 DEFMETHOD (source, interp, args, ,
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	5964 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	5965 @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	5966 @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	5967 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	5968
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5969 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	5970 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	5971 @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	5972
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	5973 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	5974 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	5975 (@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	5976 @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	5977 @end deftypefn */)
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5978 {
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5979 int nargin = args.length ();
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5980
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5981 if (nargin < 1 \|\| nargin > 2)
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5794 diff changeset	5982 print_usage ();
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5983
27017 24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	5984 std::string file_name
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	5985 = 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	5986
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5987 std::string context;
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	5988 if (nargin == 2)
21861 a55f1fa2c94a oct-parse.in.yy: Shorten lines to < 80 characters where possible. Rik <rik@octave.org> parents: 21748 diff changeset	5989 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	5990
27017 24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	5991 interp.source_file (file_name, context);
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	5992
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	5993 return octave_value_list ();
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5994 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	5995
24624 ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	5996 //! Evaluate an Octave function (built-in or interpreted) and return
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	5997 //! the list of result values.
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	5998 //!
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	5999 //! @param name The name of the function to call.
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	6000 //! @param args The arguments to the function.
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	6001 //! @param nargout The number of output arguments expected.
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	6002 //! @return A list of output values. The length of the list is not
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	6003 //! necessarily the same as @c nargout.
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	6004
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	6005 octave_value_list
26883 a2aed4b49be3 fix const-ness of feval arguments John W. Eaton <jwe@octave.org> parents: 26799 diff changeset	6006 feval (const char *name, const octave_value_list& args, int nargout)
a2aed4b49be3 fix const-ness of feval arguments John W. Eaton <jwe@octave.org> parents: 26799 diff changeset	6007 {
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	6008 interpreter& interp = __get_interpreter__ ("feval");
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	6009
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	6010 return interp.feval (name, args, nargout);
26883 a2aed4b49be3 fix const-ness of feval arguments John W. Eaton <jwe@octave.org> parents: 26799 diff changeset	6011 }
a2aed4b49be3 fix const-ness of feval arguments John W. Eaton <jwe@octave.org> parents: 26799 diff changeset	6012
a2aed4b49be3 fix const-ness of feval arguments John W. Eaton <jwe@octave.org> parents: 26799 diff changeset	6013 octave_value_list
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	6014 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	6015 {
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	6016 interpreter& interp = __get_interpreter__ ("feval");
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	6017
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	6018 return interp.feval (name, args, nargout);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	6019 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	6020
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	6021 octave_value_list
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	6022 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	6023 {
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	6024 interpreter& interp = __get_interpreter__ ("feval");
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	6025
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	6026 return interp.feval (fcn, args, nargout);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	6027 }
23502 c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	6028
c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	6029 octave_value_list
26883 a2aed4b49be3 fix const-ness of feval arguments John W. Eaton <jwe@octave.org> parents: 26799 diff changeset	6030 feval (const octave_value& val, const octave_value_list& args, int nargout)
23502 c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	6031 {
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	6032 interpreter& interp = __get_interpreter__ ("feval");
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	6033
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	6034 return interp.feval (val, args, nargout);
23502 c6714ae1c06c eliminate remaining do_multi_index_op methods John W. Eaton <jwe@octave.org> parents: 23479 diff changeset	6035 }
25442 47a3e4b9b6fe tmp-parser-namespace-fixes John W. Eaton <jwe@octave.org> parents: 25441 diff changeset	6036
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	6037 octave_value_list
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	6038 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	6039 {
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	6040 interpreter& interp = __get_interpreter__ ("feval");
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	6041
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	6042 return interp.feval (args, nargout);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	6043 }
29958 32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29950 diff changeset	6044
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	6045 DEFMETHOD (feval, interp, args, nargout,
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	6046 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	6047 @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	6048 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	6049
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6050 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	6051 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	6052
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6053 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6054 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6055 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	6056 @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	6057 @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	6058 @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	6059
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6060 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6061 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	6062
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6063 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	6064 (@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	6065 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	6066 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	6067
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6068 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6069 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6070 @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	6071 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	6072 @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	6073 @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	6074 @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	6075 @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	6076 @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	6077
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6078 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6079 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	6080 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	6081 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	6082 instead.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6083 @end deftypefn */)
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	6084 {
20818 cef0448a6ed2 eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20798 diff changeset	6085 if (args.length () == 0)
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5794 diff changeset	6086 print_usage ();
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	6087
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	6088 return interp.feval (args, nargout);
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	6089 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	6090
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	6091 DEFMETHOD (builtin, interp, args, nargout,
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	6092 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	6093 @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	6094 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	6095 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	6096
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6097 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	6098 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	6099 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	6100
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6101 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	6102 @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	6103
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6104 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6105 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6106 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	6107 @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	6108 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	6109 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	6110 @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	6111 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	6112 @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	6113 @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	6114 @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	6115 @end deftypefn */)
11225 8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	6116 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	6117 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	6118
20818 cef0448a6ed2 eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20798 diff changeset	6119 if (args.length () == 0)
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	6120 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	6121
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	6122 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	6123
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29960 diff changeset	6124 symbol_table& symtab = interp.get_symbol_table ();
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	6125
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	6126 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	6127
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	6128 if (fcn.is_defined ())
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	6129 retval = interp.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	6130 else
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	6131 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	6132
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	6133 return retval;
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	6134 }
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	6135
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	6136 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	6137 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	6138 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	6139 if (*lst)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	6140 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	6141 delete *lst;
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23750 diff changeset	6142 *lst = nullptr;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	6143 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23054 diff changeset	6144 }
29958 32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29950 diff changeset	6145
26113 8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 26065 diff changeset	6146 DEFMETHOD (eval, interp, args, nargout,
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 26065 diff changeset	6147 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	6148 @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	6149 @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	6150 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	6151 program.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6152
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6153 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	6154
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6155 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	6156 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	6157
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6158 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	6159 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	6160
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6161 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6162 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	6163 @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	6164
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6165 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	6166 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	6167
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6168 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6169 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6170 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	6171 '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	6172 @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	6173 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	6174 @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	6175 @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	6176
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6177 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	6178 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	6179 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	6180 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	6181 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	6182 does.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6183 @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	6184 @end deftypefn */)
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	6185 {
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	6186 int nargin = args.length ();
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	6187
27019 6cb675912f2b move core of eval function to evaluator John W. Eaton <jwe@octave.org> parents: 27018 diff changeset	6188 if (nargin < 1 \|\| nargin > 2)
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	6189 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	6190
27797 5dcdd5bd46e2 maint: remove trailing spaces from code. Rik <rik@octave.org> parents: 27778 diff changeset	6191 if (! args(0).is_string () \|\| args(0).rows () > 1 \|\| args(0).ndims () != 2)
27165 58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696). Rik <rik@octave.org> parents: 27160 diff changeset	6192 error ("eval: TRY must be a string");
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696). Rik <rik@octave.org> parents: 27160 diff changeset	6193
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696). Rik <rik@octave.org> parents: 27160 diff changeset	6194 std::string try_code = args(0).string_value ();
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696). Rik <rik@octave.org> parents: 27160 diff changeset	6195
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696). Rik <rik@octave.org> parents: 27160 diff changeset	6196 if (nargin == 1)
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696). Rik <rik@octave.org> parents: 27160 diff changeset	6197 return interp.eval (try_code, nargout);
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	6198 else
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	6199 {
27165 58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696). Rik <rik@octave.org> parents: 27160 diff changeset	6200 if (! args(1).is_string () \|\| args(1).rows () > 1
27797 5dcdd5bd46e2 maint: remove trailing spaces from code. Rik <rik@octave.org> parents: 27778 diff changeset	6201 \|\| args(1).ndims () != 2)
27165 58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696). Rik <rik@octave.org> parents: 27160 diff changeset	6202 error ("eval: CATCH must be a string");
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696). Rik <rik@octave.org> parents: 27160 diff changeset	6203
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696). Rik <rik@octave.org> parents: 27160 diff changeset	6204 std::string catch_code = args(1).string_value ();
27019 6cb675912f2b move core of eval function to evaluator John W. Eaton <jwe@octave.org> parents: 27018 diff changeset	6205
6cb675912f2b move core of eval function to evaluator John W. Eaton <jwe@octave.org> parents: 27018 diff changeset	6206 return interp.eval (try_code, catch_code, nargout);
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	6207 }
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	6208 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	6209
7562 c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	6210 /*
c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	6211
14084 5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	6212 %!shared x
7562 c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	6213 %! x = 1;
14084 5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	6214
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	6215 %!assert (eval ("x"), 1)
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	6216 %!assert (eval ("x;"))
21317 a4faec57f4c8 maint: remove semicolon after %!assert tests to follow Octave conventions. Rik <rik@octave.org> parents: 21301 diff changeset	6217 %!assert (eval ("x;"), 1)
14084 5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	6218
7562 c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	6219 %!test
14084 5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	6220 %! y = eval ("x");
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	6221 %! assert (y, 1);
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	6222
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	6223 %!test
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	6224 %! y = eval ("x;");
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	6225 %! assert (y, 1);
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	6226
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	6227 %!test
21580 ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 21416 diff changeset	6228 %! eval ("x = 1;");
14084 5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	6229 %! assert (x,1);
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	6230
7562 c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	6231 %!test
c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	6232 %! eval ("flipud = 2;");
14084 5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	6233 %! assert (flipud, 2);
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	6234
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	6235 %!function y = __f ()
7562 c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	6236 %! eval ("flipud = 2;");
c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	6237 %! y = flipud;
14084 5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	6238 %!endfunction
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	6239 %!assert (__f(), 2)
7562 c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	6240
27165 58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696). Rik <rik@octave.org> parents: 27160 diff changeset	6241 %!test <*35645>
14533 e6aa044253eb Allow comma at the end of an assignment list (bug #35645) Max Brister <max@2bass.com> parents: 14512 diff changeset	6242 %! [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	6243 %! [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	6244
27165 58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696). Rik <rik@octave.org> parents: 27160 diff changeset	6245 ## Can't assign to a keyword
21581 6fab85c1538f maint: Follow Octave conventions for use of semicolon in BIST tests. Rik <rik@octave.org> parents: 21580 diff changeset	6246 %!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	6247
27165 58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696). Rik <rik@octave.org> parents: 27160 diff changeset	6248 %!shared str
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696). Rik <rik@octave.org> parents: 27160 diff changeset	6249 %! str = "disp ('hello');";
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696). Rik <rik@octave.org> parents: 27160 diff changeset	6250 %! str(:,:,2) = str(:,:,1);
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696). Rik <rik@octave.org> parents: 27160 diff changeset	6251
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696). Rik <rik@octave.org> parents: 27160 diff changeset	6252 %!error <TRY must be a string> eval (1)
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696). Rik <rik@octave.org> parents: 27160 diff changeset	6253 %!error <TRY must be a string> eval (['a';'b'])
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696). Rik <rik@octave.org> parents: 27160 diff changeset	6254 %!error <TRY must be a string> eval (str)
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696). Rik <rik@octave.org> parents: 27160 diff changeset	6255
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696). Rik <rik@octave.org> parents: 27160 diff changeset	6256 %!error <CATCH must be a string> eval (str(:,:,1), 1)
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696). Rik <rik@octave.org> parents: 27160 diff changeset	6257 %!error <CATCH must be a string> eval (str(:,:,1), ['a';'b'])
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696). Rik <rik@octave.org> parents: 27160 diff changeset	6258 %!error <CATCH must be a string> eval (str(:,:,1), str)
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696). Rik <rik@octave.org> parents: 27160 diff changeset	6259
7562 c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	6260 */
c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	6261
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	6262 DEFMETHOD (assignin, interp, args, ,
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	6263 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	6264 @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	6265 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	6266 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	6267 @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	6268 @end deftypefn */)
4297 59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	6269 {
20818 cef0448a6ed2 eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20798 diff changeset	6270 if (args.length () != 3)
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	6271 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	6272
27014 daab1b311a98 move core of assignin function to evaluator John W. Eaton <jwe@octave.org> parents: 26998 diff changeset	6273 std::string context
daab1b311a98 move core of assignin function to evaluator John W. Eaton <jwe@octave.org> parents: 26998 diff changeset	6274 = args(0).xstring_value ("assignin: CONTEXT must be a string");
daab1b311a98 move core of assignin function to evaluator John W. Eaton <jwe@octave.org> parents: 26998 diff changeset	6275
daab1b311a98 move core of assignin function to evaluator John W. Eaton <jwe@octave.org> parents: 26998 diff changeset	6276 std::string varname
daab1b311a98 move core of assignin function to evaluator John W. Eaton <jwe@octave.org> parents: 26998 diff changeset	6277 = args(1).xstring_value ("assignin: VARNAME must be a string");
daab1b311a98 move core of assignin function to evaluator John W. Eaton <jwe@octave.org> parents: 26998 diff changeset	6278
daab1b311a98 move core of assignin function to evaluator John W. Eaton <jwe@octave.org> parents: 26998 diff changeset	6279 interp.assignin (context, varname, args(2));
daab1b311a98 move core of assignin function to evaluator John W. Eaton <jwe@octave.org> parents: 26998 diff changeset	6280
daab1b311a98 move core of assignin function to evaluator John W. Eaton <jwe@octave.org> parents: 26998 diff changeset	6281 return octave_value_list ();
4297 59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	6282 }
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	6283
21369 105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21361 diff changeset	6284 /*
105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21361 diff changeset	6285
21581 6fab85c1538f maint: Follow Octave conventions for use of semicolon in BIST tests. Rik <rik@octave.org> parents: 21580 diff changeset	6286 %!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	6287
105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21361 diff changeset	6288 */
105224df2330 also disallow assignment to keywords in assignin (bug #46459) John W. Eaton <jwe@octave.org> parents: 21361 diff changeset	6289
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	6290 DEFMETHOD (evalin, interp, args, nargout,
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	6291 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	6292 @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	6293 @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	6294 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	6295 @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	6296 @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	6297 @end deftypefn */)
4245 610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	6298 {
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	6299 int nargin = args.length ();
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	6300
27018 a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	6301 if (nargin < 2 \|\| nargin > 3)
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	6302 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	6303
27018 a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	6304 std::string context
a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	6305 = args(0).xstring_value ("evalin: CONTEXT must be a string");
a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	6306
a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	6307 std::string try_code
a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	6308 = args(1).xstring_value ("evalin: TRY must be a string");
a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	6309
a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	6310 if (nargin == 3)
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	6311 {
27018 a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	6312 std::string catch_code
a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	6313 = args(2).xstring_value ("evalin: CATCH must be a string");
a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	6314
a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	6315 return interp.evalin (context, try_code, catch_code, nargout);
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	6316 }
4245 610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	6317
27018 a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	6318 return interp.evalin (context, try_code, nargout);
22504 2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	6319 }
2aa9e8893ea9 Fix crash in evalc (bug #49057). Mike Miller <mtmiller@octave.org> parents: 22327 diff changeset	6320
26113 8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 26065 diff changeset	6321 DEFMETHOD (evalc, interp, args, nargout,
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 26065 diff changeset	6322 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	6323 @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	6324 @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	6325 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	6326 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	6327
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6328 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	6329
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6330 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	6331 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	6332 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	6333
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6334 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	6335 @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	6336 @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	6337 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	6338
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6339 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6340 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6341 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	6342 @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	6343
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	6344 @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	6345 @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	6346 @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	6347 @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	6348 @end deftypefn */)
21075 5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6349 {
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6350 int nargin = args.length ();
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6351
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6352 if (nargin == 0 \|\| nargin > 2)
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6353 print_usage ();
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6354
27930 ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6355 // Flush pending output and redirect stdout/stderr to capturing
ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6356 // buffer.
ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6357
ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6358 octave_stdout.flush ();
ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6359 std::cerr.flush ();
ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6360
ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6361 std::stringbuf buffer;
ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6362
ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6363 std::streambuf *old_out_buf = octave_stdout.rdbuf (&buffer);
ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6364 std::streambuf *old_err_buf = std::cerr.rdbuf (&buffer);
ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6365
ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6366 // Restore previous output buffers no matter how control exits this
ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6367 // function. There's no need to flush here. That has already
ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6368 // happened for the normal execution path. If an error happens during
ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6369 // the eval, then the message is stored in the exception object and we
ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6370 // will display it later, after the buffers have been restored.
ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6371
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29960 diff changeset	6372 unwind_action act ([=] (void)
27930 ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6373 {
ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6374 octave_stdout.rdbuf (old_out_buf);
ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6375 std::cerr.rdbuf (old_err_buf);
ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6376 });
ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6377
ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6378 // Call standard eval function.
27471 fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27458 diff changeset	6379
21075 5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6380 int eval_nargout = std::max (0, nargout - 1);
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6381
27930 ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6382 octave_value_list retval = Feval (interp, args, eval_nargout);
ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6383
ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6384 // Make sure we capture all pending output.
ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6385
ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6386 octave_stdout.flush ();
ea1898178973 simplify handling of temporary output buffer in evalc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	6387 std::cerr.flush ();
21075 5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6388
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6389 retval.prepend (buffer.str ());
27471 fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27458 diff changeset	6390
21075 5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6391 return retval;
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6392 }
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6393
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6394 /*
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6395
26716 daa281e03d9a Harden BIST tests against changes in format(). Rik <rik@octave.org> parents: 26709 diff changeset	6396 %!test
daa281e03d9a Harden BIST tests against changes in format(). Rik <rik@octave.org> parents: 26709 diff changeset	6397 %! [old_fmt, old_spacing] = format ();
daa281e03d9a Harden BIST tests against changes in format(). Rik <rik@octave.org> parents: 26709 diff changeset	6398 %! unwind_protect
daa281e03d9a Harden BIST tests against changes in format(). Rik <rik@octave.org> parents: 26709 diff changeset	6399 %! format short;
daa281e03d9a Harden BIST tests against changes in format(). Rik <rik@octave.org> parents: 26709 diff changeset	6400 %! str = evalc ("1");
27458 2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939) Rik <rik@octave.org> parents: 27408 diff changeset	6401 %! assert (str, "ans = 1\n");
26716 daa281e03d9a Harden BIST tests against changes in format(). Rik <rik@octave.org> parents: 26709 diff changeset	6402 %! unwind_protect_cleanup
daa281e03d9a Harden BIST tests against changes in format(). Rik <rik@octave.org> parents: 26709 diff changeset	6403 %! format (old_fmt);
daa281e03d9a Harden BIST tests against changes in format(). Rik <rik@octave.org> parents: 26709 diff changeset	6404 %! format (old_spacing);
daa281e03d9a Harden BIST tests against changes in format(). Rik <rik@octave.org> parents: 26709 diff changeset	6405 %! end_unwind_protect
daa281e03d9a Harden BIST tests against changes in format(). Rik <rik@octave.org> parents: 26709 diff changeset	6406
21075 5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6407 %!assert (evalc ("1;"), "")
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6408
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6409 %!test
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6410 %! [s, y] = evalc ("1");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6411 %! assert (s, "");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6412 %! assert (y, 1);
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6413
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6414 %!test
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6415 %! [s, y] = evalc ("1;");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6416 %! assert (s, "");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6417 %! assert (y, 1);
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6418
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6419 %!test
26716 daa281e03d9a Harden BIST tests against changes in format(). Rik <rik@octave.org> parents: 26709 diff changeset	6420 %! [old_fmt, old_spacing] = format ();
daa281e03d9a Harden BIST tests against changes in format(). Rik <rik@octave.org> parents: 26709 diff changeset	6421 %! unwind_protect
daa281e03d9a Harden BIST tests against changes in format(). Rik <rik@octave.org> parents: 26709 diff changeset	6422 %! format short;
daa281e03d9a Harden BIST tests against changes in format(). Rik <rik@octave.org> parents: 26709 diff changeset	6423 %! str = evalc ("y = 2");
27458 2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939) Rik <rik@octave.org> parents: 27408 diff changeset	6424 %! assert (str, "y = 2\n");
26716 daa281e03d9a Harden BIST tests against changes in format(). Rik <rik@octave.org> parents: 26709 diff changeset	6425 %! assert (y, 2);
daa281e03d9a Harden BIST tests against changes in format(). Rik <rik@octave.org> parents: 26709 diff changeset	6426 %! unwind_protect_cleanup
daa281e03d9a Harden BIST tests against changes in format(). Rik <rik@octave.org> parents: 26709 diff changeset	6427 %! format (old_fmt);
daa281e03d9a Harden BIST tests against changes in format(). Rik <rik@octave.org> parents: 26709 diff changeset	6428 %! format (old_spacing);
daa281e03d9a Harden BIST tests against changes in format(). Rik <rik@octave.org> parents: 26709 diff changeset	6429 %! end_unwind_protect
21075 5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6430
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6431 %!test
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6432 %! assert (evalc ("y = 3;"), "");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6433 %! assert (y, 3);
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6434
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6435 %!test
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6436 %! [s, a, b] = evalc ("deal (1, 2)");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6437 %! assert (s, "");
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6438 %! assert (a, 1);
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6439 %! assert (b, 2);
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6440
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6441 %!function [a, b] = __f_evalc ()
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6442 %! printf ("foo");
27458 2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939) Rik <rik@octave.org> parents: 27408 diff changeset	6443 %! fprintf (stdout, "bar ");
21580 ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 21416 diff changeset	6444 %! disp (pi);
21075 5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6445 %! a = 1;
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6446 %! b = 2;
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6447 %!endfunction
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6448 %!test
26585 d673b506f382 test: use "format short" in tests depending on output format (bug #55539) Mike Miller <mtmiller@octave.org> parents: 26423 diff changeset	6449 %! [old_fmt, old_spacing] = format ();
d673b506f382 test: use "format short" in tests depending on output format (bug #55539) Mike Miller <mtmiller@octave.org> parents: 26423 diff changeset	6450 %! unwind_protect
d673b506f382 test: use "format short" in tests depending on output format (bug #55539) Mike Miller <mtmiller@octave.org> parents: 26423 diff changeset	6451 %! format short;
d673b506f382 test: use "format short" in tests depending on output format (bug #55539) Mike Miller <mtmiller@octave.org> parents: 26423 diff changeset	6452 %! [s, a, b] = evalc ("__f_evalc ()");
d673b506f382 test: use "format short" in tests depending on output format (bug #55539) Mike Miller <mtmiller@octave.org> parents: 26423 diff changeset	6453 %! assert (s, "foobar 3.1416\n");
d673b506f382 test: use "format short" in tests depending on output format (bug #55539) Mike Miller <mtmiller@octave.org> parents: 26423 diff changeset	6454 %! assert (a, 1);
d673b506f382 test: use "format short" in tests depending on output format (bug #55539) Mike Miller <mtmiller@octave.org> parents: 26423 diff changeset	6455 %! assert (b, 2);
d673b506f382 test: use "format short" in tests depending on output format (bug #55539) Mike Miller <mtmiller@octave.org> parents: 26423 diff changeset	6456 %! unwind_protect_cleanup
d673b506f382 test: use "format short" in tests depending on output format (bug #55539) Mike Miller <mtmiller@octave.org> parents: 26423 diff changeset	6457 %! format (old_fmt);
d673b506f382 test: use "format short" in tests depending on output format (bug #55539) Mike Miller <mtmiller@octave.org> parents: 26423 diff changeset	6458 %! format (old_spacing);
d673b506f382 test: use "format short" in tests depending on output format (bug #55539) Mike Miller <mtmiller@octave.org> parents: 26423 diff changeset	6459 %! end_unwind_protect
21075 5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6460
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6461 %!error <foo> (evalc ("error ('foo')"))
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6462 %!error <bar> (evalc ("error ('foo')", "error ('bar')"))
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6463
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6464 %!test
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6465 %! warning ("off", "quiet", "local");
27471 fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27458 diff changeset	6466 %! str = evalc ("warning ('foo')");
fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27458 diff changeset	6467 %! assert (str(1:13), "warning: foo\n");
21075 5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6468
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6469 %!test
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6470 %! warning ("off", "quiet", "local");
27471 fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27458 diff changeset	6471 %! str = evalc ("error ('foo')", "warning ('bar')");
fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27458 diff changeset	6472 %! assert (str(1:13), "warning: bar\n");
21075 5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6473
21581 6fab85c1538f maint: Follow Octave conventions for use of semicolon in BIST tests. Rik <rik@octave.org> parents: 21580 diff changeset	6474 %!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	6475
21075 5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6476 */
5ed379c8decd Add new function evalc to core. Oliver Heimlich <oheim@posteo.de> parents: 21073 diff changeset	6477
8311 7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	6478 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	6479 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	6480 @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	6481 @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	6482 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	6483 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	6484 @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	6485 @end deftypefn */)
8311 7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	6486 {
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	6487 octave_value retval;
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	6488
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	6489 bool debug_flag = octave_debug;
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	6490
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	6491 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	6492 "__parser_debug_flag__");
8311 7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	6493
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	6494 octave_debug = debug_flag;
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	6495
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	6496 return retval;
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	6497 }
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	6498
27017 24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	6499 DEFMETHOD (__parse_file__, interp, args, ,
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	6500 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	6501 @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	6502 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	6503 @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	6504 {
091e4df179de new function to help with debugging by parsing .m files without executing them John W. Eaton <jwe@octave.org> parents: 17326 diff changeset	6505 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	6506
091e4df179de new function to help with debugging by parsing .m files without executing them John W. Eaton <jwe@octave.org> parents: 17326 diff changeset	6507 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	6508
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	6509 if (nargin < 1 \|\| nargin > 2)
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	6510 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	6511
28857 43ad651cf5a0 eliminate unnecessary uses of octave:: namespace qualifier John W. Eaton <jwe@octave.org> parents: 28851 diff changeset	6512 std::string file
43ad651cf5a0 eliminate unnecessary uses of octave:: namespace qualifier John W. Eaton <jwe@octave.org> parents: 28851 diff changeset	6513 = args(0).xstring_value ("__parse_file__: expecting filename as argument");
43ad651cf5a0 eliminate unnecessary uses of octave:: namespace qualifier John W. Eaton <jwe@octave.org> parents: 28851 diff changeset	6514
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29960 diff changeset	6515 std::string full_file = sys::file_ops::tilde_expand (file);
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29960 diff changeset	6516
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29960 diff changeset	6517 full_file = sys::env::make_absolute (full_file);
23667 2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	6518
2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	6519 std::string dir_name;
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	6520
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	6521 std::size_t file_len = file.length ();
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	6522
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	6523 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	6524 \|\| (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	6525 \|\| (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	6526 {
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29960 diff changeset	6527 file = 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	6528 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	6529
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29960 diff changeset	6530 std::size_t pos = file.find_last_of (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	6531 if (pos != std::string::npos)
23667 2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	6532 {
2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	6533 dir_name = file.substr (0, pos);
2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	6534 file = file.substr (pos+1);
2d4a7ae1f6cd store directory and package names in function when function is parsed John W. Eaton <jwe@octave.org> parents: 23655 diff changeset	6535 }
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	6536 }
20798 bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	6537
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	6538 if (nargin == 2)
bb585db6dee2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	6539 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	6540
23653 3bb0a937c071 avoid possible memory errors when parsing function files John W. Eaton <jwe@octave.org> parents: 23641 diff changeset	6541 octave_value ov_fcn
27509 fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	6542 = parse_fcn_file (interp, full_file, file, dir_name, "", "", true,
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend John W. Eaton <jwe@octave.org> parents: 27507 diff changeset	6543 false, false, false);
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	6544
091e4df179de new function to help with debugging by parsing .m files without executing them John W. Eaton <jwe@octave.org> parents: 17326 diff changeset	6545 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	6546 }
29958 32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29950 diff changeset	6547
32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29950 diff changeset	6548 OCTAVE_NAMESPACE_END

Mercurial > octave

annotate libinterp/parse-tree/oct-parse.yy @ 30108:3efce22b7350