annotate libinterp/parse-tree/oct-parse.yy @ 29723:6858992dfadf

enter symbols into current scope in parser instead of lexer * lex.h, lex.ll (base_lexer::is_variable): Eliminate unused SCOPE argument. Change all uses. * oct-parse.yy (identifer): Enter NAME in current scope here instead of in lexer. * token.h, token.cc (token::m_sr): Delete member variable and all uses. (token::symbol_name): Delete method. Use token::text where this method was used prevoiusly. (token::sym_rec, token::is_symbol): Delete methods and all uses. (token::sym_rec_token): Delete enum value and all uses. Use string_token instead. (token::isstring): New method. (token::tok_info): Delete overload for symbol_record objects.
author John W. Eaton <jwe@octave.org>
date Tue, 01 Jun 2021 16:57:40 -0400
parents 32f4357ac8d9
children c19f8cbe0fd5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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;
2891
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe]
jwe
parents: 2884
diff changeset
177 octave_user_function *octave_user_function_type;
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
178
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
179 octave::tree_classdef *tree_classdef_type;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
180 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
181 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
182 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
183 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
184 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
185 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
186 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
187 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
188 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
189 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
190 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
191 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
192 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
193 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
194 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
195 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
196 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
197
143
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe]
jwe
parents: 118
diff changeset
198 // Tokens with line and column information.
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe]
jwe
parents: 118
diff changeset
199 %token <tok_val> '=' ':' '-' '+' '*' '/'
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
200 %token <tok_val> '(' ')' '[' ']' '{' '}' '.' '@'
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
201 %token <tok_val> ',' ';' '\n'
4018
a8621d87fbf5 [project @ 2002-08-05 03:17:25 by jwe]
jwe
parents: 4009
diff changeset
202 %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
203 %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
204 %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
205 %token <tok_val> EXPR_AND EXPR_OR EXPR_NOT
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe]
jwe
parents: 118
diff changeset
206 %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
207 %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
208 %token <tok_val> HERMITIAN TRANSPOSE
143
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe]
jwe
parents: 118
diff changeset
209 %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
210 %token <tok_val> NUMBER
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
211 %token <tok_val> STRUCT_ELT
2883
0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe]
jwe
parents: 2865
diff changeset
212 %token <tok_val> NAME
143
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe]
jwe
parents: 118
diff changeset
213 %token <tok_val> END
5279
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe]
jwe
parents: 5189
diff changeset
214 %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
215 %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
216 %token <tok_val> SPMD
1491
893b416bb919 [project @ 1995-09-29 04:03:01 by jwe]
jwe
parents: 1489
diff changeset
217 %token <tok_val> IF ELSEIF ELSE
2764
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe]
jwe
parents: 2745
diff changeset
218 %token <tok_val> SWITCH CASE OTHERWISE
1491
893b416bb919 [project @ 1995-09-29 04:03:01 by jwe]
jwe
parents: 1489
diff changeset
219 %token <tok_val> BREAK CONTINUE FUNC_RET
924
8b0920cc1d64 [project @ 1994-11-15 00:40:50 by jwe]
jwe
parents: 922
diff changeset
220 %token <tok_val> UNWIND CLEANUP
1489
3e705c864019 [project @ 1995-09-28 05:38:26 by jwe]
jwe
parents: 1371
diff changeset
221 %token <tok_val> TRY CATCH
14294
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14293
diff changeset
222 %token <tok_val> GLOBAL PERSISTENT
4342
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe]
jwe
parents: 4318
diff changeset
223 %token <tok_val> FCN_HANDLE
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
224 %token <tok_val> CLASSDEF
13249
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
225 %token <tok_val> PROPERTIES METHODS EVENTS ENUMERATION
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
226 %token <tok_val> METAQUERY
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
227 %token <tok_val> SUPERCLASSREF
18520
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18419
diff changeset
228 %token <tok_val> FQ_IDENT
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
229 %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
230 %token <tok_val> FCN
21064
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21063
diff changeset
231 %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
232 %token <tok_val> END_OF_INPUT
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
233
143
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe]
jwe
parents: 118
diff changeset
234 // 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
235 %token <dummy_type> INPUT_FILE
7587
1f662945c2be handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents: 7562
diff changeset
236 // %token VARARGIN VARARGOUT
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
237
143
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe]
jwe
parents: 118
diff changeset
238 // Nonterminals we construct.
24037
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
239 %type <dummy_type> indirect_ref_op decl_param_init
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
240 %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
241 %type <dummy_type> param_list_beg param_list_end stmt_begin anon_fcn_begin
bd80e14f268a improve parse error message for @()x+=expr (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27729
diff changeset
242 %type <dummy_type> parsing_local_fcns parse_error
16644
856cb7cba231 maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16595 16627
diff changeset
243 %type <comment_type> stash_comment
17657
df266c923b83 delete unnecessary tok_type semantic value in parser
John W. Eaton <jwe@octave.org>
parents: 17656
diff changeset
244 %type <tok_val> function_beg classdef_beg
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
245 %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
246 %type <tree_type> input
5861
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe]
jwe
parents: 5848
diff changeset
247 %type <tree_constant_type> string constant magic_colon
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe]
jwe
parents: 5848
diff changeset
248 %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
249 %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
250 %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
251 %type <tree_cell_type> cell_rows
5102
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe]
jwe
parents: 5013
diff changeset
252 %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
253 %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
254 %type <tree_expression_type> simple_expr colon_expr assign_expr expression
17283
e6c0ac8ce5b6 eliminate parse conflicts introduced by changeset 923ce8b42db2
John W. Eaton <jwe@octave.org>
parents: 17281
diff changeset
255 %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
256 %type <tree_superclass_ref_type> superclass_identifier
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26662
diff changeset
257 %type <tree_metaclass_query_type> meta_identifier
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
258 %type <tree_index_expression_type> word_list_cmd
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3347
diff changeset
259 %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
260 %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
261 %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
262 %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
263 %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
264 %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
265 %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
266 %type <tree_function_def_type> function
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
267 %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
268 %type <tree_command_type> file
578
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe]
jwe
parents: 572
diff changeset
269 %type <tree_if_command_type> if_command
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe]
jwe
parents: 572
diff changeset
270 %type <tree_if_clause_type> elseif_clause else_clause
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe]
jwe
parents: 572
diff changeset
271 %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
272 %type <tree_switch_command_type> switch_command
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe]
jwe
parents: 2745
diff changeset
273 %type <tree_switch_case_type> switch_case default_case
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe]
jwe
parents: 2745
diff changeset
274 %type <tree_switch_case_list_type> case_list1 case_list
17317
56fe31b248de disallow ~ in global and persistent declaration lists
John W. Eaton <jwe@octave.org>
parents: 17316
diff changeset
275 %type <tree_decl_elt_type> decl2 param_list_elt
2846
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe]
jwe
parents: 2825
diff changeset
276 %type <tree_decl_init_list_type> decl1
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe]
jwe
parents: 2825
diff changeset
277 %type <tree_decl_command_type> declaration
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
278 %type <tree_statement_type> statement function_end
627
739d16c30481 [project @ 1994-08-19 13:23:14 by jwe]
jwe
parents: 620
diff changeset
279 %type <tree_statement_list_type> simple_list simple_list1 list list1
17322
4c1ae06111c9 allow parser to accept empty statements (bug #37099)
John W. Eaton <jwe@octave.org>
parents: 17317
diff changeset
280 %type <tree_statement_list_type> opt_list
23343
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
281 %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
282 %type <tree_classdef_attribute_type> attr
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
283 %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
284 %type <tree_classdef_superclass_type> superclass
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
285 %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
286 %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
287 %type <tree_classdef_property_type> class_property
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
288 %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
289 %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
290 %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
291 %type <tree_classdef_methods_block_type> methods_block
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
292 %type <tree_classdef_event_type> class_event
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
293 %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
294 %type <tree_classdef_events_block_type> events_block
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
295 %type <tree_classdef_enum_type> class_enum
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
296 %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
297 %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
298 %type <tree_function_def_type> method_decl method
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
299 %type <octave_user_function_type> method_decl1
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
300
143
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe]
jwe
parents: 118
diff changeset
301 // Precedence and associativity.
21294
3d375b0905a0 eliminate unused << and >> operators from Octave scripting language
John W. Eaton <jwe@octave.org>
parents: 21159
diff changeset
302 %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
303 %left EXPR_OR_OR
ef3caf27cb9c [project @ 2002-08-07 06:54:41 by jwe]
jwe
parents: 4018
diff changeset
304 %left EXPR_AND_AND
ef3caf27cb9c [project @ 2002-08-07 06:54:41 by jwe]
jwe
parents: 4018
diff changeset
305 %left EXPR_OR
ef3caf27cb9c [project @ 2002-08-07 06:54:41 by jwe]
jwe
parents: 4018
diff changeset
306 %left EXPR_AND
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
307 %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
308 %left ':'
1276
cbdf7db98554 [project @ 1995-04-24 15:31:24 by jwe]
jwe
parents: 1266
diff changeset
309 %left '-' '+' EPLUS EMINUS
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
310 %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
311 %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
312 %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
313 %right PLUS_PLUS MINUS_MINUS
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3347
diff changeset
314 %left '(' '.' '{'
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
315
17629
1e8f8900a041 clean up partially constructed parse tree objects on parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17622
diff changeset
316 // 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
317 // 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
318 // 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
319 // 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
320 // 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
321 // here).
0c5f50706ba3 attempt to catch possible memory leaks in parser cleanup
John W. Eaton <jwe@octave.org>
parents: 17632
diff changeset
322
0c5f50706ba3 attempt to catch possible memory leaks in parser cleanup
John W. Eaton <jwe@octave.org>
parents: 17632
diff changeset
323 %destructor { } <tok_val>
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
324 %destructor { } <punct_type>
17658
0c5f50706ba3 attempt to catch possible memory leaks in parser cleanup
John W. Eaton <jwe@octave.org>
parents: 17632
diff changeset
325 %destructor { } <comment_type>
0c5f50706ba3 attempt to catch possible memory leaks in parser cleanup
John W. Eaton <jwe@octave.org>
parents: 17632
diff changeset
326 %destructor { } <>
0c5f50706ba3 attempt to catch possible memory leaks in parser cleanup
John W. Eaton <jwe@octave.org>
parents: 17632
diff changeset
327
19593
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
328 %destructor { delete $$; } <tree_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
329 %destructor { delete $$; } <tree_matrix_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
330 %destructor { delete $$; } <tree_cell_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
331 %destructor { delete $$; } <tree_expression_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
332 %destructor { delete $$; } <tree_constant_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
333 %destructor { delete $$; } <tree_fcn_handle_type>
26686
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26662
diff changeset
334 %destructor { delete $$; } <tree_superclass_ref_type>
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26662
diff changeset
335 %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
336 %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
337 %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
338 %destructor { delete $$; } <tree_identifier_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
339 %destructor { delete $$; } <tree_index_expression_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
340 %destructor { delete $$; } <tree_argument_list_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
341 %destructor { delete $$; } <tree_parameter_list_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
342 %destructor { delete $$; } <tree_command_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
343 %destructor { delete $$; } <tree_if_command_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
344 %destructor { delete $$; } <tree_if_clause_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
345 %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
346 %destructor { delete $$; } <tree_switch_command_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
347 %destructor { delete $$; } <tree_switch_case_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
348 %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
349 %destructor { delete $$; } <tree_decl_elt_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
350 %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
351 %destructor { delete $$; } <tree_decl_command_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
352 %destructor { delete $$; } <tree_statement_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
353 %destructor { delete $$; } <tree_statement_list_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
354 %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
355
18262
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
356 %destructor { delete $$; } <tree_classdef_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
357 %destructor { delete $$; } <tree_classdef_attribute_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
358 %destructor { delete $$; } <tree_classdef_attribute_list_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
359 %destructor { delete $$; } <tree_classdef_superclass_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
360 %destructor { delete $$; } <tree_classdef_superclass_list_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
361 %destructor { delete $$; } <tree_classdef_body_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
362 %destructor { delete $$; } <tree_classdef_property_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
363 %destructor { delete $$; } <tree_classdef_property_list_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
364 %destructor { delete $$; } <tree_classdef_properties_block_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
365 %destructor { delete $$; } <tree_classdef_methods_list_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
366 %destructor { delete $$; } <tree_classdef_methods_block_type>
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
367 %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
368 %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
369 %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
370 %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
371 %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
372 %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
373
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
374 // 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
375 // already explicitly declared for all types.
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
376 //
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
377 // %destructor {
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
378 // warning_with_id
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
379 // ("Octave:parser-destructor",
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
380 // "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
381 // } <*>
17629
1e8f8900a041 clean up partially constructed parse tree objects on parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17622
diff changeset
382
143
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe]
jwe
parents: 118
diff changeset
383 // Where to start.
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
384 %start input
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
385
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
386 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
387
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
388 // ==============================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
389 // Statements and statement lists
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
390 // ==============================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
391
17322
4c1ae06111c9 allow parser to accept empty statements (bug #37099)
John W. Eaton <jwe@octave.org>
parents: 17317
diff changeset
392 input : simple_list '\n'
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
393 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
394 OCTAVE_YYUSE ($2);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
395
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
396 $$ = nullptr;
28407
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28266
diff changeset
397 std::shared_ptr<octave::tree_statement_list> tmp_lst ($1);
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28266
diff changeset
398 parser.statement_list (tmp_lst);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
399 YYACCEPT;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
400 }
17322
4c1ae06111c9 allow parser to accept empty statements (bug #37099)
John W. Eaton <jwe@octave.org>
parents: 17317
diff changeset
401 | simple_list END_OF_INPUT
4c1ae06111c9 allow parser to accept empty statements (bug #37099)
John W. Eaton <jwe@octave.org>
parents: 17317
diff changeset
402 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
403 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
404
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
405 $$ = nullptr;
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
406 lexer.m_end_of_input = true;
28407
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28266
diff changeset
407 std::shared_ptr<octave::tree_statement_list> tmp_lst ($1);
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28266
diff changeset
408 parser.statement_list (tmp_lst);
17322
4c1ae06111c9 allow parser to accept empty statements (bug #37099)
John W. Eaton <jwe@octave.org>
parents: 17317
diff changeset
409 YYACCEPT;
4c1ae06111c9 allow parser to accept empty statements (bug #37099)
John W. Eaton <jwe@octave.org>
parents: 17317
diff changeset
410 }
17326
f444e4cef9b9 avoid exiting Octave on parse error (bug #39862)
John W. Eaton <jwe@octave.org>
parents: 17322
diff changeset
411 | parse_error
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
412 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
413 $$ = nullptr;
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
414 YYABORT;
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
415 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
416 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
417
17322
4c1ae06111c9 allow parser to accept empty statements (bug #37099)
John W. Eaton <jwe@octave.org>
parents: 17317
diff changeset
418 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
419 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
420 OCTAVE_YYUSE ($1);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
421
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
422 $$ = nullptr;
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
423 }
17322
4c1ae06111c9 allow parser to accept empty statements (bug #37099)
John W. Eaton <jwe@octave.org>
parents: 17317
diff changeset
424 | 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
425 { $$ = 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
426 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
427
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
428 simple_list1 : statement
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
429 { $$ = parser.make_statement_list ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
430 | 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
431 { $$ = 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
432 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
433
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
434 opt_list : // empty
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
435 { $$ = new octave::tree_statement_list (); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
436 | list
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
437 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
438 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
439
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
440 list : list1 opt_sep
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
441 { $$ = 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
442 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
443
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
444 list1 : statement
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
445 { $$ = parser.make_statement_list ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
446 | list1 sep statement
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
447 { $$ = 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
448 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
449
23343
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
450 opt_fcn_list : // empty
23635
b5a9cd6de1b8 avoid possible memory error in parser
John W. Eaton <jwe@octave.org>
parents: 23631
diff changeset
451 { $$ = new octave::tree_statement_list (); }
23343
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
452 | fcn_list
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
453 { $$ = $1; }
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
454 ;
23396
945b53af4655 maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents: 23343
diff changeset
455
23343
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
456 fcn_list : fcn_list1 opt_sep
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
457 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
458 OCTAVE_YYUSE ($2);
23343
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
459
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
460 $$ = $1;
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
461 }
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
462 ;
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
463
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
464 fcn_list1 : function
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
465 {
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
466 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
467 $$ = new octave::tree_statement_list (stmt);
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
468 }
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
469 | fcn_list1 opt_sep function
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
470 {
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
471 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
472 $$ = 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
473 }
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
474 ;
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
475
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
476 statement : expression
17693
efbe746f8fa8 eliminate octave_comment_buffer singleton
John W. Eaton <jwe@octave.org>
parents: 17673
diff changeset
477 { $$ = parser.make_statement ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
478 | command
17693
efbe746f8fa8 eliminate octave_comment_buffer singleton
John W. Eaton <jwe@octave.org>
parents: 17673
diff changeset
479 { $$ = parser.make_statement ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
480 | word_list_cmd
17693
efbe746f8fa8 eliminate octave_comment_buffer singleton
John W. Eaton <jwe@octave.org>
parents: 17673
diff changeset
481 { $$ = parser.make_statement ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
482 ;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
483
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
484 // =================
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
485 // Word-list command
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
486 // =================
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
487
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
488 // 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
489 // 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
490 // WHILE, etc.
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
491
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
492 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
493 {
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804)
Max Brister <max@2bass.com>
parents: 16294
diff changeset
494 $$ = 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
495 if (! $$)
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
496 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
497 // 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
498 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
499 }
26662
05fc703b419a update handling of command-style function call syntax in eval
John W. Eaton <jwe@octave.org>
parents: 26661
diff changeset
500 $$->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
501 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
502 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
503
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
504 word_list : string
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
505 { $$ = new octave::tree_argument_list ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
506 | word_list string
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
507 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
508 $1->append ($2);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
509 $$ = $1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
510 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
511 ;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
512
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
513 // ===========
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
514 // Expressions
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
515 // ===========
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
516
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
517 identifier : NAME
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
518 {
29723
6858992dfadf enter symbols into current scope in parser instead of lexer
John W. Eaton <jwe@octave.org>
parents: 29655
diff changeset
519 // 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
520 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
521 = 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
522
6858992dfadf enter symbols into current scope in parser instead of lexer
John W. Eaton <jwe@octave.org>
parents: 29655
diff changeset
523 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
524
6858992dfadf enter symbols into current scope in parser instead of lexer
John W. Eaton <jwe@octave.org>
parents: 29655
diff changeset
525 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
526 = (scope
6858992dfadf enter symbols into current scope in parser instead of lexer
John W. Eaton <jwe@octave.org>
parents: 29655
diff changeset
527 ? 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
528
6858992dfadf enter symbols into current scope in parser instead of lexer
John W. Eaton <jwe@octave.org>
parents: 29655
diff changeset
529
6858992dfadf enter symbols into current scope in parser instead of lexer
John W. Eaton <jwe@octave.org>
parents: 29655
diff changeset
530 $$ = 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
531 $1->column ());
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
532 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
533 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
534
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
535 superclass_identifier
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
536 : SUPERCLASSREF
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
537 {
26718
9b0335f4bc74 revise naming of the parts of a superclass reference
John W. Eaton <jwe@octave.org>
parents: 26716
diff changeset
538 std::string meth = $1->superclass_method_name ();
26686
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26662
diff changeset
539 std::string cls = $1->superclass_class_name ();
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26662
diff changeset
540
26718
9b0335f4bc74 revise naming of the parts of a superclass reference
John W. Eaton <jwe@octave.org>
parents: 26716
diff changeset
541 $$ = new octave::tree_superclass_ref (meth, cls,
26686
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26662
diff changeset
542 $1->line (),
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26662
diff changeset
543 $1->column ());
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
544 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
545 ;
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11572
diff changeset
546
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
547 meta_identifier : METAQUERY
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
548 {
26686
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26662
diff changeset
549 std::string cls = $1->text ();
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26662
diff changeset
550
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26662
diff changeset
551 $$ = new octave::tree_metaclass_query (cls, $1->line (),
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26662
diff changeset
552 $1->column ());
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
553 }
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11572
diff changeset
554 ;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
555
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
556 string : DQ_STRING
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
557 { $$ = parser.make_constant (DQ_STRING, $1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
558 | SQ_STRING
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
559 { $$ = parser.make_constant (SQ_STRING, $1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
560 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
561
28582
dc8de424fc72 use octave_value object to store numeric tokens in the lexer
John W. Eaton <jwe@octave.org>
parents: 28548
diff changeset
562 constant : NUMBER
dc8de424fc72 use octave_value object to store numeric tokens in the lexer
John W. Eaton <jwe@octave.org>
parents: 28548
diff changeset
563 { $$ = parser.make_constant (NUMBER, $1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
564 | string
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
565 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
566 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
567
16924
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
568 matrix : '[' matrix_rows ']'
27764
f64e399b6dda report missing semicolon location for array expressions (bug #57159)
John W. Eaton <jwe@octave.org>
parents: 27762
diff changeset
569 { $$ = parser.finish_matrix ($2, $1, $3); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
570 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
571
16924
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
572 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
573 { $$ = $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
574 | matrix_rows ';' cell_or_matrix_row
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
575 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
576 OCTAVE_YYUSE ($2);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
577
16924
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
578 if ($1)
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
579 {
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
580 if ($3)
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
581 $1->append ($3);
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
582
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
583 $$ = $1;
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
584 }
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
585 else
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
586 $$ = $3 ? new octave::tree_matrix ($3) : nullptr;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
587 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
588 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
589
16924
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
590 cell : '{' cell_rows '}'
27764
f64e399b6dda report missing semicolon location for array expressions (bug #57159)
John W. Eaton <jwe@octave.org>
parents: 27762
diff changeset
591 { $$ = parser.finish_cell ($2, $1, $3); }
10315
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 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
595 { $$ = $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
596 | cell_rows ';' cell_or_matrix_row
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
597 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
598 OCTAVE_YYUSE ($2);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
599
16924
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
600 if ($1)
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
601 {
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
602 if ($3)
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
603 $1->append ($3);
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
604
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
605 $$ = $1;
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
606 }
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
607 else
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
608 $$ = $3 ? new octave::tree_cell ($3) : nullptr;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
609 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
610 ;
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3347
diff changeset
611
16924
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
612 // 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
613 // 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
614
28804
3719f5d452d4 refactor implementation of END indexing in interpreter (bug #58953)
John W. Eaton <jwe@octave.org> and Fernando Alvarruiz
parents: 28700
diff changeset
615 // 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
616 // 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
617 // 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
618
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3347
diff changeset
619 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
620 : // empty
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
621 { $$ = nullptr; }
16924
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
622 | ','
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
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 ($1);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
625
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
626 $$ = nullptr;
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
627 }
16924
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
628 | arg_list
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16251
diff changeset
629 { $$ = $1; }
16924
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
630 | arg_list ','
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
631 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
632 OCTAVE_YYUSE ($2);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
633
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
634 $$ = $1;
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
635 }
16924
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
636 | ',' arg_list
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
637 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
638 OCTAVE_YYUSE ($1);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
639
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
640 $$ = $2;
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
641 }
16924
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
642 | ',' arg_list ','
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
643 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
644 OCTAVE_YYUSE ($1);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
645 OCTAVE_YYUSE ($3);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
646
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
647 $$ = $2;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
648 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
649 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
650
26740
cf271740922a allow parsing of function handles of the form @foo.bar
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
651 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
652 { $$ = parser.make_fcn_handle ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
653 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
654
27736
bd80e14f268a improve parse error message for @()x+=expr (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27729
diff changeset
655 // 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
656 // 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
657 // 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
658
bd80e14f268a improve parse error message for @()x+=expr (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27729
diff changeset
659 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
660 {
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27766
diff changeset
661 $$ = 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
662 if (! $$)
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27516
diff changeset
663 {
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27516
diff changeset
664 // 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
665 YYABORT;
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27516
diff changeset
666 }
27736
bd80e14f268a improve parse error message for @()x+=expr (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27729
diff changeset
667
bd80e14f268a improve parse error message for @()x+=expr (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27729
diff changeset
668 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
669 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
670 }
27736
bd80e14f268a improve parse error message for @()x+=expr (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27729
diff changeset
671 | '@' 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
672 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
673 OCTAVE_YYUSE ($1);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
674 OCTAVE_YYUSE ($2);
24283
81557c74be7f improve error message for invalid anonymous functions
John W. Eaton <jwe@octave.org>
parents: 24270
diff changeset
675
27736
bd80e14f268a improve parse error message for @()x+=expr (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27729
diff changeset
676 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
677
24283
81557c74be7f improve error message for invalid anonymous functions
John W. Eaton <jwe@octave.org>
parents: 24270
diff changeset
678 $$ = nullptr;
81557c74be7f improve error message for invalid anonymous functions
John W. Eaton <jwe@octave.org>
parents: 24270
diff changeset
679 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
680 YYABORT;
81557c74be7f improve error message for invalid anonymous functions
John W. Eaton <jwe@octave.org>
parents: 24270
diff changeset
681 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
682 ;
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11572
diff changeset
683
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
684 primary_expr : identifier
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
685 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
686 | constant
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
687 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
688 | fcn_handle
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
689 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
690 | matrix
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16251
diff changeset
691 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
692 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
693 $$ = $1;
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16251
diff changeset
694 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
695 | cell
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
696 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
697 | meta_identifier
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
698 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
699 | superclass_identifier
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
700 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
701 | '(' expression ')'
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
702 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
703 OCTAVE_YYUSE ($1);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
704 OCTAVE_YYUSE ($3);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
705
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
706 $$ = $2->mark_in_parens ();
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
707 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
708 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
709
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
710 magic_colon : ':'
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
711 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
712 OCTAVE_YYUSE ($1);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
713
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
714 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
715 $$ = new octave::tree_constant (tmp);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
716 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
717 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
718
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
719 magic_tilde : EXPR_NOT
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
720 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
721 OCTAVE_YYUSE ($1);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
722
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
723 $$ = new octave::tree_black_hole ();
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
724 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
725 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
726
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
727 arg_list : expression
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
728 { $$ = new octave::tree_argument_list ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
729 | magic_colon
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
730 { $$ = new octave::tree_argument_list ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
731 | magic_tilde
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
732 { $$ = new octave::tree_argument_list ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
733 | arg_list ',' magic_colon
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
734 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
735 OCTAVE_YYUSE ($2);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
736
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
737 $1->append ($3);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
738 $$ = $1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
739 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
740 | arg_list ',' magic_tilde
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
741 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
742 OCTAVE_YYUSE ($2);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
743
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
744 $1->append ($3);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
745 $$ = $1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
746 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
747 | arg_list ',' expression
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
748 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
749 OCTAVE_YYUSE ($2);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
750
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
751 $1->append ($3);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
752 $$ = $1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
753 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
754 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
755
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
756 indirect_ref_op : '.'
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
757 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
758 OCTAVE_YYUSE ($1);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
759
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
760 $$ = 0;
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
761 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
762 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
763 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
764
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
765 oper_expr : primary_expr
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
766 { $$ = $1; }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
767 | oper_expr PLUS_PLUS
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
768 { $$ = 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
769 | oper_expr MINUS_MINUS
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
770 { $$ = 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
771 | oper_expr '(' ')'
16302
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804)
Max Brister <max@2bass.com>
parents: 16294
diff changeset
772 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
773 OCTAVE_YYUSE ($2);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
774 OCTAVE_YYUSE ($3);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
775
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
776 $$ = 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
777 if (! $$)
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
778 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
779 // 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
780 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
781 }
16302
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804)
Max Brister <max@2bass.com>
parents: 16294
diff changeset
782 }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
783 | 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
784 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
785 OCTAVE_YYUSE ($2);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
786 OCTAVE_YYUSE ($4);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
787
16302
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804)
Max Brister <max@2bass.com>
parents: 16294
diff changeset
788 $$ = 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
789 if (! $$)
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
790 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
791 // 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
792 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
793 }
16302
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804)
Max Brister <max@2bass.com>
parents: 16294
diff changeset
794 }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
795 | oper_expr '{' '}'
16302
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804)
Max Brister <max@2bass.com>
parents: 16294
diff changeset
796 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
797 OCTAVE_YYUSE ($2);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
798 OCTAVE_YYUSE ($3);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
799
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
800 $$ = 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
801 if (! $$)
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
802 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
803 // 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
804 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
805 }
16302
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804)
Max Brister <max@2bass.com>
parents: 16294
diff changeset
806 }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
807 | 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
808 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
809 OCTAVE_YYUSE ($2);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
810 OCTAVE_YYUSE ($4);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
811
16302
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804)
Max Brister <max@2bass.com>
parents: 16294
diff changeset
812 $$ = 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
813 if (! $$)
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
814 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
815 // 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
816 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
817 }
16302
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804)
Max Brister <max@2bass.com>
parents: 16294
diff changeset
818 }
16284
09881dab3aaf * lex.ll, oct-parse.in.yy (HERMITIAN): Rename token from QUOTE.
John W. Eaton <jwe@octave.org>
parents: 16279
diff changeset
819 | oper_expr HERMITIAN
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
820 { $$ = 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
821 | oper_expr TRANSPOSE
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
822 { $$ = 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
823 | 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
824 { $$ = 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
825 | 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
826 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
827 OCTAVE_YYUSE ($3);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
828 OCTAVE_YYUSE ($5);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
829
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
830 $$ = 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
831 }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
832 | 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
833 { $$ = 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
834 | 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
835 { $$ = 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
836 | 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
837 { $$ = 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
838 | '+' oper_expr %prec UNARY
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
839 { $$ = 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
840 | '-' oper_expr %prec UNARY
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
841 { $$ = 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
842 | oper_expr POW power_expr
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
843 { $$ = 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
844 | oper_expr EPOW power_expr
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
845 { $$ = 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
846 | oper_expr '+' oper_expr
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
847 { $$ = 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
848 | oper_expr '-' oper_expr
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
849 { $$ = parser.make_binary_op ('-', $1, $2, $3); }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
850 | oper_expr '*' oper_expr
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
851 { $$ = parser.make_binary_op ('*', $1, $2, $3); }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
852 | oper_expr '/' oper_expr
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
853 { $$ = parser.make_binary_op ('/', $1, $2, $3); }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
854 | oper_expr EPLUS oper_expr
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
855 { $$ = parser.make_binary_op ('+', $1, $2, $3); }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
856 | oper_expr EMINUS oper_expr
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
857 { $$ = parser.make_binary_op ('-', $1, $2, $3); }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
858 | oper_expr EMUL oper_expr
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
859 { $$ = parser.make_binary_op (EMUL, $1, $2, $3); }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
860 | oper_expr EDIV oper_expr
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
861 { $$ = parser.make_binary_op (EDIV, $1, $2, $3); }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
862 | oper_expr LEFTDIV oper_expr
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
863 { $$ = parser.make_binary_op (LEFTDIV, $1, $2, $3); }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
864 | oper_expr ELEFTDIV oper_expr
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
865 { $$ = 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
866 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
867
17622
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
868 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
869 { $$ = $1; }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
870 | 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
871 { $$ = 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
872 | 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
873 { $$ = 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
874 | power_expr '(' ')'
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
875 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
876 OCTAVE_YYUSE ($2);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
877 OCTAVE_YYUSE ($3);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
878
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
879 $$ = 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
880 if (! $$)
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
881 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
882 // 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
883 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
884 }
17622
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
885 }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
886 | 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
887 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
888 OCTAVE_YYUSE ($2);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
889 OCTAVE_YYUSE ($4);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
890
17622
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
891 $$ = 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
892 if (! $$)
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
893 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
894 // 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
895 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
896 }
17622
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
897 }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
898 | power_expr '{' '}'
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
899 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
900 OCTAVE_YYUSE ($2);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
901 OCTAVE_YYUSE ($3);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
902
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
903 $$ = 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
904 if (! $$)
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
905 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
906 // 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
907 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
908 }
17622
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
909 }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
910 | 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
911 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
912 OCTAVE_YYUSE ($2);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
913 OCTAVE_YYUSE ($4);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
914
17622
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
915 $$ = 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
916 if (! $$)
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
917 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
918 // 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
919 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
920 }
17622
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
921 }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
922 | 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
923 { $$ = 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
924 | 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
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 ($3);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
927 OCTAVE_YYUSE ($5);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
928
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
929 $$ = 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
930 }
17622
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
931 | 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
932 { $$ = 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
933 | 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
934 { $$ = 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
935 | 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
936 { $$ = 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
937 | '+' 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
938 { $$ = 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
939 | '-' 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
940 { $$ = 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
941 ;
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
942
23655
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
943 colon_expr : oper_expr ':' oper_expr
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
944 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
945 OCTAVE_YYUSE ($2);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
946
23655
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
947 $$ = 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
948
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
949 if (! $$)
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
950 {
23655
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
951 // 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
952 YYABORT;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
953 }
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
954 }
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
955 | 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
956 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
957 OCTAVE_YYUSE ($2);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
958 OCTAVE_YYUSE ($4);
23655
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
959
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
960 $$ = 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
961
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
962 if (! $$)
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
963 {
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
964 // 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
965 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
966 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
967 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
968 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
969
23655
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
970 simple_expr : oper_expr
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
971 { $$ = $1; }
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
972 | colon_expr
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
973 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
974 | 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
975 { $$ = 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
976 | 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
977 { $$ = 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
978 | 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
979 { $$ = 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
980 | 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
981 { $$ = 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
982 | 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
983 { $$ = 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
984 | 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
985 { $$ = 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
986 | 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
987 { $$ = 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
988 | 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
989 { $$ = 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
990 | 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
991 { $$ = 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
992 | 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
993 { $$ = 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
994 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
995
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
996 assign_lhs : simple_expr
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
997 {
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
998 $$ = parser.validate_matrix_for_assignment ($1);
16273
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
999
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
1000 if ($$)
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
1001 { 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
1002 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1003 {
16277
8cb65fd72164 eliminate obsolete concepts of "pending local" and "forced" variables
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
1004 // 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
1005 YYABORT;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1006 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1007 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1008 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1009
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1010 assign_expr : assign_lhs '=' expression
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1011 { $$ = parser.make_assign_op ('=', $1, $2, $3); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1012 | assign_lhs ADD_EQ expression
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1013 { $$ = 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
1014 | assign_lhs SUB_EQ expression
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1015 { $$ = 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
1016 | assign_lhs MUL_EQ expression
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1017 { $$ = 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
1018 | assign_lhs DIV_EQ expression
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1019 { $$ = 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
1020 | assign_lhs LEFTDIV_EQ expression
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1021 { $$ = 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
1022 | assign_lhs POW_EQ expression
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1023 { $$ = 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
1024 | assign_lhs EMUL_EQ expression
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1025 { $$ = 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
1026 | assign_lhs EDIV_EQ expression
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1027 { $$ = 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
1028 | assign_lhs ELEFTDIV_EQ expression
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1029 { $$ = 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
1030 | assign_lhs EPOW_EQ expression
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1031 { $$ = 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
1032 | assign_lhs AND_EQ expression
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1033 { $$ = 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
1034 | assign_lhs OR_EQ expression
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1035 { $$ = 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
1036 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1037
27729
718845eb3c7a eliminate unnecessary expr_no_assign non-terminal in parser
John W. Eaton <jwe@octave.org>
parents: 27728
diff changeset
1038 expression : simple_expr
16273
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
1039 {
23576
00e518162fda maint: Deprecate is_cell and replace with iscell.
Rik <rik@octave.org>
parents: 23553
diff changeset
1040 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
1041 {
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1042 if (parser.validate_array_list ($1))
16273
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
1043 $$ = $1;
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
1044 else
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
1045 {
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
1046 delete $1;
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
1047 YYABORT;
16273
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
1048 }
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
1049 }
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
1050 else
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
1051 $$ = $1;
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
1052 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1053 | assign_expr
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
1054 {
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
1055 if (! $1)
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
1056 YYABORT;
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
1057
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
1058 $$ = $1;
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
1059 }
27729
718845eb3c7a eliminate unnecessary expr_no_assign non-terminal in parser
John W. Eaton <jwe@octave.org>
parents: 27728
diff changeset
1060 | anon_fcn_handle
718845eb3c7a eliminate unnecessary expr_no_assign non-terminal in parser
John W. Eaton <jwe@octave.org>
parents: 27728
diff changeset
1061 { $$ = $1; }
718845eb3c7a eliminate unnecessary expr_no_assign non-terminal in parser
John W. Eaton <jwe@octave.org>
parents: 27728
diff changeset
1062 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1063
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1064 // ================================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1065 // Commands, declarations, and function definitions
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1066 // ================================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1067
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1068 command : declaration
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1069 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1070 | select_command
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1071 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1072 | loop_command
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1073 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1074 | jump_command
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1075 { $$ = $1; }
28518
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
1076 | spmd_command
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
1077 { $$ = $1; }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1078 | except_command
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1079 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1080 | function
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1081 { $$ = $1; }
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1082 | file
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1083 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1084 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1085
27956
2310164737b3 fix many spelling errors (bug #57613)
John W. Eaton <jwe@octave.org>
parents: 26585
diff changeset
1086 // ======================
2310164737b3 fix many spelling errors (bug #57613)
John W. Eaton <jwe@octave.org>
parents: 26585
diff changeset
1087 // Declaration statements
2310164737b3 fix many spelling errors (bug #57613)
John W. Eaton <jwe@octave.org>
parents: 26585
diff changeset
1088 // ======================
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1089
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
1090 declaration : GLOBAL decl1
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1091 {
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1092 $$ = 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
1093 lexer.m_looking_at_decl_list = false;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1094 }
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
1095 | PERSISTENT decl1
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1096 {
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1097 $$ = 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
1098 lexer.m_looking_at_decl_list = false;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1099 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1100 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1101
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1102 decl1 : decl2
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1103 { $$ = new octave::tree_decl_init_list ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1104 | decl1 decl2
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1105 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1106 $1->append ($2);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1107 $$ = $1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1108 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1109 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1110
7634
ae90e05ad299 fix parameter list initializer bug
John W. Eaton <jwe@octave.org>
parents: 7587
diff changeset
1111 decl_param_init : // empty
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1112 {
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1113 $$ = 0;
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
1114 lexer.m_looking_at_initializer_expression = true;
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1115 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1116
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1117 decl2 : identifier
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1118 { $$ = new octave::tree_decl_elt ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1119 | identifier '=' decl_param_init expression
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1120 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1121 OCTAVE_YYUSE ($2);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1122
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
1123 lexer.m_looking_at_initializer_expression = false;
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1124 $$ = new octave::tree_decl_elt ($1, $4);
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 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1127
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1128 // ====================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1129 // Selection statements
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1130 // ====================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1131
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1132 select_command : if_command
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 | switch_command
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1135 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1136 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1137
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1138 // ============
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1139 // If statement
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1140 // ============
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1141
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1142 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
1143 {
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1144 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
1145 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1146 // 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
1147 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1148 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1149 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1150 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1151
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1152 if_cmd_list : if_cmd_list1
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1153 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1154 | if_cmd_list1 else_clause
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1155 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1156 $1->append ($2);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1157 $$ = $1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1158 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1159 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1160
16681
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958)
John W. Eaton <jwe@octave.org>
parents: 16627
diff changeset
1161 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
1162 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1163 OCTAVE_YYUSE ($3);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1164
18127
d76f790b4eec enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents: 17796
diff changeset
1165 $1->mark_braindead_shortcircuit ();
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1166
16681
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958)
John W. Eaton <jwe@octave.org>
parents: 16627
diff changeset
1167 $$ = 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
1168 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1169 | if_cmd_list1 elseif_clause
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 $1->append ($2);
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 }
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
16681
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958)
John W. Eaton <jwe@octave.org>
parents: 16627
diff changeset
1176 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
1177 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1178 OCTAVE_YYUSE ($3);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1179 OCTAVE_YYUSE ($6);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1180
18127
d76f790b4eec enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents: 17796
diff changeset
1181 $4->mark_braindead_shortcircuit ();
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1182
16681
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958)
John W. Eaton <jwe@octave.org>
parents: 16627
diff changeset
1183 $$ = 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
1184 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1185 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1186
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1187 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
1188 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1189 OCTAVE_YYUSE ($1);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1190 OCTAVE_YYUSE ($3);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1191
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1192 $$ = 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
1193 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1194 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1195
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1196 // ================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1197 // Switch statement
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1198 // ================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1199
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1200 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
1201 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1202 OCTAVE_YYUSE ($4);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1203
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1204 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
1205 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1206 // 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
1207 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1208 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1209 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1210 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1211
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1212 case_list : // empty
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1213 { $$ = 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
1214 | default_case
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1215 { $$ = new octave::tree_switch_case_list ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1216 | case_list1
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1217 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1218 | case_list1 default_case
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1219 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1220 $1->append ($2);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1221 $$ = $1;
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11572
diff changeset
1222 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1223 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1224
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1225 case_list1 : switch_case
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1226 { $$ = new octave::tree_switch_case_list ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1227 | case_list1 switch_case
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 $1->append ($2);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1230 $$ = $1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1231 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1232 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1233
16681
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958)
John W. Eaton <jwe@octave.org>
parents: 16627
diff changeset
1234 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
1235 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1236 OCTAVE_YYUSE ($3);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1237 OCTAVE_YYUSE ($6);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1238
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1239 $$ = 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
1240 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1241 ;
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 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
1244 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1245 OCTAVE_YYUSE ($1);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1246 OCTAVE_YYUSE ($3);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1247
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1248 $$ = new octave::tree_switch_case ($4, $2);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1249 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1250 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1251
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1252 // =======
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1253 // Looping
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1254 // =======
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1255
16681
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958)
John W. Eaton <jwe@octave.org>
parents: 16627
diff changeset
1256 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
1257 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1258 OCTAVE_YYUSE ($5);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1259
18127
d76f790b4eec enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents: 17796
diff changeset
1260 $3->mark_braindead_shortcircuit ();
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1261
16681
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958)
John W. Eaton <jwe@octave.org>
parents: 16627
diff changeset
1262 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
1263 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1264 // 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
1265 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1266 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1267 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1268 | 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
1269 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1270 OCTAVE_YYUSE ($1);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1271 OCTAVE_YYUSE ($3);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1272
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1273 $$ = 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
1274 }
16681
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958)
John W. Eaton <jwe@octave.org>
parents: 16627
diff changeset
1275 | 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
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 ($4);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1278 OCTAVE_YYUSE ($7);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1279
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
1280 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
1281 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
1282 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1283 // 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
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 | 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
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 ($3);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1290 OCTAVE_YYUSE ($5);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1291 OCTAVE_YYUSE ($7);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1292 OCTAVE_YYUSE ($8);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1293
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
1294 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
1295 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
1296 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1297 // 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
1298 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1299 }
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
1300 }
16681
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958)
John W. Eaton <jwe@octave.org>
parents: 16627
diff changeset
1301 | 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
1302 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1303 OCTAVE_YYUSE ($4);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1304 OCTAVE_YYUSE ($7);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1305
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1306 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
1307 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
1308 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1309 // 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
1310 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1311 }
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
1312 }
027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now
John W. Eaton <jwe@octave.org>
parents: 13241
diff changeset
1313 | 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
1314 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1315 OCTAVE_YYUSE ($3);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1316 OCTAVE_YYUSE ($5);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1317 OCTAVE_YYUSE ($7);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1318 OCTAVE_YYUSE ($9);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1319 OCTAVE_YYUSE ($10);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1320
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1321 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
1322 $8, $11, $12, $2)))
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1323 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1324 // 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
1325 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1326 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1327 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1328 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1329
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1330 // =======
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1331 // Jumping
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1332 // =======
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1333
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1334 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
1335 {
9c6661004167 error if break statement is in script file separate from loop (bug #39168)
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
1336 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
1337 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
1338 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1339 | 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
1340 {
12532d392693 error if continue is used outside of a for loop (bug #55995)
John W. Eaton <jwe@octave.org>
parents: 26906
diff changeset
1341 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
1342 YYABORT;
12532d392693 error if continue is used outside of a for loop (bug #55995)
John W. Eaton <jwe@octave.org>
parents: 26906
diff changeset
1343 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1344 | FUNC_RET
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1345 { $$ = parser.make_return_command ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1346 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1347
28518
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
1348 // =======================
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
1349 // Parallel execution pool
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
1350 // =======================
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
1351
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
1352 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
1353 {
29283
aa645ebc7b29 eliminate extra YYUSE on default missed when merging 59696b24ea53 from stable
John W. Eaton <jwe@octave.org>
parents: 29273
diff changeset
1354 OCTAVE_YYUSE ($3);
28518
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
1355
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
1356 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
1357 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
1358
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
1359 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
1360 {
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
1361 // 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
1362 YYABORT;
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
1363 }
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
1364 }
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
1365 ;
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
1366
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1367 // ==========
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1368 // Exceptions
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1369 // ==========
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1370
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1371 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
1372 stash_comment opt_sep opt_list END
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1373 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1374 OCTAVE_YYUSE ($3);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1375 OCTAVE_YYUSE ($5);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1376 OCTAVE_YYUSE ($7);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1377
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1378 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
1379 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1380 // 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
1381 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1382 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1383 }
17283
e6c0ac8ce5b6 eliminate parse conflicts introduced by changeset 923ce8b42db2
John W. Eaton <jwe@octave.org>
parents: 17281
diff changeset
1384 | 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
1385 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
1386 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1387 OCTAVE_YYUSE ($3);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1388 OCTAVE_YYUSE ($5);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1389 OCTAVE_YYUSE ($7);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1390
17283
e6c0ac8ce5b6 eliminate parse conflicts introduced by changeset 923ce8b42db2
John W. Eaton <jwe@octave.org>
parents: 17281
diff changeset
1391 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
1392 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1393 // 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
1394 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1395 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1396 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1397 | TRY stash_comment opt_sep opt_list END
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1398 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1399 OCTAVE_YYUSE ($3);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1400
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
1401 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
1402 $5, $2, nullptr)))
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1403 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1404 // 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
1405 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1406 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1407 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1408 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1409
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1410 // ===========================================
15466
d174210ce1ec use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents: 14189
diff changeset
1411 // Some 'subroutines' for function definitions
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1412 // ===========================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1413
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1414 push_fcn_symtab : // empty
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1415 {
27510
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
1416 if (! parser.push_fcn_symtab ())
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
1417 YYABORT;
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
1418
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1419 $$ = 0;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1420 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1421 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1422
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1423 // ===========================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1424 // List of function parameters
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1425 // ===========================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1426
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1427 param_list_beg : '('
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1428 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1429 OCTAVE_YYUSE ($1);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
1430
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1431 $$ = 0;
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
1432 lexer.m_looking_at_parameter_list = true;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
1433
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
1434 if (lexer.m_looking_at_function_handle)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1435 {
24354
11d3603dd880 give names to anonymous function scopes
John W. Eaton <jwe@octave.org>
parents: 24297
diff changeset
1436 // Will get a real name later.
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
1437 lexer.m_symtab_context.push (octave::symbol_scope ("parser:param_lsit_beg"));
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
1438 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
1439 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
1440 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1441 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1442 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1443
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1444 param_list_end : ')'
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1445 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1446 OCTAVE_YYUSE ($1);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
1447
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1448 $$ = 0;
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
1449 lexer.m_looking_at_parameter_list = false;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
1450 lexer.m_looking_for_object_index = false;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1451 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1452 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1453
23673
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1454 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
1455 { $$ = nullptr; }
23673
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1456 | param_list
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1457 { $$ = $1; }
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1458 ;
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1459
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1460 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
1461 {
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16320
diff changeset
1462 if ($2)
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16320
diff changeset
1463 lexer.mark_as_variables ($2->variable_names ());
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16320
diff changeset
1464
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16320
diff changeset
1465 $$ = $2;
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16320
diff changeset
1466 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1467 | param_list_beg error
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1468 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
1469 $$ = nullptr;
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1470 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
1471 YYABORT;
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
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1475 param_list1 : // empty
28257
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
1476 { $$ = 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
1477 | param_list2
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1478 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1479 $1->mark_as_formal_parameters ();
23654
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
1480
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
1481 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
1482 {
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16320
diff changeset
1483 lexer.mark_as_variables ($1->variable_names ());
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16320
diff changeset
1484 $$ = $1;
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16320
diff changeset
1485 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1486 else
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1487 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1488 delete $1;
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
1489 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1490 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1491 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1492 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1493
17317
56fe31b248de disallow ~ in global and persistent declaration lists
John W. Eaton <jwe@octave.org>
parents: 17316
diff changeset
1494 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
1495 { $$ = 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
1496 | param_list2 ',' param_list_elt
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1497 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1498 OCTAVE_YYUSE ($2);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
1499
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1500 $1->append ($3);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1501 $$ = $1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1502 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1503 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1504
17317
56fe31b248de disallow ~ in global and persistent declaration lists
John W. Eaton <jwe@octave.org>
parents: 17316
diff changeset
1505 param_list_elt : decl2
56fe31b248de disallow ~ in global and persistent declaration lists
John W. Eaton <jwe@octave.org>
parents: 17316
diff changeset
1506 { $$ = $1; }
56fe31b248de disallow ~ in global and persistent declaration lists
John W. Eaton <jwe@octave.org>
parents: 17316
diff changeset
1507 | magic_tilde
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1508 { $$ = 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
1509 ;
56fe31b248de disallow ~ in global and persistent declaration lists
John W. Eaton <jwe@octave.org>
parents: 17316
diff changeset
1510
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1511 // ===================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1512 // List of function return value names
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1513 // ===================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1514
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1515 return_list : '[' ']'
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1516 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1517 OCTAVE_YYUSE ($1);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1518 OCTAVE_YYUSE ($2);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
1519
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
1520 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
1521
28257
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
1522 $$ = 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
1523 }
17316
8e2906e2fb26 avoid reduce/reduce conflict in parser rules
John W. Eaton <jwe@octave.org>
parents: 17283
diff changeset
1524 | identifier
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1525 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
1526 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
1527
28257
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
1528 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
1529 = 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
1530
8e2906e2fb26 avoid reduce/reduce conflict in parser rules
John W. Eaton <jwe@octave.org>
parents: 17283
diff changeset
1531 // 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
1532 // 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
1533 // to check for varargin or varargout.
8e2906e2fb26 avoid reduce/reduce conflict in parser rules
John W. Eaton <jwe@octave.org>
parents: 17283
diff changeset
1534
23654
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
1535 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
1536 $$ = tmp;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1537 else
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1538 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1539 delete tmp;
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
1540 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1541 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1542 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1543 | '[' return_list1 ']'
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1544 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1545 OCTAVE_YYUSE ($1);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1546 OCTAVE_YYUSE ($3);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
1547
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
1548 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
1549
8e2906e2fb26 avoid reduce/reduce conflict in parser rules
John W. Eaton <jwe@octave.org>
parents: 17283
diff changeset
1550 // Check for duplicate parameter names, varargin,
8e2906e2fb26 avoid reduce/reduce conflict in parser rules
John W. Eaton <jwe@octave.org>
parents: 17283
diff changeset
1551 // or varargout.
8e2906e2fb26 avoid reduce/reduce conflict in parser rules
John W. Eaton <jwe@octave.org>
parents: 17283
diff changeset
1552
23654
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
1553 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
1554 $$ = $2;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1555 else
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1556 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1557 delete $2;
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
1558 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1559 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1560 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1561 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1562
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1563 return_list1 : identifier
28257
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
1564 {
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279)
John W. Eaton <jwe@octave.org>
parents: 28149
diff changeset
1565 $$ = 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
1566 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1567 | return_list1 ',' identifier
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1568 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1569 OCTAVE_YYUSE ($2);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
1570
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1571 $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
1572 $$ = $1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1573 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1574 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1575
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1576 // =======================
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1577 // Script or function file
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1578 // =======================
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1579
23343
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
1580 parsing_local_fcns
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
1581 : // empty
27510
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
1582 { parser.parsing_local_functions (true); }
23343
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
1583 ;
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
1584
24037
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1585 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
1586 {
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1587 $$ = 0;
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1588
24377
ea3458c1d884 improve handling of invalid symbol_scope objects (bug #52607)
John W. Eaton <jwe@octave.org>
parents: 24361
diff changeset
1589 // 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
1590 // 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
1591 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
1592 }
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1593 ;
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1594
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1595 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
1596 { $$ = 0; }
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1597 ;
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1598
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1599 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
1600 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1601 OCTAVE_YYUSE ($2);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1602
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
1603 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
1604 {
77eff9c6fb09 avoid memory leak when parsing function files (bug #40218)
John W. Eaton <jwe@octave.org>
parents: 17377
diff changeset
1605 // 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
1606 // 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
1607 // 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
1608 // 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
1609 // 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
1610
24037
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1611 // 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
1612 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
1613
77eff9c6fb09 avoid memory leak when parsing function files (bug #40218)
John W. Eaton <jwe@octave.org>
parents: 17377
diff changeset
1614 delete $3;
77eff9c6fb09 avoid memory leak when parsing function files (bug #40218)
John W. Eaton <jwe@octave.org>
parents: 17377
diff changeset
1615 }
77eff9c6fb09 avoid memory leak when parsing function files (bug #40218)
John W. Eaton <jwe@octave.org>
parents: 17377
diff changeset
1616 else
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1617 {
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1618 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
1619 = 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
1620 $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
1621
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1622 parser.make_script ($3, end_of_script);
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1623 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1624
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
1625 $$ = nullptr;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1626 }
24037
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1627 | 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
1628 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1629 OCTAVE_YYUSE ($2);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1630 OCTAVE_YYUSE ($5);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1631 OCTAVE_YYUSE ($7);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1632
24037
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1633 // 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
1634 lexer.m_symtab_context.pop ();
24037
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1635
24067
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
1636 parser.finish_classdef_file ($3, $6);
16211
3449bf257514 maint: fix botched merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16205
diff changeset
1637
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
1638 $$ = nullptr;
16211
3449bf257514 maint: fix botched merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16205
diff changeset
1639 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1640 ;
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7699
diff changeset
1641
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1642 // ===================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1643 // Function definition
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1644 // ===================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1645
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
1646 function_beg : push_fcn_symtab FCN
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1647 {
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
1648 $$ = $2;
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
1649 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
1650 || lexer.m_parsing_classdef)
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
1651 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
1652 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1653 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1654
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1655 fcn_name : identifier
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1656 {
27510
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
1657 $$ = parser.make_fcn_name ($1);
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
1658 if (! $$)
23054
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
1659 {
27510
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
1660 // 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
1661 YYABORT;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
1662 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1663 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1664 | GET '.' identifier
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1665 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1666 OCTAVE_YYUSE ($1);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1667 OCTAVE_YYUSE ($2);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1668
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
1669 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
1670 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
1671 lexer.m_parsing_classdef_get_method = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1672 $$ = $3;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1673 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1674 | SET '.' identifier
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1675 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1676 OCTAVE_YYUSE ($1);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1677 OCTAVE_YYUSE ($2);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1678
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
1679 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
1680 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
1681 lexer.m_parsing_classdef_set_method = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1682 $$ = $3;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1683 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1684 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1685
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1686 function_end : END
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1687 {
27510
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
1688 parser.endfunction_found (true);
21071
f25c14056b7c overhaul parser error handling for end token mismatch
John W. Eaton <jwe@octave.org>
parents: 21066
diff changeset
1689
23398
d4ef04757ead eliminate some compiler warnings
John W. Eaton <jwe@octave.org>
parents: 23396
diff changeset
1690 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
1691 $$ = 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
1692 $1->beg_pos (), $1->end_pos ());
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1693 else
21071
f25c14056b7c overhaul parser error handling for end token mismatch
John W. Eaton <jwe@octave.org>
parents: 21066
diff changeset
1694 {
23398
d4ef04757ead eliminate some compiler warnings
John W. Eaton <jwe@octave.org>
parents: 23396
diff changeset
1695 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
1696 YYABORT;
21071
f25c14056b7c overhaul parser error handling for end token mismatch
John W. Eaton <jwe@octave.org>
parents: 21066
diff changeset
1697 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1698 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1699 | END_OF_INPUT
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1700 {
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9471
diff changeset
1701 // 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
1702 // if (lexer.m_reading_script_file)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1703 // {
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1704 // 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
1705 // YYABORT;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1706 // }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1707
27510
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
1708 if (parser.endfunction_found ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1709 {
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1710 parser.bison_error ("inconsistent function endings -- "
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1711 "if one function is explicitly ended, "
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1712 "so must all the others");
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1713 YYABORT;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1714 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1715
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
1716 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
1717 || lexer.input_from_eval_string ()))
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1718 {
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1719 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
1720 YYABORT;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1721 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1722
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
1723 if (lexer.m_reading_classdef_file)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1724 {
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1725 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
1726 YYABORT;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1727 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1728
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
1729 $$ = 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
1730 $1->beg_pos (), $1->end_pos ());
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 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1733
23673
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1734 function : function_beg stash_comment fcn_name
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1735 opt_param_list opt_sep opt_list function_end
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1736 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1737 OCTAVE_YYUSE ($5);
23673
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1738
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
1739 $$ = 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
1740 }
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1741 | function_beg stash_comment return_list '=' fcn_name
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1742 opt_param_list opt_sep opt_list function_end
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1743 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1744 OCTAVE_YYUSE ($4);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1745 OCTAVE_YYUSE ($7);
23673
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1746
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1747 $$ = 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
1748 }
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1749 ;
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1750
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
1751 // ========
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
1752 // Classdef
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
1753 // ========
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
1754
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1755 classdef_beg : CLASSDEF
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1756 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
1757 if (! lexer.m_reading_classdef_file)
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1758 {
16289
bde729ba8381 maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16286 16288
diff changeset
1759 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
1760 YYABORT;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1761 }
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1762
23599
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23577
diff changeset
1763 // 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
1764 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
1765 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
1766 lexer.m_parsing_classdef_decl = true;
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1767
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1768 $$ = $1;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1769 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1770 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1771
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1772 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
1773 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1774 OCTAVE_YYUSE ($5);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1775
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
1776 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
1777 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
1778
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
1779 lexer.m_parsing_classdef = false;
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1780
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
1781 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
1782 lc, tc)))
17656
2b1047efc4fb don't leak memory when parsing classdef objects fails
John W. Eaton <jwe@octave.org>
parents: 17654
diff changeset
1783 {
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
1784 // 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
1785 // TC.
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
1786 YYABORT;
18419
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1787 }
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1788 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1789 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1790
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1791 attr_list : // empty
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
1792 { $$ = nullptr; }
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1793 | '(' 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
1794 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1795 OCTAVE_YYUSE ($1);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1796 OCTAVE_YYUSE ($3);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1797 OCTAVE_YYUSE ($4);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
1798
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
1799 $$ = $2;
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
1800 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1801 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1802
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1803 attr_list1 : attr
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1804 { $$ = new octave::tree_classdef_attribute_list ($1); }
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1805 | attr_list1 ',' attr
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1806 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1807 OCTAVE_YYUSE ($2);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
1808
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1809 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1810 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1811 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1812 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1813
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1814 attr : identifier
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1815 { $$ = new octave::tree_classdef_attribute ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1816 | identifier '=' decl_param_init expression
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1817 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1818 OCTAVE_YYUSE ($2);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1819
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
1820 lexer.m_looking_at_initializer_expression = false;
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1821 $$ = new octave::tree_classdef_attribute ($1, $4);
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1822 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1823 | EXPR_NOT identifier
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1824 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1825 OCTAVE_YYUSE ($1);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1826
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1827 $$ = 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
1828 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1829 ;
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
1830
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1831 superclass_list : // empty
26709
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26707
diff changeset
1832 {
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26707
diff changeset
1833 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
1834 lexer.m_parsing_classdef_superclass = false;
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1835
26709
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26707
diff changeset
1836 $$ = nullptr;
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26707
diff changeset
1837 }
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1838 | superclass_list1 opt_sep
26709
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26707
diff changeset
1839 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1840 OCTAVE_YYUSE ($2);
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1841
26709
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26707
diff changeset
1842 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
1843 lexer.m_parsing_classdef_superclass = false;
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1844
26709
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26707
diff changeset
1845 $$ = $1;
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26707
diff changeset
1846 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1847 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1848
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1849 superclass_list1
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1850 : EXPR_LT superclass
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1851 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1852 OCTAVE_YYUSE ($1);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1853
26709
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26707
diff changeset
1854 $$ = 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
1855 }
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1856 | superclass_list1 EXPR_AND superclass
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1857 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1858 OCTAVE_YYUSE ($2);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1859
26709
17e7d310def8 revamp parsing of superclass identifiers in classdef decls
John W. Eaton <jwe@octave.org>
parents: 26707
diff changeset
1860 $1->append ($3);
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1861 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1862 }
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1863 ;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1864
18520
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18419
diff changeset
1865 superclass : FQ_IDENT
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1866 { $$ = new octave::tree_classdef_superclass ($1->text ()); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1867 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1868
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1869 class_body : // empty
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1870 { $$ = nullptr; }
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1871 | class_body1 opt_sep
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1872 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1873 OCTAVE_YYUSE ($2);
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1874
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1875 $$ = $1;
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1876 }
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1877 ;
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1878
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1879 class_body1 : properties_block
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1880 { $$ = new octave::tree_classdef_body ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1881 | methods_block
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1882 { $$ = new octave::tree_classdef_body ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1883 | events_block
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1884 { $$ = new octave::tree_classdef_body ($1); }
13249
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1885 | enum_block
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1886 { $$ = new octave::tree_classdef_body ($1); }
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1887 | class_body1 opt_sep properties_block
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1888 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1889 OCTAVE_YYUSE ($2);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1890
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1891 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1892 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1893 }
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1894 | class_body1 opt_sep methods_block
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1895 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1896 OCTAVE_YYUSE ($2);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1897
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1898 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1899 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1900 }
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1901 | class_body1 opt_sep events_block
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1902 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1903 OCTAVE_YYUSE ($2);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1904
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1905 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1906 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1907 }
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1908 | class_body1 opt_sep enum_block
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1909 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1910 OCTAVE_YYUSE ($2);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1911
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1912 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1913 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1914 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1915 ;
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
1916
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
1917 properties_block
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
1918 : PROPERTIES 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
1919 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1920 OCTAVE_YYUSE ($3);
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
1921
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
1922 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
1923 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
1924
16289
bde729ba8381 maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16286 16288
diff changeset
1925 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
1926 ($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
1927 {
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
1928 // 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
1929 // $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
1930 YYABORT;
18419
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1931 }
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1932 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1933 ;
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
1934
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1935 property_list : // empty
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1936 { $$ = nullptr; }
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1937 | property_list1 opt_sep
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1938 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1939 OCTAVE_YYUSE ($2);
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1940
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1941 $$ = $1;
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1942 }
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1943 ;
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1944
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1945 property_list1
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1946 : class_property
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1947 { $$ = new octave::tree_classdef_property_list ($1); }
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
1948 | property_list1 sep class_property
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1949 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1950 OCTAVE_YYUSE ($2);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1951
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
1952 // 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
1953 // 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
1954 // 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
1955 // 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
1956 // 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
1957 // 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
1958 // 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
1959
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
1960 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
1961
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
1962 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
1963 {
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
1964 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
1965
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
1966 if (cl)
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
1967 {
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
1968 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
1969
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
1970 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
1971 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
1972 }
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
1973 }
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
1974
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1975 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1976 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1977 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1978 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1979
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
1980 class_property : stash_comment identifier
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
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 $$ = new octave::tree_classdef_property ($2, $1);
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
1983 }
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
1984 | stash_comment identifier '=' decl_param_init expression
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
1985 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
1986 OCTAVE_YYUSE ($3);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1987
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
1988 lexer.m_looking_at_initializer_expression = false;
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
1989
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
1990 $$ = new octave::tree_classdef_property ($2, $5, $1);
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1991 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1992 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1993
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
1994 methods_block : METHODS 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
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 ($3);
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
1997
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
1998 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
1999 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
2000
16289
bde729ba8381 maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16286 16288
diff changeset
2001 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
2002 ($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
2003 {
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
2004 // 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
2005 // 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
2006 YYABORT;
17656
2b1047efc4fb don't leak memory when parsing classdef objects fails
John W. Eaton <jwe@octave.org>
parents: 17654
diff changeset
2007 }
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
2008 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2009 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2010
18262
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
2011 method_decl1 : identifier
18308
c1baf94184af * oct-parse.in.yy: Suppress TAB characters.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18304
diff changeset
2012 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
2013 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
2014 YYABORT;
18262
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
2015 }
18308
c1baf94184af * oct-parse.in.yy: Suppress TAB characters.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18304
diff changeset
2016 | identifier param_list
18341
02b349ccf0ec Allow "end" method declaration/definition in classde files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18308
diff changeset
2017 {
02b349ccf0ec Allow "end" method declaration/definition in classde files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18308
diff changeset
2018 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
2019 YYABORT;
18262
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
2020 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2021 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2022
18262
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
2023 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
2024 { $$ = 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
2025 | stash_comment return_list '='
02b349ccf0ec Allow "end" method declaration/definition in classde files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18308
diff changeset
2026 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
2027 OCTAVE_YYUSE ($3);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
2028
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
2029 lexer.m_defining_func++;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
2030 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
2031 }
02b349ccf0ec Allow "end" method declaration/definition in classde files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18308
diff changeset
2032 method_decl1
02b349ccf0ec Allow "end" method declaration/definition in classde files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18308
diff changeset
2033 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
2034 lexer.m_defining_func--;
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
2035 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
2036
18341
02b349ccf0ec Allow "end" method declaration/definition in classde files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18308
diff changeset
2037 $$ = 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
2038 }
18262
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
2039 ;
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
2040
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
2041 method : method_decl
18308
c1baf94184af * oct-parse.in.yy: Suppress TAB characters.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18304
diff changeset
2042 { $$ = $1; }
c1baf94184af * oct-parse.in.yy: Suppress TAB characters.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18304
diff changeset
2043 | function
18262
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
2044 { $$ = $1; }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2045 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2046
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2047 methods_list : // empty
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2048 { $$ = nullptr; }
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2049 | methods_list1 opt_sep
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2050 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
2051 OCTAVE_YYUSE ($2);
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2052
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2053 $$ = $1;
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2054 }
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2055 ;
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2056
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2057 methods_list1 : method
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
2058 {
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
2059 octave_value fcn;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
2060 if ($1)
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
2061 fcn = $1->function ();
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
2062 delete $1;
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
2063 $$ = new octave::tree_classdef_methods_list (fcn);
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
2064 }
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2065 | methods_list1 opt_sep method
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
2066 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
2067 OCTAVE_YYUSE ($2);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
2068
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
2069 octave_value fcn;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
2070 if ($3)
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
2071 fcn = $3->function ();
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
2072 delete $3;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
2073
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
2074 $1->append (fcn);
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
2075 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
2076 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2077 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2078
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
2079 events_block : EVENTS 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
2080 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
2081 OCTAVE_YYUSE ($3);
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
2082
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
2083 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
2084 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
2085
16289
bde729ba8381 maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16286 16288
diff changeset
2086 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
2087 ($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
2088 {
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
2089 // 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
2090 // 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
2091 YYABORT;
18419
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
2092 }
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
2093 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2094 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2095
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2096 events_list : // empty
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2097 { $$ = nullptr; }
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2098 | events_list1 opt_sep
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
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);
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2101
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2102 $$ = $1;
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2103 }
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2104 ;
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2105
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2106 events_list1 : class_event
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
2107 { $$ = new octave::tree_classdef_events_list ($1); }
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2108 | events_list1 opt_sep class_event
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
2109 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
2110 OCTAVE_YYUSE ($2);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
2111
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
2112 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
2113 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
2114 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2115 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2116
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
2117 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
2118 { $$ = new octave::tree_classdef_event ($2, $1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2119 ;
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11572
diff changeset
2120
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
2121 enum_block : ENUMERATION 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
2122 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
2123 OCTAVE_YYUSE ($3);
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
2124
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
2125 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
2126 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
2127
16289
bde729ba8381 maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16286 16288
diff changeset
2128 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
2129 ($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
2130 {
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
2131 // 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
2132 // and TC.
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
2133 YYABORT;
18419
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
2134 }
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
2135 }
13249
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
2136 ;
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
2137
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2138 enum_list : // empty
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2139 { $$ = nullptr; }
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2140 | enum_list1 opt_sep
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2141 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
2142 OCTAVE_YYUSE ($2);
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2143
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2144 $$ = $1;
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2145 }
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2146 ;
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2147
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2148 enum_list1 : class_enum
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
2149 { $$ = new octave::tree_classdef_enum_list ($1); }
28509
06bc2f0bf760 refactor some classdef parsing rules
John W. Eaton <jwe@octave.org>
parents: 28432
diff changeset
2150 | enum_list1 opt_sep class_enum
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
2151 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
2152 OCTAVE_YYUSE ($2);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
2153
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
2154 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
2155 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
2156 }
13249
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
2157 ;
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
2158
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
2159 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
2160 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
2161 OCTAVE_YYUSE ($3);
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
2162 OCTAVE_YYUSE ($5);
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
2163
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
2164 $$ = 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
2165 }
13249
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
2166 ;
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
2167
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
2168 // =============
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
2169 // Miscellaneous
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
2170 // =============
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
2171
16681
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958)
John W. Eaton <jwe@octave.org>
parents: 16627
diff changeset
2172 stmt_begin : // empty
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
2173 {
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
2174 $$ = 0;
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
2175 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
2176 }
16681
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958)
John W. Eaton <jwe@octave.org>
parents: 16627
diff changeset
2177 ;
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958)
John W. Eaton <jwe@octave.org>
parents: 16627
diff changeset
2178
27736
bd80e14f268a improve parse error message for @()x+=expr (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27729
diff changeset
2179 anon_fcn_begin : // empty
bd80e14f268a improve parse error message for @()x+=expr (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27729
diff changeset
2180 {
bd80e14f268a improve parse error message for @()x+=expr (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27729
diff changeset
2181 $$ = 0;
bd80e14f268a improve parse error message for @()x+=expr (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27729
diff changeset
2182 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
2183 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
2184 }
bd80e14f268a improve parse error message for @()x+=expr (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27729
diff changeset
2185 ;
bd80e14f268a improve parse error message for @()x+=expr (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27729
diff changeset
2186
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2187 stash_comment : // empty
17693
efbe746f8fa8 eliminate octave_comment_buffer singleton
John W. Eaton <jwe@octave.org>
parents: 17673
diff changeset
2188 { $$ = lexer.get_comment (); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2189 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2190
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2191 parse_error : LEXICAL_ERROR
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
2192 {
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
2193 $$ = 0;
21064
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21063
diff changeset
2194 std::string msg = $1->text ();
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21063
diff changeset
2195 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
2196 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2197 | error
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
2198 { $$ = 0; }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2199 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2200
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2201 sep_no_nl : ','
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2202 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
2203 OCTAVE_YYUSE ($1);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2204
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2205 $$ = ',';
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2206 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2207 | ';'
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2208 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
2209 OCTAVE_YYUSE ($1);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2210
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2211 $$ = ';';
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2212 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2213 | sep_no_nl ','
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2214 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
2215 OCTAVE_YYUSE ($2);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2216
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2217 $$ = $1;
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2218 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2219 | sep_no_nl ';'
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2220 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
2221 OCTAVE_YYUSE ($2);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2222
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2223 $$ = $1;
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2224 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2225 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2226
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2227 opt_sep_no_nl : // empty
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2228 { $$ = 0; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2229 | sep_no_nl
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2230 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2231 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2232
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
2233 opt_nl : // empty
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
2234 { $$ = 0; }
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
2235 | nl
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
2236 { $$ = $1; }
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
2237 ;
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
2238
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
2239 nl : '\n'
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2240 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
2241 OCTAVE_YYUSE ($1);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2242
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2243 $$ = '\n';
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2244 }
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
2245 | nl '\n'
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2246 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
2247 OCTAVE_YYUSE ($2);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2248
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2249 $$ = $1;
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2250 }
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
2251 ;
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
2252
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2253 sep : ','
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2254 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
2255 OCTAVE_YYUSE ($1);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2256
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2257 $$ = ',';
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2258 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2259 | ';'
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2260 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
2261 OCTAVE_YYUSE ($1);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2262
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2263 $$ = ';';
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2264 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2265 | '\n'
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2266 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
2267 OCTAVE_YYUSE ($1);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2268
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2269 $$ = '\n';
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2270 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2271 | sep ','
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2272 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
2273 OCTAVE_YYUSE ($2);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2274
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2275 $$ = $1;
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2276 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2277 | sep ';'
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
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);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2280
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2281 $$ = $1;
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2282 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2283 | sep '\n'
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2284 {
29272
59696b24ea53 avoid YYUSE in Octave parser files (see bug #59806)
John W. Eaton <jwe@octave.org>
parents: 29006
diff changeset
2285 OCTAVE_YYUSE ($2);
27762
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2286
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2287 $$ = $1;
80d68a3e8ec0 make location info available for more tokens in parser
John W. Eaton <jwe@octave.org>
parents: 27745
diff changeset
2288 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2289 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2290
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2291 opt_sep : // empty
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2292 { $$ = 0; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2293 | sep
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2294 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2295 ;
2525
8561d88be5f2 [project @ 1996-11-17 21:23:31 by jwe]
jwe
parents: 2524
diff changeset
2296
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2297 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2298
21023
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 21021
diff changeset
2299 #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
2300 // 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
2301 # pragma GCC diagnostic pop
21023
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 21021
diff changeset
2302 #endif
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 21021
diff changeset
2303
666
fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe]
jwe
parents: 627
diff changeset
2304 // Generic error messages.
fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe]
jwe
parents: 627
diff changeset
2305
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
2306 #undef lexer
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2307 #undef scanner
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16147
diff changeset
2308
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2309 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
2310 yyerror (octave::base_parser& parser, const char *s)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2311 {
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
2312 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
2313 }
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
2314
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2315 namespace octave
16157
335041cc657a optionally use push parser interface
John W. Eaton <jwe@octave.org>
parents: 16153
diff changeset
2316 {
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
2317 std::size_t
23054
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2318 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
2319 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2320 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
2321 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2322
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2323 void
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2324 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
2325 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2326 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
2327 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2328
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2329 void
24361
8bcfddad15ec use shared_ptr to manage symbol_scope objects
John W. Eaton <jwe@octave.org>
parents: 24356
diff changeset
2330 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
2331 {
23602
214cb58ccc1c use pointer to scope instead of scope id
John W. Eaton <jwe@octave.org>
parents: 23600
diff changeset
2332 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
2333 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2334
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2335 void
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2336 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
2337 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2338 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
2339 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2340
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2341 bool
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2342 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
2343 {
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2344 // 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
2345 // 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
2346 // 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
2347 // 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
2348
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2349 std::string full_name;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2350
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
2351 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
2352 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2353 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
2354
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2355 if (name == elt.second)
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2356 return false;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2357
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2358 full_name += elt.second + ">";
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2359 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2360
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2361 full_name += name;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2362
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2363 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
2364 {
d45d1b4bb919 allow functions to be redefined in scripts (bug #52851)
John W. Eaton <jwe@octave.org>
parents: 28545
diff changeset
2365 // 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
2366 // 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
2367 // duplicate name.
d45d1b4bb919 allow functions to be redefined in scripts (bug #52851)
John W. Eaton <jwe@octave.org>
parents: 28545
diff changeset
2368
d45d1b4bb919 allow functions to be redefined in scripts (bug #52851)
John W. Eaton <jwe@octave.org>
parents: 28545
diff changeset
2369 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
2370 || 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
2371 || 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
2372 }
23054
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2373
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2374 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
2375
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2376 return true;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2377 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2378
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2379 bool
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2380 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
2381 {
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2382 if (! name_ok (name))
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2383 return false;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2384
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2385 if (size () > 0)
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2386 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
2387
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2388 return true;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2389 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2390
24361
8bcfddad15ec use shared_ptr to manage symbol_scope objects
John W. Eaton <jwe@octave.org>
parents: 24356
diff changeset
2391 symbol_scope
23054
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2392 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
2393 {
24361
8bcfddad15ec use shared_ptr to manage symbol_scope objects
John W. Eaton <jwe@octave.org>
parents: 24356
diff changeset
2394 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
2395 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2396
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2397 std::string
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2398 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
2399 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2400 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
2401 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2402
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2403 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
2404 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2405 m_info.clear ();
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2406 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
2407 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2408
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2409 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
2410 : 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
2411 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
2412 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
2413 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
2414 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
2415 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
2416 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
2417 { }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2418
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2419 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
2420 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2421 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
2422
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2423 // 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
2424 // 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
2425 // 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
2426 // 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
2427 // 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
2428 // 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
2429 // 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
2430
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2431 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
2432 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2433
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2434 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2435 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
2436 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2437 m_endfunction_found = false;
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2438 m_autoloading = false;
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2439 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
2440 m_parsing_subfunctions = false;
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2441 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
2442 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
2443 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
2444 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
2445 m_curr_class_name = "";
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2446 m_curr_package_name = "";
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2447 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
2448 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
2449 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
2450 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
2451 m_stmt_list.reset ();
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2452
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2453 m_lexer.reset ();
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2454
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2455 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
2456 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
2457 }
25442
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2458
27956
2310164737b3 fix many spelling errors (bug #57613)
John W. Eaton <jwe@octave.org>
parents: 26585
diff changeset
2459 // Error messages for mismatched end tokens.
25442
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2460
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2461 static std::string
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2462 end_token_as_string (token::end_tok_type ettype)
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2463 {
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2464 std::string retval = "<unknown>";
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2465
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2466 switch (ettype)
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2467 {
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2468 case token::simple_end:
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2469 retval = "end";
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2470 break;
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2471
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2472 case token::classdef_end:
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2473 retval = "endclassdef";
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2474 break;
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2475
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2476 case token::enumeration_end:
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2477 retval = "endenumeration";
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2478 break;
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2479
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2480 case token::events_end:
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2481 retval = "endevents";
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2482 break;
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2483
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2484 case token::for_end:
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2485 retval = "endfor";
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2486 break;
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2487
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2488 case token::function_end:
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2489 retval = "endfunction";
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2490 break;
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2491
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2492 case token::if_end:
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2493 retval = "endif";
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2494 break;
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2495
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2496 case token::methods_end:
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2497 retval = "endmethods";
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2498 break;
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2499
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2500 case token::parfor_end:
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2501 retval = "endparfor";
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2502 break;
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2503
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2504 case token::properties_end:
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2505 retval = "endproperties";
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2506 break;
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2507
28517
6e8a9845d118 Add 'spmd' as interpreter keyword for Matlab compatibility (bug #58676).
Rik <rik@octave.org>
parents: 28516
diff changeset
2508 case token::spmd_end:
6e8a9845d118 Add 'spmd' as interpreter keyword for Matlab compatibility (bug #58676).
Rik <rik@octave.org>
parents: 28516
diff changeset
2509 retval = "endspmd";
6e8a9845d118 Add 'spmd' as interpreter keyword for Matlab compatibility (bug #58676).
Rik <rik@octave.org>
parents: 28516
diff changeset
2510 break;
6e8a9845d118 Add 'spmd' as interpreter keyword for Matlab compatibility (bug #58676).
Rik <rik@octave.org>
parents: 28516
diff changeset
2511
25442
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2512 case token::switch_end:
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2513 retval = "endswitch";
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2514 break;
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2515
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2516 case token::try_catch_end:
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2517 retval = "end_try_catch";
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2518 break;
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2519
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2520 case token::unwind_protect_end:
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2521 retval = "end_unwind_protect";
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2522 break;
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2523
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2524 case token::while_end:
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2525 retval = "endwhile";
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2526 break;
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2527
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2528 default:
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2529 panic_impossible ();
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2530 break;
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2531 }
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2532
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2533 return retval;
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2534 }
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
2535
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2536 void
28407
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28266
diff changeset
2537 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
2538 {
29322
6264fb660f72 avoid crash on null statement list (bug #59938)
John W. Eaton <jwe@octave.org>
parents: 29272
diff changeset
2539 if (! lst)
6264fb660f72 avoid crash on null statement list (bug #59938)
John W. Eaton <jwe@octave.org>
parents: 29272
diff changeset
2540 return;
6264fb660f72 avoid crash on null statement list (bug #59938)
John W. Eaton <jwe@octave.org>
parents: 29272
diff changeset
2541
28407
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28266
diff changeset
2542 if (m_stmt_list)
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28266
diff changeset
2543 {
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28266
diff changeset
2544 // 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
2545
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28266
diff changeset
2546 while (! lst->empty ())
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28266
diff changeset
2547 {
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28266
diff changeset
2548 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
2549 lst->pop_front ();
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28266
diff changeset
2550 }
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28266
diff changeset
2551 }
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28266
diff changeset
2552 else
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28266
diff changeset
2553 m_stmt_list = lst;
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28266
diff changeset
2554 }
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28266
diff changeset
2555
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28266
diff changeset
2556 void
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2557 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
2558 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2559 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
2560 + "' 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
2561 + 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
2562
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27766
diff changeset
2563 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
2564 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2565
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2566 // 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
2567
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2568 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2569 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
2570 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2571 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
2572
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2573 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
2574 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2575
27510
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
2576 bool
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
2577 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
2578 {
27510
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
2579 m_curr_fcn_depth++;
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
2580
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
2581 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
2582 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
2583
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
2584 // 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
2585 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
2586 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
2587
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
2588 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
2589 && ! m_parsing_subfunctions)
28432
71c34141cc2d refactor handling of parent functions and localfunctions
John W. Eaton <jwe@octave.org>
parents: 28407
diff changeset
2590 {
71c34141cc2d refactor handling of parent functions and localfunctions
John W. Eaton <jwe@octave.org>
parents: 28407
diff changeset
2591 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
2592 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
2593 }
27510
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
2594
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
2595 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
2596 {
27510
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
2597 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
2598
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
2599 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
2600 }
27510
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
2601
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
2602 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
2603 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2604
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2605 // 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
2606
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2607 tree_constant *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2608 base_parser::make_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
2609 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2610 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
2611 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
2612
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
2613 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
2614
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2615 switch (op)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2616 {
28582
dc8de424fc72 use octave_value object to store numeric tokens in the lexer
John W. Eaton <jwe@octave.org>
parents: 28548
diff changeset
2617 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
2618 {
28582
dc8de424fc72 use octave_value object to store numeric tokens in the lexer
John W. Eaton <jwe@octave.org>
parents: 28548
diff changeset
2619 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
2620 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
2621 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2622 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2623
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2624 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
2625 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
2626 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2627 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
2628
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2629 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
2630 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
2631
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2632 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
2633 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2634 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
2635 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
2636 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2637 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
2638 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2639
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2640 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
2641
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2642 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
2643 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
2644
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2645 // 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
2646 // 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
2647 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
2648 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2649 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2650
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2651 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2652 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2653 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2654 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2655
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2656 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2657 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2658
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2659 // 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
2660
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2661 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
2662 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
2663 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2664 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
2665 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
2666
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2667 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
2668
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2669 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2670 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2671
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2672 // 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
2673
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2674 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
2675 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
2676 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
2677 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
2678 {
27728
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27516
diff changeset
2679 // 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
2680 // 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
2681 // increment, or decrement operator.
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27516
diff changeset
2682
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27516
diff changeset
2683 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
2684
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27516
diff changeset
2685 if (! validator.ok ())
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27516
diff changeset
2686 {
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27516
diff changeset
2687 delete param_list;
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27516
diff changeset
2688 delete expr;
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27516
diff changeset
2689
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27516
diff changeset
2690 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
2691 validator.column ());
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27516
diff changeset
2692
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27516
diff changeset
2693 return nullptr;
5e92bff668d6 disallow lvalue references in anonymous functions (bug #57255)
John W. Eaton <jwe@octave.org>
parents: 27516
diff changeset
2694 }
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
2695
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
2696 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
2697 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
2698
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
2699 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
2700
23600
db947ba52118 explicitly limit anonymous functions to a single expression
John W. Eaton <jwe@octave.org>
parents: 23599
diff changeset
2701 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
2702
24361
8bcfddad15ec use shared_ptr to manage symbol_scope objects
John W. Eaton <jwe@octave.org>
parents: 24356
diff changeset
2703 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
2704
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27766
diff changeset
2705 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
2706 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
2707
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2708 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
2709 = 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
2710 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
2711
24354
11d3603dd880 give names to anonymous function scopes
John W. Eaton <jwe@octave.org>
parents: 24297
diff changeset
2712 std::ostringstream buf;
11d3603dd880 give names to anonymous function scopes
John W. Eaton <jwe@octave.org>
parents: 24297
diff changeset
2713
11d3603dd880 give names to anonymous function scopes
John W. Eaton <jwe@octave.org>
parents: 24297
diff changeset
2714 tree_print_code tpc (buf);
11d3603dd880 give names to anonymous function scopes
John W. Eaton <jwe@octave.org>
parents: 24297
diff changeset
2715
11d3603dd880 give names to anonymous function scopes
John W. Eaton <jwe@octave.org>
parents: 24297
diff changeset
2716 retval->accept (tpc);
11d3603dd880 give names to anonymous function scopes
John W. Eaton <jwe@octave.org>
parents: 24297
diff changeset
2717
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
2718 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
2719 if (! file.empty ())
11d3603dd880 give names to anonymous function scopes
John W. Eaton <jwe@octave.org>
parents: 24297
diff changeset
2720 buf << ": file: " << file;
11d3603dd880 give names to anonymous function scopes
John W. Eaton <jwe@octave.org>
parents: 24297
diff changeset
2721 else if (m_lexer.input_from_terminal ())
11d3603dd880 give names to anonymous function scopes
John W. Eaton <jwe@octave.org>
parents: 24297
diff changeset
2722 buf << ": *terminal input*";
11d3603dd880 give names to anonymous function scopes
John W. Eaton <jwe@octave.org>
parents: 24297
diff changeset
2723 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
2724 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
2725 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
2726
11d3603dd880 give names to anonymous function scopes
John W. Eaton <jwe@octave.org>
parents: 24297
diff changeset
2727 std::string scope_name = buf.str ();
11d3603dd880 give names to anonymous function scopes
John W. Eaton <jwe@octave.org>
parents: 24297
diff changeset
2728
24361
8bcfddad15ec use shared_ptr to manage symbol_scope objects
John W. Eaton <jwe@octave.org>
parents: 24356
diff changeset
2729 fcn_scope.cache_name (scope_name);
24354
11d3603dd880 give names to anonymous function scopes
John W. Eaton <jwe@octave.org>
parents: 24297
diff changeset
2730
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2731 // 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
2732 // errors when executed.
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
2733 //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
2734
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2735 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2736 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2737
23655
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2738 // Build a colon expression.
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2739
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2740 tree_expression *
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2741 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
2742 tree_expression *limit,
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2743 tree_expression *incr)
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2744 {
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2745 tree_expression *retval = nullptr;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2746
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2747 if (! base || ! limit)
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2748 {
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2749 delete base;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2750 delete limit;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2751 delete incr;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2752
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2753 return retval;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2754 }
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2755
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2756 int l = base->line ();
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2757 int c = base->column ();
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2758
27516
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
2759 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
2760 = 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
2761
27516
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
2762 retval = expr;
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
2763
23655
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2764 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
2765 && (! 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
2766 {
27516
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
2767 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
2768
23655
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2769 try
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2770 {
27516
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
2771 // 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
2772 // 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
2773 // conversion to a constant value.
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
2774
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
2775 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
2776
29253
28913793f678 prefer unwind_action over unwind_protect in more places
John W. Eaton <jwe@octave.org>
parents: 29007
diff changeset
2777 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
2778 (&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
2779 es.last_warning_message (""));
28913793f678 prefer unwind_action over unwind_protect in more places
John W. Eaton <jwe@octave.org>
parents: 29007
diff changeset
2780
28913793f678 prefer unwind_action over unwind_protect in more places
John W. Eaton <jwe@octave.org>
parents: 29007
diff changeset
2781 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
2782 (&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
2783 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
2784
27160
6b0c61a5a0f0 move global error configuration and status variables inside a class
John W. Eaton <jwe@octave.org>
parents: 27102
diff changeset
2785 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
2786
27516
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
2787 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
2788
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
2789 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
2790
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
2791 if (msg.empty ())
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
2792 {
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
2793 tree_constant *tc_retval
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
2794 = 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
2795
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
2796 std::ostringstream buf;
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
2797
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
2798 tree_print_code tpc (buf);
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
2799
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
2800 expr->accept (tpc);
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
2801
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
2802 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
2803
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
2804 delete expr;
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
2805
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
2806 retval = tc_retval;
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
2807 }
23655
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2808 }
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
2809 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
2810 {
27474
3fec8e9fa2aa make recover_from_exception a member function
John W. Eaton <jwe@octave.org>
parents: 27471
diff changeset
2811 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
2812 }
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2813 }
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2814
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2815 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2816 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2817
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2818 // 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
2819
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2820 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2821 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
2822 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
2823 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2824 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
2825
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2826 switch (op)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2827 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2828 case POW:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2829 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
2830 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2831
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2832 case EPOW:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2833 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
2834 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2835
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2836 case '+':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2837 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
2838 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2839
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2840 case '-':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2841 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
2842 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2843
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2844 case '*':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2845 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
2846 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2847
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2848 case '/':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2849 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
2850 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2851
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2852 case EMUL:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2853 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
2854 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2855
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2856 case EDIV:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2857 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
2858 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2859
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2860 case LEFTDIV:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2861 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
2862 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2863
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2864 case ELEFTDIV:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2865 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
2866 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2867
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2868 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
2869 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
2870 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2871
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2872 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
2873 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
2874 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2875
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2876 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
2877 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
2878 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2879
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2880 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
2881 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
2882 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2883
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2884 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
2885 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
2886 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2887
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2888 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
2889 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
2890 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2891
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2892 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
2893 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
2894 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2895
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2896 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
2897 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
2898 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2899
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2900 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2901 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2902 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2903 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2904
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2905 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
2906 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
2907
25829
8ac4bfa55053 restore optimization for compound transpose-mul/div ops (bug #45890)
John W. Eaton <jwe@octave.org>
parents: 25753
diff changeset
2908 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
2909 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2910
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2911 // 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
2912
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2913 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2914 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
2915 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
2916 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2917 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
2918
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2919 switch (op)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2920 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2921 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
2922 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
2923 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2924
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2925 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
2926 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
2927 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2928
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2929 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2930 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2931 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2932 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2933
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2934 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
2935 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
2936
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2937 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
2938 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2939
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2940 // 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
2941
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2942 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2943 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
2944 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2945 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
2946
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2947 switch (op)
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 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
2950 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
2951 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2952
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2953 case '+':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2954 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
2955 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2956
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2957 case '-':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2958 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
2959 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2960
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2961 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
2962 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
2963 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2964
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2965 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
2966 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
2967 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2968
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2969 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2970 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2971 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2972 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2973
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2974 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
2975 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
2976
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2977 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
2978 }
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 // 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
2981
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2982 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2983 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
2984 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2985 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
2986
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2987 switch (op)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2988 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2989 case HERMITIAN:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2990 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
2991 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2992
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2993 case TRANSPOSE:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2994 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
2995 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2996
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2997 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
2998 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
2999 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3000
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3001 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
3002 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
3003 break;
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 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3006 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3007 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3008 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3009
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3010 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
3011 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
3012
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3013 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
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 // 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
3017
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3018 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3019 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
3020 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
3021 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
3022 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
3023 comment_list *lc,
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
3024 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
3025 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3026 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
3027
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3028 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
3029 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3030 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
3031
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3032 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
3033 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
3034
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3035 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
3036 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
3037 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3038 else
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 delete body;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3041 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
3042
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3043 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
3044 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3045
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3046 return retval;
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3049 // 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
3050
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3051 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3052 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
3053 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
3054 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
3055 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
3056 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
3057 comment_list *lc,
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
3058 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
3059 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3060 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
3061
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3062 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
3063 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3064 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
3065
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3066 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
3067 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
3068
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3069 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
3070
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3071 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
3072 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3073 tree_statement *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
3074
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3075 if (stmt)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3076 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3077 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
3078
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3079 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
3080 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3081 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
3082
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3083 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
3084
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3085 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
3086 delete stmt;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3087 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3088 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3089 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3090
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3091 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
3092 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
3093 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3094 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3095 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3096 delete body;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3097 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
3098
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3099 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
3100 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3101
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3102 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3103 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3104
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3105 // 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
3106
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3107 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3108 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
3109 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
3110 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
3111 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
3112 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
3113 {
23798
771310737137 Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23796
diff changeset
3114 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
3115
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3116 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
3117
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3118 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
3119 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3120 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
3121
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3122 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
3123
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3124 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
3125 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
3126
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3127 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
3128 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3129 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3130 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3131 delete expr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3132 delete body;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3133
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3134 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
3135 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3136
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3137 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3138 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3139
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3140 // 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
3141
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3142 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3143 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
3144 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
3145 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
3146 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
3147 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3148 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
3149
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3150 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
3151
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3152 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
3153
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3154 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
3155 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
3156
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3157 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
3158 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3159
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3160 // 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
3161
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3162 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3163 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
3164 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
3165 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
3166 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
3167 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
3168 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
3169 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
3170 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3171 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
3172
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3173 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
3174
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3175 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
3176 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3177 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
3178
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3179 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
3180
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3181 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
3182
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3183 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
3184 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
3185
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3186 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
3187 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3188 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
3189
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3190 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
3191 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
3192
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3193 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3194 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3195 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3196 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3197 if (parfor)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3198 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3199 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3200 delete expr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3201 delete maxproc;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3202 delete body;
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 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
3205 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3206 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3207 retval = new tree_complex_for_command (lhs, expr, body,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3208 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
3209 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3210 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3211 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3212 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3213 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3214 delete expr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3215 delete maxproc;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3216 delete body;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3217
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3218 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
3219 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3220
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3221 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3222 }
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 // 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
3225
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3226 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3227 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
3228 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3229 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
3230 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
3231
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3232 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
3233 {
26998
258195ea1a76 Simplify error messages when break or continue statements fail to parse (bug #55995).
Rik <rik@octave.org>
parents: 26981
diff changeset
3234 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
3235 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
3236 }
9c6661004167 error if break statement is in script file separate from loop (bug #39168)
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
3237 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
3238 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
3239 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3240
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3241 // 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
3242
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3243 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3244 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
3245 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3246 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
3247 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
3248
26981
12532d392693 error if continue is used outside of a for loop (bug #55995)
John W. Eaton <jwe@octave.org>
parents: 26906
diff changeset
3249 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
3250 {
26998
258195ea1a76 Simplify error messages when break or continue statements fail to parse (bug #55995).
Rik <rik@octave.org>
parents: 26981
diff changeset
3251 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
3252 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
3253 }
12532d392693 error if continue is used outside of a for loop (bug #55995)
John W. Eaton <jwe@octave.org>
parents: 26906
diff changeset
3254 else
12532d392693 error if continue is used outside of a for loop (bug #55995)
John W. Eaton <jwe@octave.org>
parents: 26906
diff changeset
3255 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
3256 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3257
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3258 // 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
3259
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3260 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3261 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
3262 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3263 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
3264 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
3265
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3266 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
3267 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3268
28518
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
3269 // Build an spmd command.
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
3270
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
3271 tree_spmd_command *
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
3272 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
3273 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
3274 comment_list *tc)
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
3275 {
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
3276 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
3277
28522
a5541f5a78dd make parsing of spmd and endspmd keywords work properly (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28518
diff changeset
3278 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
3279 {
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
3280 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
3281 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
3282
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
3283 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
3284 }
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
3285 else
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
3286 {
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
3287 delete body;
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
3288 delete lc;
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
3289 delete tc;
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
3290
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
3291 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
3292 }
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
3293
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
3294 return retval;
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
3295 }
b8ab8b58547d accept spmd command blocks as language elements (bug #58676)
John W. Eaton <jwe@octave.org>
parents: 28517
diff changeset
3296
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3297 // 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
3298
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3299 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
3300 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
3301 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
3302 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3303 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
3304
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3305 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
3306
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3307 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
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 // 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
3311
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3312 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
3313 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
3314 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
3315 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
3316 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
3317 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3318 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
3319
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3320 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
3321 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3322 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
3323
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3324 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
3325 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
3326
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3327 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
3328 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3329 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
3330
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3331 if (elt)
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 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
3334 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
3335 }
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3338 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
3339 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3340 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3341 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3342 delete list;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3343
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3344 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
3345 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3346
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3347 return retval;
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 // 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
3351
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3352 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
3353 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
3354 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
3355 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
3356 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
3357 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3358 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
3359
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3360 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
3361 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
3362
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3363 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
3364 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3365
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3366 // 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
3367
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3368 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
3369 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
3370 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
3371 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
3372 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
3373 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
3374 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3375 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
3376
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3377 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
3378 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3379 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
3380
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3381 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
3382 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
3383
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3384 if (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
3385 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3386 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
3387
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3388 if (elt)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3389 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3390 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
3391 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
3392 }
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3395 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
3396 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3397 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3398 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3399 delete expr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3400 delete list;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3401
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3402 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
3403 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3404
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3405 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3406 }
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 // 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
3409
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3410 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
3411 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
3412 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
3413 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
3414 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
3415 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3416 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
3417
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3418 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
3419 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
3420
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3421 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
3422 }
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 // 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
3425
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3426 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3427 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
3428 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
3429 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3430 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
3431
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3432 switch (op)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3433 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3434 case '=':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3435 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
3436 break;
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 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
3439 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
3440 break;
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 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
3443 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
3444 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3445
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3446 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
3447 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
3448 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3449
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3450 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
3451 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
3452 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3453
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3454 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
3455 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
3456 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3457
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3458 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
3459 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
3460 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3461
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3462 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
3463 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
3464 break;
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 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
3467 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
3468 break;
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 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
3471 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
3472 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3473
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3474 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
3475 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
3476 break;
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 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
3479 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
3480 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3481
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3482 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
3483 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
3484 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3485
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3486 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3487 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3488 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3489 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3490
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3491 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
3492 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
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 (! 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
3495 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3496 // 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
3497 // '=', not '+=', etc.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3498
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3499 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3500 delete rhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3501
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27766
diff changeset
3502 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
3503 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
3504
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3505 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
3506 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3507
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3508 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
3509 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3510 // 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
3511
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3512 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
3513
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3514 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
3515 && 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
3516 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3517 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
3518
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3519 delete tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3520 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3521 delete rhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3522
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27766
diff changeset
3523 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
3524 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
3525
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3526 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
3527 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3528
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3529 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3530
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3531 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
3532 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3533 else
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 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
3536
22872
551ac93c984c maint: Use C++ range feature to simplify some for loops in libinterp/parse-tree
Rik <rik@octave.org>
parents: 22785
diff changeset
3537 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
3538 {
26059
da2bbcf1fbcd Deprecate C++ function is_keyword in favor of iskeyword for readability.
Rik <rik@octave.org>
parents: 26040
diff changeset
3539 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
3540 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3541 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3542 delete rhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3543
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3544 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
3545 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
3546
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3547 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
3548 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3549 }
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 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
3552 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3553 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3554
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3555 // Define a script.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3556
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3557 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3558 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
3559 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
3560 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3561 if (! cmds)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3562 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
3563
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3564 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
3565
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3566 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
3567
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3568 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
3569 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
3570 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
3571
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3572 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
3573 = 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
3574 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
3575 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
3576
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3577 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
3578 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
3579
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
3580 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
3581
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3582 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
3583 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
3584
27505
c409d16b7190 eliminate some uses of bare pointers to octave_function objects
John W. Eaton <jwe@octave.org>
parents: 27504
diff changeset
3585 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
3586 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3587
27510
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
3588 tree_identifier *
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
3589 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
3590 {
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
3591 std::string id_name = id->name ();
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
3592
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
3593 // 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
3594
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
3595 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
3596 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
3597
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
3598 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
3599 {
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
3600 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
3601 id->line (), id->column ());
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
3602
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
3603 delete id;
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
3604 return nullptr;
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
3605 }
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
3606
28857
43ad651cf5a0 eliminate unnecessary uses of octave:: namespace qualifier
John W. Eaton <jwe@octave.org>
parents: 28851
diff changeset
3607 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
3608 curr_scope.cache_name (id_name);
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
3609
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
3610 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
3611 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
3612
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
3613 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
3614 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3615
23673
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3616 // Define a function.
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3617
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3618 // FIXME: combining start_function, finish_function, and
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3619 // 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
3620 // 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
3621
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3622 tree_function_def *
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3623 base_parser::make_function (token *fcn_tok,
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3624 tree_parameter_list *ret_list,
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3625 tree_identifier *id,
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3626 tree_parameter_list *param_list,
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3627 tree_statement_list *body,
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3628 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
3629 comment_list *lc)
23673
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3630 {
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3631 int l = fcn_tok->line ();
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3632 int c = fcn_tok->column ();
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3633
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3634 octave_user_function *tmp_fcn
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3635 = 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
3636
26404
abca0c2690b7 oct-parse.yy: Fix static analyzer detected issues (bug #55347).
Rik <rik@octave.org>
parents: 26376
diff changeset
3637 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
3638
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3639 recover_from_parsing_function ();
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3640
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3641 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
3642 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3643
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3644 // 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
3645
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3646 octave_user_function *
23673
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3647 base_parser::start_function (tree_identifier *id,
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3648 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
3649 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
3650 tree_statement *end_fcn_stmt)
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9471
diff changeset
3651 {
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3652 // 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
3653
23673
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3654 std::string id_name = id->name ();
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3655
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3656 delete id;
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3657
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3658 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
3659 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
3660 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
3661 id_name.insert (0, "set.");
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3662
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3663 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
3664 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
3665
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3666 if (! body)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3667 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
3668
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3669 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
3670
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3671 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
3672 = 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
3673 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
3674
26369
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347).
Andreas Weber <octave@josoansi.de>
parents: 26149
diff changeset
3675 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
3676
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347).
Andreas Weber <octave@josoansi.de>
parents: 26149
diff changeset
3677 fcn->stash_trailing_comment (tc);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347).
Andreas Weber <octave@josoansi.de>
parents: 26149
diff changeset
3678 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
3679 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
3680
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3681 // 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
3682 // 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
3683 // 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
3684 // name).
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3685 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
3686 && 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
3687 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3688 // 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
3689 // 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
3690 // 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
3691
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3692 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
3693
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
3694 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
3695
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3696 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
3697 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
3698
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3699 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
3700 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3701 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
3702 ("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
3703 "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
3704 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
3705
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3706 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
3707 }
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
28700
7d63f42e94be allow keboard to work in functions defined in script files (bug #54789)
John W. Eaton <jwe@octave.org>
parents: 28698
diff changeset
3710 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
3711
7d63f42e94be allow keboard to work in functions defined in script files (bug #54789)
John W. Eaton <jwe@octave.org>
parents: 28698
diff changeset
3712 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
3713 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
3714 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
3715 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
3716 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
3717 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
3718
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3719 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
3720 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3721 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
3722 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
3723
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3724 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
3725 {
26794
287eba9ed14b refactor predicates for classdef methods/constructors
John W. Eaton <jwe@octave.org>
parents: 26740
diff changeset
3726 if (m_lexer.m_parsing_classdef)
287eba9ed14b refactor predicates for classdef methods/constructors
John W. Eaton <jwe@octave.org>
parents: 26740
diff changeset
3727 {
287eba9ed14b refactor predicates for classdef methods/constructors
John W. Eaton <jwe@octave.org>
parents: 26740
diff changeset
3728 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
3729 fcn->mark_as_classdef_constructor ();
26794
287eba9ed14b refactor predicates for classdef methods/constructors
John W. Eaton <jwe@octave.org>
parents: 26740
diff changeset
3730 else
26799
0b17abf0ee9d fix error introduced in changeset 287eba9ed14b
John W. Eaton <jwe@octave.org>
parents: 26794
diff changeset
3731 fcn->mark_as_classdef_method ();
26794
287eba9ed14b refactor predicates for classdef methods/constructors
John W. Eaton <jwe@octave.org>
parents: 26740
diff changeset
3732 }
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3733 else
26794
287eba9ed14b refactor predicates for classdef methods/constructors
John W. Eaton <jwe@octave.org>
parents: 26740
diff changeset
3734 {
287eba9ed14b refactor predicates for classdef methods/constructors
John W. Eaton <jwe@octave.org>
parents: 26740
diff changeset
3735 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
3736 fcn->mark_as_legacy_constructor ();
26794
287eba9ed14b refactor predicates for classdef methods/constructors
John W. Eaton <jwe@octave.org>
parents: 26740
diff changeset
3737 else
26799
0b17abf0ee9d fix error introduced in changeset 287eba9ed14b
John W. Eaton <jwe@octave.org>
parents: 26794
diff changeset
3738 fcn->mark_as_legacy_method ();
26794
287eba9ed14b refactor predicates for classdef methods/constructors
John W. Eaton <jwe@octave.org>
parents: 26740
diff changeset
3739 }
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3740
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3741 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
3742 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3743
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3744 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
3745
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
3746 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
3747
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3748 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
3749 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
3750 "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
3751 }
25994
f881d3e271d2 eliminate global and file-scope static variables in oct-hist.cc
John W. Eaton <jwe@octave.org>
parents: 25830
diff changeset
3752 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
3753 && ! 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
3754 && 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
3755 && 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
3756 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3757 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
3758 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
3759 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3760
24297
9a1b193ddd01 Recognize docstrings from subfunctions (bug #46008).
Rik <rik@octave.org>
parents: 24283
diff changeset
3761 // Record help text for functions other than nested functions.
9a1b193ddd01 Recognize docstrings from subfunctions (bug #46008).
Rik <rik@octave.org>
parents: 24283
diff changeset
3762 // 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
3763 // 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
3764 // 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
3765 // 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
3766 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
3767 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3768 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
3769
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3770 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
3771 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3772
26060
edcb09d4b1f5 store nesting depth and primary parent info in nested function scopes
John W. Eaton <jwe@octave.org>
parents: 26059
diff changeset
3773 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
3774 && ! 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
3775 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
3776
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3777 return fcn;
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3780 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
3781 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
3782 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
3783 {
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27766
diff changeset
3784 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
3785 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
3786
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3787 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
3788 }
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_function_def *
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::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
3792 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
3793 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
3794 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
3795 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3796 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
3797
28545
3dae50cf0bc5 don't allow function return_list objects to be null
John W. Eaton <jwe@octave.org>
parents: 28511
diff changeset
3798 if (! ret_list)
3dae50cf0bc5 don't allow function return_list objects to be null
John W. Eaton <jwe@octave.org>
parents: 28511
diff changeset
3799 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
3800
3dae50cf0bc5 don't allow function return_list objects to be null
John W. Eaton <jwe@octave.org>
parents: 28511
diff changeset
3801 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
3802
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3803 if (fcn)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3804 {
28432
71c34141cc2d refactor handling of parent functions and localfunctions
John W. Eaton <jwe@octave.org>
parents: 28407
diff changeset
3805 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
3806 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
3807
28432
71c34141cc2d refactor handling of parent functions and localfunctions
John W. Eaton <jwe@octave.org>
parents: 28407
diff changeset
3808 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
3809 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
3810 tmp += ": " + file;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3811
24361
8bcfddad15ec use shared_ptr to manage symbol_scope objects
John W. Eaton <jwe@octave.org>
parents: 24356
diff changeset
3812 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
3813 fcn_scope.cache_name (tmp);
28432
71c34141cc2d refactor handling of parent functions and localfunctions
John W. Eaton <jwe@octave.org>
parents: 28407
diff changeset
3814 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
3815 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
3816 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
3817
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3818 if (lc)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3819 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
3820
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3821 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
3822
26060
edcb09d4b1f5 store nesting depth and primary parent info in nested function scopes
John W. Eaton <jwe@octave.org>
parents: 26059
diff changeset
3823 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
3824 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3825 fcn->stash_fcn_location (l, c);
25394
9e39a53b4e00 make listing local functions for command completion work again (bug #53925)
John W. Eaton <jwe@octave.org>
parents: 25206
diff changeset
3826 fcn->stash_parent_fcn_name (m_lexer.m_fcn_file_name);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3827
23611
91c8f006ed8b remove additional functions from symbol_table class
John W. Eaton <jwe@octave.org>
parents: 23603
diff changeset
3828 octave_value ov_fcn (fcn);
91c8f006ed8b remove additional functions from symbol_table class
John W. Eaton <jwe@octave.org>
parents: 23603
diff changeset
3829
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3830 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
3831 {
24705
8b346a19108e mark objects as nested or subfunctions when parsing
John W. Eaton <jwe@octave.org>
parents: 24624
diff changeset
3832 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
3833 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
3834
24361
8bcfddad15ec use shared_ptr to manage symbol_scope objects
John W. Eaton <jwe@octave.org>
parents: 24356
diff changeset
3835 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
3836 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
3837 fcn_scope.set_primary_parent (m_primary_fcn_scope);
28432
71c34141cc2d refactor handling of parent functions and localfunctions
John W. Eaton <jwe@octave.org>
parents: 28407
diff changeset
3838 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
3839
71c34141cc2d refactor handling of parent functions and localfunctions
John W. Eaton <jwe@octave.org>
parents: 28407
diff changeset
3840 // 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
3841 // 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
3842 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3843 else
22974
ecc5eeada8dc Don't mark nested functions in primary function as subfunctions.
Rik <rik@octave.org>
parents: 22880
diff changeset
3844 {
ecc5eeada8dc Don't mark nested functions in primary function as subfunctions.
Rik <rik@octave.org>
parents: 22880
diff changeset
3845 fcn->mark_as_subfunction ();
28432
71c34141cc2d refactor handling of parent functions and localfunctions
John W. Eaton <jwe@octave.org>
parents: 28407
diff changeset
3846 m_subfunction_names.push_back (fcn_nm);
24705
8b346a19108e mark objects as nested or subfunctions when parsing
John W. Eaton <jwe@octave.org>
parents: 24624
diff changeset
3847 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
3848 if (m_parsing_subfunctions)
71c34141cc2d refactor handling of parent functions and localfunctions
John W. Eaton <jwe@octave.org>
parents: 28407
diff changeset
3849 fcn_scope.set_primary_parent (m_primary_fcn_scope);
71c34141cc2d refactor handling of parent functions and localfunctions
John W. Eaton <jwe@octave.org>
parents: 28407
diff changeset
3850 m_primary_fcn_scope.install_subfunction (fcn_nm, ov_fcn);
71c34141cc2d refactor handling of parent functions and localfunctions
John W. Eaton <jwe@octave.org>
parents: 28407
diff changeset
3851
71c34141cc2d refactor handling of parent functions and localfunctions
John W. Eaton <jwe@octave.org>
parents: 28407
diff changeset
3852 // Prepend name of primary fucntion to list of parent
71c34141cc2d refactor handling of parent functions and localfunctions
John W. Eaton <jwe@octave.org>
parents: 28407
diff changeset
3853 // functions (if any) for subfunction.
71c34141cc2d refactor handling of parent functions and localfunctions
John W. Eaton <jwe@octave.org>
parents: 28407
diff changeset
3854
71c34141cc2d refactor handling of parent functions and localfunctions
John W. Eaton <jwe@octave.org>
parents: 28407
diff changeset
3855 std::list<std::string> plst
71c34141cc2d refactor handling of parent functions and localfunctions
John W. Eaton <jwe@octave.org>
parents: 28407
diff changeset
3856 = fcn_scope.parent_fcn_names ();
71c34141cc2d refactor handling of parent functions and localfunctions
John W. Eaton <jwe@octave.org>
parents: 28407
diff changeset
3857 plst.push_front (m_primary_fcn_scope.fcn_name ());
71c34141cc2d refactor handling of parent functions and localfunctions
John W. Eaton <jwe@octave.org>
parents: 28407
diff changeset
3858 fcn_scope.cache_parent_fcn_names (plst);
24705
8b346a19108e mark objects as nested or subfunctions when parsing
John W. Eaton <jwe@octave.org>
parents: 24624
diff changeset
3859 }
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3860 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3861
26060
edcb09d4b1f5 store nesting depth and primary parent info in nested function scopes
John W. Eaton <jwe@octave.org>
parents: 26059
diff changeset
3862 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
3863 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
3864
26060
edcb09d4b1f5 store nesting depth and primary parent info in nested function scopes
John W. Eaton <jwe@octave.org>
parents: 26059
diff changeset
3865 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
3866 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3867 // 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
3868 // 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
3869 // 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
3870 // 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
3871 // 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
3872 // 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
3873 // 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
3874 // 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
3875 // 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
3876
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3877 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
3878 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3879 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
3880 fcn->time_parsed ());
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3881 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
3882 }
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
3883
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3884 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
3885 }
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 return retval;
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3891 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3892 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
3893 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3894 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
3895
26060
edcb09d4b1f5 store nesting depth and primary parent info in nested function scopes
John W. Eaton <jwe@octave.org>
parents: 26059
diff changeset
3896 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
3897 && ! m_parsing_subfunctions)
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3898 m_parsing_subfunctions = true;
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3899
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3900 m_curr_fcn_depth--;
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3901 m_function_scopes.pop ();
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3902
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3903 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
3904 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
3905 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
3906 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
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 // 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
3910 // 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
3911 // 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
3912 // 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
3913 // 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
3914
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
3915 // 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
3916 // 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
3917 // 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
3918
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3919 tree_classdef *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3920 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
3921 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
3922 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
3923 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
3924 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
3925 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
3926 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3927 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
3928
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3929 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
3930
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3931 std::string cls_name = id->name ();
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9471
diff changeset
3932
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
3933 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
3934
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
3935 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
3936
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9471
diff changeset
3937 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
3938 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
3939
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3940 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
3941 {
27050
69082b3b99a0 use correct line in classdef file name mismatch error message (bug #55812)
John W. Eaton <jwe@octave.org>
parents: 27049
diff changeset
3942 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
3943 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
3944
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3945 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3946 delete id;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3947 delete sc;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3948 delete body;
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
3949 delete lc;
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
3950 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
3951
27050
69082b3b99a0 use correct line in classdef file name mismatch error message (bug #55812)
John W. Eaton <jwe@octave.org>
parents: 27049
diff changeset
3952 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
3953
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3954 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3955 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3956 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3957 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
3958 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3959 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
3960 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
3961
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3962 if (! body)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3963 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
3964
27189
946c6f117091 use dummy stack frame when creating meta class (bug #55766 and #55768)
John W. Eaton <jwe@octave.org>
parents: 27165
diff changeset
3965 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
3966 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
3967 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
3968 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3969 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3970 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3971 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3972 delete id;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3973 delete sc;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3974 delete body;
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
3975 delete lc;
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
3976 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
3977
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3978 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
3979 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3980 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3981
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3982 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3983 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3984
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
3985 // 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
3986 // 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
3987 // 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
3988 // classdef block.
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
3989
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
3990 // 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
3991 // 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
3992 // 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
3993
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3994 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
3995 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
3996 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
3997 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
3998 token *end_tok,
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
3999 comment_list *lc,
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4000 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
4001 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
4002 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
4003
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4004 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
4005 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4006 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
4007 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
4008
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4009 if (plist)
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4010 {
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4011 // 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
4012 // 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
4013 // 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
4014
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4015 if (tc)
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4016 {
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4017 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
4018
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4019 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
4020 {
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4021 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
4022
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4023 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
4024 {
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4025 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
4026
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4027 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
4028 }
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4029 }
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4030 }
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4031 }
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4032 else
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4033 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
4034
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4035 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
4036 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4037 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4038 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4039 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4040 delete plist;
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4041 delete lc;
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4042 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
4043
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4044 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
4045 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4046
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4047 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4048 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4049
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4050 // 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
4051 // 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
4052 // 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
4053 // classdef block.
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4054
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4055 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
4056 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
4057 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
4058 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
4059 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
4060 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
4061 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
4062 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
4063
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4064 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
4065 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4066 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
4067 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
4068
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4069 if (! mlist)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4070 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
4071
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4072 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
4073 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4074 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4075 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4076 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4077 delete mlist;
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4078 delete lc;
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4079 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
4080
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4081 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
4082 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4083
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4084 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4085 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4086
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4087 // 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
4088 // 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
4089 // 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
4090 // classdef block.
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4091
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4092 // 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
4093 // 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
4094 // 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
4095
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4096 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
4097 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
4098 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
4099 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
4100 token *end_tok,
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4101 comment_list *lc,
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4102 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
4103 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
4104 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
4105
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4106 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
4107 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4108 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
4109 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
4110
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4111 if (! elist)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4112 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
4113
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4114 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
4115 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4116 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4117 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4118 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4119 delete elist;
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4120 delete lc;
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4121 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
4122
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4123 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
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 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4127 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4128
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4129 // 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
4130 // 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
4131 // 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
4132 // classdef block.
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4133
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4134 // 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
4135 // 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
4136 // 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
4137 // list.
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4138
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4139 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
4140 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
4141 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
4142 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
4143 token *end_tok,
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4144 comment_list *lc,
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4145 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
4146 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
4147 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
4148
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4149 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
4150 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4151 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
4152 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
4153
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4154 if (! elist)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4155 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
4156
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4157 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
4158 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4159 else
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 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4162 delete elist;
28511
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4163 delete lc;
59dfd9ed72a3 capture comments for classdef classes, properties, events, and enumerations
John W. Eaton <jwe@octave.org>
parents: 28509
diff changeset
4164 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
4165
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4166 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
4167 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4168
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4169 return retval;
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 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
4173 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
4174 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
4175 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
4176 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
4177
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4178 // 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
4179 // 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
4180
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4181 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
4182 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4183
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4184 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
4185
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4186 // 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
4187 // - 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
4188 // - class constructor
27216
823b4bcf79fc unless necessary for formatting or code, use ' instead of `
John W. Eaton <jwe@octave.org>
parents: 27189
diff changeset
4189 // - 'delete'
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4190
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4191 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
4192 && mname != "delete"
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4193 && 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
4194 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4195 // 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
4196 // is loaded.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4197
24361
8bcfddad15ec use shared_ptr to manage symbol_scope objects
John W. Eaton <jwe@octave.org>
parents: 24356
diff changeset
4198 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
4199
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4200 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
4201
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4202 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
4203 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
4204
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4205 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
4206 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4207 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4208 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
4209 "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
4210 "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
4211 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4212 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4213 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
4214
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4215 if (! retval)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4216 delete id;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4217
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4218 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4219 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4220
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4221 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
4222 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
4223 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
4224 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
4225 {
28545
3dae50cf0bc5 don't allow function return_list objects to be null
John W. Eaton <jwe@octave.org>
parents: 28511
diff changeset
4226 if (! ret_list)
3dae50cf0bc5 don't allow function return_list objects to be null
John W. Eaton <jwe@octave.org>
parents: 28511
diff changeset
4227 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
4228
3dae50cf0bc5 don't allow function return_list objects to be null
John W. Eaton <jwe@octave.org>
parents: 28511
diff changeset
4229 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
4230
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4231 if (cl)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4232 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
4233
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4234 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
4235 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
4236
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4237 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
4238 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4239
24067
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
4240 void
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
4241 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
4242 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
4243 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
4244 if (m_lexer.m_reading_classdef_file)
27504
7a31b25e3252 use shared_ptr for storing classdef and statement_list objects in parser
John W. Eaton <jwe@octave.org>
parents: 27481
diff changeset
4245 m_classdef_object = std::shared_ptr<tree_classdef> (cls);
24067
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
4246
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
4247 if (local_fcns)
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
4248 {
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
4249 symbol_table& symtab
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
4250 = __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
4251
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
4252 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
4253 {
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
4254 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
4255
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
4256 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
4257 = 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
4258
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
4259 octave_value ov_fcn = fcn_def->function ();
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
4260 octave_function *fcn = ov_fcn.function_value ();
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
4261 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
4262 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
4263
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
4264 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
4265 }
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
4266
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
4267 delete local_fcns;
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
4268 }
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
4269 }
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
4270
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4271 // 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
4272
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4273 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
4274 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
4275 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
4276 char type)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4277 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
4278 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
4279
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4280 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
4281 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4282 delete expr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4283 delete args;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4284
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4285 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
4286 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4287 else
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9471
diff changeset
4288 {
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4289 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
4290 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
4291
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4292 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
4293 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
4294
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4295 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
4296 {
26707
f35db7d5b7a4 use dynamic_cast instead of static_cast as appropriate parser
John W. Eaton <jwe@octave.org>
parents: 26686
diff changeset
4297 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
4298 = 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
4299
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4300 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
4301
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4302 retval = tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4303 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4304 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4305 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
4306 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4307
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4308 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4309 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4310
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4311 // 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
4312
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4313 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
4314 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
4315 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
4316 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
4317 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
4318
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4319 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
4320 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
4321
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4322 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
4323 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
4324
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4325 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
4326 {
26707
f35db7d5b7a4 use dynamic_cast instead of static_cast as appropriate parser
John W. Eaton <jwe@octave.org>
parents: 26686
diff changeset
4327 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
4328 = 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
4329
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4330 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
4331
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4332 retval = tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4333 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4334 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4335 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
4336
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
4337 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
4338
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4339 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4340 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4341
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4342 // 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
4343
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4344 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
4345 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
4346 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
4347 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
4348 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
4349
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4350 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
4351 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
4352
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4353 if (! 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
4354 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
4355
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4356 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
4357 {
26707
f35db7d5b7a4 use dynamic_cast instead of static_cast as appropriate parser
John W. Eaton <jwe@octave.org>
parents: 26686
diff changeset
4358 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
4359 = 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
4360
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4361 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
4362
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4363 retval = tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4364 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4365 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4366 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
4367
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
4368 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
4369
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4370 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4371 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4372
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4373 // 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
4374
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4375 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
4376 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
4377 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
4378 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
4379 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
4380
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4381 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
4382 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
4383
24216
81d723f0cdfe clean up change merged from stable
John W. Eaton <jwe@octave.org>
parents: 24215
diff changeset
4384 if (lst)
81d723f0cdfe clean up change merged from stable
John W. Eaton <jwe@octave.org>
parents: 24215
diff changeset
4385 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
4386
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4387 switch (tok)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4388 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4389 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
4390 {
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes
John W. Eaton <jwe@octave.org>
parents: 23454
diff changeset
4391 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
4392 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
4393 }
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4394 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4395
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4396 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
4397 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
4398 {
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes
John W. Eaton <jwe@octave.org>
parents: 23454
diff changeset
4399 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
4400 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
4401 }
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4402 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4403 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
4404 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
4405 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
4406 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
4407 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4408 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
4409 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4410 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4411
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4412 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4413 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4414 break;
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4417 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4418 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4419
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4420 bool
23654
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4421 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
4422 tree_parameter_list::in_or_out type)
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4423 {
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4424 std::set<std::string> dict;
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4425
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4426 for (tree_decl_elt *elt : *lst)
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4427 {
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4428 tree_identifier *id = elt->ident ();
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4429
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4430 if (id)
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4431 {
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4432 std::string name = id->name ();
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4433
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4434 if (id->is_black_hole ())
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4435 {
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4436 if (type != tree_parameter_list::in)
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4437 {
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4438 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
4439 return false;
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4440 }
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4441 }
28647
f0414ee0fefe disallow keywords in function parameter lists (bug #58945)
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
4442 else if (iskeyword (name))
f0414ee0fefe disallow keywords in function parameter lists (bug #58945)
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
4443 {
f0414ee0fefe disallow keywords in function parameter lists (bug #58945)
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
4444 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
4445 + "' in parameter list");
f0414ee0fefe disallow keywords in function parameter lists (bug #58945)
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
4446 return false;
f0414ee0fefe disallow keywords in function parameter lists (bug #58945)
John W. Eaton <jwe@octave.org>
parents: 28582
diff changeset
4447 }
23654
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4448 else if (dict.find (name) != dict.end ())
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4449 {
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4450 bison_error ("'" + name
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4451 + "' appears more than once in parameter list");
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4452 return false;
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4453 }
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4454 else
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4455 dict.insert (name);
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4456 }
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4457 }
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4458
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4459 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
4460 ? "varargin" : "varargout");
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4461
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
4462 std::size_t len = lst->length ();
23654
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4463
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4464 if (len > 0)
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4465 {
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4466 tree_decl_elt *elt = lst->back ();
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4467
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4468 tree_identifier *id = elt->ident ();
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4469
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4470 if (id && id->name () == va_type)
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4471 {
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4472 if (len == 1)
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4473 lst->mark_varargs_only ();
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4474 else
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4475 lst->mark_varargs ();
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4476
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4477 tree_parameter_list::iterator p = lst->end ();
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4478 --p;
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4479 delete *p;
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4480 lst->erase (p);
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4481 }
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4482 }
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4483
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4484 return true;
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4485 }
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4486
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4487 bool
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4488 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
4489 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4490 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
4491
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4492 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
4493
22872
551ac93c984c maint: Use C++ range feature to simplify some for loops in libinterp/parse-tree
Rik <rik@octave.org>
parents: 22785
diff changeset
4494 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
4495 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4496 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
4497 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4498 retval = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4499
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4500 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
4501 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
4502 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4503 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
4504
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4505 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4506 }
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4509 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4510 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4511
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4512 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
4513 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
4514 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
4515 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
4516
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4517 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
4518 {
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4519 tree_evaluator& tw
23532
084245f9bd03 pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents: 23502
diff changeset
4520 = __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
4521
27371
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 27216
diff changeset
4522 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
4523
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4524 delete e;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4525
23577
80c42f4cca13 maint: Deprecate is_empty and replace with isempty.
Rik <rik@octave.org>
parents: 23576
diff changeset
4526 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
4527 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
4528 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4529 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
4530 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4531 else
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 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
4534
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
4535 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
4536
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4537 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
4538 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4539 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
4540
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4541 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
4542 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4543 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
4544 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
4545 delete e;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4546 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
4547 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4548 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4549 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4550 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
4551
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4552 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
4553 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4554 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
4555 retval = tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4556 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4557 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4558 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4559 delete tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4560
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4561 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
4562 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4563
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4564 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
4565 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
4566 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4567
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4568 return retval;
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4571 // 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
4572
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4573 tree_expression *
27764
f64e399b6dda report missing semicolon location for array expressions (bug #57159)
John W. Eaton <jwe@octave.org>
parents: 27762
diff changeset
4574 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
4575 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
4576 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4577 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
4578
27764
f64e399b6dda report missing semicolon location for array expressions (bug #57159)
John W. Eaton <jwe@octave.org>
parents: 27762
diff changeset
4579 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
4580
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4581 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
4582 {
27516
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
4583 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
4584
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4585 try
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4586 {
27516
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
4587 // 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
4588 // 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
4589 // conversion to a constant value.
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
4590
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
4591 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
4592
29253
28913793f678 prefer unwind_action over unwind_protect in more places
John W. Eaton <jwe@octave.org>
parents: 29007
diff changeset
4593 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
4594 (&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
4595 es.last_warning_message (""));
28913793f678 prefer unwind_action over unwind_protect in more places
John W. Eaton <jwe@octave.org>
parents: 29007
diff changeset
4596
28913793f678 prefer unwind_action over unwind_protect in more places
John W. Eaton <jwe@octave.org>
parents: 29007
diff changeset
4597 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
4598 (&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
4599 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
4600
27160
6b0c61a5a0f0 move global error configuration and status variables inside a class
John W. Eaton <jwe@octave.org>
parents: 27102
diff changeset
4601 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
4602
27371
fcaecdbc8d8a don't use visitor pattern for expression evaluation (bug #56752)
John W. Eaton <jwe@octave.org>
parents: 27216
diff changeset
4603 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
4604
27516
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
4605 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
4606
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
4607 if (msg.empty ())
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
4608 {
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
4609 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
4610 = 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
4611 close_delim->column ());
27516
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
4612
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
4613 std::ostringstream buf;
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
4614
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
4615 tree_print_code tpc (buf);
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
4616
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
4617 array_list->accept (tpc);
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
4618
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
4619 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
4620
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
4621 delete array_list;
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
4622
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
4623 retval = tc_retval;
c3e24c82157f skip constant folding if expression evaluation generates warning
John W. Eaton <jwe@octave.org>
parents: 27511
diff changeset
4624 }
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4625 }
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4626 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
4627 {
27474
3fec8e9fa2aa make recover_from_exception a member function
John W. Eaton <jwe@octave.org>
parents: 27471
diff changeset
4628 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
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4632 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4633 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4634
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4635 // 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
4636
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4637 tree_expression *
27764
f64e399b6dda report missing semicolon location for array expressions (bug #57159)
John W. Eaton <jwe@octave.org>
parents: 27762
diff changeset
4638 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
4639 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
4640 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4641 return (m
27764
f64e399b6dda report missing semicolon location for array expressions (bug #57159)
John W. Eaton <jwe@octave.org>
parents: 27762
diff changeset
4642 ? 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
4643 : 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
4644 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
4645 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4646
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4647 // 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
4648
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4649 tree_expression *
27764
f64e399b6dda report missing semicolon location for array expressions (bug #57159)
John W. Eaton <jwe@octave.org>
parents: 27762
diff changeset
4650 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
4651 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
4652 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4653 return (c
27764
f64e399b6dda report missing semicolon location for array expressions (bug #57159)
John W. Eaton <jwe@octave.org>
parents: 27762
diff changeset
4654 ? 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
4655 : 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
4656 close_delim->line (), close_delim->column ()));
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9471
diff changeset
4657 }
1623
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe]
jwe
parents: 1607
diff changeset
4658
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4659 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
4660 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
4661 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
4662 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4663 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
4664
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4665 switch (sep)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4666 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4667 case ';':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4668 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
4669 break;
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 case 0:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4672 case ',':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4673 case '\n':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4674 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
4675 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
4676 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
4677 break;
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 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4680 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
4681 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4682 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4683
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4684 // 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
4685 // 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
4686
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4687 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
4688 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4689 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
4690 delete tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4691 }
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 return list;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4694 }
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 // 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
4697 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
4698 tree_statement *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4699 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
4700 {
23750
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
4701 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
4702
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4703 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
4704 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4705
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4706 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
4707 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
4708 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4709 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
4710 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4711
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4712 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
4713 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
4714 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
4715 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
4716 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4717 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
4718
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4719 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
4720
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4721 return list;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4722 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4723
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4724 void
26662
05fc703b419a update handling of command-style function call syntax in eval
John W. Eaton <jwe@octave.org>
parents: 26661
diff changeset
4725 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
4726 {
05fc703b419a update handling of command-style function call syntax in eval
John W. Eaton <jwe@octave.org>
parents: 26661
diff changeset
4727 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
4728 }
05fc703b419a update handling of command-style function call syntax in eval
John W. Eaton <jwe@octave.org>
parents: 26661
diff changeset
4729
27049
eb522480d44c improve error reporting for parse errors when reading from files
John W. Eaton <jwe@octave.org>
parents: 27020
diff changeset
4730 // 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
4731 static std::string
eb522480d44c improve error reporting for parse errors when reading from files
John W. Eaton <jwe@octave.org>
parents: 27020
diff changeset
4732 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
4733 {
27049
eb522480d44c improve error reporting for parse errors when reading from files
John W. Eaton <jwe@octave.org>
parents: 27020
diff changeset
4734 // 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
4735
29006
139df373c107 Use wide character overload to open file streams on Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents: 28804
diff changeset
4736 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
4737
eb522480d44c improve error reporting for parse errors when reading from files
John W. Eaton <jwe@octave.org>
parents: 27020
diff changeset
4738 std::string text;
eb522480d44c improve error reporting for parse errors when reading from files
John W. Eaton <jwe@octave.org>
parents: 27020
diff changeset
4739
eb522480d44c improve error reporting for parse errors when reading from files
John W. Eaton <jwe@octave.org>
parents: 27020
diff changeset
4740 if (fs)
eb522480d44c improve error reporting for parse errors when reading from files
John W. Eaton <jwe@octave.org>
parents: 27020
diff changeset
4741 {
eb522480d44c improve error reporting for parse errors when reading from files
John W. Eaton <jwe@octave.org>
parents: 27020
diff changeset
4742 int i = 1;
eb522480d44c improve error reporting for parse errors when reading from files
John W. Eaton <jwe@octave.org>
parents: 27020
diff changeset
4743
eb522480d44c improve error reporting for parse errors when reading from files
John W. Eaton <jwe@octave.org>
parents: 27020
diff changeset
4744 do
eb522480d44c improve error reporting for parse errors when reading from files
John W. Eaton <jwe@octave.org>
parents: 27020
diff changeset
4745 {
eb522480d44c improve error reporting for parse errors when reading from files
John W. Eaton <jwe@octave.org>
parents: 27020
diff changeset
4746 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
4747 {
eb522480d44c improve error reporting for parse errors when reading from files
John W. Eaton <jwe@octave.org>
parents: 27020
diff changeset
4748 text = "";
eb522480d44c improve error reporting for parse errors when reading from files
John W. Eaton <jwe@octave.org>
parents: 27020
diff changeset
4749 break;
eb522480d44c improve error reporting for parse errors when reading from files
John W. Eaton <jwe@octave.org>
parents: 27020
diff changeset
4750 }
eb522480d44c improve error reporting for parse errors when reading from files
John W. Eaton <jwe@octave.org>
parents: 27020
diff changeset
4751 }
eb522480d44c improve error reporting for parse errors when reading from files
John W. Eaton <jwe@octave.org>
parents: 27020
diff changeset
4752 while (i++ < line);
eb522480d44c improve error reporting for parse errors when reading from files
John W. Eaton <jwe@octave.org>
parents: 27020
diff changeset
4753 }
eb522480d44c improve error reporting for parse errors when reading from files
John W. Eaton <jwe@octave.org>
parents: 27020
diff changeset
4754
eb522480d44c improve error reporting for parse errors when reading from files
John W. Eaton <jwe@octave.org>
parents: 27020
diff changeset
4755 return text;
eb522480d44c improve error reporting for parse errors when reading from files
John W. Eaton <jwe@octave.org>
parents: 27020
diff changeset
4756 }
eb522480d44c improve error reporting for parse errors when reading from files
John W. Eaton <jwe@octave.org>
parents: 27020
diff changeset
4757
26662
05fc703b419a update handling of command-style function call syntax in eval
John W. Eaton <jwe@octave.org>
parents: 26661
diff changeset
4758 void
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27766
diff changeset
4759 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
4760 {
27778
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27766
diff changeset
4761 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
4762 }
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27766
diff changeset
4763
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27766
diff changeset
4764 void
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27766
diff changeset
4765 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
4766 {
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27766
diff changeset
4767 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
4768 }
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27766
diff changeset
4769
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27766
diff changeset
4770 void
2f8559459314 store beginning and ending location info for tokens recognized by lexer
John W. Eaton <jwe@octave.org>
parents: 27766
diff changeset
4771 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
4772 {
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4773 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
4774
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
4775 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
4776 || 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
4777 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
4778 << " 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
4779 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4780 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
4781
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4782 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
4783 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
4784
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4785 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
4786
27049
eb522480d44c improve error reporting for parse errors when reading from files
John W. Eaton <jwe@octave.org>
parents: 27020
diff changeset
4787 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
4788
eb522480d44c improve error reporting for parse errors when reading from files
John W. Eaton <jwe@octave.org>
parents: 27020
diff changeset
4789 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
4790 || 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
4791 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
4792 else
9e983eb1749d display code and error location when input is from terminal (bug #57536)
John W. Eaton <jwe@octave.org>
parents: 28026
diff changeset
4793 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
4794
9e983eb1749d display code and error location when input is from terminal (bug #57536)
John W. Eaton <jwe@octave.org>
parents: 28026
diff changeset
4795 // 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
4796 // lexer for easier reporting.
026bff6a54d7 improve position tracking in the lexer (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28147
diff changeset
4797 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
4798
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4799 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
4800 {
27049
eb522480d44c improve error reporting for parse errors when reading from files
John W. Eaton <jwe@octave.org>
parents: 27020
diff changeset
4801 // 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
4802 // 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
4803 // 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
4804
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
4805 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
4806
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4807 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
4808 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
4809
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4810 // 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
4811
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4812 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
4813
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4814 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
4815 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
4816
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4817 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
4818 output_buf << " ";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4819
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4820 output_buf << "^";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4821 }
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 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
4824
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4825 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
4826 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4827
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4828 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4829 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
4830 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4831 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
4832
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4833 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
4834
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4835 try
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 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
4838 }
27481
458adc344819 avoid possible crash due to execution_exception in GUI thread
John W. Eaton <jwe@octave.org>
parents: 27474
diff changeset
4839 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
4840 {
27481
458adc344819 avoid possible crash due to execution_exception in GUI thread
John W. Eaton <jwe@octave.org>
parents: 27474
diff changeset
4841 // 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
4842 // 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
4843 // 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
4844 // 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
4845 // 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
4846
458adc344819 avoid possible crash due to execution_exception in GUI thread
John W. Eaton <jwe@octave.org>
parents: 27474
diff changeset
4847 throw;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4848 }
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4849 catch (const exit_exception&)
23049
7351f2c93389 rethrow octave::exit_exception (bug #49304)
Olaf Till <i7tiol@t-online.de>
parents: 22879
diff changeset
4850 {
7351f2c93389 rethrow octave::exit_exception (bug #49304)
Olaf Till <i7tiol@t-online.de>
parents: 22879
diff changeset
4851 throw;
7351f2c93389 rethrow octave::exit_exception (bug #49304)
Olaf Till <i7tiol@t-online.de>
parents: 22879
diff changeset
4852 }
27481
458adc344819 avoid possible crash due to execution_exception in GUI thread
John W. Eaton <jwe@octave.org>
parents: 27474
diff changeset
4853 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
4854 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4855 throw;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4856 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4857 catch (...)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4858 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
4859 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
4860
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4861 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
4862 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
4863 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4864 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
4865 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4866
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4867 if (status != 0)
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4868 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
4869
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4870 return status;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4871 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4872
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4873 // 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
4874 // 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
4875
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4876 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4877 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
4878 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4879 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
4880
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4881 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
4882
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4883 do
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4884 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4885 YYSTYPE lval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4886
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
4887 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
4888
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4889 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
4890 {
28147
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28145
diff changeset
4891 // 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
4892 // 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
4893 // 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
4894 // "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
4895
648202bebcb0 improve treatment of comments at interactive command line (bug #57924)
John W. Eaton <jwe@octave.org>
parents: 28145
diff changeset
4896 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
4897
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4898 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
4899 return status;
257105b5193a fix push parser to return status indicating more input is needed
John W. Eaton <jwe@octave.org>
parents: 27510
diff changeset
4900
257105b5193a fix push parser to return status indicating more input is needed
John W. Eaton <jwe@octave.org>
parents: 27510
diff changeset
4901 break;
22196
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
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4904 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
4905
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4906 try
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4907 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4908 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
4909 }
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4910 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
4911 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
4912 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
4913
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4914 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
4915 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
4916 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4917 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
4918 }
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4919 catch (const exit_exception&)
23049
7351f2c93389 rethrow octave::exit_exception (bug #49304)
Olaf Till <i7tiol@t-online.de>
parents: 22879
diff changeset
4920 {
7351f2c93389 rethrow octave::exit_exception (bug #49304)
Olaf Till <i7tiol@t-online.de>
parents: 22879
diff changeset
4921 throw;
7351f2c93389 rethrow octave::exit_exception (bug #49304)
Olaf Till <i7tiol@t-online.de>
parents: 22879
diff changeset
4922 }
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4923 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
4924 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4925 throw;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4926 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4927 catch (...)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4928 {
24833
7c88cf242111 use m_ prefix for data members in more classes
John W. Eaton <jwe@octave.org>
parents: 24705
diff changeset
4929 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
4930
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4931 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
4932 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
4933 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4934 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
4935 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4936 }
28407
808e3964987b accept multi-line interactive input (bug #58370)
John W. Eaton <jwe@octave.org>
parents: 28266
diff changeset
4937 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
4938
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4939 if (status != 0)
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4940 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
4941
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4942 return status;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4943 }
25442
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
4944
28266
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28257
diff changeset
4945 int
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28257
diff changeset
4946 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
4947 {
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28257
diff changeset
4948 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
4949 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
4950
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28257
diff changeset
4951 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
4952
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28257
diff changeset
4953 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
4954
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28257
diff changeset
4955 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
4956 = 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
4957
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28257
diff changeset
4958 do
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28257
diff changeset
4959 {
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28257
diff changeset
4960 // 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
4961 // 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
4962 // 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
4963 // 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
4964
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28257
diff changeset
4965 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
4966
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28257
diff changeset
4967 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
4968 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
4969
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28257
diff changeset
4970 if (eof)
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28257
diff changeset
4971 {
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28257
diff changeset
4972 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
4973 break;
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28257
diff changeset
4974 }
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28257
diff changeset
4975
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28257
diff changeset
4976 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
4977
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28257
diff changeset
4978 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
4979 }
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28257
diff changeset
4980 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
4981
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28257
diff changeset
4982 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
4983 }
ce7a5b60e102 restore pull parser interface when input is not interactive (bug #58198)
John W. Eaton <jwe@octave.org>
parents: 28257
diff changeset
4984
27509
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
4985 octave_value
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
4986 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
4987 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
4988 const std::string& dispatch_type,
25442
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
4989 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
4990 bool force_script, bool autoload, bool relative_lookup)
25442
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
4991 {
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
4992 octave_value retval;
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
4993
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
4994 FILE *ffile = nullptr;
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
4995
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
4996 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
4997 {
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
4998 // 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
4999 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
5000 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
5001
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
5002 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
5003 {
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
5004 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
5005
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
5006 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
5007 }
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
5008
27509
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5009 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
5010 }
27509
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5011
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5012 if (! ffile)
25442
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
5013 {
27509
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5014 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
5015 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
5016
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5017 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
5018 }
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5019
28851
1ac5a76ae91d use [=] capture default specification where possible
John W. Eaton <jwe@octave.org>
parents: 28806
diff changeset
5020 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
5021
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
5022 // get the encoding for this folder
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
5023 octave::input_system& input_sys = interp.get_input_system ();
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
5024 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
5025
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5026 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
5027 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
5028 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
5029 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
5030
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5031 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
5032 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
5033 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
5034
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5035 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
5036 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
5037 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
5038 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
5039
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5040 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
5041
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5042 if (err)
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5043 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
5044
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5045 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
5046
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5047 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
5048 && 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
5049 {
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5050 // 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
5051 // 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
5052 // 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
5053
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5054 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
5055 panic_impossible ();
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5056
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5057 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
5058
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5059 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
5060 = 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
5061
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5062 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
5063 }
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5064 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
5065 {
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5066 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
5067
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5068 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
5069
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5070 if (parser.m_parsing_subfunctions)
25442
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
5071 {
27509
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5072 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
5073 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
5074
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5075 fcn->stash_subfunction_names (parser.m_subfunction_names);
25442
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
5076 }
27509
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5077
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5078 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
5079 }
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5080
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5081 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
5082 }
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5083
27510
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5084 // 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
5085 // test in a logical expression.
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5086
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5087 void
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5088 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
5089 {
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5090 if (expr->is_assignment_expression ()
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5091 && expr->paren_count () < 2)
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5092 {
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5093 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
5094 warning_with_id
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5095 ("Octave:assign-as-truth-value",
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5096 "suggest parenthesis around assignment used as truth value");
25442
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
5097 else
27510
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5098 warning_with_id
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5099 ("Octave:assign-as-truth-value",
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5100 "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
5101 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
5102 }
27510
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5103 }
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5104
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5105 // 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
5106
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5107 void
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5108 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
5109 {
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5110 if (! expr->is_constant ())
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5111 {
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5112 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
5113 warning_with_id ("Octave:variable-switch-label",
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5114 "variable switch label");
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5115 else
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5116 warning_with_id
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5117 ("Octave:variable-switch-label",
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5118 "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
5119 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
5120 }
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5121 }
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5122
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5123 void
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5124 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
5125 {
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5126 if (m_curr_fcn_depth >= 0)
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5127 {
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5128 tree_statement *tmp = t->back ();
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5129
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5130 if (tmp->is_expression ())
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5131 warning_with_id
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5132 ("Octave:missing-semicolon",
5438a82a18fb declare base_parser class data protected
John W. Eaton <jwe@octave.org>
parents: 27509
diff changeset
5133 "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
5134 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
5135 }
25442
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
5136 }
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
5137
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5138 std::string
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5139 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
5140 std::string& full_file)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5141 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5142 std::string retval;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5143
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5144 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
5145
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5146 std::string file = full_file;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5147
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
5148 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
5149
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5150 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
5151 || (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
5152 || (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
5153 {
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
5154 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
5155 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
5156
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
5157 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
5158 if (pos != std::string::npos)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5159 file = file.substr (pos+1);
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5160 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5161
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5162 if (! file.empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5163 {
27017
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator
John W. Eaton <jwe@octave.org>
parents: 27016
diff changeset
5164 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
5165
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5166 symbol_found = true;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5167
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5168 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
5169 = 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
5170 false, false, false);
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5171
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5172 if (ov_fcn.is_defined ())
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5173 {
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5174 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
5175
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5176 if (fcn)
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5177 retval = fcn->doc_string ();
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5178 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5179 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5180
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5181 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5182 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5183
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5184 std::string
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5185 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
5186 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5187 std::string file;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5188 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
5189 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5190
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5191 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
5192 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
5193 const std::string& dir_name,
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5194 const std::string& dispatch_type,
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5195 const std::string& package_name,
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5196 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
5197 {
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5198 octave_value retval;
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5199
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
5200 unwind_protect frame;
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5201
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5202 std::string nm = file_name;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5203
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
5204 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
5205
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5206 std::string file;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5207
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5208 bool relative_lookup = false;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5209
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5210 file = nm;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5211
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5212 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
5213 || (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
5214 || (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
5215 {
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
5216 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
5217 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
5218
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
5219 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
5220 if (pos != std::string::npos)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5221 nm = nm.substr (pos+1);
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5222 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5223
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
5224 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
5225
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
5226 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
5227
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5228 int len = file.length ();
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5229
27017
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator
John W. Eaton <jwe@octave.org>
parents: 27016
diff changeset
5230 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
5231
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator
John W. Eaton <jwe@octave.org>
parents: 27016
diff changeset
5232 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
5233
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5234 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
5235 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5236 if (autoload && ! fcn_name.empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5237 nm = fcn_name;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5238
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5239 octave_function *tmpfcn
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5240 = 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
5241
25206
cbe53b5ea5ce check success of loading oct-file (bug #52977)
Olaf Till <i7tiol@t-online.de>
parents: 25193
diff changeset
5242 if (tmpfcn)
cbe53b5ea5ce check success of loading oct-file (bug #52977)
Olaf Till <i7tiol@t-online.de>
parents: 25193
diff changeset
5243 {
cbe53b5ea5ce check success of loading oct-file (bug #52977)
Olaf Till <i7tiol@t-online.de>
parents: 25193
diff changeset
5244 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
5245 retval = octave_value (tmpfcn);
cbe53b5ea5ce check success of loading oct-file (bug #52977)
Olaf Till <i7tiol@t-online.de>
parents: 25193
diff changeset
5246 }
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5247 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5248 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
5249 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5250 // 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
5251 // 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
5252
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5253 std::string doc_string;
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5254
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5255 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
5256 = 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
5257 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
5258 autoload, autoload, relative_lookup);
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5259
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5260 if (ov_fcn.is_defined ())
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5261 {
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5262 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
5263
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5264 if (tmpfcn)
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5265 doc_string = tmpfcn->doc_string ();
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5266 }
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5267
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5268 octave_function *tmpfcn
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5269 = 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
5270
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5271 if (tmpfcn)
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5272 {
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5273 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
5274 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
5275
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5276 retval = octave_value (tmpfcn);
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5277 }
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5278 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5279 else if (len > 2)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5280 {
27509
fefc780b4e2e move parse_fcn_file from interpreter member function to parser friend
John W. Eaton <jwe@octave.org>
parents: 27507
diff changeset
5281 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
5282 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
5283 autoload, autoload, relative_lookup);
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5284 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5285
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5286 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5287 }
5312
80c1aa832cb2 [project @ 2005-04-28 01:54:46 by jwe]
jwe
parents: 5309
diff changeset
5288 }
80c1aa832cb2 [project @ 2005-04-28 01:54:46 by jwe]
jwe
parents: 5309
diff changeset
5289
23553
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
5290 DEFMETHOD (autoload, interp, args, ,
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
5291 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
5292 @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
5293 @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
5294 @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
5295 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
5296
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5297 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
5298 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
5299 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
5300 path.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5301
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5302 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
5303 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
5304 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
5305 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
5306
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5307 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5308 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
5309 @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
5310
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5311 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5312 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
5313 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
5314
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5315 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5316 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
5317 @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
5318
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5319 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5320 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
5321
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5322 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
5323
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5324 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
5325 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
5326
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5327 @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
5328 @end deftypefn */)
5484
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe]
jwe
parents: 5472
diff changeset
5329 {
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe]
jwe
parents: 5472
diff changeset
5330 int nargin = args.length ();
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe]
jwe
parents: 5472
diff changeset
5331
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5332 if (nargin == 1 || nargin > 3)
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5333 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5334
27016
9b261300a001 move file-scope static autoload map variable and functions to evaluator
John W. Eaton <jwe@octave.org>
parents: 27015
diff changeset
5335 octave::tree_evaluator& tw = interp.get_evaluator ();
9b261300a001 move file-scope static autoload map variable and functions to evaluator
John W. Eaton <jwe@octave.org>
parents: 27015
diff changeset
5336
5626
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe]
jwe
parents: 5615
diff changeset
5337 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
5338 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
5339 else
5484
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe]
jwe
parents: 5472
diff changeset
5340 {
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe]
jwe
parents: 5472
diff changeset
5341 string_vector argv = args.make_argv ("autoload");
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe]
jwe
parents: 5472
diff changeset
5342
20547
52ce821a52fd eliminate simple uses of error_state in parser and lexer
John W. Eaton <jwe@octave.org>
parents: 20535
diff changeset
5343 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
5344 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
5345 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
5346 {
21021
a5b99b09f8fd maint: Use comparison operators rather than compare() for strings.
Rik <rik@octave.org>
parents: 20957
diff changeset
5347 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
5348 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
5349 "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
5350
27016
9b261300a001 move file-scope static autoload map variable and functions to evaluator
John W. Eaton <jwe@octave.org>
parents: 27015
diff changeset
5351 tw.remove_autoload (argv[1], argv[2]);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
5352 }
5484
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe]
jwe
parents: 5472
diff changeset
5353 }
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe]
jwe
parents: 5472
diff changeset
5354
27016
9b261300a001 move file-scope static autoload map variable and functions to evaluator
John W. Eaton <jwe@octave.org>
parents: 27015
diff changeset
5355 return octave_value_list ();
4486
6ceba1f351fb [project @ 2003-08-22 16:49:46 by jwe]
jwe
parents: 4463
diff changeset
5356 }
6ceba1f351fb [project @ 2003-08-22 16:49:46 by jwe]
jwe
parents: 4463
diff changeset
5357
23553
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
5358 DEFMETHOD (mfilename, interp, args, ,
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
5359 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
5360 @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
5361 @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
5362 @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
5363 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
5364
25294
01ad54f997f5 Allow filenames which begin with a '.' to be returned from mfilename (bug #53707).
Rik <rik@octave.org>
parents: 25206
diff changeset
5365 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
5366 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
5367 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
5368
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5369 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
5370 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
5371
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5372 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
5373 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
5374 @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
5375 @end deftypefn */)
5739
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5376 {
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5377 int nargin = args.length ();
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5378
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5379 if (nargin > 1)
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5380 print_usage ();
5739
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5381
27015
4d9e1a832a55 move core of mfilename function to evaluator
John W. Eaton <jwe@octave.org>
parents: 27014
diff changeset
5382 std::string opt;
5739
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5383
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5384 if (nargin == 1)
27015
4d9e1a832a55 move core of mfilename function to evaluator
John W. Eaton <jwe@octave.org>
parents: 27014
diff changeset
5385 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
5386
4d9e1a832a55 move core of mfilename function to evaluator
John W. Eaton <jwe@octave.org>
parents: 27014
diff changeset
5387 return octave_value (interp.mfilename (opt));
5739
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5388 }
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5389
27017
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator
John W. Eaton <jwe@octave.org>
parents: 27016
diff changeset
5390 namespace octave
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator
John W. Eaton <jwe@octave.org>
parents: 27016
diff changeset
5391 {
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator
John W. Eaton <jwe@octave.org>
parents: 27016
diff changeset
5392 // 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
5393 // 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
5394 // 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
5395
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator
John W. Eaton <jwe@octave.org>
parents: 27016
diff changeset
5396 void
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator
John W. Eaton <jwe@octave.org>
parents: 27016
diff changeset
5397 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
5398 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
5399 {
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator
John W. Eaton <jwe@octave.org>
parents: 27016
diff changeset
5400 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
5401
27507
2d537a089e5d eliminate warn_for argument for source_file and parse_fcn_file functions
John W. Eaton <jwe@octave.org>
parents: 27505
diff changeset
5402 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
5403 }
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator
John W. Eaton <jwe@octave.org>
parents: 27016
diff changeset
5404 }
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator
John W. Eaton <jwe@octave.org>
parents: 27016
diff changeset
5405
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator
John W. Eaton <jwe@octave.org>
parents: 27016
diff changeset
5406 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
5407 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
5408 @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
5409 @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
5410 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
5411
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5412 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
5413 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
5414 @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
5415
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5416 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
5417 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
5418 (@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
5419 @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
5420 @end deftypefn */)
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5421 {
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5422 int nargin = args.length ();
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5423
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5424 if (nargin < 1 || nargin > 2)
5823
080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe]
jwe
parents: 5794
diff changeset
5425 print_usage ();
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5426
27017
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator
John W. Eaton <jwe@octave.org>
parents: 27016
diff changeset
5427 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
5428 = 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
5429
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5430 std::string context;
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5431 if (nargin == 2)
21861
a55f1fa2c94a oct-parse.in.yy: Shorten lines to < 80 characters where possible.
Rik <rik@octave.org>
parents: 21748
diff changeset
5432 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
5433
27017
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator
John W. Eaton <jwe@octave.org>
parents: 27016
diff changeset
5434 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
5435
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator
John W. Eaton <jwe@octave.org>
parents: 27016
diff changeset
5436 return octave_value_list ();
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5437 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5438
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5439 namespace octave
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5440 {
24624
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent
Mike Miller <mtmiller@octave.org>
parents: 24534
diff changeset
5441 //! 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
5442 //! the list of result values.
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent
Mike Miller <mtmiller@octave.org>
parents: 24534
diff changeset
5443 //!
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent
Mike Miller <mtmiller@octave.org>
parents: 24534
diff changeset
5444 //! @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
5445 //! @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
5446 //! @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
5447 //! @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
5448 //! necessarily the same as @c nargout.
ce2eb28e0a6d doc: make all Doxygen comment blocks more consistent
Mike Miller <mtmiller@octave.org>
parents: 24534
diff changeset
5449
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5450 octave_value_list
26883
a2aed4b49be3 fix const-ness of feval arguments
John W. Eaton <jwe@octave.org>
parents: 26799
diff changeset
5451 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
5452 {
27020
30e9204de313 move feval functions to interpreter class
John W. Eaton <jwe@octave.org>
parents: 27019
diff changeset
5453 interpreter& interp = __get_interpreter__ ("feval");
30e9204de313 move feval functions to interpreter class
John W. Eaton <jwe@octave.org>
parents: 27019
diff changeset
5454
30e9204de313 move feval functions to interpreter class
John W. Eaton <jwe@octave.org>
parents: 27019
diff changeset
5455 return interp.feval (name, args, nargout);
26883
a2aed4b49be3 fix const-ness of feval arguments
John W. Eaton <jwe@octave.org>
parents: 26799
diff changeset
5456 }
a2aed4b49be3 fix const-ness of feval arguments
John W. Eaton <jwe@octave.org>
parents: 26799
diff changeset
5457
a2aed4b49be3 fix const-ness of feval arguments
John W. Eaton <jwe@octave.org>
parents: 26799
diff changeset
5458 octave_value_list
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5459 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
5460 {
27020
30e9204de313 move feval functions to interpreter class
John W. Eaton <jwe@octave.org>
parents: 27019
diff changeset
5461 interpreter& interp = __get_interpreter__ ("feval");
30e9204de313 move feval functions to interpreter class
John W. Eaton <jwe@octave.org>
parents: 27019
diff changeset
5462
30e9204de313 move feval functions to interpreter class
John W. Eaton <jwe@octave.org>
parents: 27019
diff changeset
5463 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
5464 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5465
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5466 octave_value_list
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5467 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
5468 {
27020
30e9204de313 move feval functions to interpreter class
John W. Eaton <jwe@octave.org>
parents: 27019
diff changeset
5469 interpreter& interp = __get_interpreter__ ("feval");
30e9204de313 move feval functions to interpreter class
John W. Eaton <jwe@octave.org>
parents: 27019
diff changeset
5470
30e9204de313 move feval functions to interpreter class
John W. Eaton <jwe@octave.org>
parents: 27019
diff changeset
5471 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
5472 }
23502
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5473
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5474 octave_value_list
26883
a2aed4b49be3 fix const-ness of feval arguments
John W. Eaton <jwe@octave.org>
parents: 26799
diff changeset
5475 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
5476 {
27020
30e9204de313 move feval functions to interpreter class
John W. Eaton <jwe@octave.org>
parents: 27019
diff changeset
5477 interpreter& interp = __get_interpreter__ ("feval");
30e9204de313 move feval functions to interpreter class
John W. Eaton <jwe@octave.org>
parents: 27019
diff changeset
5478
30e9204de313 move feval functions to interpreter class
John W. Eaton <jwe@octave.org>
parents: 27019
diff changeset
5479 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
5480 }
25442
47a3e4b9b6fe tmp-parser-namespace-fixes
John W. Eaton <jwe@octave.org>
parents: 25441
diff changeset
5481
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5482 octave_value_list
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5483 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
5484 {
27020
30e9204de313 move feval functions to interpreter class
John W. Eaton <jwe@octave.org>
parents: 27019
diff changeset
5485 interpreter& interp = __get_interpreter__ ("feval");
30e9204de313 move feval functions to interpreter class
John W. Eaton <jwe@octave.org>
parents: 27019
diff changeset
5486
30e9204de313 move feval functions to interpreter class
John W. Eaton <jwe@octave.org>
parents: 27019
diff changeset
5487 return interp.feval (args, nargout);
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5488 }
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5489 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5490
27020
30e9204de313 move feval functions to interpreter class
John W. Eaton <jwe@octave.org>
parents: 27019
diff changeset
5491 DEFMETHOD (feval, interp, args, nargout,
30e9204de313 move feval functions to interpreter class
John W. Eaton <jwe@octave.org>
parents: 27019
diff changeset
5492 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
5493 @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
5494 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
5495
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5496 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
5497 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
5498
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5499 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5500 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5501 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
5502 @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
5503 @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
5504 @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
5505
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5506 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5507 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
5508
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5509 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
5510 (@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
5511 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
5512 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
5513
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5514 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5515 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5516 @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
5517 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
5518 @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
5519 @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
5520 @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
5521 @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
5522 @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
5523
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5524 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5525 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
5526 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
5527 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
5528 instead.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5529 @end deftypefn */)
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5530 {
20818
cef0448a6ed2 eliminate unnecessary uses of nargin
John W. Eaton <jwe@octave.org>
parents: 20798
diff changeset
5531 if (args.length () == 0)
5823
080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe]
jwe
parents: 5794
diff changeset
5532 print_usage ();
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5533
27020
30e9204de313 move feval functions to interpreter class
John W. Eaton <jwe@octave.org>
parents: 27019
diff changeset
5534 return interp.feval (args, nargout);
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5535 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5536
23599
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23577
diff changeset
5537 DEFMETHOD (builtin, interp, args, nargout,
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23577
diff changeset
5538 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
5539 @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
5540 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
5541 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
5542
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5543 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
5544 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
5545 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
5546
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5547 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
5548 @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
5549
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5550 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5551 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5552 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
5553 @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
5554 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
5555 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
5556 @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
5557 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
5558 @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
5559 @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
5560 @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
5561 @end deftypefn */)
11225
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 11138
diff changeset
5562 {
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11572
diff changeset
5563 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
5564
20818
cef0448a6ed2 eliminate unnecessary uses of nargin
John W. Eaton <jwe@octave.org>
parents: 20798
diff changeset
5565 if (args.length () == 0)
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5566 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5567
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5568 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
5569
23693
b9378eff6d13 move symbol_table class inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23673
diff changeset
5570 octave::symbol_table& symtab = interp.get_symbol_table ();
23599
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23577
diff changeset
5571
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23577
diff changeset
5572 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
5573
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5574 if (fcn.is_defined ())
27020
30e9204de313 move feval functions to interpreter class
John W. Eaton <jwe@octave.org>
parents: 27019
diff changeset
5575 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
5576 else
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5577 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
5578
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 11138
diff changeset
5579 return retval;
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 11138
diff changeset
5580 }
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 11138
diff changeset
5581
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5582 namespace octave
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5583 {
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5584 void
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5585 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
5586 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5587 if (*lst)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5588 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5589 delete *lst;
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
5590 *lst = nullptr;
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5591 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5592 }
13970
c93b953f7d54 plug some memory leaks
John W. Eaton <jwe@octave.org>
parents: 13844
diff changeset
5593 }
c93b953f7d54 plug some memory leaks
John W. Eaton <jwe@octave.org>
parents: 13844
diff changeset
5594
26113
8a15f3bace49 move eval_string inside interpreter/evaluator class
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5595 DEFMETHOD (eval, interp, args, nargout,
8a15f3bace49 move eval_string inside interpreter/evaluator class
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5596 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
5597 @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
5598 @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
5599 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
5600 program.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5601
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5602 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
5603
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5604 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
5605 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
5606
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5607 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
5608 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
5609
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5610 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5611 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
5612 @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
5613
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5614 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
5615 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
5616
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5617 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5618 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5619 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
5620 '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
5621 @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
5622 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
5623 @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
5624 @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
5625
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5626 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
5627 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
5628 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
5629 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
5630 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
5631 does.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5632 @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
5633 @end deftypefn */)
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5634 {
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5635 int nargin = args.length ();
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5636
27019
6cb675912f2b move core of eval function to evaluator
John W. Eaton <jwe@octave.org>
parents: 27018
diff changeset
5637 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
5638 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5639
27797
5dcdd5bd46e2 maint: remove trailing spaces from code.
Rik <rik@octave.org>
parents: 27778
diff changeset
5640 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
5641 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
5642
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696).
Rik <rik@octave.org>
parents: 27160
diff changeset
5643 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
5644
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696).
Rik <rik@octave.org>
parents: 27160
diff changeset
5645 if (nargin == 1)
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696).
Rik <rik@octave.org>
parents: 27160
diff changeset
5646 return interp.eval (try_code, nargout);
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5647 else
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5648 {
27165
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696).
Rik <rik@octave.org>
parents: 27160
diff changeset
5649 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
5650 || 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
5651 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
5652
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696).
Rik <rik@octave.org>
parents: 27160
diff changeset
5653 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
5654
6cb675912f2b move core of eval function to evaluator
John W. Eaton <jwe@octave.org>
parents: 27018
diff changeset
5655 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
5656 }
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5657 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5658
7562
c827f5673321 move tests to individual source files
John W. Eaton <jwe@octave.org>
parents: 7351
diff changeset
5659 /*
c827f5673321 move tests to individual source files
John W. Eaton <jwe@octave.org>
parents: 7351
diff changeset
5660
14084
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5661 %!shared x
7562
c827f5673321 move tests to individual source files
John W. Eaton <jwe@octave.org>
parents: 7351
diff changeset
5662 %! x = 1;
14084
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5663
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5664 %!assert (eval ("x"), 1)
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5665 %!assert (eval ("x;"))
21317
a4faec57f4c8 maint: remove semicolon after %!assert tests to follow Octave conventions.
Rik <rik@octave.org>
parents: 21301
diff changeset
5666 %!assert (eval ("x;"), 1)
14084
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5667
7562
c827f5673321 move tests to individual source files
John W. Eaton <jwe@octave.org>
parents: 7351
diff changeset
5668 %!test
14084
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5669 %! y = eval ("x");
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5670 %! assert (y, 1);
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5671
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5672 %!test
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5673 %! y = eval ("x;");
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5674 %! assert (y, 1);
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5675
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5676 %!test
21580
ecce63c99c3f maint: Add semicolons to terminate code in %! blocks.
Rik <rik@octave.org>
parents: 21416
diff changeset
5677 %! eval ("x = 1;");
14084
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5678 %! assert (x,1);
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5679
7562
c827f5673321 move tests to individual source files
John W. Eaton <jwe@octave.org>
parents: 7351
diff changeset
5680 %!test
c827f5673321 move tests to individual source files
John W. Eaton <jwe@octave.org>
parents: 7351
diff changeset
5681 %! eval ("flipud = 2;");
14084
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5682 %! assert (flipud, 2);
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5683
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5684 %!function y = __f ()
7562
c827f5673321 move tests to individual source files
John W. Eaton <jwe@octave.org>
parents: 7351
diff changeset
5685 %! eval ("flipud = 2;");
c827f5673321 move tests to individual source files
John W. Eaton <jwe@octave.org>
parents: 7351
diff changeset
5686 %! y = flipud;
14084
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5687 %!endfunction
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5688 %!assert (__f(), 2)
7562
c827f5673321 move tests to individual source files
John W. Eaton <jwe@octave.org>
parents: 7351
diff changeset
5689
27165
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696).
Rik <rik@octave.org>
parents: 27160
diff changeset
5690 %!test <*35645>
14533
e6aa044253eb Allow comma at the end of an assignment list (bug #35645)
Max Brister <max@2bass.com>
parents: 14512
diff changeset
5691 %! [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
5692 %! [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
5693
27165
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696).
Rik <rik@octave.org>
parents: 27160
diff changeset
5694 ## 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
5695 %!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
5696
27165
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696).
Rik <rik@octave.org>
parents: 27160
diff changeset
5697 %!shared str
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696).
Rik <rik@octave.org>
parents: 27160
diff changeset
5698 %! str = "disp ('hello');";
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696).
Rik <rik@octave.org>
parents: 27160
diff changeset
5699 %! 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
5700
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696).
Rik <rik@octave.org>
parents: 27160
diff changeset
5701 %!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
5702 %!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
5703 %!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
5704
58bdc2d98481 Only accept 1xN character vectors as string input to eval (bug #49696).
Rik <rik@octave.org>
parents: 27160
diff changeset
5705 %!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
5706 %!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
5707 %!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
5708
7562
c827f5673321 move tests to individual source files
John W. Eaton <jwe@octave.org>
parents: 7351
diff changeset
5709 */
c827f5673321 move tests to individual source files
John W. Eaton <jwe@octave.org>
parents: 7351
diff changeset
5710
23553
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
5711 DEFMETHOD (assignin, interp, args, ,
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
5712 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
5713 @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
5714 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
5715 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
5716 @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
5717 @end deftypefn */)
4297
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe]
jwe
parents: 4246
diff changeset
5718 {
20818
cef0448a6ed2 eliminate unnecessary uses of nargin
John W. Eaton <jwe@octave.org>
parents: 20798
diff changeset
5719 if (args.length () != 3)
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5720 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5721
27014
daab1b311a98 move core of assignin function to evaluator
John W. Eaton <jwe@octave.org>
parents: 26998
diff changeset
5722 std::string context
daab1b311a98 move core of assignin function to evaluator
John W. Eaton <jwe@octave.org>
parents: 26998
diff changeset
5723 = 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
5724
daab1b311a98 move core of assignin function to evaluator
John W. Eaton <jwe@octave.org>
parents: 26998
diff changeset
5725 std::string varname
daab1b311a98 move core of assignin function to evaluator
John W. Eaton <jwe@octave.org>
parents: 26998
diff changeset
5726 = 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
5727
daab1b311a98 move core of assignin function to evaluator
John W. Eaton <jwe@octave.org>
parents: 26998
diff changeset
5728 interp.assignin (context, varname, args(2));
daab1b311a98 move core of assignin function to evaluator
John W. Eaton <jwe@octave.org>
parents: 26998
diff changeset
5729
daab1b311a98 move core of assignin function to evaluator
John W. Eaton <jwe@octave.org>
parents: 26998
diff changeset
5730 return octave_value_list ();
4297
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe]
jwe
parents: 4246
diff changeset
5731 }
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe]
jwe
parents: 4246
diff changeset
5732
21369
105224df2330 also disallow assignment to keywords in assignin (bug #46459)
John W. Eaton <jwe@octave.org>
parents: 21361
diff changeset
5733 /*
105224df2330 also disallow assignment to keywords in assignin (bug #46459)
John W. Eaton <jwe@octave.org>
parents: 21361
diff changeset
5734
21581
6fab85c1538f maint: Follow Octave conventions for use of semicolon in BIST tests.
Rik <rik@octave.org>
parents: 21580
diff changeset
5735 %!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
5736
105224df2330 also disallow assignment to keywords in assignin (bug #46459)
John W. Eaton <jwe@octave.org>
parents: 21361
diff changeset
5737 */
105224df2330 also disallow assignment to keywords in assignin (bug #46459)
John W. Eaton <jwe@octave.org>
parents: 21361
diff changeset
5738
23553
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
5739 DEFMETHOD (evalin, interp, args, nargout,
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
5740 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
5741 @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
5742 @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
5743 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
5744 @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
5745 @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
5746 @end deftypefn */)
4245
610671be8792 [project @ 2002-12-28 04:02:31 by jwe]
jwe
parents: 4244
diff changeset
5747 {
610671be8792 [project @ 2002-12-28 04:02:31 by jwe]
jwe
parents: 4244
diff changeset
5748 int nargin = args.length ();
610671be8792 [project @ 2002-12-28 04:02:31 by jwe]
jwe
parents: 4244
diff changeset
5749
27018
a20ead51515d move core of evalin function to evaluator
John W. Eaton <jwe@octave.org>
parents: 27017
diff changeset
5750 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
5751 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5752
27018
a20ead51515d move core of evalin function to evaluator
John W. Eaton <jwe@octave.org>
parents: 27017
diff changeset
5753 std::string context
a20ead51515d move core of evalin function to evaluator
John W. Eaton <jwe@octave.org>
parents: 27017
diff changeset
5754 = 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
5755
a20ead51515d move core of evalin function to evaluator
John W. Eaton <jwe@octave.org>
parents: 27017
diff changeset
5756 std::string try_code
a20ead51515d move core of evalin function to evaluator
John W. Eaton <jwe@octave.org>
parents: 27017
diff changeset
5757 = 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
5758
a20ead51515d move core of evalin function to evaluator
John W. Eaton <jwe@octave.org>
parents: 27017
diff changeset
5759 if (nargin == 3)
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5760 {
27018
a20ead51515d move core of evalin function to evaluator
John W. Eaton <jwe@octave.org>
parents: 27017
diff changeset
5761 std::string catch_code
a20ead51515d move core of evalin function to evaluator
John W. Eaton <jwe@octave.org>
parents: 27017
diff changeset
5762 = 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
5763
a20ead51515d move core of evalin function to evaluator
John W. Eaton <jwe@octave.org>
parents: 27017
diff changeset
5764 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
5765 }
4245
610671be8792 [project @ 2002-12-28 04:02:31 by jwe]
jwe
parents: 4244
diff changeset
5766
27018
a20ead51515d move core of evalin function to evaluator
John W. Eaton <jwe@octave.org>
parents: 27017
diff changeset
5767 return interp.evalin (context, try_code, nargout);
22504
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5768 }
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5769
26113
8a15f3bace49 move eval_string inside interpreter/evaluator class
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5770 DEFMETHOD (evalc, interp, args, nargout,
8a15f3bace49 move eval_string inside interpreter/evaluator class
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5771 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
5772 @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
5773 @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
5774 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
5775 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
5776
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5777 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
5778
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5779 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
5780 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
5781 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
5782
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5783 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
5784 @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
5785 @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
5786 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
5787
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5788 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5789 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5790 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
5791 @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
5792
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5793 @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
5794 @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
5795 @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
5796 @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
5797 @end deftypefn */)
21075
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5798 {
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5799 int nargin = args.length ();
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5800
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5801 if (nargin == 0 || nargin > 2)
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5802 print_usage ();
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5803
27930
ea1898178973 simplify handling of temporary output buffer in evalc
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
5804 // 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
5805 // buffer.
ea1898178973 simplify handling of temporary output buffer in evalc
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
5806
ea1898178973 simplify handling of temporary output buffer in evalc
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
5807 octave_stdout.flush ();
ea1898178973 simplify handling of temporary output buffer in evalc
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
5808 std::cerr.flush ();
ea1898178973 simplify handling of temporary output buffer in evalc
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
5809
ea1898178973 simplify handling of temporary output buffer in evalc
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
5810 std::stringbuf buffer;
ea1898178973 simplify handling of temporary output buffer in evalc
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
5811
ea1898178973 simplify handling of temporary output buffer in evalc
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
5812 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
5813 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
5814
ea1898178973 simplify handling of temporary output buffer in evalc
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
5815 // 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
5816 // 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
5817 // 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
5818 // 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
5819 // 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
5820
28851
1ac5a76ae91d use [=] capture default specification where possible
John W. Eaton <jwe@octave.org>
parents: 28806
diff changeset
5821 octave::unwind_action act ([=] (void)
27930
ea1898178973 simplify handling of temporary output buffer in evalc
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
5822 {
ea1898178973 simplify handling of temporary output buffer in evalc
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
5823 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
5824 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
5825 });
ea1898178973 simplify handling of temporary output buffer in evalc
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
5826
ea1898178973 simplify handling of temporary output buffer in evalc
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
5827 // Call standard eval function.
27471
fd32c1a9b1bd revamp error handling
John W. Eaton <jwe@octave.org>
parents: 27458
diff changeset
5828
21075
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5829 int eval_nargout = std::max (0, nargout - 1);
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5830
27930
ea1898178973 simplify handling of temporary output buffer in evalc
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
5831 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
5832
ea1898178973 simplify handling of temporary output buffer in evalc
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
5833 // 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
5834
ea1898178973 simplify handling of temporary output buffer in evalc
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
5835 octave_stdout.flush ();
ea1898178973 simplify handling of temporary output buffer in evalc
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
5836 std::cerr.flush ();
21075
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5837
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5838 retval.prepend (buffer.str ());
27471
fd32c1a9b1bd revamp error handling
John W. Eaton <jwe@octave.org>
parents: 27458
diff changeset
5839
21075
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5840 return retval;
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5841 }
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5842
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5843 /*
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5844
26716
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26709
diff changeset
5845 %!test
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26709
diff changeset
5846 %! [old_fmt, old_spacing] = format ();
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26709
diff changeset
5847 %! unwind_protect
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26709
diff changeset
5848 %! format short;
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26709
diff changeset
5849 %! 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
5850 %! assert (str, "ans = 1\n");
26716
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26709
diff changeset
5851 %! unwind_protect_cleanup
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26709
diff changeset
5852 %! format (old_fmt);
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26709
diff changeset
5853 %! format (old_spacing);
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26709
diff changeset
5854 %! end_unwind_protect
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26709
diff changeset
5855
21075
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5856 %!assert (evalc ("1;"), "")
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5857
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5858 %!test
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5859 %! [s, y] = evalc ("1");
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5860 %! assert (s, "");
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5861 %! assert (y, 1);
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5862
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5863 %!test
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5864 %! [s, y] = evalc ("1;");
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5865 %! assert (s, "");
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5866 %! assert (y, 1);
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5867
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5868 %!test
26716
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26709
diff changeset
5869 %! [old_fmt, old_spacing] = format ();
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26709
diff changeset
5870 %! unwind_protect
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26709
diff changeset
5871 %! format short;
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26709
diff changeset
5872 %! 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
5873 %! assert (str, "y = 2\n");
26716
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26709
diff changeset
5874 %! assert (y, 2);
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26709
diff changeset
5875 %! unwind_protect_cleanup
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26709
diff changeset
5876 %! format (old_fmt);
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26709
diff changeset
5877 %! format (old_spacing);
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26709
diff changeset
5878 %! end_unwind_protect
21075
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5879
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5880 %!test
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5881 %! assert (evalc ("y = 3;"), "");
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5882 %! assert (y, 3);
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5883
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5884 %!test
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5885 %! [s, a, b] = evalc ("deal (1, 2)");
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5886 %! assert (s, "");
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5887 %! assert (a, 1);
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5888 %! assert (b, 2);
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5889
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5890 %!function [a, b] = __f_evalc ()
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5891 %! printf ("foo");
27458
2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939)
Rik <rik@octave.org>
parents: 27408
diff changeset
5892 %! fprintf (stdout, "bar ");
21580
ecce63c99c3f maint: Add semicolons to terminate code in %! blocks.
Rik <rik@octave.org>
parents: 21416
diff changeset
5893 %! disp (pi);
21075
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5894 %! a = 1;
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5895 %! b = 2;
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5896 %!endfunction
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5897 %!test
26585
d673b506f382 test: use "format short" in tests depending on output format (bug #55539)
Mike Miller <mtmiller@octave.org>
parents: 26423
diff changeset
5898 %! [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
5899 %! unwind_protect
d673b506f382 test: use "format short" in tests depending on output format (bug #55539)
Mike Miller <mtmiller@octave.org>
parents: 26423
diff changeset
5900 %! format short;
d673b506f382 test: use "format short" in tests depending on output format (bug #55539)
Mike Miller <mtmiller@octave.org>
parents: 26423
diff changeset
5901 %! [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
5902 %! 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
5903 %! 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
5904 %! 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
5905 %! 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
5906 %! 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
5907 %! 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
5908 %! end_unwind_protect
21075
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5909
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5910 %!error <foo> (evalc ("error ('foo')"))
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5911 %!error <bar> (evalc ("error ('foo')", "error ('bar')"))
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5912
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5913 %!test
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5914 %! warning ("off", "quiet", "local");
27471
fd32c1a9b1bd revamp error handling
John W. Eaton <jwe@octave.org>
parents: 27458
diff changeset
5915 %! str = evalc ("warning ('foo')");
fd32c1a9b1bd revamp error handling
John W. Eaton <jwe@octave.org>
parents: 27458
diff changeset
5916 %! assert (str(1:13), "warning: foo\n");
21075
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5917
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5918 %!test
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5919 %! warning ("off", "quiet", "local");
27471
fd32c1a9b1bd revamp error handling
John W. Eaton <jwe@octave.org>
parents: 27458
diff changeset
5920 %! str = evalc ("error ('foo')", "warning ('bar')");
fd32c1a9b1bd revamp error handling
John W. Eaton <jwe@octave.org>
parents: 27458
diff changeset
5921 %! assert (str(1:13), "warning: bar\n");
21075
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5922
21581
6fab85c1538f maint: Follow Octave conventions for use of semicolon in BIST tests.
Rik <rik@octave.org>
parents: 21580
diff changeset
5923 %!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
5924
21075
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5925 */
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5926
8311
7124bffc89c7 parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents: 8283
diff changeset
5927 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
5928 doc: /* -*- texinfo -*-
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5929 @deftypefn {} {@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
5930 @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
5931 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
5932 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
5933 @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
5934 @end deftypefn */)
8311
7124bffc89c7 parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents: 8283
diff changeset
5935 {
7124bffc89c7 parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents: 8283
diff changeset
5936 octave_value retval;
7124bffc89c7 parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents: 8283
diff changeset
5937
7124bffc89c7 parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents: 8283
diff changeset
5938 bool debug_flag = octave_debug;
7124bffc89c7 parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents: 8283
diff changeset
5939
7124bffc89c7 parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents: 8283
diff changeset
5940 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
5941 "__parser_debug_flag__");
8311
7124bffc89c7 parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents: 8283
diff changeset
5942
7124bffc89c7 parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents: 8283
diff changeset
5943 octave_debug = debug_flag;
7124bffc89c7 parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents: 8283
diff changeset
5944
7124bffc89c7 parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents: 8283
diff changeset
5945 return retval;
7124bffc89c7 parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents: 8283
diff changeset
5946 }
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
5947
27017
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator
John W. Eaton <jwe@octave.org>
parents: 27016
diff changeset
5948 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
5949 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
5950 @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
5951 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
5952 @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
5953 {
091e4df179de new function to help with debugging by parsing .m files without executing them
John W. Eaton <jwe@octave.org>
parents: 17326
diff changeset
5954 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
5955
091e4df179de new function to help with debugging by parsing .m files without executing them
John W. Eaton <jwe@octave.org>
parents: 17326
diff changeset
5956 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
5957
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5958 if (nargin < 1 || nargin > 2)
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5959 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5960
28857
43ad651cf5a0 eliminate unnecessary uses of octave:: namespace qualifier
John W. Eaton <jwe@octave.org>
parents: 28851
diff changeset
5961 std::string file
43ad651cf5a0 eliminate unnecessary uses of octave:: namespace qualifier
John W. Eaton <jwe@octave.org>
parents: 28851
diff changeset
5962 = 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
5963
43ad651cf5a0 eliminate unnecessary uses of octave:: namespace qualifier
John W. Eaton <jwe@octave.org>
parents: 28851
diff changeset
5964 std::string full_file = octave::sys::file_ops::tilde_expand (file);
23667
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
5965
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
5966 full_file = octave::sys::env::make_absolute (full_file);
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
5967
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
5968 std::string dir_name;
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5969
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
5970 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
5971
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5972 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
5973 || (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
5974 || (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
5975 {
21732
6a1eded90355 use namespace for system env class
John W. Eaton <jwe@octave.org>
parents: 21730
diff changeset
5976 file = octave::sys::env::base_pathname (file);
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5977 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
5978
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
5979 std::size_t pos = file.find_last_of (octave::sys::file_ops::dir_sep_str ());
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5980 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
5981 {
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
5982 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
5983 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
5984 }
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
5985 }
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 if (nargin == 2)
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5988 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
5989
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5990 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
5991 = 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
5992 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
5993
091e4df179de new function to help with debugging by parsing .m files without executing them
John W. Eaton <jwe@octave.org>
parents: 17326
diff changeset
5994 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
5995 }