Mercurial > octave

annotate libinterp/parse-tree/oct-parse.in.yy @ 24067:5b88383b9a69

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
install local functions after classdef parse is complete (bug #52080) * parse.h, oct-parse.in.yy (base_parser::finish_classdef_file): New function. (file): Use it to install classdef object and local functions. (base_parser::finish_function): Don't install classdef file local functions here.
author John W. Eaton <jwe@octave.org>
date Thu, 21 Sep 2017 11:15:43 -0400
parents c81ed514ca2c
children f8b8a8e6bd79
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1829
7d2982b55242 [project @ 1996-02-02 14:12:59 by jwe]
jwe
parents: 1826
diff changeset
1 /*
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2
23219
3ac9f9ecfae5 maint: Update copyright dates.
John W. Eaton <jwe@octave.org>
parents: 23049
diff changeset
3 Copyright (C) 1993-2017 John W. Eaton
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9471
diff changeset
4 Copyright (C) 2009 David Grundberg
11523
fd0a3ac60b0e update copyright notices
John W. Eaton <jwe@octave.org>
parents: 11464
diff changeset
5 Copyright (C) 2009-2010 VZLU Prague
21075
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
6 Copyright (C) 2016 Oliver Heimlich
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
7
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
8 This file is part of Octave.
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
9
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
10 Octave is free software; you can redistribute it and/or modify it
22755
3a2b891d0b33 maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents: 22712
diff changeset
11 under the terms of the GNU General Public License as published by
3a2b891d0b33 maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents: 22712
diff changeset
12 the Free Software Foundation; either version 3 of the License, or
3a2b891d0b33 maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents: 22712
diff changeset
13 (at your option) any later version.
3a2b891d0b33 maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents: 22712
diff changeset
14
3a2b891d0b33 maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents: 22712
diff changeset
15 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents: 22712
diff changeset
16 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents: 22712
diff changeset
17 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents: 22712
diff changeset
18 GNU General Public License for more details.
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
19
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
20 You should have received a copy of the GNU General Public License
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 7001
diff changeset
21 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 7001
diff changeset
22 <http://www.gnu.org/licenses/>.
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
23
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
24 */
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
25
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
26 // Parser for Octave.
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
27
767
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 751
diff changeset
28 // C decarations.
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe]
jwe
parents: 751
diff changeset
29
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
30 %{
21023
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 21021
diff changeset
31
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
32 #define YYDEBUG 1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
33
21724
aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents: 21707
diff changeset
34 #if defined (HAVE_CONFIG_H)
22003
2d3972b802ff use consistent style for including config.h in source files
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
35 # include "config.h"
240
a99f28f5e351 [project @ 1993-11-30 20:24:36 by jwe]
jwe
parents: 206
diff changeset
36 #endif
a99f28f5e351 [project @ 1993-11-30 20:24:36 by jwe]
jwe
parents: 206
diff changeset
37
3178
09a3064a3a17 [project @ 1998-06-23 03:46:42 by jwe]
jwe
parents: 3165
diff changeset
38 #include <cassert>
10463
bbe99b2a5ba7 undo recent gnulib-related changes
John W. Eaton <jwe@octave.org>
parents: 10447
diff changeset
39 #include <cstdio>
bbe99b2a5ba7 undo recent gnulib-related changes
John W. Eaton <jwe@octave.org>
parents: 10447
diff changeset
40 #include <cstdlib>
2427
2f50b24ce84f [project @ 1996-10-25 06:15:28 by jwe]
jwe
parents: 2375
diff changeset
41
8950
d865363208d6 include <iosfwd> instead of <iostream> in header files
John W. Eaton <jwe@octave.org>
parents: 8920
diff changeset
42 #include <iostream>
5484
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe]
jwe
parents: 5472
diff changeset
43 #include <map>
5765
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5760
diff changeset
44 #include <sstream>
5484
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe]
jwe
parents: 5472
diff changeset
45
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
46 #include "Matrix.h"
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
47 #include "cmd-edit.h"
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
48 #include "cmd-hist.h"
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
49 #include "file-ops.h"
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
50 #include "file-stat.h"
4243
7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe]
jwe
parents: 4240
diff changeset
51 #include "oct-env.h"
3712
7066a8065e7e [project @ 2000-08-22 06:21:20 by jwe]
jwe
parents: 3665
diff changeset
52 #include "oct-time.h"
4171
04694e5b4239 [project @ 2002-11-12 20:27:24 by jwe]
jwe
parents: 4131
diff changeset
53 #include "quit.h"
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
54
22091
0f6fc2ec3b1a move call_stack class to a separate file
John W. Eaton <jwe@octave.org>
parents: 22003
diff changeset
55 #include "Cell.h"
23454
30b6eccd6708 use builtin-defun-decls.h to ensure declarations of interpreter functions
John W. Eaton <jwe@octave.org>
parents: 23438
diff changeset
56 #include "builtin-defun-decls.h"
22091
0f6fc2ec3b1a move call_stack class to a separate file
John W. Eaton <jwe@octave.org>
parents: 22003
diff changeset
57 #include "call-stack.h"
4243
7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe]
jwe
parents: 4240
diff changeset
58 #include "defaults.h"
2166
d68119516779 [project @ 1996-05-13 13:41:55 by jwe]
jwe
parents: 2124
diff changeset
59 #include "defun.h"
4243
7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe]
jwe
parents: 4240
diff changeset
60 #include "dirfns.h"
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
61 #include "dynamic-ld.h"
1351
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe]
jwe
parents: 1315
diff changeset
62 #include "error.h"
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe]
jwe
parents: 1315
diff changeset
63 #include "input.h"
23438
d24d01273bd0 eliminate load-path singleton
John W. Eaton <jwe@octave.org>
parents: 23435
diff changeset
64 #include "interpreter-private.h"
22094
9203833cab7d move new interpreter class to separate file
John W. Eaton <jwe@octave.org>
parents: 22091
diff changeset
65 #include "interpreter.h"
1351
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe]
jwe
parents: 1315
diff changeset
66 #include "lex.h"
5832
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe]
jwe
parents: 5823
diff changeset
67 #include "load-path.h"
1743
ab8612a09449 [project @ 1996-01-12 11:25:30 by jwe]
jwe
parents: 1740
diff changeset
68 #include "oct-hist.h"
5626
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe]
jwe
parents: 5615
diff changeset
69 #include "oct-map.h"
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
70 #include "ov-classdef.h"
4935
4fc993a4e072 [project @ 2004-08-06 03:17:12 by jwe]
jwe
parents: 4930
diff changeset
71 #include "ov-fcn-handle.h"
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
72 #include "ov-usr-fcn.h"
8150
283989f2da9b make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 8064
diff changeset
73 #include "ov-null-mat.h"
1351
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe]
jwe
parents: 1315
diff changeset
74 #include "pager.h"
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe]
jwe
parents: 1315
diff changeset
75 #include "parse.h"
2987
ae20b3f37f5e [project @ 1997-05-16 07:05:15 by jwe]
jwe
parents: 2982
diff changeset
76 #include "pt-all.h"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents: 8471
diff changeset
77 #include "pt-eval.h"
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
78 #include "pt-funcall.h"
1351
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe]
jwe
parents: 1315
diff changeset
79 #include "symtab.h"
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe]
jwe
parents: 1315
diff changeset
80 #include "token.h"
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
81 #include "unwind-prot.h"
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
82 #include "utils.h"
1351
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe]
jwe
parents: 1315
diff changeset
83 #include "variables.h"
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
84
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16147
diff changeset
85 // oct-parse.h must be included after pt-all.h
23479
06bf3a0b08bf maint: Use "" instead of <> for our own include files.
John W. Eaton <jwe@octave.org>
parents: 23473
diff changeset
86 #include "oct-parse.h"
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16147
diff changeset
87
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16147
diff changeset
88 extern int octave_lex (YYSTYPE *, void *);
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16147
diff changeset
89
5484
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe]
jwe
parents: 5472
diff changeset
90 // List of autoloads (function -> file mapping).
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe]
jwe
parents: 5472
diff changeset
91 static std::map<std::string, std::string> autoload_map;
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe]
jwe
parents: 5472
diff changeset
92
496
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe]
jwe
parents: 482
diff changeset
93 // Forward declarations for some functions defined at the bottom of
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe]
jwe
parents: 482
diff changeset
94 // the file.
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe]
jwe
parents: 482
diff changeset
95
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
96 static void yyerror (octave::base_parser& parser, const char *s);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
97
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
98 #define lexer parser.m_lexer
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
99 #define scanner lexer.scanner
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16147
diff changeset
100
21023
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 21021
diff changeset
101 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 21021
diff changeset
102 // Disable this warning for code that is generated by Bison, including
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 21021
diff changeset
103 // grammar rules. Push the current state so we can restore the warning
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 21021
diff changeset
104 // state prior to functions we define at the bottom of the file.
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 21021
diff changeset
105 #pragma GCC diagnostic push
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 21021
diff changeset
106 #pragma GCC diagnostic ignored "-Wold-style-cast"
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 21021
diff changeset
107 #endif
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 21021
diff changeset
108
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
109 %}
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
110
666
fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe]
jwe
parents: 627
diff changeset
111 // Bison declarations.
fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe]
jwe
parents: 627
diff changeset
112
23673
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
113 // 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
114 // we notice if that number changes.
af5ad573c665 oct-parse.in.yy: Add %expect declaration.
John W. Eaton <jwe@octave.org>
parents: 17731
diff changeset
115
23673
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
116 %expect 9
17743
af5ad573c665 oct-parse.in.yy: Add %expect declaration.
John W. Eaton <jwe@octave.org>
parents: 17731
diff changeset
117
18974
d8abf813c69f handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents: 18531
diff changeset
118 %API_PREFIX_DECL%
4753
9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe]
jwe
parents: 4699
diff changeset
119
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16147
diff changeset
120 // 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
121 // 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
122 // 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
123 // 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
124 // 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
125 // 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
126 // 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
127 // 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
128
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16147
diff changeset
129 %define api.pure
16174
39096b290a2f check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents: 16167
diff changeset
130 %PUSH_PULL_DECL%
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
131 %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
132 %lex-param { void *lexer.scanner }
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16147
diff changeset
133
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
134 %union
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
135 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
136 int dummy_type;
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
137
2891
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe]
jwe
parents: 2884
diff changeset
138 // 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
139 octave::token *tok_val;
143
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe]
jwe
parents: 118
diff changeset
140
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3544
diff changeset
141 // 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
142 octave::comment_list *comment_type;
3665
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe]
jwe
parents: 3544
diff changeset
143
2891
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe]
jwe
parents: 2884
diff changeset
144 // 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
145 char punct_type;
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
146 octave::tree *tree_type;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
147 octave::tree_matrix *tree_matrix_type;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
148 octave::tree_cell *tree_cell_type;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
149 octave::tree_expression *tree_expression_type;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
150 octave::tree_constant *tree_constant_type;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
151 octave::tree_fcn_handle *tree_fcn_handle_type;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
152 octave::tree_funcall *tree_funcall_type;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
153 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
154 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
155 octave::tree_identifier *tree_identifier_type;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
156 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
157 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
158 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
159 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
160 octave::tree_command *tree_command_type;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
161 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
162 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
163 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
164 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
165 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
166 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
167 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
168 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
169 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
170 octave::tree_statement *tree_statement_type;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
171 octave::tree_statement_list *tree_statement_list_type;
2891
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe]
jwe
parents: 2884
diff changeset
172 octave_user_function *octave_user_function_type;
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
173
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
174 octave::tree_classdef *tree_classdef_type;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
175 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
176 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
177 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
178 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
179 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
180 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
181 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
182 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
183 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
184 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
185 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
186 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
187 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
188 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
189 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
190 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
191 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
192
143
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe]
jwe
parents: 118
diff changeset
193 // Tokens with line and column information.
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe]
jwe
parents: 118
diff changeset
194 %token <tok_val> '=' ':' '-' '+' '*' '/'
4018
a8621d87fbf5 [project @ 2002-08-05 03:17:25 by jwe]
jwe
parents: 4009
diff changeset
195 %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
196 %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
197 %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
198 %token <tok_val> EXPR_AND EXPR_OR EXPR_NOT
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe]
jwe
parents: 118
diff changeset
199 %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
200 %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
201 %token <tok_val> HERMITIAN TRANSPOSE
143
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe]
jwe
parents: 118
diff changeset
202 %token <tok_val> PLUS_PLUS MINUS_MINUS POW EPOW
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe]
jwe
parents: 118
diff changeset
203 %token <tok_val> NUM IMAG_NUM
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
204 %token <tok_val> STRUCT_ELT
2883
0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe]
jwe
parents: 2865
diff changeset
205 %token <tok_val> NAME
143
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe]
jwe
parents: 118
diff changeset
206 %token <tok_val> END
5279
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe]
jwe
parents: 5189
diff changeset
207 %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
208 %token <tok_val> FOR PARFOR WHILE DO UNTIL
1491
893b416bb919 [project @ 1995-09-29 04:03:01 by jwe]
jwe
parents: 1489
diff changeset
209 %token <tok_val> IF ELSEIF ELSE
2764
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe]
jwe
parents: 2745
diff changeset
210 %token <tok_val> SWITCH CASE OTHERWISE
1491
893b416bb919 [project @ 1995-09-29 04:03:01 by jwe]
jwe
parents: 1489
diff changeset
211 %token <tok_val> BREAK CONTINUE FUNC_RET
924
8b0920cc1d64 [project @ 1994-11-15 00:40:50 by jwe]
jwe
parents: 922
diff changeset
212 %token <tok_val> UNWIND CLEANUP
1489
3e705c864019 [project @ 1995-09-28 05:38:26 by jwe]
jwe
parents: 1371
diff changeset
213 %token <tok_val> TRY CATCH
14294
9e3983c8963c deprecate the static keyword
John W. Eaton <jwe@octave.org>
parents: 14293
diff changeset
214 %token <tok_val> GLOBAL PERSISTENT
4342
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe]
jwe
parents: 4318
diff changeset
215 %token <tok_val> FCN_HANDLE
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
216 %token <tok_val> CLASSDEF
13249
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
217 %token <tok_val> PROPERTIES METHODS EVENTS ENUMERATION
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
218 %token <tok_val> METAQUERY
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
219 %token <tok_val> SUPERCLASSREF
18520
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18419
diff changeset
220 %token <tok_val> FQ_IDENT
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
221 %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
222 %token <tok_val> FCN
21064
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21063
diff changeset
223 %token <tok_val> LEXICAL_ERROR
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
224
143
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe]
jwe
parents: 118
diff changeset
225 // Other tokens.
21064
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21063
diff changeset
226 %token<dummy_type> END_OF_INPUT
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
227 %token<dummy_type> INPUT_FILE
7587
1f662945c2be handle varargin and varargout without keywords
John W. Eaton <jwe@octave.org>
parents: 7562
diff changeset
228 // %token VARARGIN VARARGOUT
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
229
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
230 %token<dummy_type> '(' ')' '[' ']' '{' '}' '.' ',' ';' '@' '\n'
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
231
143
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe]
jwe
parents: 118
diff changeset
232 // 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
233 %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
234 %type <dummy_type> push_fcn_symtab push_script_symtab begin_file
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
235 %type <dummy_type> param_list_beg param_list_end stmt_begin parse_error
23343
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
236 %type <dummy_type> parsing_local_fcns
16644
856cb7cba231 maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16595 16627
diff changeset
237 %type <comment_type> stash_comment
17657
df266c923b83 delete unnecessary tok_type semantic value in parser
John W. Eaton <jwe@octave.org>
parents: 17656
diff changeset
238 %type <tok_val> function_beg classdef_beg
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
239 %type <punct_type> sep_no_nl opt_sep_no_nl nl opt_nl sep opt_sep
578
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe]
jwe
parents: 572
diff changeset
240 %type <tree_type> input
5861
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe]
jwe
parents: 5848
diff changeset
241 %type <tree_constant_type> string constant magic_colon
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe]
jwe
parents: 5848
diff changeset
242 %type <tree_anon_fcn_handle_type> anon_fcn_handle
4342
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe]
jwe
parents: 4318
diff changeset
243 %type <tree_fcn_handle_type> fcn_handle
16924
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
244 %type <tree_matrix_type> matrix_rows
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
245 %type <tree_cell_type> cell_rows
5102
b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe]
jwe
parents: 5013
diff changeset
246 %type <tree_expression_type> matrix cell
23600
db947ba52118 explicitly limit anonymous functions to a single expression
John W. Eaton <jwe@octave.org>
parents: 23599
diff changeset
247 %type <tree_expression_type> primary_expr oper_expr power_expr expr_no_assign
4207
fa3482b34599 [project @ 2002-12-03 18:22:05 by jwe]
jwe
parents: 4186
diff changeset
248 %type <tree_expression_type> simple_expr colon_expr assign_expr expression
17283
e6c0ac8ce5b6 eliminate parse conflicts introduced by changeset 923ce8b42db2
John W. Eaton <jwe@octave.org>
parents: 17281
diff changeset
249 %type <tree_identifier_type> identifier fcn_name magic_tilde
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
250 %type <tree_funcall_type> superclass_identifier meta_identifier
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
251 %type <tree_index_expression_type> word_list_cmd
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3347
diff changeset
252 %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
253 %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
254 %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
255 %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
256 %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
257 %type <tree_command_type> command select_command loop_command
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
258 %type <tree_command_type> jump_command except_command
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
259 %type <tree_function_def_type> function
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
260 %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
261 %type <tree_command_type> file
578
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe]
jwe
parents: 572
diff changeset
262 %type <tree_if_command_type> if_command
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe]
jwe
parents: 572
diff changeset
263 %type <tree_if_clause_type> elseif_clause else_clause
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe]
jwe
parents: 572
diff changeset
264 %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
265 %type <tree_switch_command_type> switch_command
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe]
jwe
parents: 2745
diff changeset
266 %type <tree_switch_case_type> switch_case default_case
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe]
jwe
parents: 2745
diff changeset
267 %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
268 %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
269 %type <tree_decl_init_list_type> decl1
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe]
jwe
parents: 2825
diff changeset
270 %type <tree_decl_command_type> declaration
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
271 %type <tree_statement_type> statement function_end
627
739d16c30481 [project @ 1994-08-19 13:23:14 by jwe]
jwe
parents: 620
diff changeset
272 %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
273 %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
274 %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
275 %type <tree_classdef_attribute_type> attr
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
276 %type <tree_classdef_attribute_list_type> attr_list opt_attr_list
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
277 %type <tree_classdef_superclass_type> superclass
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
278 %type <tree_classdef_superclass_list_type> superclass_list opt_superclass_list
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
279 %type <tree_classdef_body_type> class_body
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
280 %type <tree_classdef_property_type> class_property
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
281 %type <tree_classdef_property_list_type> property_list
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
282 %type <tree_classdef_properties_block_type> properties_block
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
283 %type <tree_classdef_methods_list_type> methods_list
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
284 %type <tree_classdef_methods_block_type> methods_block
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
285 %type <tree_classdef_event_type> class_event
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
286 %type <tree_classdef_events_list_type> events_list
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
287 %type <tree_classdef_events_block_type> events_block
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
288 %type <tree_classdef_enum_type> class_enum
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
289 %type <tree_classdef_enum_list_type> enum_list
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
290 %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
291 %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
292 %type <octave_user_function_type> method_decl1
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
293
143
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe]
jwe
parents: 118
diff changeset
294 // Precedence and associativity.
21294
3d375b0905a0 eliminate unused << and >> operators from Octave scripting language
John W. Eaton <jwe@octave.org>
parents: 21159
diff changeset
295 %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
296 %left EXPR_OR_OR
ef3caf27cb9c [project @ 2002-08-07 06:54:41 by jwe]
jwe
parents: 4018
diff changeset
297 %left EXPR_AND_AND
ef3caf27cb9c [project @ 2002-08-07 06:54:41 by jwe]
jwe
parents: 4018
diff changeset
298 %left EXPR_OR
ef3caf27cb9c [project @ 2002-08-07 06:54:41 by jwe]
jwe
parents: 4018
diff changeset
299 %left EXPR_AND
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
300 %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
301 %left ':'
1276
cbdf7db98554 [project @ 1995-04-24 15:31:24 by jwe]
jwe
parents: 1266
diff changeset
302 %left '-' '+' EPLUS EMINUS
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
303 %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
304 %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
305 %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
306 %right PLUS_PLUS MINUS_MINUS
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3347
diff changeset
307 %left '(' '.' '{'
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
308
17629
1e8f8900a041 clean up partially constructed parse tree objects on parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17622
diff changeset
309 // How to clean up if there is a parse error. We handle deleting tokens
1e8f8900a041 clean up partially constructed parse tree objects on parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17622
diff changeset
310 // and comments seperately and separators are just characters. The
1e8f8900a041 clean up partially constructed parse tree objects on parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17622
diff changeset
311 // 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
312 // 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
313 // 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
314 // here).
0c5f50706ba3 attempt to catch possible memory leaks in parser cleanup
John W. Eaton <jwe@octave.org>
parents: 17632
diff changeset
315
0c5f50706ba3 attempt to catch possible memory leaks in parser cleanup
John W. Eaton <jwe@octave.org>
parents: 17632
diff changeset
316 %destructor { } <tok_val>
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
317 %destructor { } <punct_type>
17658
0c5f50706ba3 attempt to catch possible memory leaks in parser cleanup
John W. Eaton <jwe@octave.org>
parents: 17632
diff changeset
318 %destructor { } <comment_type>
0c5f50706ba3 attempt to catch possible memory leaks in parser cleanup
John W. Eaton <jwe@octave.org>
parents: 17632
diff changeset
319 %destructor { } <>
0c5f50706ba3 attempt to catch possible memory leaks in parser cleanup
John W. Eaton <jwe@octave.org>
parents: 17632
diff changeset
320
19593
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
321 %destructor { delete $$; } <tree_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
322 %destructor { delete $$; } <tree_matrix_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
323 %destructor { delete $$; } <tree_cell_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
324 %destructor { delete $$; } <tree_expression_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
325 %destructor { delete $$; } <tree_constant_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
326 %destructor { delete $$; } <tree_fcn_handle_type>
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
327 %destructor { delete $$; } <tree_funcall_type>
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
328 %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
329 %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
330 %destructor { delete $$; } <tree_identifier_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
331 %destructor { delete $$; } <tree_index_expression_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
332 %destructor { delete $$; } <tree_argument_list_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
333 %destructor { delete $$; } <tree_parameter_list_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
334 %destructor { delete $$; } <tree_command_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
335 %destructor { delete $$; } <tree_if_command_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
336 %destructor { delete $$; } <tree_if_clause_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
337 %destructor { delete $$; } <tree_if_command_list_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
338 %destructor { delete $$; } <tree_switch_command_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
339 %destructor { delete $$; } <tree_switch_case_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
340 %destructor { delete $$; } <tree_switch_case_list_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
341 %destructor { delete $$; } <tree_decl_elt_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
342 %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
343 %destructor { delete $$; } <tree_decl_command_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
344 %destructor { delete $$; } <tree_statement_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
345 %destructor { delete $$; } <tree_statement_list_type>
446c46af4b42 strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
346 %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
347
18262
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
348 %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
349 %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
350 %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
351 %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
352 %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
353 %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
354 %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
355 %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
356 %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
357 %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
358 %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
359 %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
360 %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
361 %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
362 %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
363 %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
364 %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
365
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
366 // 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
367 // already explicitly declared for all types.
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
368 //
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
369 // %destructor {
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
370 // warning_with_id
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
371 // ("Octave:parser-destructor",
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
372 // "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
373 // } <*>
17629
1e8f8900a041 clean up partially constructed parse tree objects on parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17622
diff changeset
374
143
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe]
jwe
parents: 118
diff changeset
375 // Where to start.
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
376 %start input
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
377
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
378 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
379
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
380 // ==============================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
381 // Statements and statement lists
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
382 // ==============================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
383
17322
4c1ae06111c9 allow parser to accept empty statements (bug #37099)
John W. Eaton <jwe@octave.org>
parents: 17317
diff changeset
384 input : simple_list '\n'
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
385 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
386 $$ = nullptr;
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
387 parser.m_stmt_list = $1;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
388 YYACCEPT;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
389 }
17322
4c1ae06111c9 allow parser to accept empty statements (bug #37099)
John W. Eaton <jwe@octave.org>
parents: 17317
diff changeset
390 | simple_list END_OF_INPUT
4c1ae06111c9 allow parser to accept empty statements (bug #37099)
John W. Eaton <jwe@octave.org>
parents: 17317
diff changeset
391 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
392 $$ = nullptr;
17322
4c1ae06111c9 allow parser to accept empty statements (bug #37099)
John W. Eaton <jwe@octave.org>
parents: 17317
diff changeset
393 lexer.end_of_input = true;
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
394 parser.m_stmt_list = $1;
17322
4c1ae06111c9 allow parser to accept empty statements (bug #37099)
John W. Eaton <jwe@octave.org>
parents: 17317
diff changeset
395 YYACCEPT;
4c1ae06111c9 allow parser to accept empty statements (bug #37099)
John W. Eaton <jwe@octave.org>
parents: 17317
diff changeset
396 }
17326
f444e4cef9b9 avoid exiting Octave on parse error (bug #39862)
John W. Eaton <jwe@octave.org>
parents: 17322
diff changeset
397 | parse_error
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
398 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
399 $$ = nullptr;
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
400 YYABORT;
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
401 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
402 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
403
17322
4c1ae06111c9 allow parser to accept empty statements (bug #37099)
John W. Eaton <jwe@octave.org>
parents: 17317
diff changeset
404 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
405 {
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
406 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
407
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
408 $$ = nullptr;
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
409 }
17322
4c1ae06111c9 allow parser to accept empty statements (bug #37099)
John W. Eaton <jwe@octave.org>
parents: 17317
diff changeset
410 | 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
411 { $$ = 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
412 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
413
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
414 simple_list1 : statement
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
415 { $$ = parser.make_statement_list ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
416 | 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
417 { $$ = 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
418 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
419
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
420 opt_list : // empty
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
421 { $$ = new octave::tree_statement_list (); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
422 | list
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
423 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
424 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
425
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
426 list : list1 opt_sep
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
427 { $$ = 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
428 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
429
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
430 list1 : statement
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
431 { $$ = parser.make_statement_list ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
432 | list1 sep statement
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
433 { $$ = 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
434 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
435
23343
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
436 opt_fcn_list : // empty
23635
b5a9cd6de1b8 avoid possible memory error in parser
John W. Eaton <jwe@octave.org>
parents: 23631
diff changeset
437 { $$ = new octave::tree_statement_list (); }
23343
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
438 | fcn_list
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
439 { $$ = $1; }
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
440 ;
23396
945b53af4655 maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents: 23343
diff changeset
441
23343
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
442 fcn_list : fcn_list1 opt_sep
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
443 {
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
444 YYUSE ($2);
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
445
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
446 $$ = $1;
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
447 }
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
448 ;
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
449
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
450 fcn_list1 : function
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
451 {
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
452 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
453 $$ = new octave::tree_statement_list (stmt);
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
454 }
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
455 | fcn_list1 opt_sep function
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
456 {
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
457 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
458 $$ = 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
459 }
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
460 ;
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
461
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
462 statement : expression
17693
efbe746f8fa8 eliminate octave_comment_buffer singleton
John W. Eaton <jwe@octave.org>
parents: 17673
diff changeset
463 { $$ = parser.make_statement ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
464 | command
17693
efbe746f8fa8 eliminate octave_comment_buffer singleton
John W. Eaton <jwe@octave.org>
parents: 17673
diff changeset
465 { $$ = parser.make_statement ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
466 | word_list_cmd
17693
efbe746f8fa8 eliminate octave_comment_buffer singleton
John W. Eaton <jwe@octave.org>
parents: 17673
diff changeset
467 { $$ = parser.make_statement ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
468 ;
8746
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
469
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
470 // =================
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
471 // Word-list command
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
472 // =================
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
473
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
474 // 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
475 // 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
476 // WHILE, etc.
5dd06f19e9be handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents: 8745
diff changeset
477
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
478 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
479 {
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804)
Max Brister <max@2bass.com>
parents: 16294
diff changeset
480 $$ = 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
481 if (! $$)
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
482 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
483 // 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
484 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
485 }
16302
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804)
Max Brister <max@2bass.com>
parents: 16294
diff changeset
486 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
487 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
488
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
489 word_list : string
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
490 { $$ = new octave::tree_argument_list ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
491 | word_list string
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
492 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
493 $1->append ($2);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
494 $$ = $1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
495 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
496 ;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
497
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
498 // ===========
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
499 // Expressions
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
500 // ===========
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
501
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
502 identifier : NAME
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
503 {
23693
b9378eff6d13 move symbol_table class inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23673
diff changeset
504 octave::symbol_table::symbol_record sr = $1->sym_rec ();
23602
214cb58ccc1c use pointer to scope instead of scope id
John W. Eaton <jwe@octave.org>
parents: 23600
diff changeset
505 $$ = new octave::tree_identifier (sr, $1->line (), $1->column ());
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
506 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
507 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
508
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
509 superclass_identifier
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
510 : SUPERCLASSREF
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
511 {
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
512 std::string method_nm = $1->superclass_method_name ();
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
513 std::string class_nm = $1->superclass_class_name ();
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
514
18927
09eb8a2ddb02 eliminate some unused parameter warnings in parser functions
John W. Eaton <jwe@octave.org>
parents: 18537
diff changeset
515 $$ = parser.make_superclass_ref (method_nm, class_nm);
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
516 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
517 ;
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11572
diff changeset
518
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
519 meta_identifier : METAQUERY
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
520 {
18520
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18419
diff changeset
521 std::string class_nm = $1->text ();
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18419
diff changeset
522
18927
09eb8a2ddb02 eliminate some unused parameter warnings in parser functions
John W. Eaton <jwe@octave.org>
parents: 18537
diff changeset
523 $$ = parser.make_meta_class_query (class_nm);
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
524 }
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11572
diff changeset
525 ;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
526
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
527 string : DQ_STRING
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
528 { $$ = parser.make_constant (DQ_STRING, $1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
529 | SQ_STRING
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
530 { $$ = parser.make_constant (SQ_STRING, $1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
531 ;
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 constant : NUM
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
534 { $$ = parser.make_constant (NUM, $1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
535 | IMAG_NUM
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
536 { $$ = parser.make_constant (IMAG_NUM, $1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
537 | string
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
538 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
539 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
540
16924
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
541 matrix : '[' matrix_rows ']'
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
542 { $$ = parser.finish_matrix ($2); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
543 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
544
16924
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
545 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
546 { $$ = $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
547 | matrix_rows ';' cell_or_matrix_row
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
548 {
16924
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
549 if ($1)
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
550 {
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
551 if ($3)
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
552 $1->append ($3);
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
553
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
554 $$ = $1;
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
555 }
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
556 else
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
557 $$ = $3 ? new octave::tree_matrix ($3) : nullptr;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
558 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
559 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
560
16924
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
561 cell : '{' cell_rows '}'
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
562 { $$ = parser.finish_cell ($2); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
563 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
564
16924
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
565 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
566 { $$ = $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
567 | cell_rows ';' cell_or_matrix_row
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
568 {
16924
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
569 if ($1)
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
570 {
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
571 if ($3)
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
572 $1->append ($3);
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
573
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
574 $$ = $1;
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
575 }
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
576 else
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
577 $$ = $3 ? new octave::tree_cell ($3) : nullptr;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
578 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
579 ;
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3347
diff changeset
580
16924
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
581 // 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
582 // 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
583
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3347
diff changeset
584 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
585 : // empty
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
586 { $$ = nullptr; }
16924
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
587 | ','
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
588 { $$ = nullptr; }
16924
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
589 | arg_list
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16251
diff changeset
590 { $$ = $1; }
16924
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
591 | arg_list ','
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16251
diff changeset
592 { $$ = $1; }
16924
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
593 | ',' arg_list
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
594 { $$ = $2; }
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
595 | ',' arg_list ','
aebb54d99dba improve compatibility of parsing of matrices and cell arrays
John W. Eaton <jwe@octave.org>
parents: 16850
diff changeset
596 { $$ = $2; }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
597 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
598
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
599 fcn_handle : '@' FCN_HANDLE
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
600 {
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
601 $$ = parser.make_fcn_handle ($2);
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
602 lexer.looking_at_function_handle--;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
603 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
604 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
605
23600
db947ba52118 explicitly limit anonymous functions to a single expression
John W. Eaton <jwe@octave.org>
parents: 23599
diff changeset
606 anon_fcn_handle : '@' param_list stmt_begin expr_no_assign
13237
1bfca2bbea8b fix parsing of anonymous functions inside cell array lists.
John W. Eaton <jwe@octave.org>
parents: 13125
diff changeset
607 {
16681
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958)
John W. Eaton <jwe@octave.org>
parents: 16627
diff changeset
608 $$ = parser.make_anon_fcn_handle ($2, $4);
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
609 lexer.nesting_level.remove ();
13237
1bfca2bbea8b fix parsing of anonymous functions inside cell array lists.
John W. Eaton <jwe@octave.org>
parents: 13125
diff changeset
610 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
611 ;
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11572
diff changeset
612
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
613 primary_expr : identifier
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
614 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
615 | constant
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
616 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
617 | fcn_handle
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
618 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
619 | matrix
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16251
diff changeset
620 {
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
621 lexer.looking_at_matrix_or_assign_lhs = false;
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16251
diff changeset
622 $$ = $1;
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16251
diff changeset
623 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
624 | cell
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
625 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
626 | meta_identifier
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
627 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
628 | superclass_identifier
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
629 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
630 | '(' expression ')'
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
631 { $$ = $2->mark_in_parens (); }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
632 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
633
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
634 magic_colon : ':'
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
635 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
636 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
637
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
638 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
639 $$ = new octave::tree_constant (tmp);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
640 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
641 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
642
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
643 magic_tilde : EXPR_NOT
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
644 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
645 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
646
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
647 $$ = new octave::tree_black_hole ();
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
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
651 arg_list : expression
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
652 { $$ = new octave::tree_argument_list ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
653 | magic_colon
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
654 { $$ = new octave::tree_argument_list ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
655 | magic_tilde
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
656 { $$ = new octave::tree_argument_list ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
657 | arg_list ',' magic_colon
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
658 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
659 $1->append ($3);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
660 $$ = $1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
661 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
662 | arg_list ',' magic_tilde
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
663 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
664 $1->append ($3);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
665 $$ = $1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
666 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
667 | arg_list ',' expression
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
668 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
669 $1->append ($3);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
670 $$ = $1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
671 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
672 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
673
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
674 indirect_ref_op : '.'
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
675 {
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
676 $$ = 0;
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
677 lexer.looking_at_indirect_ref = true;
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
678 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
679 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
680
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
681 oper_expr : primary_expr
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
682 { $$ = $1; }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
683 | oper_expr PLUS_PLUS
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
684 { $$ = 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
685 | oper_expr MINUS_MINUS
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
686 { $$ = 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
687 | oper_expr '(' ')'
16302
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804)
Max Brister <max@2bass.com>
parents: 16294
diff changeset
688 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
689 $$ = 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
690 if (! $$)
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
691 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
692 // 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
693 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
694 }
16302
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804)
Max Brister <max@2bass.com>
parents: 16294
diff changeset
695 }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
696 | 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
697 {
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804)
Max Brister <max@2bass.com>
parents: 16294
diff changeset
698 $$ = 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
699 if (! $$)
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
700 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
701 // make_index_expression deleted $1 and $3.
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
702 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
703 }
16302
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804)
Max Brister <max@2bass.com>
parents: 16294
diff changeset
704 }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
705 | oper_expr '{' '}'
16302
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804)
Max Brister <max@2bass.com>
parents: 16294
diff changeset
706 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
707 $$ = 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
708 if (! $$)
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
709 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
710 // make_index_expression deleted $1.
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
711 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
712 }
16302
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804)
Max Brister <max@2bass.com>
parents: 16294
diff changeset
713 }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
714 | oper_expr '{' arg_list '}'
16302
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804)
Max Brister <max@2bass.com>
parents: 16294
diff changeset
715 {
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804)
Max Brister <max@2bass.com>
parents: 16294
diff changeset
716 $$ = 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
717 if (! $$)
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
718 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
719 // make_index_expression deleted $1 and $3.
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
720 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
721 }
16302
a4af67e0d22c oct-parse.in.yy: a{~}.b segfaults the interpreter (bug #37804)
Max Brister <max@2bass.com>
parents: 16294
diff changeset
722 }
16284
09881dab3aaf * lex.ll, oct-parse.in.yy (HERMITIAN): Rename token from QUOTE.
John W. Eaton <jwe@octave.org>
parents: 16279
diff changeset
723 | oper_expr HERMITIAN
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
724 { $$ = 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
725 | oper_expr TRANSPOSE
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
726 { $$ = 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
727 | 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
728 { $$ = 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
729 | oper_expr indirect_ref_op '(' expression ')'
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
730 { $$ = parser.make_indirect_ref ($1, $4); }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
731 | 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
732 { $$ = 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
733 | 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
734 { $$ = 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
735 | 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
736 { $$ = 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
737 | '+' oper_expr %prec UNARY
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
738 { $$ = parser.make_prefix_op ('+', $2, $1); }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
739 | '-' oper_expr %prec UNARY
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
740 { $$ = parser.make_prefix_op ('-', $2, $1); }
17622
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
741 | oper_expr POW power_expr
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
742 { $$ = 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
743 | oper_expr EPOW power_expr
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
744 { $$ = parser.make_binary_op (EPOW, $1, $2, $3); }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
745 | oper_expr '+' oper_expr
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
746 { $$ = parser.make_binary_op ('+', $1, $2, $3); }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
747 | oper_expr '-' oper_expr
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
748 { $$ = parser.make_binary_op ('-', $1, $2, $3); }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
749 | oper_expr '*' oper_expr
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
750 { $$ = parser.make_binary_op ('*', $1, $2, $3); }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
751 | oper_expr '/' oper_expr
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
752 { $$ = parser.make_binary_op ('/', $1, $2, $3); }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
753 | oper_expr EPLUS oper_expr
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
754 { $$ = parser.make_binary_op ('+', $1, $2, $3); }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
755 | oper_expr EMINUS oper_expr
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
756 { $$ = parser.make_binary_op ('-', $1, $2, $3); }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
757 | oper_expr EMUL oper_expr
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
758 { $$ = parser.make_binary_op (EMUL, $1, $2, $3); }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
759 | oper_expr EDIV oper_expr
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
760 { $$ = parser.make_binary_op (EDIV, $1, $2, $3); }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
761 | oper_expr LEFTDIV oper_expr
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
762 { $$ = parser.make_binary_op (LEFTDIV, $1, $2, $3); }
12627
002948ae5bc0 fix precedence level of transpose operators (bug #32533)
John W. Eaton <jwe@octave.org>
parents: 12483
diff changeset
763 | oper_expr ELEFTDIV oper_expr
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
764 { $$ = parser.make_binary_op (ELEFTDIV, $1, $2, $3); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
765 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
766
17622
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
767 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
768 { $$ = $1; }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
769 | 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
770 { $$ = 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
771 | 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
772 { $$ = 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
773 | power_expr '(' ')'
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
774 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
775 $$ = 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
776 if (! $$)
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
777 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
778 // 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
779 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
780 }
17622
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
781 }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
782 | 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
783 {
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
784 $$ = 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
785 if (! $$)
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
786 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
787 // make_index_expression deleted $1 and $3.
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
788 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
789 }
17622
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
790 }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
791 | power_expr '{' '}'
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
792 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
793 $$ = 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
794 if (! $$)
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
795 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
796 // make_index_expression deleted $1.
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
797 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
798 }
17622
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
799 }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
800 | power_expr '{' arg_list '}'
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
801 {
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
802 $$ = 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
803 if (! $$)
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
804 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
805 // make_index_expression deleted $1 and $3.
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
806 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
807 }
17622
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
808 }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
809 | power_expr 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
810 { $$ = 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
811 | power_expr indirect_ref_op '(' expression ')'
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
812 { $$ = parser.make_indirect_ref ($1, $4); }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
813 | 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
814 { $$ = 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
815 | 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
816 { $$ = 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
817 | 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
818 { $$ = 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
819 | '+' power_expr %prec POW
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
820 { $$ = parser.make_prefix_op ('+', $2, $1); }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
821 | '-' power_expr %prec POW
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
822 { $$ = parser.make_prefix_op ('-', $2, $1); }
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
823 ;
fd712a12fe53 compatibility for power operator precedence and direction (bug #33304)
Axel Mathéi <axel.mathei@gmail.com>
parents: 17618
diff changeset
824
23655
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
825 colon_expr : oper_expr ':' oper_expr
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
826 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
827 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
828
23655
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
829 $$ = 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
830
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
831 if (! $$)
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
832 {
23655
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
833 // 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
834 YYABORT;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
835 }
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
836 }
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
837 | 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
838 {
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
839 YYUSE ($2);
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
840 YYUSE ($4);
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
841
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
842 $$ = 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
843
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
844 if (! $$)
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
845 {
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
846 // 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
847 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
848 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
849 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
850 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
851
23655
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
852 simple_expr : oper_expr
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
853 { $$ = $1; }
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
854 | colon_expr
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
855 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
856 | 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
857 { $$ = 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
858 | 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
859 { $$ = 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
860 | 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
861 { $$ = 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
862 | 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
863 { $$ = 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
864 | 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
865 { $$ = 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
866 | 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
867 { $$ = 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
868 | 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
869 { $$ = 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
870 | 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
871 { $$ = 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
872 | 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
873 { $$ = 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
874 | 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
875 { $$ = 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
876 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
877
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
878 assign_lhs : simple_expr
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
879 {
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
880 $$ = parser.validate_matrix_for_assignment ($1);
16273
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
881
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
882 if ($$)
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
883 { lexer.looking_at_matrix_or_assign_lhs = false; }
16273
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
884 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
885 {
16277
8cb65fd72164 eliminate obsolete concepts of "pending local" and "forced" variables
John W. Eaton <jwe@octave.org>
parents: 16273
diff changeset
886 // 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
887 YYABORT;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
888 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
889 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
890 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
891
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
892 assign_expr : assign_lhs '=' expression
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
893 { $$ = parser.make_assign_op ('=', $1, $2, $3); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
894 | assign_lhs ADD_EQ expression
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
895 { $$ = parser.make_assign_op (ADD_EQ, $1, $2, $3); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
896 | assign_lhs SUB_EQ expression
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
897 { $$ = parser.make_assign_op (SUB_EQ, $1, $2, $3); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
898 | assign_lhs MUL_EQ expression
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
899 { $$ = parser.make_assign_op (MUL_EQ, $1, $2, $3); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
900 | assign_lhs DIV_EQ expression
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
901 { $$ = parser.make_assign_op (DIV_EQ, $1, $2, $3); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
902 | assign_lhs LEFTDIV_EQ expression
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
903 { $$ = parser.make_assign_op (LEFTDIV_EQ, $1, $2, $3); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
904 | assign_lhs POW_EQ expression
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
905 { $$ = parser.make_assign_op (POW_EQ, $1, $2, $3); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
906 | assign_lhs EMUL_EQ expression
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
907 { $$ = parser.make_assign_op (EMUL_EQ, $1, $2, $3); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
908 | assign_lhs EDIV_EQ expression
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
909 { $$ = parser.make_assign_op (EDIV_EQ, $1, $2, $3); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
910 | assign_lhs ELEFTDIV_EQ expression
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
911 { $$ = 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
912 | assign_lhs EPOW_EQ expression
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
913 { $$ = 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
914 | assign_lhs AND_EQ expression
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
915 { $$ = 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
916 | assign_lhs OR_EQ expression
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
917 { $$ = 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
918 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
919
23600
db947ba52118 explicitly limit anonymous functions to a single expression
John W. Eaton <jwe@octave.org>
parents: 23599
diff changeset
920 expr_no_assign : simple_expr
16273
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
921 {
23576
00e518162fda maint: Deprecate is_cell and replace with iscell.
Rik <rik@octave.org>
parents: 23553
diff changeset
922 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
923 {
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
924 if (parser.validate_array_list ($1))
16273
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
925 $$ = $1;
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
926 else
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
927 {
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
928 delete $1;
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
929 YYABORT;
16273
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
930 }
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
931 }
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
932 else
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
933 $$ = $1;
c5e5f6ccac5d 9/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16265
diff changeset
934 }
23600
db947ba52118 explicitly limit anonymous functions to a single expression
John W. Eaton <jwe@octave.org>
parents: 23599
diff changeset
935 | anon_fcn_handle
db947ba52118 explicitly limit anonymous functions to a single expression
John W. Eaton <jwe@octave.org>
parents: 23599
diff changeset
936 { $$ = $1; }
db947ba52118 explicitly limit anonymous functions to a single expression
John W. Eaton <jwe@octave.org>
parents: 23599
diff changeset
937 ;
db947ba52118 explicitly limit anonymous functions to a single expression
John W. Eaton <jwe@octave.org>
parents: 23599
diff changeset
938
db947ba52118 explicitly limit anonymous functions to a single expression
John W. Eaton <jwe@octave.org>
parents: 23599
diff changeset
939 expression : expr_no_assign
db947ba52118 explicitly limit anonymous functions to a single expression
John W. Eaton <jwe@octave.org>
parents: 23599
diff changeset
940 { $$ = $1; }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
941 | assign_expr
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
942 {
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
943 if (! $1)
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
944 YYABORT;
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
945
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
946 $$ = $1;
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
947 }
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
948
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
949 // ================================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
950 // Commands, declarations, and function definitions
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
951 // ================================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
952
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
953 command : declaration
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
954 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
955 | select_command
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
956 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
957 | loop_command
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
958 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
959 | jump_command
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
960 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
961 | except_command
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
962 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
963 | function
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
964 { $$ = $1; }
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
965 | file
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
966 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
967 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
968
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
969 // =====================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
970 // Declaration statemnts
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
971 // =====================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
972
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
973 declaration : GLOBAL decl1
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
974 {
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
975 $$ = parser.make_decl_command (GLOBAL, $1, $2);
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
976 lexer.looking_at_decl_list = false;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
977 }
16263
9acb86e6ac90 4/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16259
diff changeset
978 | PERSISTENT decl1
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
979 {
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
980 $$ = parser.make_decl_command (PERSISTENT, $1, $2);
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
981 lexer.looking_at_decl_list = false;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
982 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
983 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
984
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
985 decl1 : decl2
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
986 { $$ = new octave::tree_decl_init_list ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
987 | decl1 decl2
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
988 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
989 $1->append ($2);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
990 $$ = $1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
991 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
992 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
993
7634
ae90e05ad299 fix parameter list initializer bug
John W. Eaton <jwe@octave.org>
parents: 7587
diff changeset
994 decl_param_init : // empty
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
995 {
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
996 $$ = 0;
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
997 lexer.looking_at_initializer_expression = true;
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
998 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
999
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1000 decl2 : identifier
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1001 { $$ = new octave::tree_decl_elt ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1002 | identifier '=' decl_param_init expression
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1003 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1004 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1005
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1006 lexer.looking_at_initializer_expression = false;
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1007 $$ = new octave::tree_decl_elt ($1, $4);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1008 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1009 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1010
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1011 // ====================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1012 // Selection statements
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1013 // ====================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1014
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1015 select_command : if_command
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1016 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1017 | switch_command
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1018 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1019 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1020
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1021 // ============
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1022 // If statement
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1023 // ============
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1024
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1025 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
1026 {
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1027 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
1028 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1029 // 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
1030 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1031 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1032 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1033 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1034
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1035 if_cmd_list : if_cmd_list1
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1036 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1037 | if_cmd_list1 else_clause
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1038 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1039 $1->append ($2);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1040 $$ = $1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1041 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1042 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1043
16681
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958)
John W. Eaton <jwe@octave.org>
parents: 16627
diff changeset
1044 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
1045 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1046 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1047
18127
d76f790b4eec enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents: 17796
diff changeset
1048 $1->mark_braindead_shortcircuit ();
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1049
16681
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958)
John W. Eaton <jwe@octave.org>
parents: 16627
diff changeset
1050 $$ = 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
1051 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1052 | if_cmd_list1 elseif_clause
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1053 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1054 $1->append ($2);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1055 $$ = $1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1056 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1057 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1058
16681
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958)
John W. Eaton <jwe@octave.org>
parents: 16627
diff changeset
1059 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
1060 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1061 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1062 YYUSE ($6);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1063
18127
d76f790b4eec enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents: 17796
diff changeset
1064 $4->mark_braindead_shortcircuit ();
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1065
16681
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958)
John W. Eaton <jwe@octave.org>
parents: 16627
diff changeset
1066 $$ = 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
1067 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1068 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1069
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1070 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
1071 {
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1072 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1073 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1074
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1075 $$ = 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
1076 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1077 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1078
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1079 // ================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1080 // Switch statement
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1081 // ================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1082
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1083 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
1084 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1085 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1086
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1087 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
1088 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1089 // 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
1090 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1091 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1092 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1093 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1094
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1095 case_list : // empty
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1096 { $$ = 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
1097 | default_case
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1098 { $$ = new octave::tree_switch_case_list ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1099 | case_list1
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1100 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1101 | case_list1 default_case
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1102 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1103 $1->append ($2);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1104 $$ = $1;
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11572
diff changeset
1105 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1106 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1107
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1108 case_list1 : switch_case
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1109 { $$ = new octave::tree_switch_case_list ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1110 | case_list1 switch_case
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1111 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1112 $1->append ($2);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1113 $$ = $1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1114 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1115 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1116
16681
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958)
John W. Eaton <jwe@octave.org>
parents: 16627
diff changeset
1117 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
1118 {
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1119 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1120 YYUSE ($6);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1121
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1122 $$ = 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
1123 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1124 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1125
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1126 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
1127 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1128 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1129 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1130
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1131 $$ = new octave::tree_switch_case ($4, $2);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1132 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1133 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1134
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1135 // =======
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1136 // Looping
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
16681
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958)
John W. Eaton <jwe@octave.org>
parents: 16627
diff changeset
1139 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
1140 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1141 YYUSE ($5);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1142
18127
d76f790b4eec enable do_braindead_shortcircuit_evaluation by default and deprecate
John W. Eaton <jwe@octave.org>
parents: 17796
diff changeset
1143 $3->mark_braindead_shortcircuit ();
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1144
16681
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958)
John W. Eaton <jwe@octave.org>
parents: 16627
diff changeset
1145 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
1146 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1147 // 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
1148 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1149 }
10315
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 | 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
1152 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1153 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1154 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1155
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1156 $$ = 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
1157 }
16681
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958)
John W. Eaton <jwe@octave.org>
parents: 16627
diff changeset
1158 | 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
1159 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1160 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1161 YYUSE ($7);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1162
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
1163 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
1164 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
1165 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1166 // 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
1167 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1168 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1169 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1170 | 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
1171 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1172 YYUSE ($5);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1173 YYUSE ($8);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1174
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
1175 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
1176 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
1177 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1178 // 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
1179 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1180 }
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
1181 }
16681
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958)
John W. Eaton <jwe@octave.org>
parents: 16627
diff changeset
1182 | 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
1183 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1184 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1185 YYUSE ($7);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1186
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1187 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
1188 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
1189 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1190 // 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
1191 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1192 }
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
1193 }
027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now
John W. Eaton <jwe@octave.org>
parents: 13241
diff changeset
1194 | 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
1195 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1196 YYUSE ($5);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1197 YYUSE ($10);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1198
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1199 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
1200 $8, $11, $12, $2)))
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1201 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1202 // 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
1203 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1204 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1205 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1206 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1207
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1208 // =======
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1209 // Jumping
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1210 // =======
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1211
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1212 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
1213 {
9c6661004167 error if break statement is in script file separate from loop (bug #39168)
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
1214 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
1215 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
1216 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1217 | CONTINUE
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1218 { $$ = parser.make_continue_command ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1219 | FUNC_RET
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1220 { $$ = parser.make_return_command ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1221 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1222
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1223 // ==========
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1224 // Exceptions
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1225 // ==========
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1226
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1227 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
1228 stash_comment opt_sep opt_list END
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1229 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1230 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1231 YYUSE ($5);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1232 YYUSE ($7);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1233
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1234 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
1235 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1236 // 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
1237 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1238 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1239 }
17283
e6c0ac8ce5b6 eliminate parse conflicts introduced by changeset 923ce8b42db2
John W. Eaton <jwe@octave.org>
parents: 17281
diff changeset
1240 | 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
1241 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
1242 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1243 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1244 YYUSE ($5);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1245 YYUSE ($7);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1246
17283
e6c0ac8ce5b6 eliminate parse conflicts introduced by changeset 923ce8b42db2
John W. Eaton <jwe@octave.org>
parents: 17281
diff changeset
1247 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
1248 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1249 // 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
1250 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1251 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1252 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1253 | TRY stash_comment opt_sep opt_list END
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1254 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1255 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1256
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
1257 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
1258 $5, $2, nullptr)))
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1259 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1260 // 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
1261 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1262 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1263 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1264 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1265
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1266 // ===========================================
15466
d174210ce1ec use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents: 14189
diff changeset
1267 // Some 'subroutines' for function definitions
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1268 // ===========================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1269
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1270 push_fcn_symtab : // empty
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1271 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1272 $$ = 0;
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1273
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
1274 parser.m_curr_fcn_depth++;
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
1275
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
1276 if (parser.m_max_fcn_depth < parser.m_curr_fcn_depth)
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
1277 parser.m_max_fcn_depth = parser.m_curr_fcn_depth;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1278
23693
b9378eff6d13 move symbol_table class inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23673
diff changeset
1279 lexer.symtab_context.push (new octave::symbol_table::scope ());
16320
09f0cb9cac7d don't modify symbol table scope in the parser
John W. Eaton <jwe@octave.org>
parents: 16302
diff changeset
1280
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
1281 parser.m_function_scopes.push (lexer.symtab_context.curr_scope ());
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1282
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1283 if (! lexer.reading_script_file
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
1284 && parser.m_curr_fcn_depth == 1
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
1285 && ! parser.m_parsing_subfunctions)
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
1286 parser.m_primary_fcn_scope
16320
09f0cb9cac7d don't modify symbol table scope in the parser
John W. Eaton <jwe@octave.org>
parents: 16302
diff changeset
1287 = lexer.symtab_context.curr_scope ();
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1289 if (lexer.reading_script_file
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
1290 && parser.m_curr_fcn_depth > 1)
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
1291 {
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
1292 parser.bison_error ("nested functions not implemented in this context");
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
1293 YYABORT;
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
1294 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1295 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1296 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1297
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1298 // ===========================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1299 // List of function parameters
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1300 // ===========================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1301
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1302 param_list_beg : '('
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1303 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1304 $$ = 0;
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1305 lexer.looking_at_parameter_list = true;
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1306
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1307 if (lexer.looking_at_function_handle)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1308 {
23693
b9378eff6d13 move symbol_table class inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23673
diff changeset
1309 lexer.symtab_context.push (new octave::symbol_table::scope ());
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1310 lexer.looking_at_function_handle--;
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1311 lexer.looking_at_anon_fcn_args = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1312 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1313 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1314 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1316 param_list_end : ')'
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1317 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1318 $$ = 0;
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1319 lexer.looking_at_parameter_list = false;
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1320 lexer.looking_for_object_index = false;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1321 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1322 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1323
23673
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1324 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
1325 { $$ = nullptr; }
23673
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1326 | param_list
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1327 { $$ = $1; }
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1328 ;
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1329
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1330 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
1331 {
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16320
diff changeset
1332 if ($2)
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16320
diff changeset
1333 lexer.mark_as_variables ($2->variable_names ());
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16320
diff changeset
1334
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16320
diff changeset
1335 $$ = $2;
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16320
diff changeset
1336 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1337 | param_list_beg error
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1338 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
1339 $$ = nullptr;
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1340 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
1341 YYABORT;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1342 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1343 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1344
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1345 param_list1 : // empty
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
1346 { $$ = nullptr; }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1347 | param_list2
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1348 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1349 $1->mark_as_formal_parameters ();
23654
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
1350
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
1351 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
1352 {
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16320
diff changeset
1353 lexer.mark_as_variables ($1->variable_names ());
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16320
diff changeset
1354 $$ = $1;
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16320
diff changeset
1355 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1356 else
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1357 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1358 delete $1;
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
1359 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1360 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1361 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1362 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1363
17317
56fe31b248de disallow ~ in global and persistent declaration lists
John W. Eaton <jwe@octave.org>
parents: 17316
diff changeset
1364 param_list2 : param_list_elt
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1365 { $$ = new octave::tree_parameter_list ($1); }
17317
56fe31b248de disallow ~ in global and persistent declaration lists
John W. Eaton <jwe@octave.org>
parents: 17316
diff changeset
1366 | param_list2 ',' param_list_elt
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1367 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1368 $1->append ($3);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1369 $$ = $1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1370 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1371 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1372
17317
56fe31b248de disallow ~ in global and persistent declaration lists
John W. Eaton <jwe@octave.org>
parents: 17316
diff changeset
1373 param_list_elt : decl2
56fe31b248de disallow ~ in global and persistent declaration lists
John W. Eaton <jwe@octave.org>
parents: 17316
diff changeset
1374 { $$ = $1; }
56fe31b248de disallow ~ in global and persistent declaration lists
John W. Eaton <jwe@octave.org>
parents: 17316
diff changeset
1375 | magic_tilde
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1376 { $$ = 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
1377 ;
56fe31b248de disallow ~ in global and persistent declaration lists
John W. Eaton <jwe@octave.org>
parents: 17316
diff changeset
1378
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1379 // ===================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1380 // List of function return value names
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1381 // ===================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1382
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1383 return_list : '[' ']'
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1384 {
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1385 lexer.looking_at_return_list = false;
17316
8e2906e2fb26 avoid reduce/reduce conflict in parser rules
John W. Eaton <jwe@octave.org>
parents: 17283
diff changeset
1386
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1387 $$ = new octave::tree_parameter_list ();
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1388 }
17316
8e2906e2fb26 avoid reduce/reduce conflict in parser rules
John W. Eaton <jwe@octave.org>
parents: 17283
diff changeset
1389 | identifier
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1390 {
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1391 lexer.looking_at_return_list = false;
17316
8e2906e2fb26 avoid reduce/reduce conflict in parser rules
John W. Eaton <jwe@octave.org>
parents: 17283
diff changeset
1392
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1393 octave::tree_parameter_list *tmp = new octave::tree_parameter_list ($1);
17316
8e2906e2fb26 avoid reduce/reduce conflict in parser rules
John W. Eaton <jwe@octave.org>
parents: 17283
diff changeset
1394
8e2906e2fb26 avoid reduce/reduce conflict in parser rules
John W. Eaton <jwe@octave.org>
parents: 17283
diff changeset
1395 // 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
1396 // 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
1397 // to check for varargin or varargout.
8e2906e2fb26 avoid reduce/reduce conflict in parser rules
John W. Eaton <jwe@octave.org>
parents: 17283
diff changeset
1398
23654
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
1399 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
1400 $$ = tmp;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1401 else
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1402 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1403 delete tmp;
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
1404 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1405 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1406 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1407 | '[' return_list1 ']'
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1408 {
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1409 lexer.looking_at_return_list = false;
17316
8e2906e2fb26 avoid reduce/reduce conflict in parser rules
John W. Eaton <jwe@octave.org>
parents: 17283
diff changeset
1410
8e2906e2fb26 avoid reduce/reduce conflict in parser rules
John W. Eaton <jwe@octave.org>
parents: 17283
diff changeset
1411 // Check for duplicate parameter names, varargin,
8e2906e2fb26 avoid reduce/reduce conflict in parser rules
John W. Eaton <jwe@octave.org>
parents: 17283
diff changeset
1412 // or varargout.
8e2906e2fb26 avoid reduce/reduce conflict in parser rules
John W. Eaton <jwe@octave.org>
parents: 17283
diff changeset
1413
23654
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
1414 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
1415 $$ = $2;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1416 else
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1417 {
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1418 delete $2;
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
1419 YYABORT;
17632
bd0a84de3375 further reduce memory leaks from parse errors (bug #40231)
John W. Eaton <jwe@octave.org>
parents: 17629
diff changeset
1420 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1421 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1422 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1423
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1424 return_list1 : identifier
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1425 { $$ = new octave::tree_parameter_list (new octave::tree_decl_elt ($1)); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1426 | return_list1 ',' identifier
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1427 {
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1428 $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
1429 $$ = $1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1430 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1431 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1432
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1433 // =======================
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1434 // Script or function file
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1435 // =======================
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1436
23343
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
1437 parsing_local_fcns
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
1438 : // empty
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
1439 { parser.m_parsing_local_functions = true; }
23343
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
1440 ;
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
1441
24037
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1442 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
1443 {
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1444 $$ = 0;
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1445
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1446 lexer.symtab_context.push (new octave::symbol_table::scope ());
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1447 }
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1448 ;
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1449
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1450 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
1451 { $$ = 0; }
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1452 ;
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1453
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1454 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
1455 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1456 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1457
17618
77eff9c6fb09 avoid memory leak when parsing function files (bug #40218)
John W. Eaton <jwe@octave.org>
parents: 17377
diff changeset
1458 if (lexer.reading_fcn_file)
77eff9c6fb09 avoid memory leak when parsing function files (bug #40218)
John W. Eaton <jwe@octave.org>
parents: 17377
diff changeset
1459 {
77eff9c6fb09 avoid memory leak when parsing function files (bug #40218)
John W. Eaton <jwe@octave.org>
parents: 17377
diff changeset
1460 // 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
1461 // 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
1462 // 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
1463 // been stored in the symbol table or in
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
1464 // base_parser::m_primary_fcn_ptr.
17618
77eff9c6fb09 avoid memory leak when parsing function files (bug #40218)
John W. Eaton <jwe@octave.org>
parents: 17377
diff changeset
1465
24037
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1466 // Unused symbol table context.
24045
a666e433aa21 avoid memory leak when parsing function and classdef files
John W. Eaton <jwe@octave.org>
parents: 24042
diff changeset
1467 delete lexer.symtab_context.curr_scope ();
24037
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1468 lexer.symtab_context.pop ();
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1469
17618
77eff9c6fb09 avoid memory leak when parsing function files (bug #40218)
John W. Eaton <jwe@octave.org>
parents: 17377
diff changeset
1470 delete $3;
77eff9c6fb09 avoid memory leak when parsing function files (bug #40218)
John W. Eaton <jwe@octave.org>
parents: 17377
diff changeset
1471 }
77eff9c6fb09 avoid memory leak when parsing function files (bug #40218)
John W. Eaton <jwe@octave.org>
parents: 17377
diff changeset
1472 else
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
1473 {
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1474 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
1475 = parser.make_end ("endscript", true,
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements
John W. Eaton <jwe@octave.org>
parents: 16574
diff changeset
1476 lexer.input_line_number,
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements
John W. Eaton <jwe@octave.org>
parents: 16574
diff changeset
1477 lexer.current_input_column);
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1478
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1479 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
1480 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1481
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
1482 $$ = nullptr;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1483 }
24037
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1484 | 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
1485 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1486 YYUSE ($2);
23343
49f051ef6f2f local functions in classdef files (bug #41723)
John W. Eaton <jwe@octave.org>
parents: 23342
diff changeset
1487 YYUSE ($5);
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1488
24037
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1489 // Unused symbol table context.
24045
a666e433aa21 avoid memory leak when parsing function and classdef files
John W. Eaton <jwe@octave.org>
parents: 24042
diff changeset
1490 delete lexer.symtab_context.curr_scope ();
24037
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1491 lexer.symtab_context.pop ();
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
1492
24067
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
1493 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
1494
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
1495 $$ = nullptr;
16211
3449bf257514 maint: fix botched merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16205
diff changeset
1496 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1497 ;
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7699
diff changeset
1498
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1499 // ===================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1500 // Function definition
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1501 // ===================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1502
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
1503 function_beg : push_fcn_symtab FCN
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1504 {
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
1505 $$ = $2;
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1506 if (lexer.reading_classdef_file
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1507 || lexer.parsing_classdef)
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1508 lexer.maybe_classdef_get_set_method = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1509 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1510 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1511
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1512 fcn_name : identifier
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1513 {
23054
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
1514 std::string id = $1->name ();
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
1515
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
1516 if (! parser.m_function_scopes.name_current_scope (id))
23054
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
1517 {
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
1518 parser.bison_error ("duplicate subfunction or nested function name",
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
1519 $1->line (), $1->column ());
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
1520
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
1521 delete $1;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
1522
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
1523 YYABORT;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
1524 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1525
23693
b9378eff6d13 move symbol_table class inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23673
diff changeset
1526 octave::symbol_table::scope *curr_scope
23603
18bd46c4b79a make symbol table context info mostly local to symbol table scopes
John W. Eaton <jwe@octave.org>
parents: 23602
diff changeset
1527 = lexer.symtab_context.curr_scope ();
18bd46c4b79a make symbol table context info mostly local to symbol table scopes
John W. Eaton <jwe@octave.org>
parents: 23602
diff changeset
1528 curr_scope->cache_name (id);
18bd46c4b79a make symbol table context info mostly local to symbol table scopes
John W. Eaton <jwe@octave.org>
parents: 23602
diff changeset
1529
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1530 lexer.parsed_function_name.top () = true;
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1531 lexer.maybe_classdef_get_set_method = false;
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11572
diff changeset
1532
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1533 $$ = $1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1534 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1535 | GET '.' identifier
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1536 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1537 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1538
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1539 lexer.parsed_function_name.top () = true;
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1540 lexer.maybe_classdef_get_set_method = false;
16289
bde729ba8381 maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16286 16288
diff changeset
1541 lexer.parsing_classdef_get_method = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1542 $$ = $3;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1543 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1544 | SET '.' identifier
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1545 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1546 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1547
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1548 lexer.parsed_function_name.top () = true;
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1549 lexer.maybe_classdef_get_set_method = false;
16289
bde729ba8381 maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16286 16288
diff changeset
1550 lexer.parsing_classdef_set_method = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1551 $$ = $3;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1552 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1553 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1554
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1555 function_end : END
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1556 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
1557 parser.m_endfunction_found = true;
21071
f25c14056b7c overhaul parser error handling for end token mismatch
John W. Eaton <jwe@octave.org>
parents: 21066
diff changeset
1558
23398
d4ef04757ead eliminate some compiler warnings
John W. Eaton <jwe@octave.org>
parents: 23396
diff changeset
1559 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
1560 $$ = parser.make_end ("endfunction", false,
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements
John W. Eaton <jwe@octave.org>
parents: 16574
diff changeset
1561 $1->line (), $1->column ());
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1562 else
21071
f25c14056b7c overhaul parser error handling for end token mismatch
John W. Eaton <jwe@octave.org>
parents: 21066
diff changeset
1563 {
23398
d4ef04757ead eliminate some compiler warnings
John W. Eaton <jwe@octave.org>
parents: 23396
diff changeset
1564 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
1565 YYABORT;
21071
f25c14056b7c overhaul parser error handling for end token mismatch
John W. Eaton <jwe@octave.org>
parents: 21066
diff changeset
1566 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1567 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1568 | END_OF_INPUT
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1569 {
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9471
diff changeset
1570 // A lot of tests are based on the assumption that this is OK
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1571 // if (lexer.reading_script_file)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1572 // {
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1573 // 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
1574 // YYABORT;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1575 // }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1576
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
1577 if (parser.m_endfunction_found)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1578 {
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1579 parser.bison_error ("inconsistent function endings -- "
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1580 "if one function is explicitly ended, "
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1581 "so must all the others");
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1582 YYABORT;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1583 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1584
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1585 if (! (lexer.reading_fcn_file || lexer.reading_script_file
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1586 || lexer.input_from_eval_string ()))
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1587 {
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1588 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
1589 YYABORT;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1590 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1591
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1592 if (lexer.reading_classdef_file)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1593 {
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1594 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
1595 YYABORT;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1596 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1597
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
1598 $$ = parser.make_end ("endfunction", true,
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements
John W. Eaton <jwe@octave.org>
parents: 16574
diff changeset
1599 lexer.input_line_number,
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements
John W. Eaton <jwe@octave.org>
parents: 16574
diff changeset
1600 lexer.current_input_column);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1601 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1602 ;
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1603
23673
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1604 function : function_beg stash_comment fcn_name
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1605 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
1606 {
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1607 YYUSE ($5);
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1608
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
1609 $$ = 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
1610 }
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1611 | 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
1612 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
1613 {
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1614 YYUSE ($4);
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1615 YYUSE ($7);
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1616
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1617 $$ = 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
1618 }
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1619 ;
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
1620
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
1621 // ========
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
1622 // Classdef
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
1623 // ========
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
1624
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1625 classdef_beg : CLASSDEF
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1626 {
16289
bde729ba8381 maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16286 16288
diff changeset
1627 if (! lexer.reading_classdef_file)
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1628 {
16289
bde729ba8381 maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16286 16288
diff changeset
1629 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
1630 YYABORT;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1631 }
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1632
23599
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23577
diff changeset
1633 // Create invalid parent scope.
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
1634 lexer.symtab_context.push (nullptr);
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1635 lexer.parsing_classdef = true;
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1636 $$ = $1;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1637 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1638 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1639
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1640 classdef : classdef_beg stash_comment opt_attr_list identifier opt_superclass_list opt_sep class_body opt_sep END
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1641 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1642 YYUSE ($6);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1643 YYUSE ($8);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1644
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1645 lexer.parsing_classdef = false;
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
1646
16289
bde729ba8381 maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16286 16288
diff changeset
1647 if (! ($$ = parser.make_classdef ($1, $3, $4, $5, $7, $9, $2)))
17656
2b1047efc4fb don't leak memory when parsing classdef objects fails
John W. Eaton <jwe@octave.org>
parents: 17654
diff changeset
1648 {
2b1047efc4fb don't leak memory when parsing classdef objects fails
John W. Eaton <jwe@octave.org>
parents: 17654
diff changeset
1649 // make_classdef deleted $3, $4, $5, and $7.
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
1650 YYABORT;
17656
2b1047efc4fb don't leak memory when parsing classdef objects fails
John W. Eaton <jwe@octave.org>
parents: 17654
diff changeset
1651 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1652 }
18419
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1653 | classdef_beg stash_comment opt_attr_list identifier opt_superclass_list opt_sep END
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1654 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1655 YYUSE ($6);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1656
18419
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1657 lexer.parsing_classdef = false;
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1658
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
1659 if (! ($$ = parser.make_classdef ($1, $3, $4, $5, nullptr,
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
1660 $7, $2)))
18419
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1661 {
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1662 // make_classdef deleted $3, $4, and $5.
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
1663 YYABORT;
18419
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1664 }
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1665 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1666 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1667
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1668 opt_attr_list : // empty
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
1669 { $$ = nullptr; }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1670 | '(' attr_list ')'
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1671 { $$ = $2; }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1672 ;
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 attr_list : attr
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1675 { $$ = new octave::tree_classdef_attribute_list ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1676 | attr_list ',' attr
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1677 {
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1678 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1679 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1680 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1681 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1682
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1683 attr : identifier
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1684 { $$ = new octave::tree_classdef_attribute ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1685 | identifier '=' decl_param_init expression
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1686 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1687 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1688
16289
bde729ba8381 maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16286 16288
diff changeset
1689 lexer.looking_at_initializer_expression = false;
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1690 $$ = new octave::tree_classdef_attribute ($1, $4);
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1691 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1692 | EXPR_NOT identifier
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1693 {
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1694 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1695
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1696 $$ = 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
1697 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1698 ;
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
1699
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1700 opt_superclass_list
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1701 : // empty
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
1702 { $$ = nullptr; }
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1703 | superclass_list
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1704 { $$ = $1; }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1705 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1706
18520
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18419
diff changeset
1707 superclass_list : EXPR_LT
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1708 {
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1709 YYUSE ($1);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1710
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1711 lexer.enable_fq_identifier ();
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1712 }
18520
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18419
diff changeset
1713 superclass
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1714 { $$ = new octave::tree_classdef_superclass_list ($3); }
18520
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18419
diff changeset
1715 | superclass_list EXPR_AND
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1716 {
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1717 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1718
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1719 lexer.enable_fq_identifier ();
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1720 }
18520
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18419
diff changeset
1721 superclass
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1722 {
18520
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18419
diff changeset
1723 $1->append ($4);
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1724 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1725 }
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1726 ;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1727
18520
932aca9a7c57 Allow multi-level classdef package.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18419
diff changeset
1728 superclass : FQ_IDENT
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1729 { $$ = new octave::tree_classdef_superclass ($1->text ()); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1730 ;
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 class_body : properties_block
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1733 { $$ = new octave::tree_classdef_body ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1734 | methods_block
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1735 { $$ = new octave::tree_classdef_body ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1736 | events_block
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1737 { $$ = new octave::tree_classdef_body ($1); }
13249
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1738 | enum_block
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1739 { $$ = new octave::tree_classdef_body ($1); }
13250
f6bbdea030b2 use opt_sep instead of literal '\n' in parser rules for classdef
John W. Eaton <jwe@octave.org>
parents: 13249
diff changeset
1740 | class_body opt_sep properties_block
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1741 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1742 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1743
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1744 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1745 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1746 }
13250
f6bbdea030b2 use opt_sep instead of literal '\n' in parser rules for classdef
John W. Eaton <jwe@octave.org>
parents: 13249
diff changeset
1747 | class_body opt_sep methods_block
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1748 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1749 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1750
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1751 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1752 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1753 }
13250
f6bbdea030b2 use opt_sep instead of literal '\n' in parser rules for classdef
John W. Eaton <jwe@octave.org>
parents: 13249
diff changeset
1754 | class_body opt_sep events_block
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1755 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1756 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1757
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1758 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1759 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1760 }
13250
f6bbdea030b2 use opt_sep instead of literal '\n' in parser rules for classdef
John W. Eaton <jwe@octave.org>
parents: 13249
diff changeset
1761 | class_body opt_sep enum_block
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1762 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1763 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1764
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1765 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1766 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1767 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1768 ;
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
1769
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
1770 properties_block
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1771 : PROPERTIES stash_comment opt_attr_list opt_sep property_list opt_sep END
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1772 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1773 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1774 YYUSE ($6);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1775
16289
bde729ba8381 maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16286 16288
diff changeset
1776 if (! ($$ = parser.make_classdef_properties_block
17656
2b1047efc4fb don't leak memory when parsing classdef objects fails
John W. Eaton <jwe@octave.org>
parents: 17654
diff changeset
1777 ($1, $3, $5, $7, $2)))
2b1047efc4fb don't leak memory when parsing classdef objects fails
John W. Eaton <jwe@octave.org>
parents: 17654
diff changeset
1778 {
2b1047efc4fb don't leak memory when parsing classdef objects fails
John W. Eaton <jwe@octave.org>
parents: 17654
diff changeset
1779 // make_classdef_properties_block delete $3 and $5.
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
1780 YYABORT;
17656
2b1047efc4fb don't leak memory when parsing classdef objects fails
John W. Eaton <jwe@octave.org>
parents: 17654
diff changeset
1781 }
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1782 }
18419
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1783 | PROPERTIES stash_comment opt_attr_list opt_sep END
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1784 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1785 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1786
18419
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1787 if (! ($$ = parser.make_classdef_properties_block
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
1788 ($1, $3, nullptr, $5, $2)))
18419
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1789 {
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1790 // make_classdef_properties_block delete $3.
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
1791 YYABORT;
18419
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1792 }
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1793 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1794 ;
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 9474
diff changeset
1795
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1796 property_list
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1797 : class_property
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1798 { $$ = new octave::tree_classdef_property_list ($1); }
22879
194481349d22 don't require semicolon between property list elements (bug #49819)
John W. Eaton <jwe@octave.org>
parents: 22712
diff changeset
1799 | property_list sep class_property
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1800 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1801 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1802
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1803 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1804 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1805 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1806 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1807
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1808 class_property : identifier
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1809 { $$ = new octave::tree_classdef_property ($1); }
22879
194481349d22 don't require semicolon between property list elements (bug #49819)
John W. Eaton <jwe@octave.org>
parents: 22712
diff changeset
1810 | identifier '=' decl_param_init expression
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1811 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1812 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1813
16289
bde729ba8381 maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16286 16288
diff changeset
1814 lexer.looking_at_initializer_expression = false;
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1815 $$ = new octave::tree_classdef_property ($1, $4);
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1816 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1817 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1818
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1819 methods_block : METHODS stash_comment opt_attr_list opt_sep methods_list opt_sep END
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1820 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1821 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1822 YYUSE ($6);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1823
16289
bde729ba8381 maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16286 16288
diff changeset
1824 if (! ($$ = parser.make_classdef_methods_block
17656
2b1047efc4fb don't leak memory when parsing classdef objects fails
John W. Eaton <jwe@octave.org>
parents: 17654
diff changeset
1825 ($1, $3, $5, $7, $2)))
2b1047efc4fb don't leak memory when parsing classdef objects fails
John W. Eaton <jwe@octave.org>
parents: 17654
diff changeset
1826 {
2b1047efc4fb don't leak memory when parsing classdef objects fails
John W. Eaton <jwe@octave.org>
parents: 17654
diff changeset
1827 // make_classdef_methods_block deleted $3 and $5.
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
1828 YYABORT;
17656
2b1047efc4fb don't leak memory when parsing classdef objects fails
John W. Eaton <jwe@octave.org>
parents: 17654
diff changeset
1829 }
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1830 }
18419
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1831 | METHODS stash_comment opt_attr_list opt_sep END
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1832 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1833 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1834
18419
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1835 if (! ($$ = parser.make_classdef_methods_block
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
1836 ($1, $3, nullptr, $5, $2)))
18419
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1837 {
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1838 // make_classdef_methods_block deleted $3.
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
1839 YYABORT;
18419
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1840 }
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1841 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1842 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1843 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1844
18262
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
1845 method_decl1 : identifier
18308
c1baf94184af * oct-parse.in.yy: Suppress TAB characters.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18304
diff changeset
1846 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
1847 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
1848 YYABORT;
18262
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
1849 }
18308
c1baf94184af * oct-parse.in.yy: Suppress TAB characters.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18304
diff changeset
1850 | identifier param_list
18341
02b349ccf0ec Allow "end" method declaration/definition in classde files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18308
diff changeset
1851 {
02b349ccf0ec Allow "end" method declaration/definition in classde files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18308
diff changeset
1852 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
1853 YYABORT;
18262
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
1854 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1855 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1856
18262
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
1857 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
1858 { $$ = 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
1859 | stash_comment return_list '='
02b349ccf0ec Allow "end" method declaration/definition in classde files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18308
diff changeset
1860 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1861 YYUSE ($3);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1862
18341
02b349ccf0ec Allow "end" method declaration/definition in classde files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18308
diff changeset
1863 lexer.defining_func++;
02b349ccf0ec Allow "end" method declaration/definition in classde files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18308
diff changeset
1864 lexer.parsed_function_name.push (false);
02b349ccf0ec Allow "end" method declaration/definition in classde files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18308
diff changeset
1865 }
02b349ccf0ec Allow "end" method declaration/definition in classde files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18308
diff changeset
1866 method_decl1
02b349ccf0ec Allow "end" method declaration/definition in classde files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18308
diff changeset
1867 {
02b349ccf0ec Allow "end" method declaration/definition in classde files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18308
diff changeset
1868 lexer.defining_func--;
02b349ccf0ec Allow "end" method declaration/definition in classde files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18308
diff changeset
1869 lexer.parsed_function_name.pop ();
02b349ccf0ec Allow "end" method declaration/definition in classde files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18308
diff changeset
1870 $$ = 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
1871 }
18262
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
1872 ;
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
1873
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
1874 method : method_decl
18308
c1baf94184af * oct-parse.in.yy: Suppress TAB characters.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18304
diff changeset
1875 { $$ = $1; }
c1baf94184af * oct-parse.in.yy: Suppress TAB characters.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18304
diff changeset
1876 | function
18262
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
1877 { $$ = $1; }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1878 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1879
18262
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
1880 methods_list : method
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1881 {
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1882 octave_value fcn;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1883 if ($1)
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1884 fcn = $1->function ();
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1885 delete $1;
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1886 $$ = new octave::tree_classdef_methods_list (fcn);
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1887 }
18262
69990d5edcc2 Allow to parse external methods declaration in classdef files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18158
diff changeset
1888 | methods_list opt_sep method
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1889 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1890 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1891
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1892 octave_value fcn;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1893 if ($3)
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1894 fcn = $3->function ();
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1895 delete $3;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1896
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1897 $1->append (fcn);
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1898 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1899 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1900 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1901
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1902 events_block : EVENTS stash_comment opt_attr_list opt_sep events_list opt_sep END
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1903 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1904 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1905 YYUSE ($6);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1906
16289
bde729ba8381 maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16286 16288
diff changeset
1907 if (! ($$ = parser.make_classdef_events_block
17656
2b1047efc4fb don't leak memory when parsing classdef objects fails
John W. Eaton <jwe@octave.org>
parents: 17654
diff changeset
1908 ($1, $3, $5, $7, $2)))
2b1047efc4fb don't leak memory when parsing classdef objects fails
John W. Eaton <jwe@octave.org>
parents: 17654
diff changeset
1909 {
2b1047efc4fb don't leak memory when parsing classdef objects fails
John W. Eaton <jwe@octave.org>
parents: 17654
diff changeset
1910 // make_classdef_events_block deleted $3 and $5.
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
1911 YYABORT;
17656
2b1047efc4fb don't leak memory when parsing classdef objects fails
John W. Eaton <jwe@octave.org>
parents: 17654
diff changeset
1912 }
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1913 }
18419
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1914 | EVENTS stash_comment opt_attr_list opt_sep END
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1915 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1916 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1917
18419
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1918 if (! ($$ = parser.make_classdef_events_block
23798
771310737137 Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23796
diff changeset
1919 ($1, $3, nullptr, $5, $2)))
18419
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1920 {
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1921 // make_classdef_events_block deleted $3.
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
1922 YYABORT;
18419
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1923 }
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1924 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1925 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1926
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1927 events_list : class_event
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1928 { $$ = new octave::tree_classdef_events_list ($1); }
13250
f6bbdea030b2 use opt_sep instead of literal '\n' in parser rules for classdef
John W. Eaton <jwe@octave.org>
parents: 13249
diff changeset
1929 | events_list opt_sep class_event
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1930 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1931 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1932
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1933 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1934 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1935 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1936 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1937
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1938 class_event : identifier
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1939 { $$ = new octave::tree_classdef_event ($1); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1940 ;
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11572
diff changeset
1941
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1942 enum_block : ENUMERATION stash_comment opt_attr_list opt_sep enum_list opt_sep END
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1943 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1944 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1945 YYUSE ($6);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1946
16289
bde729ba8381 maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16286 16288
diff changeset
1947 if (! ($$ = parser.make_classdef_enum_block
17656
2b1047efc4fb don't leak memory when parsing classdef objects fails
John W. Eaton <jwe@octave.org>
parents: 17654
diff changeset
1948 ($1, $3, $5, $7, $2)))
2b1047efc4fb don't leak memory when parsing classdef objects fails
John W. Eaton <jwe@octave.org>
parents: 17654
diff changeset
1949 {
2b1047efc4fb don't leak memory when parsing classdef objects fails
John W. Eaton <jwe@octave.org>
parents: 17654
diff changeset
1950 // make_classdef_enum_block deleted $3 and $5.
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
1951 YYABORT;
17656
2b1047efc4fb don't leak memory when parsing classdef objects fails
John W. Eaton <jwe@octave.org>
parents: 17654
diff changeset
1952 }
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1953 }
18419
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1954 | ENUMERATION stash_comment opt_attr_list opt_sep END
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1955 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1956 YYUSE ($4);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1957
18419
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1958 if (! ($$ = parser.make_classdef_enum_block
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
1959 ($1, $3, nullptr, $5, $2)))
18419
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1960 {
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1961 // make_classdef_enum_block deleted $3.
21073
f7cc48f601d2 additional reworking of error handling in the parser (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21071
diff changeset
1962 YYABORT;
18419
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1963 }
9154dc252f47 Allow empty classdef or methods/properties/... blocks
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18395
diff changeset
1964 }
13249
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1965 ;
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1966
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1967 enum_list : class_enum
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1968 { $$ = new octave::tree_classdef_enum_list ($1); }
13250
f6bbdea030b2 use opt_sep instead of literal '\n' in parser rules for classdef
John W. Eaton <jwe@octave.org>
parents: 13249
diff changeset
1969 | enum_list opt_sep class_enum
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1970 {
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1971 YYUSE ($2);
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1972
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1973 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1974 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
1975 }
13249
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1976 ;
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1977
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1978 class_enum : identifier '(' expression ')'
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
1979 { $$ = new octave::tree_classdef_enum ($1, $3); }
13249
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1980 ;
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13246
diff changeset
1981
2970
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1982 // =============
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1983 // Miscellaneous
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1984 // =============
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe]
jwe
parents: 2961
diff changeset
1985
16681
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958)
John W. Eaton <jwe@octave.org>
parents: 16627
diff changeset
1986 stmt_begin : // empty
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1987 {
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1988 $$ = 0;
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1989 lexer.at_beginning_of_statement = true;
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1990 }
16681
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958)
John W. Eaton <jwe@octave.org>
parents: 16627
diff changeset
1991 ;
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958)
John W. Eaton <jwe@octave.org>
parents: 16627
diff changeset
1992
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1993 stash_comment : // empty
17693
efbe746f8fa8 eliminate octave_comment_buffer singleton
John W. Eaton <jwe@octave.org>
parents: 17673
diff changeset
1994 { $$ = lexer.get_comment (); }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1995 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1996
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
1997 parse_error : LEXICAL_ERROR
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1998 {
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
1999 $$ = 0;
21064
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21063
diff changeset
2000 std::string msg = $1->text ();
a9f2c2d72892 handle lexical errors as parser errors (bug #46877)
John W. Eaton <jwe@octave.org>
parents: 21063
diff changeset
2001 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
2002 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2003 | error
19778
bf737d927707 eliminate bison warnings from oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 19709
diff changeset
2004 { $$ = 0; }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2005 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2006
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2007 sep_no_nl : ','
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2008 { $$ = ','; }
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 { $$ = ';'; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2011 | sep_no_nl ','
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2012 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2013 | sep_no_nl ';'
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2014 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2015 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2016
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2017 opt_sep_no_nl : // empty
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2018 { $$ = 0; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2019 | sep_no_nl
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2020 { $$ = $1; }
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
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
2023 opt_nl : // empty
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
2024 { $$ = 0; }
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
2025 | nl
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
2026 { $$ = $1; }
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
2027 ;
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
2028
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
2029 nl : '\n'
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
2030 { $$ = '\n'; }
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
2031 | nl '\n'
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
2032 { $$ = $1; }
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
2033 ;
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
2034
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2035 sep : ','
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2036 { $$ = ','; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2037 | ';'
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2038 { $$ = ';'; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2039 | '\n'
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2040 { $$ = '\n'; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2041 | sep ','
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2042 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2043 | sep ';'
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2044 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2045 | sep '\n'
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2046 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2047 ;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2048
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2049 opt_sep : // empty
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2050 { $$ = 0; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2051 | sep
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2052 { $$ = $1; }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
2053 ;
2525
8561d88be5f2 [project @ 1996-11-17 21:23:31 by jwe]
jwe
parents: 2524
diff changeset
2054
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2055 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2056
21023
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 21021
diff changeset
2057 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 21021
diff changeset
2058 // Restore prevailing warning state for remainder of the file.
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 21021
diff changeset
2059 #pragma GCC diagnostic pop
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 21021
diff changeset
2060 #endif
ec532a439c6f rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents: 21021
diff changeset
2061
666
fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe]
jwe
parents: 627
diff changeset
2062 // Generic error messages.
fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe]
jwe
parents: 627
diff changeset
2063
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
2064 #undef lexer
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2065 #undef scanner
16149
49dfba4fd3c5 use pure parser and reentrant lexer interfaces
John W. Eaton <jwe@octave.org>
parents: 16147
diff changeset
2066
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2067 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
2068 yyerror (octave::base_parser& parser, const char *s)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2069 {
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
2070 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
2071 }
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
2072
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2073 namespace octave
16157
335041cc657a optionally use push parser interface
John W. Eaton <jwe@octave.org>
parents: 16153
diff changeset
2074 {
23054
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2075 size_t
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2076 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
2077 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2078 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
2079 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2080
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2081 void
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2082 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
2083 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2084 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
2085 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2086
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2087 void
23602
214cb58ccc1c use pointer to scope instead of scope id
John W. Eaton <jwe@octave.org>
parents: 23600
diff changeset
2088 base_parser::parent_scope_info::push (symbol_table::scope *scope)
23054
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2089 {
23602
214cb58ccc1c use pointer to scope instead of scope id
John W. Eaton <jwe@octave.org>
parents: 23600
diff changeset
2090 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
2091 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2092
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2093 void
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2094 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
2095 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2096 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
2097 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2098
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2099 bool
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2100 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
2101 {
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2102 // 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
2103 // 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
2104 // 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
2105 // 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
2106
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2107 std::string full_name;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2108
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2109 for (size_t i = 0; i < size()-1; i++)
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2110 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2111 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
2112
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2113 if (name == elt.second)
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2114 return false;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2115
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2116 full_name += elt.second + ">";
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2117 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2118
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2119 full_name += name;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2120
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2121 if (m_all_names.find (full_name) != m_all_names.end ())
23054
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2122 return false;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2123
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2124 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
2125
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2126 return true;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2127 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2128
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2129 bool
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2130 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
2131 {
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2132 if (! name_ok (name))
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2133 return false;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2134
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2135 if (size () > 0)
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2136 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
2137
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2138 return true;
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2139 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2140
23602
214cb58ccc1c use pointer to scope instead of scope id
John W. Eaton <jwe@octave.org>
parents: 23600
diff changeset
2141 symbol_table::scope *
23054
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2142 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
2143 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
2144 return size () > 1 ? m_info[size()-2].first : nullptr;
23054
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2145 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2146
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2147 std::string
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2148 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
2149 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2150 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
2151 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2152
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2153 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
2154 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2155 m_info.clear ();
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2156 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
2157 }
564e959a0e89 avoid invalid nested function and subfunctions definitions (bug #50014)
John W. Eaton <jwe@octave.org>
parents: 23052
diff changeset
2158
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2159 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
2160 : 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
2161 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
2162 m_parsing_subfunctions (false), m_parsing_local_functions (false),
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
2163 m_max_fcn_depth (0), m_curr_fcn_depth (0), m_primary_fcn_scope (nullptr),
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2164 m_curr_class_name (), m_curr_package_name (), m_function_scopes (),
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
2165 m_primary_fcn_ptr (nullptr), m_subfunction_names (),
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
2166 m_classdef_object (nullptr), m_stmt_list (nullptr), m_lexer (lxr),
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
2167 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
2168 { }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2169
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2170 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
2171 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2172 delete m_stmt_list;
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2173
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2174 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
2175
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2176 // 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
2177 // 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
2178 // 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
2179 // 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
2180 // 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
2181 // 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
2182 // 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
2183
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2184 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
2185 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2186
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2187 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2188 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
2189 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2190 m_endfunction_found = false;
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2191 m_autoloading = false;
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2192 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
2193 m_parsing_subfunctions = false;
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2194 m_parsing_local_functions = false;
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2195 m_max_fcn_depth = 0;
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2196 m_curr_fcn_depth = 0;
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
2197 m_primary_fcn_scope = nullptr;
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2198 m_curr_class_name = "";
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2199 m_curr_package_name = "";
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2200 m_function_scopes.clear ();
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
2201 m_primary_fcn_ptr = nullptr;
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2202 m_subfunction_names.clear ();
23806
6925c8d2cd87 oct-parse.in.yy: Initialize m_classdef_object to nullptr when parser is reset.
Rik <rik@octave.org>
parents: 23798
diff changeset
2203 m_classdef_object = nullptr;
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2204
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2205 delete m_stmt_list;
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
2206 m_stmt_list = nullptr;
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2207
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2208 m_lexer.reset ();
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2209
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2210 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
2211 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
2212 }
16138
284e2ca86ef7 execute parser using member function of octave_parser class
John W. Eaton <jwe@octave.org>
parents: 16136
diff changeset
2213 }
284e2ca86ef7 execute parser using member function of octave_parser class
John W. Eaton <jwe@octave.org>
parents: 16136
diff changeset
2214
666
fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe]
jwe
parents: 627
diff changeset
2215 // Error mesages for mismatched end tokens.
fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe]
jwe
parents: 627
diff changeset
2216
21071
f25c14056b7c overhaul parser error handling for end token mismatch
John W. Eaton <jwe@octave.org>
parents: 21066
diff changeset
2217 static std::string
23398
d4ef04757ead eliminate some compiler warnings
John W. Eaton <jwe@octave.org>
parents: 23396
diff changeset
2218 end_token_as_string (octave::token::end_tok_type ettype)
496
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe]
jwe
parents: 482
diff changeset
2219 {
21071
f25c14056b7c overhaul parser error handling for end token mismatch
John W. Eaton <jwe@octave.org>
parents: 21066
diff changeset
2220 std::string retval = "<unknown>";
496
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe]
jwe
parents: 482
diff changeset
2221
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe]
jwe
parents: 482
diff changeset
2222 switch (ettype)
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe]
jwe
parents: 482
diff changeset
2223 {
23398
d4ef04757ead eliminate some compiler warnings
John W. Eaton <jwe@octave.org>
parents: 23396
diff changeset
2224 case octave::token::simple_end:
21071
f25c14056b7c overhaul parser error handling for end token mismatch
John W. Eaton <jwe@octave.org>
parents: 21066
diff changeset
2225 retval = "end";
496
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe]
jwe
parents: 482
diff changeset
2226 break;
777
a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe]
jwe
parents: 773
diff changeset
2227
23398
d4ef04757ead eliminate some compiler warnings
John W. Eaton <jwe@octave.org>
parents: 23396
diff changeset
2228 case octave::token::classdef_end:
21071
f25c14056b7c overhaul parser error handling for end token mismatch
John W. Eaton <jwe@octave.org>
parents: 21066
diff changeset
2229 retval = "endclassdef";
20075
8aa424ffc076 handle all end token types when reporting parse errors (bug #44824)
John W. Eaton <jwe@octave.org>
parents: 19849
diff changeset
2230 break;
8aa424ffc076 handle all end token types when reporting parse errors (bug #44824)
John W. Eaton <jwe@octave.org>
parents: 19849
diff changeset
2231
23398
d4ef04757ead eliminate some compiler warnings
John W. Eaton <jwe@octave.org>
parents: 23396
diff changeset
2232 case octave::token::enumeration_end:
21071
f25c14056b7c overhaul parser error handling for end token mismatch
John W. Eaton <jwe@octave.org>
parents: 21066
diff changeset
2233 retval = "endenumeration";
20075
8aa424ffc076 handle all end token types when reporting parse errors (bug #44824)
John W. Eaton <jwe@octave.org>
parents: 19849
diff changeset
2234 break;
8aa424ffc076 handle all end token types when reporting parse errors (bug #44824)
John W. Eaton <jwe@octave.org>
parents: 19849
diff changeset
2235
23398
d4ef04757ead eliminate some compiler warnings
John W. Eaton <jwe@octave.org>
parents: 23396
diff changeset
2236 case octave::token::events_end:
21071
f25c14056b7c overhaul parser error handling for end token mismatch
John W. Eaton <jwe@octave.org>
parents: 21066
diff changeset
2237 retval = "endevents";
20075
8aa424ffc076 handle all end token types when reporting parse errors (bug #44824)
John W. Eaton <jwe@octave.org>
parents: 19849
diff changeset
2238 break;
8aa424ffc076 handle all end token types when reporting parse errors (bug #44824)
John W. Eaton <jwe@octave.org>
parents: 19849
diff changeset
2239
23398
d4ef04757ead eliminate some compiler warnings
John W. Eaton <jwe@octave.org>
parents: 23396
diff changeset
2240 case octave::token::for_end:
21071
f25c14056b7c overhaul parser error handling for end token mismatch
John W. Eaton <jwe@octave.org>
parents: 21066
diff changeset
2241 retval = "endfor";
496
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe]
jwe
parents: 482
diff changeset
2242 break;
777
a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe]
jwe
parents: 773
diff changeset
2243
23398
d4ef04757ead eliminate some compiler warnings
John W. Eaton <jwe@octave.org>
parents: 23396
diff changeset
2244 case octave::token::function_end:
21071
f25c14056b7c overhaul parser error handling for end token mismatch
John W. Eaton <jwe@octave.org>
parents: 21066
diff changeset
2245 retval = "endfunction";
496
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe]
jwe
parents: 482
diff changeset
2246 break;
777
a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe]
jwe
parents: 773
diff changeset
2247
23398
d4ef04757ead eliminate some compiler warnings
John W. Eaton <jwe@octave.org>
parents: 23396
diff changeset
2248 case octave::token::if_end:
21071
f25c14056b7c overhaul parser error handling for end token mismatch
John W. Eaton <jwe@octave.org>
parents: 21066
diff changeset
2249 retval = "endif";
496
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe]
jwe
parents: 482
diff changeset
2250 break;
777
a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe]
jwe
parents: 773
diff changeset
2251
23398
d4ef04757ead eliminate some compiler warnings
John W. Eaton <jwe@octave.org>
parents: 23396
diff changeset
2252 case octave::token::methods_end:
21071
f25c14056b7c overhaul parser error handling for end token mismatch
John W. Eaton <jwe@octave.org>
parents: 21066
diff changeset
2253 retval = "endmethods";
20075
8aa424ffc076 handle all end token types when reporting parse errors (bug #44824)
John W. Eaton <jwe@octave.org>
parents: 19849
diff changeset
2254 break;
8aa424ffc076 handle all end token types when reporting parse errors (bug #44824)
John W. Eaton <jwe@octave.org>
parents: 19849
diff changeset
2255
23398
d4ef04757ead eliminate some compiler warnings
John W. Eaton <jwe@octave.org>
parents: 23396
diff changeset
2256 case octave::token::parfor_end:
21071
f25c14056b7c overhaul parser error handling for end token mismatch
John W. Eaton <jwe@octave.org>
parents: 21066
diff changeset
2257 retval = "endparfor";
20075
8aa424ffc076 handle all end token types when reporting parse errors (bug #44824)
John W. Eaton <jwe@octave.org>
parents: 19849
diff changeset
2258 break;
8aa424ffc076 handle all end token types when reporting parse errors (bug #44824)
John W. Eaton <jwe@octave.org>
parents: 19849
diff changeset
2259
23398
d4ef04757ead eliminate some compiler warnings
John W. Eaton <jwe@octave.org>
parents: 23396
diff changeset
2260 case octave::token::properties_end:
21071
f25c14056b7c overhaul parser error handling for end token mismatch
John W. Eaton <jwe@octave.org>
parents: 21066
diff changeset
2261 retval = "endproperties";
20075
8aa424ffc076 handle all end token types when reporting parse errors (bug #44824)
John W. Eaton <jwe@octave.org>
parents: 19849
diff changeset
2262 break;
8aa424ffc076 handle all end token types when reporting parse errors (bug #44824)
John W. Eaton <jwe@octave.org>
parents: 19849
diff changeset
2263
23398
d4ef04757ead eliminate some compiler warnings
John W. Eaton <jwe@octave.org>
parents: 23396
diff changeset
2264 case octave::token::switch_end:
21071
f25c14056b7c overhaul parser error handling for end token mismatch
John W. Eaton <jwe@octave.org>
parents: 21066
diff changeset
2265 retval = "endswitch";
3233
98d0ee053ba4 [project @ 1999-01-27 20:23:40 by jwe]
jwe
parents: 3216
diff changeset
2266 break;
98d0ee053ba4 [project @ 1999-01-27 20:23:40 by jwe]
jwe
parents: 3216
diff changeset
2267
23398
d4ef04757ead eliminate some compiler warnings
John W. Eaton <jwe@octave.org>
parents: 23396
diff changeset
2268 case octave::token::try_catch_end:
21071
f25c14056b7c overhaul parser error handling for end token mismatch
John W. Eaton <jwe@octave.org>
parents: 21066
diff changeset
2269 retval = "end_try_catch";
5400
c7e3cf2fce3e [project @ 2005-07-05 15:01:32 by jwe]
jwe
parents: 5397
diff changeset
2270 break;
c7e3cf2fce3e [project @ 2005-07-05 15:01:32 by jwe]
jwe
parents: 5397
diff changeset
2271
23398
d4ef04757ead eliminate some compiler warnings
John W. Eaton <jwe@octave.org>
parents: 23396
diff changeset
2272 case octave::token::unwind_protect_end:
21071
f25c14056b7c overhaul parser error handling for end token mismatch
John W. Eaton <jwe@octave.org>
parents: 21066
diff changeset
2273 retval = "end_unwind_protect";
1371
766af9ca8edb [project @ 1995-09-06 21:36:02 by jwe]
jwe
parents: 1351
diff changeset
2274 break;
766af9ca8edb [project @ 1995-09-06 21:36:02 by jwe]
jwe
parents: 1351
diff changeset
2275
23398
d4ef04757ead eliminate some compiler warnings
John W. Eaton <jwe@octave.org>
parents: 23396
diff changeset
2276 case octave::token::while_end:
21071
f25c14056b7c overhaul parser error handling for end token mismatch
John W. Eaton <jwe@octave.org>
parents: 21066
diff changeset
2277 retval = "endwhile";
20075
8aa424ffc076 handle all end token types when reporting parse errors (bug #44824)
John W. Eaton <jwe@octave.org>
parents: 19849
diff changeset
2278 break;
8aa424ffc076 handle all end token types when reporting parse errors (bug #44824)
John W. Eaton <jwe@octave.org>
parents: 19849
diff changeset
2279
496
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe]
jwe
parents: 482
diff changeset
2280 default:
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe]
jwe
parents: 482
diff changeset
2281 panic_impossible ();
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe]
jwe
parents: 482
diff changeset
2282 break;
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe]
jwe
parents: 482
diff changeset
2283 }
21071
f25c14056b7c overhaul parser error handling for end token mismatch
John W. Eaton <jwe@octave.org>
parents: 21066
diff changeset
2284
f25c14056b7c overhaul parser error handling for end token mismatch
John W. Eaton <jwe@octave.org>
parents: 21066
diff changeset
2285 return retval;
496
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe]
jwe
parents: 482
diff changeset
2286 }
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe]
jwe
parents: 482
diff changeset
2287
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2288 namespace octave
578
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe]
jwe
parents: 572
diff changeset
2289 {
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2290 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2291 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
2292 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2293 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
2294 + "' 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
2295 + 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
2296
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2297 bison_error (msg, tok->line (), tok->column ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2298 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2299
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2300 // 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
2301
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2302 bool
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2303 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
2304 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2305 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
2306
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2307 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
2308 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2309
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2310 // Maybe print a warning if an assignment expression is used as the
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2311 // test in a logical expression.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2312
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2313 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2314 base_parser::maybe_warn_assign_as_truth_value (tree_expression *expr)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2315 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2316 if (expr->is_assignment_expression ()
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2317 && expr->paren_count () < 2)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2318 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2319 if (m_lexer.fcn_file_full_name.empty ())
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2320 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
2321 ("Octave:assign-as-truth-value",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2322 "suggest parenthesis around assignment used as truth value");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2323 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2324 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
2325 ("Octave:assign-as-truth-value",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2326 "suggest parenthesis around assignment used as truth value near line %d, column %d in file '%s'",
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2327 expr->line (), expr->column (), m_lexer.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
2328 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2329 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2330
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2331 // Maybe print a warning about switch labels that aren't constants.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2332
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2333 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2334 base_parser::maybe_warn_variable_switch_label (tree_expression *expr)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2335 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2336 if (! expr->is_constant ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2337 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2338 if (m_lexer.fcn_file_full_name.empty ())
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2339 warning_with_id ("Octave:variable-switch-label",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2340 "variable switch label");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2341 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2342 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
2343 ("Octave:variable-switch-label",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2344 "variable switch label near line %d, column %d in file '%s'",
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2345 expr->line (), expr->column (), m_lexer.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
2346 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2347 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2348
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2349 // 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
2350
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2351 tree_constant *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2352 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
2353 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2354 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
2355 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
2356
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
2357 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
2358
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2359 switch (op)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2360 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2361 case NUM:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2362 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2363 octave_value tmp (tok_val->number ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2364 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
2365 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
2366 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2367 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2368
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2369 case IMAG_NUM:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2370 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2371 octave_value tmp (Complex (0.0, tok_val->number ()));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2372 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
2373 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
2374 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2375 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2376
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2377 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
2378 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
2379 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2380 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
2381
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2382 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
2383 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
2384
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2385 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
2386 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2387 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
2388 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
2389 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2390 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
2391 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2392
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2393 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
2394
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2395 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
2396 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
2397
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2398 // 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
2399 // 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
2400 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
2401 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2402 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2403
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2404 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2405 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2406 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2407 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2408
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2409 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2410 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2411
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2412 // 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
2413
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2414 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
2415 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
2416 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2417 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
2418 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
2419
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2420 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
2421
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2422 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2423 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2424
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2425 // 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
2426
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2427 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
2428 base_parser::make_anon_fcn_handle (tree_parameter_list *param_list,
23600
db947ba52118 explicitly limit anonymous functions to a single expression
John W. Eaton <jwe@octave.org>
parents: 23599
diff changeset
2429 tree_expression *expr)
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2430 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2431 // FIXME: need to get these from the location of the @ symbol.
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2432 int l = m_lexer.input_line_number;
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2433 int c = m_lexer.current_input_column;
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2434
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2435 symbol_table::scope *fcn_scope = m_lexer.symtab_context.curr_scope ();
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2436 symbol_table::scope *parent_scope = m_lexer.symtab_context.parent_scope ();
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2437
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2438 m_lexer.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
2439
23600
db947ba52118 explicitly limit anonymous functions to a single expression
John W. Eaton <jwe@octave.org>
parents: 23599
diff changeset
2440 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
2441
23850
4b0e0cae49db disallow dynamic variable creation in static scopes (bug #51698)
John W. Eaton <jwe@octave.org>
parents: 23845
diff changeset
2442 fcn_scope->mark_static ();
4b0e0cae49db disallow dynamic variable creation in static scopes (bug #51698)
John W. Eaton <jwe@octave.org>
parents: 23845
diff changeset
2443
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2444 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
2445 = new tree_anon_fcn_handle (param_list, expr, fcn_scope,
23599
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23577
diff changeset
2446 parent_scope, l, c);
23600
db947ba52118 explicitly limit anonymous functions to a single expression
John W. Eaton <jwe@octave.org>
parents: 23599
diff changeset
2447
23850
4b0e0cae49db disallow dynamic variable creation in static scopes (bug #51698)
John W. Eaton <jwe@octave.org>
parents: 23845
diff changeset
2448 // FIXME: Stash the filename. This does not work and produces
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2449 // errors when executed.
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2450 //retval->stash_file_name (m_lexer.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
2451
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2452 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2453 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2454
23655
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2455 // Build a colon expression.
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2456
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2457 tree_expression *
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2458 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
2459 tree_expression *limit,
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2460 tree_expression *incr)
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2461 {
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2462 tree_expression *retval = nullptr;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2463
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
2464 unwind_protect frame;
23655
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2465
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2466 frame.protect_var (discard_error_messages);
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2467 frame.protect_var (discard_warning_messages);
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2468
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2469 discard_error_messages = true;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2470 discard_warning_messages = true;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2471
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2472 if (! base || ! limit)
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2473 {
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2474 delete base;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2475 delete limit;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2476 delete incr;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2477
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2478 return retval;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2479 }
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2480
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2481 int l = base->line ();
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2482 int c = base->column ();
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2483
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2484 tree_colon_expression *e
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2485 = 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
2486
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2487 if (base->is_constant () && limit->is_constant ()
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2488 && (! incr || (incr && incr->is_constant ())))
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2489 {
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2490 try
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2491 {
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
2492 tree_evaluator& tw
23655
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2493 = __get_evaluator__ ("finish_colon_expression");
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2494
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2495 octave_value tmp = tw.evaluate (e);
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2496
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2497 tree_constant *tc_retval
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2498 = new tree_constant (tmp, e->line (), e->column ());
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2499
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2500 std::ostringstream buf;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2501
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2502 tree_print_code tpc (buf);
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2503
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2504 e->accept (tpc);
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2505
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2506 tc_retval->stash_original_text (buf.str ());
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2507
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2508 delete e;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2509
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2510 retval = tc_retval;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2511 }
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
2512 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
2513 {
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
2514 interpreter::recover_from_exception ();
23655
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2515 }
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2516 }
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2517 else
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2518 retval = e;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2519
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2520 return retval;
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2521 }
bbcc1e08aaed improve colon expression construction and avoid possible memory leak
John W. Eaton <jwe@octave.org>
parents: 23654
diff changeset
2522
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2523 // 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
2524
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2525 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2526 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
2527 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
2528 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2529 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
2530
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2531 switch (op)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2532 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2533 case POW:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2534 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
2535 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2536
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2537 case EPOW:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2538 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
2539 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2540
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2541 case '+':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2542 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
2543 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2544
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2545 case '-':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2546 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
2547 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2548
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2549 case '*':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2550 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
2551 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2552
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2553 case '/':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2554 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
2555 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2556
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2557 case EMUL:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2558 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
2559 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2560
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2561 case EDIV:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2562 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
2563 break;
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 case LEFTDIV:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2566 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
2567 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2568
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2569 case ELEFTDIV:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2570 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
2571 break;
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 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
2574 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
2575 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2576
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2577 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
2578 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
2579 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2580
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2581 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
2582 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
2583 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2584
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2585 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
2586 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
2587 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2588
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2589 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
2590 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
2591 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2592
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2593 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
2594 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
2595 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2596
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2597 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
2598 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
2599 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2600
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2601 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
2602 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
2603 break;
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 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2606 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2607 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2608 }
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2613 return maybe_compound_binary_expression (op1, op2, l, c, t);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2614 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2615
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2616 // 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
2617
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2618 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2619 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
2620 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
2621 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2622 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
2623
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2624 switch (op)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2625 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2626 case EXPR_AND_AND:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2627 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
2628 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2629
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2630 case EXPR_OR_OR:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2631 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
2632 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2633
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2634 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2635 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2636 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2637 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2638
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2639 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
2640 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
2641
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2642 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
2643 }
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 // 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
2646
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2647 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2648 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
2649 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2650 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
2651
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2652 switch (op)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2653 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2654 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
2655 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
2656 break;
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 case '+':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2659 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
2660 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2661
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2662 case '-':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2663 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
2664 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2665
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2666 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
2667 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
2668 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2669
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2670 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
2671 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
2672 break;
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 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2675 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2676 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2677 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2678
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2679 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
2680 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
2681
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2682 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
2683 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2684
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2685 // 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
2686
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2687 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2688 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
2689 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2690 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
2691
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2692 switch (op)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2693 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2694 case HERMITIAN:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2695 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
2696 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2697
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2698 case TRANSPOSE:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2699 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
2700 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2701
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2702 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
2703 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
2704 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2705
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2706 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
2707 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
2708 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2709
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2710 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2711 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2712 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2713 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2714
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2715 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
2716 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
2717
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2718 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
2719 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2720
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2721 // 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
2722
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2723 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2724 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
2725 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
2726 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
2727 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
2728 comment_list *lc,
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
2729 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
2730 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
2731 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
2732
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2733 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
2734 {
23750
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
2735 comment_list *tc = m_lexer.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
2736
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2737 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
2738 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
2739
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2740 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
2741 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
2742 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2743 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2744 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2745 delete body;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2746 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
2747
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2748 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
2749 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2750
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2751 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2752 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2753
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2754 // Build 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
2755
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2756 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2757 base_parser::make_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
2758 tree_statement_list *body,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2759 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
2760 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
2761 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
2762 comment_list *lc,
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
2763 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
2764 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
2765 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
2766
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2767 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
2768 {
23750
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
2769 comment_list *tc = m_lexer.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
2770
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2771 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
2772 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
2773
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
2774 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
2775
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2776 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
2777 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2778 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
2779
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2780 if (stmt)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2781 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2782 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
2783
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2784 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
2785 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2786 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
2787
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2788 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
2789
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
2790 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
2791 delete stmt;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2792 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2793 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2794 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2795
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2796 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
2797 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
2798 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2799 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2800 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2801 delete body;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2802 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
2803
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2804 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
2805 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2806
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2807 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2808 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2809
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2810 // 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
2811
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2812 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2813 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
2814 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
2815 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
2816 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
2817 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
2818 {
23798
771310737137 Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23796
diff changeset
2819 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
2820
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2821 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
2822
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2823 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
2824 {
23750
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
2825 comment_list *tc = m_lexer.comment_buf.get_comment ();
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2826
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2827 m_lexer.looping--;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2828
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2829 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
2830 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
2831
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2832 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
2833 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2834 else
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 delete expr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2837 delete body;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2838
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2839 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
2840 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2841
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2842 return retval;
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2845 // 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
2846
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2847 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2848 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
2849 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
2850 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
2851 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
2852 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2853 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
2854
23750
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
2855 comment_list *tc = m_lexer.comment_buf.get_comment ();
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2856
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2857 m_lexer.looping--;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2858
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2859 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
2860 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
2861
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2862 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
2863 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2864
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2865 // 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
2866
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2867 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2868 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
2869 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
2870 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
2871 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
2872 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
2873 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
2874 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
2875 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
2876 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
2877
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2878 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
2879
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2880 if (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
2881 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2882 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
2883
23750
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
2884 comment_list *tc = m_lexer.comment_buf.get_comment ();
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2885
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2886 m_lexer.looping--;
22196
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 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
2889 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
2890
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2891 if (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
2892 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2893 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
2894
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2895 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
2896 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
2897
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2898 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2899 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2900 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2901 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2902 if (parfor)
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 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2905 delete expr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2906 delete maxproc;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2907 delete body;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2908
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2909 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
2910 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2911 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2912 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
2913 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
2914 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2915 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2916 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2917 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2918 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2919 delete expr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2920 delete maxproc;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2921 delete body;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2922
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2923 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
2924 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2925
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2926 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2927 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2928
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2929 // 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
2930
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2931 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2932 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
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 = 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
2935 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
2936
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
2937 if (! m_lexer.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
2938 {
9c6661004167 error if break statement is in script file separate from loop (bug #39168)
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
2939 bison_error ("break must appear in a loop in the same file as loop command");
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
2940 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
2941 }
9c6661004167 error if break statement is in script file separate from loop (bug #39168)
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
2942 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
2943 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
2944 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2945
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2946 // Build a continue command.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2947
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2948 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2949 base_parser::make_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
2950 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2951 int l = 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
2952 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
2953
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2954 return new tree_continue_command (l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2955 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2956
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2957 // 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
2958
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2959 tree_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2960 base_parser::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
2961 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2962 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
2963 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
2964
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2965 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
2966 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2967
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2968 // 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
2969
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2970 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
2971 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
2972 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
2973 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2974 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
2975
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2976 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
2977
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2978 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
2979 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2980
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2981 // 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
2982
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2983 tree_if_command *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2984 base_parser::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
2985 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
2986 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
2987 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
2988 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
2989 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
2990
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2991 if (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
2992 {
23750
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
2993 comment_list *tc = m_lexer.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
2994
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2995 int l = 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
2996 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
2997
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
2998 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
2999 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3000 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
3001
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3002 if (elt)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3003 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3004 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
3005 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
3006 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3007 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3008
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3009 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
3010 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3011 else
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 delete list;
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 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
3016 }
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 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3019 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3020
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3021 // 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
3022
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3023 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
3024 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
3025 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
3026 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
3027 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
3028 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3029 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
3030
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3031 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
3032 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
3033
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3034 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
3035 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3036
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3037 // 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
3038
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3039 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
3040 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
3041 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
3042 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
3043 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
3044 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
3045 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3046 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
3047
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3048 if (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
3049 {
23750
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
3050 comment_list *tc = m_lexer.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
3051
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3052 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
3053 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
3054
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3055 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
3056 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3057 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
3058
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3059 if (elt)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3060 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3061 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
3062 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
3063 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3064 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3065
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3066 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
3067 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3068 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3069 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3070 delete expr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3071 delete list;
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 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
3074 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3075
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3076 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3077 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3078
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3079 // 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
3080
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3081 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
3082 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
3083 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
3084 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
3085 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
3086 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3087 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
3088
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3089 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
3090 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
3091
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3092 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
3093 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3094
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3095 // 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
3096
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3097 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3098 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
3099 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
3100 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3101 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
3102
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3103 switch (op)
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 case '=':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3106 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
3107 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3108
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3109 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
3110 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
3111 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3112
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3113 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
3114 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
3115 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3116
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3117 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
3118 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
3119 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3120
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3121 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
3122 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
3123 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3124
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3125 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
3126 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
3127 break;
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 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
3130 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
3131 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3132
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3133 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
3134 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
3135 break;
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 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
3138 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
3139 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3140
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3141 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
3142 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
3143 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3144
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3145 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
3146 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
3147 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3148
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3149 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
3150 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
3151 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3152
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3153 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
3154 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
3155 break;
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 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3158 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3159 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3160 }
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 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
3163 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
3164
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3165 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
3166 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3167 // 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
3168 // '=', not '+=', etc.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3169
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3170 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3171 delete rhs;
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 bison_error ("computed multiple assignment not allowed", l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3174
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3175 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
3176 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3177
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3178 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
3179 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3180 // 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
3181
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3182 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
3183
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3184 if ((tmp->is_identifier () || tmp->is_index_expression ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3185 && is_keyword (tmp->name ()))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3186 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3187 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
3188
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3189 delete tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3190 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3191 delete rhs;
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 bison_error ("invalid assignment to keyword \"" + kw + "\"", l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3194
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3195 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
3196 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3197
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3198 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3199
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3200 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
3201 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3202 else
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 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
3205
22872
551ac93c984c maint: Use C++ range feature to simplify some for loops in libinterp/parse-tree
Rik <rik@octave.org>
parents: 22785
diff changeset
3206 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
3207 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3208 if (is_keyword (kw))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3209 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3210 delete lhs;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3211 delete rhs;
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 bison_error ("invalid assignment to keyword \"" + kw + "\"",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3214 l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3215
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3216 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
3217 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3218 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3219
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3220 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
3221 }
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 // 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
3225
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3226 void
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_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
3228 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
3229 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3230 if (! cmds)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3231 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
3232
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3233 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
3234
24063
c81ed514ca2c give script scopes names
John W. Eaton <jwe@octave.org>
parents: 24045
diff changeset
3235 symbol_table::scope *script_scope = m_lexer.symtab_context.curr_scope ();
c81ed514ca2c give script scopes names
John W. Eaton <jwe@octave.org>
parents: 24045
diff changeset
3236
c81ed514ca2c give script scopes names
John W. Eaton <jwe@octave.org>
parents: 24045
diff changeset
3237 script_scope->cache_name (m_lexer.fcn_file_full_name);
c81ed514ca2c give script scopes names
John W. Eaton <jwe@octave.org>
parents: 24045
diff changeset
3238
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3239 octave_user_script *script
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3240 = new octave_user_script (m_lexer.fcn_file_full_name,
24063
c81ed514ca2c give script scopes names
John W. Eaton <jwe@octave.org>
parents: 24045
diff changeset
3241 m_lexer.fcn_file_name, script_scope,
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3242 cmds, m_lexer.help_text);
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3243
24037
21915520ac7b use more direct method for non-local symbol access (bug #38236)
John W. Eaton <jwe@octave.org>
parents: 23850
diff changeset
3244 m_lexer.symtab_context.pop ();
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3245 m_lexer.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
3246
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
3247 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
3248
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3249 script->stash_fcn_file_time (now);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3250
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3251 m_primary_fcn_ptr = script;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3252 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3253
23673
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3254 // Define a function.
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3255
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3256 // FIXME: combining start_function, finish_function, and
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3257 // 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
3258 // 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
3259
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3260 tree_function_def *
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3261 base_parser::make_function (token *fcn_tok,
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3262 tree_parameter_list *ret_list,
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3263 tree_identifier *id,
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3264 tree_parameter_list *param_list,
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3265 tree_statement_list *body,
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3266 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
3267 comment_list *lc)
23673
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3268 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3269 tree_function_def *retval = nullptr;
23673
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3270
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3271 int l = fcn_tok->line ();
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3272 int c = fcn_tok->column ();
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3273
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3274 octave_user_function *tmp_fcn
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3275 = 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
3276
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3277 retval = finish_function (ret_list, tmp_fcn, lc, l, c);
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3278
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3279 recover_from_parsing_function ();
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3280
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3281 return retval;
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3282 }
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3283
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3284 // 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
3285
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3286 octave_user_function *
23673
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3287 base_parser::start_function (tree_identifier *id,
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3288 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
3289 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
3290 tree_statement *end_fcn_stmt)
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9471
diff changeset
3291 {
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3292 // 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
3293
23673
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3294 std::string id_name = id->name ();
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3295
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3296 delete id;
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3297
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3298 if (m_lexer.parsing_classdef_get_method)
23673
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3299 id_name.insert (0, "get.");
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3300 else if (m_lexer.parsing_classdef_set_method)
23673
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3301 id_name.insert (0, "set.");
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3302
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3303 m_lexer.parsing_classdef_get_method = false;
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3304 m_lexer.parsing_classdef_set_method = false;
23673
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3305
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3306 if (! body)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3307 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
3308
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3309 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
3310
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3311 octave_user_function *fcn
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3312 = new octave_user_function (m_lexer.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
3313 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
3314
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3315 if (fcn)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3316 {
23750
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
3317 comment_list *tc = m_lexer.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
3318
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3319 fcn->stash_trailing_comment (tc);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3320 fcn->stash_fcn_end_location (end_fcn_stmt->line (),
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3321 end_fcn_stmt->column ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3322 }
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 // 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
3325 // 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
3326 // 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
3327 // name).
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3328 if (! m_autoloading && m_lexer.reading_fcn_file
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3329 && m_curr_fcn_depth == 1 && ! m_parsing_subfunctions)
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3330 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3331 // FIXME: should m_lexer.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
3332 // 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
3333 // 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
3334
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3335 std::string nm = m_lexer.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
3336
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
3337 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
3338
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3339 if (pos != std::string::npos)
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3340 nm = m_lexer.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
3341
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3342 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
3343 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3344 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
3345 ("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
3346 "function name '%s' does not agree with function filename '%s'",
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3347 id_name.c_str (), m_lexer.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
3348
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3349 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
3350 }
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
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3353 if (m_lexer.reading_fcn_file || m_lexer.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
3354 {
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
3355 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
3356
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3357 fcn->stash_fcn_file_name (m_lexer.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
3358 fcn->stash_fcn_file_time (now);
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3359 fcn->stash_dir_name (m_lexer.dir_name);
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3360 fcn->stash_package_name (m_lexer.package_name);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3361 fcn->mark_as_system_fcn_file ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3362
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3363 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
3364 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
3365
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3366 if (m_curr_fcn_depth > 1 || m_parsing_subfunctions)
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3367 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3368 fcn->stash_parent_fcn_name (m_lexer.fcn_file_name);
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3369
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3370 if (m_curr_fcn_depth > 1)
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3371 fcn->stash_parent_fcn_scope (m_function_scopes.parent_scope ());
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3372 else
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3373 fcn->stash_parent_fcn_scope (m_primary_fcn_scope);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3374 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3375
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3376 if (m_lexer.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
3377 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3378 if (m_curr_class_name == id_name)
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3379 fcn->mark_as_class_constructor ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3380 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3381 fcn->mark_as_class_method ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3382
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3383 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
3384 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3385
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3386 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
3387
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
3388 sys::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
3389
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3390 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
3391 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
3392 "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
3393 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3394 else if (! input_from_tmp_history_file
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3395 && ! m_lexer.force_script
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3396 && m_lexer.reading_script_file
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3397 && m_lexer.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
3398 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3399 warning ("function '%s' defined within script file '%s'",
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3400 id_name.c_str (), m_lexer.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
3401 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3402
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3403 fcn->stash_function_name (id_name);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3404
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3405 if (! m_lexer.help_text.empty () && m_curr_fcn_depth == 1
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3406 && ! 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
3407 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3408 fcn->document (m_lexer.help_text);
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3409
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3410 m_lexer.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
3411 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3412
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3413 if (m_lexer.reading_fcn_file && m_curr_fcn_depth == 1
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3414 && ! m_parsing_subfunctions)
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3415 m_primary_fcn_ptr = fcn;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3416
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3417 return fcn;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3418 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3419
23673
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3420 tree_statement *
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3421 base_parser::make_end (const std::string& type, bool eof, int l, int c)
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3422 {
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3423 return make_statement (new tree_no_op_command (type, eof, l, c));
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3424 }
1d1ce4df5255 refactor bison rules for parsing functions
John W. Eaton <jwe@octave.org>
parents: 23667
diff changeset
3425
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3426 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
3427 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
3428 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
3429 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
3430 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
3431 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3432 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
3433
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3434 if (ret_list)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3435 ret_list->mark_as_formal_parameters ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3436
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3437 if (fcn)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3438 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3439 std::string nm = fcn->name ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3440 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
3441
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3442 std::string tmp = nm;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3443 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
3444 tmp += ": " + file;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3445
23611
91c8f006ed8b remove additional functions from symbol_table class
John W. Eaton <jwe@octave.org>
parents: 23603
diff changeset
3446 symbol_table::scope *fcn_scope = fcn->scope ();
91c8f006ed8b remove additional functions from symbol_table class
John W. Eaton <jwe@octave.org>
parents: 23603
diff changeset
3447 fcn_scope->cache_name (tmp);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3448
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3449 if (lc)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3450 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
3451
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3452 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
3453
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3454 if (m_curr_fcn_depth > 1 || m_parsing_subfunctions)
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3455 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3456 fcn->stash_fcn_location (l, c);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3457
23611
91c8f006ed8b remove additional functions from symbol_table class
John W. Eaton <jwe@octave.org>
parents: 23603
diff changeset
3458 octave_value ov_fcn (fcn);
91c8f006ed8b remove additional functions from symbol_table class
John W. Eaton <jwe@octave.org>
parents: 23603
diff changeset
3459
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3460 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
3461 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3462 symbol_table::scope *pscope = m_function_scopes.parent_scope ();
23599
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23577
diff changeset
3463
23611
91c8f006ed8b remove additional functions from symbol_table class
John W. Eaton <jwe@octave.org>
parents: 23603
diff changeset
3464 pscope->install_nestfunction (nm, ov_fcn);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3465 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3466 else
22974
ecc5eeada8dc Don't mark nested functions in primary function as subfunctions.
Rik <rik@octave.org>
parents: 22880
diff changeset
3467 {
ecc5eeada8dc Don't mark nested functions in primary function as subfunctions.
Rik <rik@octave.org>
parents: 22880
diff changeset
3468 fcn->mark_as_subfunction ();
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3469 m_subfunction_names.push_back (nm);
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3470
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3471 m_primary_fcn_scope->install_subfunction (nm, ov_fcn);
22974
ecc5eeada8dc Don't mark nested functions in primary function as subfunctions.
Rik <rik@octave.org>
parents: 22880
diff changeset
3472 }
22196
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
24042
840882c82e22 install nested local functions only once (bug #51993)
John W. Eaton <jwe@octave.org>
parents: 24037
diff changeset
3475 if (m_curr_fcn_depth == 1)
23611
91c8f006ed8b remove additional functions from symbol_table class
John W. Eaton <jwe@octave.org>
parents: 23603
diff changeset
3476 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
3477
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3478 if (! m_lexer.reading_fcn_file && m_curr_fcn_depth == 1)
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3479 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3480 // 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
3481 // 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
3482 // 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
3483 // 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
3484 // 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
3485 // or as the primary function for the file, via
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3486 // m_primary_fcn_ptr (see also load_fcn_from_file,,
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3487 // parse_fcn_file, and
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3488 // symbol_table::fcn_info::fcn_info_rep::find_user_function).
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3489
23730
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
3490 if (m_lexer.buffer_function_text)
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
3491 {
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
3492 fcn->cache_function_text (m_lexer.function_text,
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
3493 fcn->time_parsed ());
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
3494 m_lexer.buffer_function_text = false;
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
3495 }
85f1d31956c0 make echo work for command-line functions
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
3496
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3497 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
3498 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3499 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3500
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3501 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3502 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3503
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3504 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3505 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
3506 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3507 m_lexer.symtab_context.pop ();
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3508
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3509 if (m_lexer.reading_fcn_file && m_curr_fcn_depth == 1
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3510 && ! m_parsing_subfunctions)
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3511 m_parsing_subfunctions = true;
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3512
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3513 m_curr_fcn_depth--;
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3514 m_function_scopes.pop ();
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3515
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3516 m_lexer.defining_func--;
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3517 m_lexer.parsed_function_name.pop ();
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3518 m_lexer.looking_at_return_list = false;
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3519 m_lexer.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
3520 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3521
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3522 tree_funcall *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3523 base_parser::make_superclass_ref (const std::string& method_nm,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3524 const std::string& class_nm)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3525 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3526 octave_value_list args;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3527
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3528 args(1) = class_nm;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3529 args(0) = method_nm;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3530
23599
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23577
diff changeset
3531 symbol_table& symtab
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
3532 = __get_symbol_table__ ("base_parser::make_superclass_ref");
23599
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23577
diff changeset
3533
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3534 octave_value fcn
23599
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23577
diff changeset
3535 = symtab.find_built_in_function ("__superclass_reference__");
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3536
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3537 return new tree_funcall (fcn, args);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3538 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3539
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3540 tree_funcall *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3541 base_parser::make_meta_class_query (const std::string& class_nm)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3542 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3543 octave_value_list args;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3544
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3545 args(0) = class_nm;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3546
23599
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23577
diff changeset
3547 symbol_table& symtab
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
3548 = __get_symbol_table__ ("base_parser::make_meta_class_query");
23599
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23577
diff changeset
3549
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3550 octave_value fcn
23599
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23577
diff changeset
3551 = symtab.find_built_in_function ("__meta_class_query__");
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3552
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3553 return new tree_funcall (fcn, args);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3554 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3555
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3556 // 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
3557 // 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
3558 // 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
3559 // 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
3560 // 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
3561
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3562 tree_classdef *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3563 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
3564 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
3565 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
3566 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
3567 tree_classdef_body *body, token *end_tok,
23750
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
3568 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
3569 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3570 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
3571
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3572 m_lexer.symtab_context.pop ();
23599
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23577
diff changeset
3573
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3574 std::string cls_name = id->name ();
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9471
diff changeset
3575
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3576 std::string nm = m_lexer.fcn_file_name;
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9471
diff changeset
3577
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
3578 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
3579
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9471
diff changeset
3580 if (pos != std::string::npos)
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3581 nm = m_lexer.fcn_file_name.substr (pos+1);
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9471
diff changeset
3582
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3583 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
3584 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3585 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3586 delete id;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3587 delete sc;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3588 delete body;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3589
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3590 bison_error ("invalid classdef definition, the class name must match the filename");
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3591
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3592 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3593 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3594 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3595 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
3596 {
23750
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
3597 comment_list *tc = m_lexer.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
3598
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3599 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
3600 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
3601
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3602 if (! body)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3603 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
3604
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3605 retval = new tree_classdef (a, id, sc, body, lc, tc,
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3606 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
3607 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3608 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3609 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3610 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3611 delete id;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3612 delete sc;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3613 delete body;
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 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
3616 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3617 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3618
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3619 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3620 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3621
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3622 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
3623 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
3624 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
3625 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
3626 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
3627 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
3628 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3629 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
3630
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3631 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
3632 {
23750
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
3633 comment_list *tc = m_lexer.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
3634
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3635 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
3636 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
3637
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3638 if (! plist)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3639 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
3640
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3641 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
3642 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3643 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3644 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3645 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3646 delete plist;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3647
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3648 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
3649 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3650
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3651 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3652 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3653
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3654 tree_classdef_methods_block *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3655 base_parser::make_classdef_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
3656 tree_classdef_attribute_list *a,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3657 tree_classdef_methods_list *mlist,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3658 token *end_tok,
23750
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
3659 comment_list *lc)
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3660 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3661 tree_classdef_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
3662
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3663 if (end_token_ok (end_tok, token::methods_end))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3664 {
23750
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
3665 comment_list *tc = m_lexer.comment_buf.get_comment ();
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3666
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3667 int l = tok_val->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3668 int c = tok_val->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3669
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3670 if (! mlist)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3671 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
3672
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3673 retval = new tree_classdef_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
3674 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3675 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3676 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3677 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3678 delete mlist;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3679
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3680 end_token_error (end_tok, token::methods_end);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3681 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3682
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3683 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3684 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3685
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3686 tree_classdef_events_block *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3687 base_parser::make_classdef_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
3688 tree_classdef_attribute_list *a,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3689 tree_classdef_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
3690 token *end_tok,
23750
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
3691 comment_list *lc)
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3692 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3693 tree_classdef_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
3694
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3695 if (end_token_ok (end_tok, token::events_end))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3696 {
23750
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
3697 comment_list *tc = m_lexer.comment_buf.get_comment ();
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3698
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3699 int l = tok_val->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3700 int c = tok_val->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3701
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3702 if (! elist)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3703 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
3704
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3705 retval = new tree_classdef_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
3706 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3707 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3708 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3709 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3710 delete elist;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3711
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3712 end_token_error (end_tok, token::events_end);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3713 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3714
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3715 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3716 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3717
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3718 tree_classdef_enum_block *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3719 base_parser::make_classdef_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
3720 tree_classdef_attribute_list *a,
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3721 tree_classdef_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
3722 token *end_tok,
23750
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
3723 comment_list *lc)
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3724 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3725 tree_classdef_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
3726
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3727 if (end_token_ok (end_tok, token::enumeration_end))
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3728 {
23750
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
3729 comment_list *tc = m_lexer.comment_buf.get_comment ();
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3730
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3731 int l = tok_val->line ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3732 int c = tok_val->column ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3733
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3734 if (! elist)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3735 elist = new tree_classdef_enum_list ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3736
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3737 retval = new tree_classdef_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
3738 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3739 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3740 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3741 delete a;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3742 delete elist;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3743
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3744 end_token_error (end_tok, token::enumeration_end);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3745 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3746
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3747 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3748 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3749
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3750 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
3751 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
3752 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
3753 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3754 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
3755
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3756 // 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
3757 // 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
3758
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3759 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
3760 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3761
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3762 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
3763
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3764 // 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
3765 // - 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
3766 // - class constructor
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3767 // - `delete'
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3768
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3769 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
3770 && mname != "delete"
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3771 && 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
3772 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3773 // 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
3774 // is loaded.
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3775
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3776 retval = new octave_user_function (nullptr, pl);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3777
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3778 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
3779
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3780 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
3781 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
3782
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3783 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
3784 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3785 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3786 bison_error ("invalid external method declaration, an external "
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3787 "method cannot be the class constructor, `delete' "
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3788 "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
3789 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3790 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3791 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
3792
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3793 if (! retval)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3794 delete id;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3795
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3796 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3797 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3798
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3799 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
3800 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
3801 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
3802 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
3803 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3804 if (ret_list)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3805 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
3806
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3807 if (cl)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3808 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
3809
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3810 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
3811 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
3812
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3813 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
3814 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3815
24067
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
3816 void
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
3817 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
3818 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
3819 {
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
3820 if (m_lexer.reading_classdef_file)
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
3821 m_classdef_object = cls;
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
3822
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
3823 if (local_fcns)
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
3824 {
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
3825 symbol_table& symtab
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
3826 = __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
3827
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
3828 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
3829 {
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
3830 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
3831
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
3832 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
3833 = 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
3834
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
3835 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
3836 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
3837 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
3838 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
3839
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
3840 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
3841 }
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
3842
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
3843 delete local_fcns;
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
3844 }
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
3845 }
5b88383b9a69 install local functions after classdef parse is complete (bug #52080)
John W. Eaton <jwe@octave.org>
parents: 24063
diff changeset
3846
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3847 // 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
3848
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3849 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
3850 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
3851 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
3852 char type)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3853 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3854 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
3855
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3856 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
3857 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3858 delete expr;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3859 delete args;
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 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
3862 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3863 else
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9471
diff changeset
3864 {
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3865 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
3866 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
3867
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3868 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
3869 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
3870
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3871 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
3872 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3873 tree_index_expression *tmp =
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3874 static_cast<tree_index_expression *> (expr);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3875
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3876 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
3877
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3878 retval = tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3879 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3880 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3881 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
3882 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3883
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3884 return retval;
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 // 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
3888
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3889 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
3890 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
3891 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
3892 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3893 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
3894
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3895 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
3896 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
3897
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3898 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
3899 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
3900
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3901 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
3902 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3903 tree_index_expression *tmp = static_cast<tree_index_expression *> (expr);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3904
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3905 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
3906
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3907 retval = tmp;
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 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3910 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
3911
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3912 m_lexer.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
3913
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3914 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3915 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3916
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3917 // 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
3918
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3919 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
3920 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
3921 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
3922 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3923 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
3924
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3925 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
3926 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
3927
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3928 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
3929 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
3930
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3931 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
3932 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3933 tree_index_expression *tmp = static_cast<tree_index_expression *> (expr);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3934
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3935 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
3936
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3937 retval = tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3938 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3939 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3940 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
3941
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3942 m_lexer.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
3943
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3944 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3945 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3946
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3947 // 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
3948
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3949 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
3950 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
3951 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
3952 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
3953 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
3954
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3955 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
3956 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
3957
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3958 switch (tok)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3959 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3960 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
3961 {
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes
John W. Eaton <jwe@octave.org>
parents: 23454
diff changeset
3962 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
3963 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
3964 }
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3965 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3966
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3967 case PERSISTENT:
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3968 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
3969 {
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes
John W. Eaton <jwe@octave.org>
parents: 23454
diff changeset
3970 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
3971 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
3972 }
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3973 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3974 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3975 if (m_lexer.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
3976 warning ("ignoring persistent declaration near line %d of file '%s'",
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
3977 l, m_lexer.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
3978 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3979 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
3980 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3981 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3982
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3983 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3984 panic_impossible ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3985 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3986 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3987
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3988 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3989 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3990
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
3991 bool
23654
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
3992 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
3993 tree_parameter_list::in_or_out type)
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
3994 {
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
3995 std::set<std::string> dict;
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
3996
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
3997 for (tree_decl_elt *elt : *lst)
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
3998 {
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
3999 tree_identifier *id = elt->ident ();
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4000
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4001 if (id)
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4002 {
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4003 std::string name = id->name ();
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4004
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4005 if (id->is_black_hole ())
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4006 {
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4007 if (type != tree_parameter_list::in)
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4008 {
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4009 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
4010 return false;
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4011 }
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4012 }
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4013 else if (dict.find (name) != dict.end ())
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4014 {
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4015 bison_error ("'" + name
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4016 + "' appears more than once in parameter list");
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4017 return false;
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4018 }
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4019 else
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4020 dict.insert (name);
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4021 }
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4022 }
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4023
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4024 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
4025 ? "varargin" : "varargout");
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4026
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4027 size_t len = lst->length ();
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4028
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4029 if (len > 0)
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4030 {
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4031 tree_decl_elt *elt = lst->back ();
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4032
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4033 tree_identifier *id = elt->ident ();
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4034
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4035 if (id && id->name () == va_type)
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4036 {
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4037 if (len == 1)
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4038 lst->mark_varargs_only ();
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4039 else
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4040 lst->mark_varargs ();
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4041
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4042 tree_parameter_list::iterator p = lst->end ();
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4043 --p;
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4044 delete *p;
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4045 lst->erase (p);
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4046 }
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4047 }
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4048
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4049 return true;
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4050 }
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4051
da89ce0d49eb avoid possible memory leak in parser
John W. Eaton <jwe@octave.org>
parents: 23653
diff changeset
4052 bool
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4053 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
4054 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4055 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
4056
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4057 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
4058
22872
551ac93c984c maint: Use C++ range feature to simplify some for loops in libinterp/parse-tree
Rik <rik@octave.org>
parents: 22785
diff changeset
4059 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
4060 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4061 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
4062 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4063 retval = false;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4064
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4065 if (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
4066 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
4067 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4068 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
4069
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4070 break;
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 }
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 return retval;
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4077 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
4078 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
4079 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
4080 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
4081
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4082 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
4083 {
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4084 tree_evaluator& tw
23532
084245f9bd03 pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents: 23502
diff changeset
4085 = __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
4086
084245f9bd03 pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents: 23502
diff changeset
4087 octave_value ov = tw.evaluate (e);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4088
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4089 delete e;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4090
23577
80c42f4cca13 maint: Deprecate is_empty and replace with isempty.
Rik <rik@octave.org>
parents: 23576
diff changeset
4091 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
4092 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
4093 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4094 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
4095 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4096 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4097 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4098 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
4099
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
4100 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
4101
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4102 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
4103 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4104 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
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 (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
4107 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4108 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
4109 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
4110 delete e;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4111 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
4112 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4113 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4114 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4115 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
4116
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4117 if (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
4118 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4119 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
4120 retval = tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4121 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4122 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4123 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4124 delete tmp;
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 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
4127 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4128
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4129 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
4130 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
4131 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4132
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4133 return retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4134 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4135
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4136 // 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
4137
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4138 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4139 base_parser::finish_array_list (tree_array_list *array_list)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4140 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4141 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
4142
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4143 unwind_protect frame;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4144
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4145 frame.protect_var (discard_error_messages);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4146 frame.protect_var (discard_warning_messages);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4147
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4148 discard_error_messages = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4149 discard_warning_messages = true;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4150
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4151 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
4152 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4153 try
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4154 {
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4155 tree_evaluator& tw
23532
084245f9bd03 pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents: 23502
diff changeset
4156 = __get_evaluator__ ("finish_array_list");
084245f9bd03 pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents: 23502
diff changeset
4157
084245f9bd03 pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents: 23502
diff changeset
4158 octave_value tmp = tw.evaluate (array_list);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4159
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4160 tree_constant *tc_retval
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4161 = new tree_constant (tmp, array_list->line (),
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4162 array_list->column ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4163
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4164 std::ostringstream buf;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4165
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4166 tree_print_code tpc (buf);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4167
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4168 array_list->accept (tpc);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4169
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4170 tc_retval->stash_original_text (buf.str ());
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4171
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4172 delete array_list;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4173
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4174 retval = tc_retval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4175 }
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4176 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
4177 {
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4178 interpreter::recover_from_exception ();
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4179 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4180 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4181
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4182 return retval;
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4185 // 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
4186
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4187 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4188 base_parser::finish_matrix (tree_matrix *m)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4189 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4190 return (m
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4191 ? finish_array_list (m)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4192 : new tree_constant (octave_null_matrix::instance));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4193 }
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 // 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
4196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4197 tree_expression *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4198 base_parser::finish_cell (tree_cell *c)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4199 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4200 return (c
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4201 ? finish_array_list (c)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4202 : new tree_constant (octave_value (Cell ())));
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4203 }
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 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4206 base_parser::maybe_warn_missing_semi (tree_statement_list *t)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4207 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4208 if (m_curr_fcn_depth > 0)
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4209 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4210 tree_statement *tmp = t->back ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4211
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4212 if (tmp->is_expression ())
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4213 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
4214 ("Octave:missing-semicolon",
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4215 "missing semicolon near line %d, column %d in file '%s'",
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4216 tmp->line (), tmp->column (), m_lexer.fcn_file_full_name.c_str ());
9474
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9471
diff changeset
4217 }
25ed2d6aacf6 Parse nested functions more accurately.
David Grundberg <individ@acc.umu.se>
parents: 9471
diff changeset
4218 }
1623
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe]
jwe
parents: 1607
diff changeset
4219
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4220 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
4221 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
4222 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
4223 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4224 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
4225
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4226 switch (sep)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4227 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4228 case ';':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4229 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
4230 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4231
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4232 case 0:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4233 case ',':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4234 case '\n':
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4235 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
4236 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
4237 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
4238 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4239
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4240 default:
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4241 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
4242 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4243 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4244
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4245 // 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
4246 // 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
4247
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4248 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
4249 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4250 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
4251 delete tmp;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4252 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4253
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4254 return list;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4255 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4256
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4257 // 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
4258 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
4259 tree_statement *
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4260 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
4261 {
23750
ea879bc55272 move comment_list and comment_elt classes to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23730
diff changeset
4262 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
4263
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4264 return 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
4265 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4266
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4267 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
4268 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
4269 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4270 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
4271 }
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_statement_list *
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::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
4275 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
4276 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
4277 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4278 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
4279
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4280 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
4281
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4282 return list;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4283 }
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 void
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4286 base_parser::bison_error (const std::string& str, int l, int c)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4287 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4288 int err_line = l < 0 ? m_lexer.input_line_number : l;
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4289 int err_col = c < 0 ? m_lexer.current_input_column - 1 : c;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4290
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4291 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
4292
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4293 if (m_lexer.reading_fcn_file || m_lexer.reading_script_file
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4294 || m_lexer.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
4295 output_buf << "parse error near line " << err_line
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4296 << " of file " << m_lexer.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
4297 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4298 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
4299
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4300 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
4301 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
4302
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4303 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
4304
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4305 std::string curr_line = m_lexer.current_input_line;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4306
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4307 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
4308 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4309 size_t len = curr_line.length ();
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4310
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4311 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
4312 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
4313
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4314 // 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
4315
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4316 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
4317
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4318 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
4319 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
4320
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4321 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
4322 output_buf << " ";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4323
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4324 output_buf << "^";
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4325 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4326
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4327 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
4328
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4329 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
4330 }
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 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4333 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
4334 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4335 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
4336
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4337 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
4338
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4339 try
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 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
4342 }
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4343 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
4344 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4345 std::string file = m_lexer.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
4346
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4347 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
4348 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
4349 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4350 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
4351 }
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4352 catch (const exit_exception&)
23049
7351f2c93389 rethrow octave::exit_exception (bug #49304)
Olaf Till <i7tiol@t-online.de>
parents: 22879
diff changeset
4353 {
7351f2c93389 rethrow octave::exit_exception (bug #49304)
Olaf Till <i7tiol@t-online.de>
parents: 22879
diff changeset
4354 throw;
7351f2c93389 rethrow octave::exit_exception (bug #49304)
Olaf Till <i7tiol@t-online.de>
parents: 22879
diff changeset
4355 }
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4356 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
4357 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4358 throw;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4359 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4360 catch (...)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4361 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4362 std::string file = m_lexer.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
4363
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4364 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
4365 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
4366 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4367 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
4368 }
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 if (status != 0)
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4371 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
4372
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4373 return status;
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
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4376 // 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
4377 // 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
4378
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4379 int
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4380 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
4381 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4382 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
4383
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4384 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
4385
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4386 do
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4387 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4388 YYSTYPE lval;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4389
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4390 int token = octave_lex (&lval, m_lexer.scanner);
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4391
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4392 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
4393 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4394 if (! eof && m_lexer.at_end_of_buffer ())
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4395 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4396 status = -1;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4397 break;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4398 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4399 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4400
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4401 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
4402
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4403 try
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4404 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4405 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
4406 }
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4407 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
4408 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4409 std::string file = m_lexer.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
4410
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4411 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
4412 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
4413 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4414 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
4415 }
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4416 catch (const exit_exception&)
23049
7351f2c93389 rethrow octave::exit_exception (bug #49304)
Olaf Till <i7tiol@t-online.de>
parents: 22879
diff changeset
4417 {
7351f2c93389 rethrow octave::exit_exception (bug #49304)
Olaf Till <i7tiol@t-online.de>
parents: 22879
diff changeset
4418 throw;
7351f2c93389 rethrow octave::exit_exception (bug #49304)
Olaf Till <i7tiol@t-online.de>
parents: 22879
diff changeset
4419 }
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4420 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
4421 {
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4422 throw;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4423 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4424 catch (...)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4425 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4426 std::string file = m_lexer.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
4427
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4428 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
4429 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
4430 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4431 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
4432 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4433 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4434 while (status == YYPUSH_MORE);
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4435
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4436 if (status != 0)
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4437 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
4438
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4439 return status;
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4440 }
16294
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
4441 }
0925d1f6875e push parser/lexer interface
John W. Eaton <jwe@octave.org>
parents: 16293
diff changeset
4442
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
4443 static void
10067
6f79338c269b omission from last patch
Jaroslav Hajek <highegg@gmail.com>
parents: 9794
diff changeset
4444 safe_fclose (FILE *f)
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
4445 {
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
4446 if (f)
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
4447 fclose (static_cast<FILE *> (f));
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
4448 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
4449
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4450 static octave_value
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
4451 parse_fcn_file (const std::string& full_file, const std::string& file,
23667
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
4452 const std::string& dir_name, const std::string& dispatch_type,
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
4453 const std::string& package_name, bool require_file,
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
4454 bool force_script, bool autoload, bool relative_lookup,
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
4455 const std::string& warn_for)
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
4456 {
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4457 octave_value retval;
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4458
21743
f4d7d0eb5b0c use namespace for unwind_protect class
John W. Eaton <jwe@octave.org>
parents: 21740
diff changeset
4459 octave::unwind_protect frame;
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
4460
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
4461 octave_function *fcn_ptr = nullptr;
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
4462
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
4463 // Open function file and parse.
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
4464
21748
176536b15d68 use namespace for command_editor and command_history classes
John W. Eaton <jwe@octave.org>
parents: 21743
diff changeset
4465 FILE *in_stream = octave::command_editor::get_input_stream ();
176536b15d68 use namespace for command_editor and command_history classes
John W. Eaton <jwe@octave.org>
parents: 21743
diff changeset
4466
176536b15d68 use namespace for command_editor and command_history classes
John W. Eaton <jwe@octave.org>
parents: 21743
diff changeset
4467 frame.add_fcn (octave::command_editor::set_input_stream, in_stream);
176536b15d68 use namespace for command_editor and command_history classes
John W. Eaton <jwe@octave.org>
parents: 21743
diff changeset
4468
176536b15d68 use namespace for command_editor and command_history classes
John W. Eaton <jwe@octave.org>
parents: 21743
diff changeset
4469 frame.add_fcn (octave::command_history::ignore_entries,
176536b15d68 use namespace for command_editor and command_history classes
John W. Eaton <jwe@octave.org>
parents: 21743
diff changeset
4470 octave::command_history::ignoring_entries ());
176536b15d68 use namespace for command_editor and command_history classes
John W. Eaton <jwe@octave.org>
parents: 21743
diff changeset
4471
176536b15d68 use namespace for command_editor and command_history classes
John W. Eaton <jwe@octave.org>
parents: 21743
diff changeset
4472 octave::command_history::ignore_entries ();
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7699
diff changeset
4473
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
4474 FILE *ffile = nullptr;
16198
2c5c538be353 clean up input.cc and eliminate ff_instream global variable
John W. Eaton <jwe@octave.org>
parents: 16195
diff changeset
4475
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
4476 if (! full_file.empty ())
21942
aab79a1885cc limit gnulib headers to liboctave/wrappers directory
John W. Eaton <jwe@octave.org>
parents: 21861
diff changeset
4477 ffile = std::fopen (full_file.c_str (), "rb");
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
4478
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
4479 if (ffile)
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
4480 {
19709
5cfb3ccbf24a style fixes for resource management
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
4481 frame.add_fcn (safe_fclose, ffile);
5cfb3ccbf24a style fixes for resource management
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
4482
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
4483 octave::parser parser (ffile);
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
4484
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4485 parser.m_curr_class_name = dispatch_type;
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4486 parser.m_curr_package_name = package_name;
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4487 parser.m_autoloading = autoload;
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4488 parser.m_fcn_file_from_relative_lookup = relative_lookup;
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4489
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4490 parser.m_lexer.force_script = force_script;
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4491 parser.m_lexer.prep_for_file ();
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4492 parser.m_lexer.parsing_class_method = ! dispatch_type.empty ();
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4493
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4494 parser.m_lexer.fcn_file_name = file;
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4495 parser.m_lexer.fcn_file_full_name = full_file;
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4496 parser.m_lexer.dir_name = dir_name;
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4497 parser.m_lexer.package_name = package_name;
16288
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
4498
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
4499 int status = parser.run ();
fe3b9a51e625 rename curr_lexer, curr_parser, CURR_LEXER
John W. Eaton <jwe@octave.org>
parents: 16287
diff changeset
4500
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4501 fcn_ptr = parser.m_primary_fcn_ptr;
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
4502
16211
3449bf257514 maint: fix botched merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16205
diff changeset
4503 if (status == 0)
16627
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements
John W. Eaton <jwe@octave.org>
parents: 16574
diff changeset
4504 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4505 if (parser.m_lexer.reading_classdef_file
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4506 && parser.m_classdef_object)
16627
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements
John W. Eaton <jwe@octave.org>
parents: 16574
diff changeset
4507 {
16211
3449bf257514 maint: fix botched merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16205
diff changeset
4508 // Convert parse tree for classdef object to
3449bf257514 maint: fix botched merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16205
diff changeset
4509 // meta.class info (and stash it in the symbol
3449bf257514 maint: fix botched merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16205
diff changeset
4510 // table?). Return pointer to constructor?
3449bf257514 maint: fix botched merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16205
diff changeset
4511
3449bf257514 maint: fix botched merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16205
diff changeset
4512 if (fcn_ptr)
3449bf257514 maint: fix botched merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16205
diff changeset
4513 panic_impossible ();
3449bf257514 maint: fix botched merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16205
diff changeset
4514
18263
b5be1a2aa5ab Initial implementation for classdef methods in separate files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18262
diff changeset
4515 bool is_at_folder = ! dispatch_type.empty ();
b5be1a2aa5ab Initial implementation for classdef methods in separate files.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18262
diff changeset
4516
23533
8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects
John W. Eaton <jwe@octave.org>
parents: 23532
diff changeset
4517 octave::interpreter& interp
8edbc923a7dc begin refactoring use of interpreter/evaluator in classdef objects
John W. Eaton <jwe@octave.org>
parents: 23532
diff changeset
4518 = octave::__get_interpreter__ ("parse_fcn_file");
23532
084245f9bd03 pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents: 23502
diff changeset
4519
084245f9bd03 pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents: 23502
diff changeset
4520 fcn_ptr
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4521 = parser.m_classdef_object->make_meta_class (interp, is_at_folder);
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4522 if (fcn_ptr)
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4523 retval = octave_value (fcn_ptr);
21589
ad90fb5a139f eliminate memory leaks from classdef parse tree (bug #47372)
John W. Eaton <jwe@octave.org>
parents: 21581
diff changeset
4524
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4525 delete (parser.m_classdef_object);
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4526
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
4527 parser.m_classdef_object = nullptr;
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 14846
diff changeset
4528 }
16644
856cb7cba231 maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16595 16627
diff changeset
4529 else if (fcn_ptr)
856cb7cba231 maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16595 16627
diff changeset
4530 {
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4531 retval = octave_value (fcn_ptr);
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4532
16644
856cb7cba231 maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16595 16627
diff changeset
4533 fcn_ptr->maybe_relocate_end ();
856cb7cba231 maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16595 16627
diff changeset
4534
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4535 if (parser.m_parsing_subfunctions)
16644
856cb7cba231 maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16595 16627
diff changeset
4536 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4537 if (! parser.m_endfunction_found)
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4538 parser.m_subfunction_names.reverse ();
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4539
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
4540 fcn_ptr->stash_subfunction_names (parser.m_subfunction_names);
16644
856cb7cba231 maint: periodic merge of default to classdef
John W. Eaton <jwe@octave.org>
parents: 16595 16627
diff changeset
4541 }
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
4542 }
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
4543 }
10872
988d16d5ae34 correctly .m files that are empty or contain only comments
John W. Eaton <jwe@octave.org>
parents: 10659
diff changeset
4544 else
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
4545 error ("parse error while reading file %s", full_file.c_str ());
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
4546 }
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7699
diff changeset
4547 else if (require_file)
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
4548 error ("no such file, '%s'", full_file.c_str ());
7715
5b4d278ec828 parse scripts completely before executing
John W. Eaton <jwe@octave.org>
parents: 7699
diff changeset
4549 else if (! warn_for.empty ())
16203
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
4550 error ("%s: unable to open file '%s'", warn_for.c_str (),
127cccb037bf move more global parser and lexer variables to classes
John W. Eaton <jwe@octave.org>
parents: 16199
diff changeset
4551 full_file.c_str ());
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
4552
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4553 return retval;
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
4554 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
4555
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4556 namespace octave
5592
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman]
dbateman
parents: 5484
diff changeset
4557 {
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4558 std::string
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4559 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
4560 std::string& full_file)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4561 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4562 std::string retval;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4563
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4564 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
4565
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4566 std::string file = full_file;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4567
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4568 size_t file_len = file.length ();
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4569
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4570 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
4571 || (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
4572 || (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
4573 {
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4574 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
4575 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
4576
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4577 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
4578 if (pos != std::string::npos)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4579 file = file.substr (pos+1);
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4580 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4581
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4582 if (! file.empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4583 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4584 symbol_found = true;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4585
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4586 octave_value ov_fcn
23667
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
4587 = parse_fcn_file (full_file, file, "", "", "", true,
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
4588 false, false, false, "");
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4589
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4590 if (ov_fcn.is_defined ())
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4591 {
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4592 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
4593
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4594 if (fcn)
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4595 retval = fcn->doc_string ();
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4596 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4597 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4598
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4599 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4600 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4601
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4602 std::string
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4603 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
4604 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4605 std::string file;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4606 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
4607 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4608
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4609 std::string
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4610 lookup_autoload (const std::string& nm)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4611 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4612 std::string retval;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4613
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4614 typedef std::map<std::string, std::string>::const_iterator am_iter;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4615
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4616 am_iter p = autoload_map.find (nm);
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4617
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4618 if (p != autoload_map.end ())
23438
d24d01273bd0 eliminate load-path singleton
John W. Eaton <jwe@octave.org>
parents: 23435
diff changeset
4619 {
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4620 load_path& lp = __get_load_path__ ("lookup_autoload");
23438
d24d01273bd0 eliminate load-path singleton
John W. Eaton <jwe@octave.org>
parents: 23435
diff changeset
4621
d24d01273bd0 eliminate load-path singleton
John W. Eaton <jwe@octave.org>
parents: 23435
diff changeset
4622 retval = lp.find_file (p->second);
d24d01273bd0 eliminate load-path singleton
John W. Eaton <jwe@octave.org>
parents: 23435
diff changeset
4623 }
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4624
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4625 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4626 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4627
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4628 string_vector
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4629 autoloaded_functions (void)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4630 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4631 string_vector names (autoload_map.size ());
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4632
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4633 octave_idx_type i = 0;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4634 for (const auto& fcn_fname : autoload_map)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4635 names[i++] = fcn_fname.first;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4636
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4637 return names;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4638 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4639
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4640 string_vector
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4641 reverse_lookup_autoload (const std::string& nm)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4642 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4643 string_vector names;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4644
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4645 for (const auto& fcn_fname : autoload_map)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4646 if (nm == fcn_fname.second)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4647 names.append (fcn_fname.first);
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4648
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4649 return names;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4650 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4651
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4652 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
4653 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
4654 const std::string& dir_name,
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4655 const std::string& dispatch_type,
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4656 const std::string& package_name,
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4657 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
4658 {
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4659 octave_value retval;
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4660
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4661 unwind_protect frame;
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4662
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4663 std::string nm = file_name;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4664
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4665 size_t nm_len = nm.length ();
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4666
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4667 std::string file;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4668
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4669 bool relative_lookup = false;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4670
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4671 file = nm;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4672
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4673 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
4674 || (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
4675 || (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
4676 {
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4677 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
4678 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
4679
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4680 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
4681 if (pos != std::string::npos)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4682 nm = nm.substr (pos+1);
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4683 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4684
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4685 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
4686
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4687 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
4688
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4689 int len = file.length ();
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4690
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4691 dynamic_loader& dyn_loader
23627
0a6e87804cab don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents: 23611
diff changeset
4692 = __get_dynamic_loader__ ("~octave_mex_function");
0a6e87804cab don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents: 23611
diff changeset
4693
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4694 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
4695 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4696 if (autoload && ! fcn_name.empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4697 nm = fcn_name;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4698
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4699 octave_function *tmpfcn
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4700 = 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
4701
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4702 retval = octave_value (tmpfcn);
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4703 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4704 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
4705 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4706 // 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
4707 // 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
4708
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4709 std::string doc_string;
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4710
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4711 octave_value ov_fcn
23667
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
4712 = parse_fcn_file (file.substr (0, len - 2), nm, dir_name,
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
4713 dispatch_type, package_name, false,
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
4714 autoload, autoload, relative_lookup, "");
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4715
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4716 if (ov_fcn.is_defined ())
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4717 {
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4718 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
4719
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4720 if (tmpfcn)
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4721 doc_string = tmpfcn->doc_string ();
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4722 }
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4723
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4724 octave_function *tmpfcn
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4725 = 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
4726
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4727 if (tmpfcn)
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4728 {
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4729 tmpfcn->document (doc_string);
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4730
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4731 retval = octave_value (tmpfcn);
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4732 }
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4733 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4734 else if (len > 2)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4735 {
23667
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
4736 retval = parse_fcn_file (file, nm, dir_name, dispatch_type,
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
4737 package_name, true, autoload, autoload,
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
4738 relative_lookup, "");
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4739 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4740
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4741 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4742 }
5312
80c1aa832cb2 [project @ 2005-04-28 01:54:46 by jwe]
jwe
parents: 5309
diff changeset
4743 }
80c1aa832cb2 [project @ 2005-04-28 01:54:46 by jwe]
jwe
parents: 5309
diff changeset
4744
23553
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
4745 DEFMETHOD (autoload, interp, args, ,
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
4746 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
4747 @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
4748 @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
4749 @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
4750 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
4751
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4752 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
4753 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
4754 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
4755 path.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4756
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4757 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
4758 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
4759 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
4760 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
4761
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4762 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4763 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
4764 @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
4765
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4766 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4767 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
4768 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
4769
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4770 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4771 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
4772 @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
4773
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4774 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4775 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
4776
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4777 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
4778
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4779 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
4780 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
4781
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4782 @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
4783 @end deftypefn */)
5484
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe]
jwe
parents: 5472
diff changeset
4784 {
5626
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe]
jwe
parents: 5615
diff changeset
4785 octave_value retval;
5484
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe]
jwe
parents: 5472
diff changeset
4786
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe]
jwe
parents: 5472
diff changeset
4787 int nargin = args.length ();
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe]
jwe
parents: 5472
diff changeset
4788
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
4789 if (nargin == 1 || nargin > 3)
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
4790 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
4791
5626
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe]
jwe
parents: 5615
diff changeset
4792 if (nargin == 0)
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe]
jwe
parents: 5615
diff changeset
4793 {
10350
12884915a8e4 merge MArray classes & improve Array interface
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
4794 Cell func_names (dim_vector (autoload_map.size (), 1));
12884915a8e4 merge MArray classes & improve Array interface
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
4795 Cell file_names (dim_vector (autoload_map.size (), 1));
5626
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe]
jwe
parents: 5615
diff changeset
4796
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe]
jwe
parents: 5615
diff changeset
4797 octave_idx_type i = 0;
22872
551ac93c984c maint: Use C++ range feature to simplify some for loops in libinterp/parse-tree
Rik <rik@octave.org>
parents: 22785
diff changeset
4798 for (const auto& fcn_fname : autoload_map)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
4799 {
22872
551ac93c984c maint: Use C++ range feature to simplify some for loops in libinterp/parse-tree
Rik <rik@octave.org>
parents: 22785
diff changeset
4800 func_names(i) = fcn_fname.first;
551ac93c984c maint: Use C++ range feature to simplify some for loops in libinterp/parse-tree
Rik <rik@octave.org>
parents: 22785
diff changeset
4801 file_names(i) = fcn_fname.second;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
4802
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
4803 i++;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
4804 }
5626
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe]
jwe
parents: 5615
diff changeset
4805
11060
54697b37d8bf replace Octave_map->octave_scalar_map in oct-parse.yy and ov-fcn-handle.cc
Jaroslav Hajek <highegg@gmail.com>
parents: 10879
diff changeset
4806 octave_map m;
5626
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe]
jwe
parents: 5615
diff changeset
4807
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe]
jwe
parents: 5615
diff changeset
4808 m.assign ("function", func_names);
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe]
jwe
parents: 5615
diff changeset
4809 m.assign ("file", file_names);
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe]
jwe
parents: 5615
diff changeset
4810
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe]
jwe
parents: 5615
diff changeset
4811 retval = m;
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe]
jwe
parents: 5615
diff changeset
4812 }
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
4813 else
5484
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe]
jwe
parents: 5472
diff changeset
4814 {
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe]
jwe
parents: 5472
diff changeset
4815 string_vector argv = args.make_argv ("autoload");
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe]
jwe
parents: 5472
diff changeset
4816
20547
52ce821a52fd eliminate simple uses of error_state in parser and lexer
John W. Eaton <jwe@octave.org>
parents: 20535
diff changeset
4817 std::string nm = argv[2];
52ce821a52fd eliminate simple uses of error_state in parser and lexer
John W. Eaton <jwe@octave.org>
parents: 20535
diff changeset
4818
21732
6a1eded90355 use namespace for system env class
John W. Eaton <jwe@octave.org>
parents: 21730
diff changeset
4819 if (! octave::sys::env::absolute_pathname (nm))
6380
ac3d67504f85 [project @ 2007-03-02 22:08:06 by jwe]
jwe
parents: 6379
diff changeset
4820 {
23553
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
4821 octave::call_stack& cs = interp.get_call_stack ();
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
4822
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
4823 octave_user_code *fcn = cs.caller_user_code ();
20547
52ce821a52fd eliminate simple uses of error_state in parser and lexer
John W. Eaton <jwe@octave.org>
parents: 20535
diff changeset
4824
52ce821a52fd eliminate simple uses of error_state in parser and lexer
John W. Eaton <jwe@octave.org>
parents: 20535
diff changeset
4825 bool found = false;
52ce821a52fd eliminate simple uses of error_state in parser and lexer
John W. Eaton <jwe@octave.org>
parents: 20535
diff changeset
4826
52ce821a52fd eliminate simple uses of error_state in parser and lexer
John W. Eaton <jwe@octave.org>
parents: 20535
diff changeset
4827 if (fcn)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
4828 {
20547
52ce821a52fd eliminate simple uses of error_state in parser and lexer
John W. Eaton <jwe@octave.org>
parents: 20535
diff changeset
4829 std::string fname = fcn->fcn_file_name ();
52ce821a52fd eliminate simple uses of error_state in parser and lexer
John W. Eaton <jwe@octave.org>
parents: 20535
diff changeset
4830
52ce821a52fd eliminate simple uses of error_state in parser and lexer
John W. Eaton <jwe@octave.org>
parents: 20535
diff changeset
4831 if (! fname.empty ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
4832 {
21732
6a1eded90355 use namespace for system env class
John W. Eaton <jwe@octave.org>
parents: 21730
diff changeset
4833 fname = octave::sys::env::make_absolute (fname);
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
4834 fname = fname.substr (0, fname.find_last_of (octave::sys::file_ops::dir_sep_str ()) + 1);
20547
52ce821a52fd eliminate simple uses of error_state in parser and lexer
John W. Eaton <jwe@octave.org>
parents: 20535
diff changeset
4835
21736
0504351a45e6 use namespace for file_stat classes
John W. Eaton <jwe@octave.org>
parents: 21733
diff changeset
4836 octave::sys::file_stat fs (fname + nm);
20547
52ce821a52fd eliminate simple uses of error_state in parser and lexer
John W. Eaton <jwe@octave.org>
parents: 20535
diff changeset
4837
52ce821a52fd eliminate simple uses of error_state in parser and lexer
John W. Eaton <jwe@octave.org>
parents: 20535
diff changeset
4838 if (fs.exists ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
4839 {
20547
52ce821a52fd eliminate simple uses of error_state in parser and lexer
John W. Eaton <jwe@octave.org>
parents: 20535
diff changeset
4840 nm = fname + nm;
52ce821a52fd eliminate simple uses of error_state in parser and lexer
John W. Eaton <jwe@octave.org>
parents: 20535
diff changeset
4841 found = true;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
4842 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
4843 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
4844 }
20547
52ce821a52fd eliminate simple uses of error_state in parser and lexer
John W. Eaton <jwe@octave.org>
parents: 20535
diff changeset
4845 if (! found)
52ce821a52fd eliminate simple uses of error_state in parser and lexer
John W. Eaton <jwe@octave.org>
parents: 20535
diff changeset
4846 warning_with_id ("Octave:autoload-relative-file-name",
20713
2469d78a1d8b Consistently use 'filename' rather than 'file name' throughout code base.
Rik <rik@octave.org>
parents: 20700
diff changeset
4847 "autoload: '%s' is not an absolute filename",
20547
52ce821a52fd eliminate simple uses of error_state in parser and lexer
John W. Eaton <jwe@octave.org>
parents: 20535
diff changeset
4848 nm.c_str ());
52ce821a52fd eliminate simple uses of error_state in parser and lexer
John W. Eaton <jwe@octave.org>
parents: 20535
diff changeset
4849 }
52ce821a52fd eliminate simple uses of error_state in parser and lexer
John W. Eaton <jwe@octave.org>
parents: 20535
diff changeset
4850 if (nargin == 2)
52ce821a52fd eliminate simple uses of error_state in parser and lexer
John W. Eaton <jwe@octave.org>
parents: 20535
diff changeset
4851 autoload_map[argv[1]] = nm;
52ce821a52fd eliminate simple uses of error_state in parser and lexer
John W. Eaton <jwe@octave.org>
parents: 20535
diff changeset
4852 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
4853 {
21021
a5b99b09f8fd maint: Use comparison operators rather than compare() for strings.
Rik <rik@octave.org>
parents: 20957
diff changeset
4854 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
4855 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
4856 "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
4857
52ce821a52fd eliminate simple uses of error_state in parser and lexer
John W. Eaton <jwe@octave.org>
parents: 20535
diff changeset
4858 // Remove function from symbol table and autoload map.
23693
b9378eff6d13 move symbol_table class inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23673
diff changeset
4859 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
4860 symtab.clear_dld_function (argv[1]);
20547
52ce821a52fd eliminate simple uses of error_state in parser and lexer
John W. Eaton <jwe@octave.org>
parents: 20535
diff changeset
4861 autoload_map.erase (argv[1]);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
4862 }
5484
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe]
jwe
parents: 5472
diff changeset
4863 }
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe]
jwe
parents: 5472
diff changeset
4864
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe]
jwe
parents: 5472
diff changeset
4865 return retval;
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe]
jwe
parents: 5472
diff changeset
4866 }
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe]
jwe
parents: 5472
diff changeset
4867
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4868 namespace octave
4486
6ceba1f351fb [project @ 2003-08-22 16:49:46 by jwe]
jwe
parents: 4463
diff changeset
4869 {
23845
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files.
John W. Eaton <jwe@octave.org>
parents: 23841
diff changeset
4870 // Execute the contents of a script file. For compatibility with
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files.
John W. Eaton <jwe@octave.org>
parents: 23841
diff changeset
4871 // Matlab, also execute a function file by calling the function it
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files.
John W. Eaton <jwe@octave.org>
parents: 23841
diff changeset
4872 // defines with no arguments and nargout = 0.
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files.
John W. Eaton <jwe@octave.org>
parents: 23841
diff changeset
4873
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4874 void
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4875 source_file (const std::string& file_name, const std::string& context,
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4876 bool verbose, bool require_file, const std::string& warn_for)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4877 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4878 // Map from absolute name of script file to recursion level. We
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4879 // use a map instead of simply placing a limit on recursion in the
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4880 // source_file function so that two mutually recursive scripts
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4881 // written as
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4882 //
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4883 // foo1.m:
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4884 // ------
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4885 // foo2
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4886 //
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4887 // foo2.m:
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4888 // ------
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4889 // foo1
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4890 //
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4891 // and called with
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4892 //
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4893 // foo1
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4894 //
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4895 // (for example) will behave the same if they are written as
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4896 //
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4897 // foo1.m:
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4898 // ------
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4899 // source ("foo2.m")
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4900 //
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4901 // foo2.m:
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4902 // ------
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4903 // source ("foo1.m")
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4904 //
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4905 // and called with
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4906 //
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4907 // source ("foo1.m")
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4908 //
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4909 // (for example).
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4910
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4911 static std::map<std::string, int> source_call_depth;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4912
23631
0954bf188bed avoid memory leak in source_file function
John W. Eaton <jwe@octave.org>
parents: 23628
diff changeset
4913 std::string file_full_name
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4914 = sys::file_ops::tilde_expand (file_name);
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4915
23667
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
4916 size_t pos
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4917 = file_full_name.find_last_of (sys::file_ops::dir_sep_str ());
23667
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
4918
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
4919 std::string dir_name = file_full_name.substr (0, pos);
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
4920
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4921 file_full_name = sys::env::make_absolute (file_full_name);
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4922
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4923 unwind_protect frame;
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4924
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4925 if (source_call_depth.find (file_full_name) == source_call_depth.end ())
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4926 source_call_depth[file_full_name] = -1;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4927
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4928 frame.protect_var (source_call_depth[file_full_name]);
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4929
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4930 source_call_depth[file_full_name]++;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4931
23705
4c597585ff52 move Vmax_recursion_depth and Vsilent_functions to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23702
diff changeset
4932 tree_evaluator& tw = __get_evaluator__ ("source_file");
4c597585ff52 move Vmax_recursion_depth and Vsilent_functions to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23702
diff changeset
4933
4c597585ff52 move Vmax_recursion_depth and Vsilent_functions to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23702
diff changeset
4934 if (source_call_depth[file_full_name] >= tw.max_recursion_depth ())
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4935 error ("max_recursion_depth exceeded");
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4936
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4937 if (! context.empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4938 {
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4939 call_stack& cs = __get_call_stack__ ("source_file");
23553
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
4940
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4941 if (context == "caller")
23553
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
4942 cs.goto_caller_frame ();
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4943 else if (context == "base")
23553
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
4944 cs.goto_base_frame ();
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4945 else
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4946 error ("source: context must be \"caller\" or \"base\"");
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4947
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4948 frame.add_method (cs, &call_stack::pop);
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4949 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4950
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4951 // Find symbol name that would be in symbol_table, if it were loaded.
23631
0954bf188bed avoid memory leak in source_file function
John W. Eaton <jwe@octave.org>
parents: 23628
diff changeset
4952 size_t dir_end
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4953 = file_name.find_last_of (sys::file_ops::dir_sep_chars ());
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4954 dir_end = (dir_end == std::string::npos) ? 0 : dir_end + 1;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4955
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4956 size_t extension = file_name.find_last_of ('.');
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4957 if (extension == std::string::npos)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4958 extension = file_name.length ();
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4959
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4960 std::string symbol = file_name.substr (dir_end, extension - dir_end);
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4961 std::string full_name = sys::canonicalize_file_name (file_name);
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4962
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4963 // Check if this file is already loaded (or in the path)
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4964 symbol_table& symtab = __get_symbol_table__ ("source_file");
23631
0954bf188bed avoid memory leak in source_file function
John W. Eaton <jwe@octave.org>
parents: 23628
diff changeset
4965 octave_value ov_code = symtab.find (symbol);
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4966
23845
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files.
John W. Eaton <jwe@octave.org>
parents: 23841
diff changeset
4967 // For compatibility with Matlab, accept both scripts and
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files.
John W. Eaton <jwe@octave.org>
parents: 23841
diff changeset
4968 // functions.
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files.
John W. Eaton <jwe@octave.org>
parents: 23841
diff changeset
4969
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files.
John W. Eaton <jwe@octave.org>
parents: 23841
diff changeset
4970 if (ov_code.is_user_code ())
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4971 {
23845
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files.
John W. Eaton <jwe@octave.org>
parents: 23841
diff changeset
4972 octave_user_code *code = ov_code.user_code_value ();
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files.
John W. Eaton <jwe@octave.org>
parents: 23841
diff changeset
4973
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files.
John W. Eaton <jwe@octave.org>
parents: 23841
diff changeset
4974 if (! code
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files.
John W. Eaton <jwe@octave.org>
parents: 23841
diff changeset
4975 || (sys::canonicalize_file_name (code->fcn_file_name ())
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4976 != full_name))
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4977 {
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4978 // Wrong file, so load it below.
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4979 ov_code = octave_value ();
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4980 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4981 }
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4982 else
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4983 {
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4984 // Not a script, so load it below.
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4985 ov_code = octave_value ();
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4986 }
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4987
23631
0954bf188bed avoid memory leak in source_file function
John W. Eaton <jwe@octave.org>
parents: 23628
diff changeset
4988 // If no symbol of this name, or the symbol is for a different
0954bf188bed avoid memory leak in source_file function
John W. Eaton <jwe@octave.org>
parents: 23628
diff changeset
4989 // file, load.
0954bf188bed avoid memory leak in source_file function
John W. Eaton <jwe@octave.org>
parents: 23628
diff changeset
4990
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
4991 if (ov_code.is_undefined ())
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4992 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4993 try
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4994 {
23667
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
4995 ov_code = parse_fcn_file (file_full_name, file_name, dir_name,
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
4996 "", "", require_file, true, false,
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
4997 false, warn_for);
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
4998 }
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
4999 catch (execution_exception& e)
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5000 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5001 error (e, "source: error sourcing file '%s'",
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5002 file_full_name.c_str ());
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5003 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5004 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5005
23845
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files.
John W. Eaton <jwe@octave.org>
parents: 23841
diff changeset
5006 // Return or error if we don't have a valid script or function.
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files.
John W. Eaton <jwe@octave.org>
parents: 23841
diff changeset
5007
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5008 if (ov_code.is_undefined ())
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5009 return;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5010
23845
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files.
John W. Eaton <jwe@octave.org>
parents: 23841
diff changeset
5011 if (! ov_code.is_user_code ())
23631
0954bf188bed avoid memory leak in source_file function
John W. Eaton <jwe@octave.org>
parents: 23628
diff changeset
5012 error ("source: %s is not a script", full_name.c_str ());
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5013
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5014 if (verbose)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5015 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5016 std::cout << "executing commands from " << full_name << " ... ";
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5017 std::cout.flush ();
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5018 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5019
23845
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files.
John W. Eaton <jwe@octave.org>
parents: 23841
diff changeset
5020 octave_user_code *code = ov_code.user_code_value ();
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files.
John W. Eaton <jwe@octave.org>
parents: 23841
diff changeset
5021
3cace95ce563 * oct-parse.in.yy (source_file): Restore source-ing of function files.
John W. Eaton <jwe@octave.org>
parents: 23841
diff changeset
5022 code->call (tw, 0, octave_value_list ());
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5023
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5024 if (verbose)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5025 std::cout << "done." << std::endl;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5026 }
4486
6ceba1f351fb [project @ 2003-08-22 16:49:46 by jwe]
jwe
parents: 4463
diff changeset
5027 }
6ceba1f351fb [project @ 2003-08-22 16:49:46 by jwe]
jwe
parents: 4463
diff changeset
5028
23553
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
5029 DEFMETHOD (mfilename, interp, args, ,
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
5030 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
5031 @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
5032 @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
5033 @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
5034 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
5035
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5036 When called from outside an m-file return the empty string.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5037
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5038 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
5039 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
5040
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5041 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
5042 the filename and the extension.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5043 @end deftypefn */)
5739
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5044 {
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5045 octave_value retval;
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5046
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5047 int nargin = args.length ();
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5048
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5049 if (nargin > 1)
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5050 print_usage ();
5739
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5051
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5052 std::string arg;
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5053
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5054 if (nargin == 1)
21861
a55f1fa2c94a oct-parse.in.yy: Shorten lines to < 80 characters where possible.
Rik <rik@octave.org>
parents: 21748
diff changeset
5055 arg = args(0).xstring_value ("mfilename: argument must be a string");
5739
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5056
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5057 std::string fname;
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5058
23553
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
5059 octave::call_stack& cs = interp.get_call_stack ();
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
5060
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
5061 octave_user_code *fcn = cs.caller_user_code ();
5743
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe]
jwe
parents: 5739
diff changeset
5062
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe]
jwe
parents: 5739
diff changeset
5063 if (fcn)
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe]
jwe
parents: 5739
diff changeset
5064 {
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe]
jwe
parents: 5739
diff changeset
5065 fname = fcn->fcn_file_name ();
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe]
jwe
parents: 5739
diff changeset
5066
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe]
jwe
parents: 5739
diff changeset
5067 if (fname.empty ())
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe]
jwe
parents: 5739
diff changeset
5068 fname = fcn->name ();
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe]
jwe
parents: 5739
diff changeset
5069 }
5739
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5070
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5071 if (arg == "fullpathext")
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5072 retval = fname;
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5073 else
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5074 {
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
5075 size_t dpos = fname.rfind (octave::sys::file_ops::dir_sep_char ());
5747
b09d4d0f5b63 [project @ 2006-04-07 06:43:10 by jwe]
jwe
parents: 5744
diff changeset
5076 size_t epos = fname.rfind ('.');
b09d4d0f5b63 [project @ 2006-04-07 06:43:10 by jwe]
jwe
parents: 5744
diff changeset
5077
b09d4d0f5b63 [project @ 2006-04-07 06:43:10 by jwe]
jwe
parents: 5744
diff changeset
5078 if (epos <= dpos)
8021
85184151822e fix typo in NPOS change
John W. Eaton <jwe@octave.org>
parents: 8019
diff changeset
5079 epos = std::string::npos;
85184151822e fix typo in NPOS change
John W. Eaton <jwe@octave.org>
parents: 8019
diff changeset
5080
85184151822e fix typo in NPOS change
John W. Eaton <jwe@octave.org>
parents: 8019
diff changeset
5081 fname = (epos != std::string::npos) ? fname.substr (0, epos) : fname;
5739
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5082
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5083 if (arg == "fullpath")
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
5084 retval = fname;
5739
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5085 else
8021
85184151822e fix typo in NPOS change
John W. Eaton <jwe@octave.org>
parents: 8019
diff changeset
5086 retval = (dpos != std::string::npos) ? fname.substr (dpos+1) : fname;
5739
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5087 }
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5088
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5089 return retval;
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5090 }
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe]
jwe
parents: 5667
diff changeset
5091
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5092 DEFUN (source, args, ,
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5093 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
5094 @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
5095 @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
5096 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
5097
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5098 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
5099 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
5100 @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
5101
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5102 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
5103 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
5104 (@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
5105 @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
5106 @end deftypefn */)
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5107 {
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5108 octave_value_list retval;
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5109
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5110 int nargin = args.length ();
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5111
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5112 if (nargin < 1 || nargin > 2)
5823
080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe]
jwe
parents: 5794
diff changeset
5113 print_usage ();
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5114
21861
a55f1fa2c94a oct-parse.in.yy: Shorten lines to < 80 characters where possible.
Rik <rik@octave.org>
parents: 21748
diff changeset
5115 std::string file_name = args(0).xstring_value ("source: FILE must be a string");
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5116
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5117 std::string context;
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5118
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5119 if (nargin == 2)
21861
a55f1fa2c94a oct-parse.in.yy: Shorten lines to < 80 characters where possible.
Rik <rik@octave.org>
parents: 21748
diff changeset
5120 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
5121
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5122 octave::source_file (file_name, context);
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5123
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5124 return retval;
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5125 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5126
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5127 namespace octave
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5128 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5129 /*!
22298
18535a29a8e8 doc: improve documentation on oct-parse.in.yy(feval) (patch #9082)
Ernst Reissner <rei3ner@arcor.de>
parents: 22196
diff changeset
5130 Evaluate an Octave function (built-in or interpreted) and return
18535a29a8e8 doc: improve documentation on oct-parse.in.yy(feval) (patch #9082)
Ernst Reissner <rei3ner@arcor.de>
parents: 22196
diff changeset
5131 the list of result values.
18535a29a8e8 doc: improve documentation on oct-parse.in.yy(feval) (patch #9082)
Ernst Reissner <rei3ner@arcor.de>
parents: 22196
diff changeset
5132
22300
aa5360a5cd3b doc fix
John W. Eaton <jwe@octave.org>
parents: 22298
diff changeset
5133 @param name The name of the function to call.
aa5360a5cd3b doc fix
John W. Eaton <jwe@octave.org>
parents: 22298
diff changeset
5134 @param args The arguments to the function.
aa5360a5cd3b doc fix
John W. Eaton <jwe@octave.org>
parents: 22298
diff changeset
5135 @param nargout The number of output arguments expected.
aa5360a5cd3b doc fix
John W. Eaton <jwe@octave.org>
parents: 22298
diff changeset
5136 @return A list of output values. The length of the list is not
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5137 necessarily the same as @c nargout.
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5138
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5139 */
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5140 octave_value_list
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5141 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
5142 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5143 octave_value_list retval;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5144
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
5145 symbol_table& symtab = __get_symbol_table__ ("feval");
23599
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23577
diff changeset
5146
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23577
diff changeset
5147 octave_value fcn = symtab.find_function (name, args);
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5148
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5149 if (fcn.is_defined ())
23502
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5150 {
23532
084245f9bd03 pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents: 23502
diff changeset
5151 tree_evaluator& tw = __get_evaluator__ ("feval");
084245f9bd03 pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents: 23502
diff changeset
5152
23502
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5153 octave_function *of = fcn.function_value ();
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5154
23532
084245f9bd03 pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents: 23502
diff changeset
5155 retval = of->call (tw, nargout, args);
23502
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5156 }
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5157 else
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5158 error ("feval: function '%s' not found", name.c_str ());
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5159
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5160 return retval;
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
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5163 octave_value_list
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5164 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
5165 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5166 octave_value_list retval;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5167
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5168 if (fcn)
23532
084245f9bd03 pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents: 23502
diff changeset
5169 {
084245f9bd03 pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents: 23502
diff changeset
5170 tree_evaluator& tw = __get_evaluator__ ("feval");
084245f9bd03 pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents: 23502
diff changeset
5171
084245f9bd03 pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents: 23502
diff changeset
5172 retval = fcn->call (tw, nargout, args);
084245f9bd03 pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents: 23502
diff changeset
5173 }
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5174
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5175 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5176 }
23502
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5177
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5178 octave_value_list
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5179 feval (octave_value& val, const octave_value_list& args, int nargout)
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5180 {
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5181 if (val.is_function ())
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5182 {
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
5183 return feval (val.function_value (), args, nargout);
23502
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5184 }
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5185 else if (val.is_function_handle ())
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5186 {
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5187 // This covers function handles, inline functions, and anonymous
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5188 // functions.
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5189
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5190 std::list<octave_value_list> arg_list;
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5191 arg_list.push_back (args);
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5192
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5193 return val.subsref ("(", arg_list, nargout);
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5194 }
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5195 else if (val.is_string ())
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5196 {
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
5197 return feval (val.string_value (), args, nargout);
23502
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5198 }
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5199 else
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5200 error ("feval: first argument must be a string, inline function, or a function handle");
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5201
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5202 return ovl ();
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5203 }
4342
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe]
jwe
parents: 4318
diff changeset
5204 }
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe]
jwe
parents: 4318
diff changeset
5205
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe]
jwe
parents: 4318
diff changeset
5206 static octave_value_list
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe]
jwe
parents: 4318
diff changeset
5207 get_feval_args (const octave_value_list& args)
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe]
jwe
parents: 4318
diff changeset
5208 {
10659
8baff2aceabc fix slicing value lists with name tags (bug #29960)
Jaroslav Hajek <highegg@gmail.com>
parents: 10578
diff changeset
5209 return args.slice (1, args.length () - 1, true);
4342
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe]
jwe
parents: 4318
diff changeset
5210 }
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe]
jwe
parents: 4318
diff changeset
5211
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5212 namespace octave
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5213 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5214 /*!
22298
18535a29a8e8 doc: improve documentation on oct-parse.in.yy(feval) (patch #9082)
Ernst Reissner <rei3ner@arcor.de>
parents: 22196
diff changeset
5215 Evaluate an Octave function (built-in or interpreted) and return
18535a29a8e8 doc: improve documentation on oct-parse.in.yy(feval) (patch #9082)
Ernst Reissner <rei3ner@arcor.de>
parents: 22196
diff changeset
5216 the list of result values.
18535a29a8e8 doc: improve documentation on oct-parse.in.yy(feval) (patch #9082)
Ernst Reissner <rei3ner@arcor.de>
parents: 22196
diff changeset
5217
22300
aa5360a5cd3b doc fix
John W. Eaton <jwe@octave.org>
parents: 22298
diff changeset
5218 @param args The first element of @c args is the function to call.
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5219 It may be the name of the function as a string, a function
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5220 handle, or an inline function. The remaining arguments are
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5221 passed to the function.
22300
aa5360a5cd3b doc fix
John W. Eaton <jwe@octave.org>
parents: 22298
diff changeset
5222 @param nargout The number of output arguments expected.
aa5360a5cd3b doc fix
John W. Eaton <jwe@octave.org>
parents: 22298
diff changeset
5223 @return A list of output values. The length of the list is not
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5224 necessarily the same as @c nargout.
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5225 */
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5226 octave_value_list
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5227 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
5228 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5229 if (args.length () > 0)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5230 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5231 octave_value f_arg = args(0);
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5232
23502
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5233 octave_value_list tmp_args = get_feval_args (args);
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5234
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
5235 return feval (f_arg, tmp_args, nargout);
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5236 }
23502
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5237 else
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5238 error ("feval: first argument must be a string, inline function, or a function handle");
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5239
c6714ae1c06c eliminate remaining do_multi_index_op methods
John W. Eaton <jwe@octave.org>
parents: 23479
diff changeset
5240 return ovl ();
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5241 }
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5242 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5243
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5244 DEFUN (feval, args, nargout,
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5245 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
5246 @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
5247 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
5248
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5249 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
5250 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
5251
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5252 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5253 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5254 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
5255 @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
5256 @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
5257 @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
5258
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5259 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5260 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
5261
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5262 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
5263 (@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
5264 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
5265 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
5266
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5267 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5268 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5269 @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
5270 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
5271 @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
5272 @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
5273 @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
5274 @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
5275 @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
5276
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5277 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5278 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
5279 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
5280 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
5281 instead.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5282 @end deftypefn */)
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5283 {
20818
cef0448a6ed2 eliminate unnecessary uses of nargin
John W. Eaton <jwe@octave.org>
parents: 20798
diff changeset
5284 if (args.length () == 0)
5823
080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe]
jwe
parents: 5794
diff changeset
5285 print_usage ();
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5286
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5287 return octave::feval (args, nargout);
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5288 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5289
23599
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23577
diff changeset
5290 DEFMETHOD (builtin, interp, args, nargout,
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23577
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 {} {[@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
5293 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
5294 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
5295
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5296 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
5297 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
5298 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
5299
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5300 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
5301 @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
5302
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5303 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5304 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5305 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
5306 @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
5307 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
5308 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
5309 @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
5310 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
5311 @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
5312 @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
5313 @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
5314 @end deftypefn */)
11225
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 11138
diff changeset
5315 {
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11572
diff changeset
5316 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
5317
20818
cef0448a6ed2 eliminate unnecessary uses of nargin
John W. Eaton <jwe@octave.org>
parents: 20798
diff changeset
5318 if (args.length () == 0)
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5319 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5320
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5321 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
5322
23693
b9378eff6d13 move symbol_table class inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23673
diff changeset
5323 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
5324
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23577
diff changeset
5325 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
5326
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5327 if (fcn.is_defined ())
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5328 retval = octave::feval (fcn.function_value (), args.splice (0, 1), nargout);
11225
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 11138
diff changeset
5329 else
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5330 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
5331
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 11138
diff changeset
5332 return retval;
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 11138
diff changeset
5333 }
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy
John W. Eaton <jwe@octave.org>
parents: 11138
diff changeset
5334
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5335 namespace octave
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5336 {
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5337 octave_value_list
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5338 eval_string (const std::string& eval_str, bool silent,
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5339 int& parse_status, int nargout)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5340 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5341 octave_value_list retval;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5342
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
5343 parser parser (eval_str);
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5344
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5345 do
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5346 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5347 parser.reset ();
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5348
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5349 parse_status = parser.run ();
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5350
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5351 if (parse_status == 0)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5352 {
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
5353 if (parser.m_stmt_list)
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5354 {
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
5355 tree_statement *stmt = nullptr;
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5356
23696
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23694
diff changeset
5357 tree_evaluator& tw = __get_evaluator__ ("eval_string");
23532
084245f9bd03 pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents: 23502
diff changeset
5358
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
5359 if (parser.m_stmt_list->length () == 1
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
5360 && (stmt = parser.m_stmt_list->front ())
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5361 && stmt->is_expression ())
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5362 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5363 tree_expression *expr = stmt->expression ();
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5364
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5365 if (silent)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5366 expr->set_print_flag (false);
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5367
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5368 bool do_bind_ans = false;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5369
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5370 if (expr->is_identifier ())
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5371 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5372 tree_identifier *id
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5373 = dynamic_cast<tree_identifier *> (expr);
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5374
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5375 do_bind_ans = (! id->is_variable ());
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5376 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5377 else
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5378 do_bind_ans = (! expr->is_assignment_expression ());
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5379
23532
084245f9bd03 pass reference to evaluator to octave_function call methods
John W. Eaton <jwe@octave.org>
parents: 23502
diff changeset
5380 retval = tw.evaluate_n (expr, nargout);
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5381
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5382 if (do_bind_ans && ! retval.empty ())
23702
d396b5fd9199 move bind_ans to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
5383 tw.bind_ans (retval(0), expr->print_result ());
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5384
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5385 if (nargout == 0)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5386 retval = octave_value_list ();
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5387 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5388 else if (nargout == 0)
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
5389 parser.m_stmt_list->accept (tw);
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5390 else
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5391 error ("eval: invalid use of statement list");
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5392
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5393 if (tree_return_command::returning
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5394 || tree_break_command::breaking
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5395 || tree_continue_command::continuing)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5396 break;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5397 }
23694
4a62da62af09 use m_ prefix for member variables in parser
John W. Eaton <jwe@octave.org>
parents: 23693
diff changeset
5398 else if (parser.m_lexer.end_of_input)
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5399 break;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5400 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5401 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5402 while (parse_status == 0);
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5403
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5404 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5405 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5406
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5407 octave_value
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5408 eval_string (const std::string& eval_str, bool silent, int& parse_status)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5409 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5410 octave_value retval;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5411
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5412 octave_value_list tmp = eval_string (eval_str, silent, parse_status, 1);
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5413
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5414 if (! tmp.empty ())
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5415 retval = tmp(0);
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5416
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5417 return retval;
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5418 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5419
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5420 static octave_value_list
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5421 eval_string (const octave_value& arg, bool silent, int& parse_status,
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5422 int nargout)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5423 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5424 std::string s = arg.xstring_value ("eval: expecting std::string argument");
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5425
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5426 return eval_string (s, silent, parse_status, nargout);
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5427 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5428
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5429 void
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5430 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
5431 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5432 if (*lst)
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5433 {
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5434 delete *lst;
23796
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23750
diff changeset
5435 *lst = nullptr;
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5436 }
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5437 }
13970
c93b953f7d54 plug some memory leaks
John W. Eaton <jwe@octave.org>
parents: 13844
diff changeset
5438 }
c93b953f7d54 plug some memory leaks
John W. Eaton <jwe@octave.org>
parents: 13844
diff changeset
5439
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5440 DEFUN (eval, args, nargout,
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5441 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
5442 @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
5443 @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
5444 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
5445 program.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5446
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5447 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
5448
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5449 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
5450 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
5451
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5452 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
5453 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
5454
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5455 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5456 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
5457 @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
5458
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5459 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
5460 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
5461
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5462 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5463 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5464 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
5465 '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
5466 @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
5467 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
5468 @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
5469 @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
5470
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5471 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
5472 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
5473 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
5474 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
5475 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
5476 does.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5477 @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
5478 @end deftypefn */)
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5479 {
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5480 octave_value_list retval;
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5481
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5482 int nargin = args.length ();
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5483
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5484 if (nargin == 0)
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5485 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5486
21743
f4d7d0eb5b0c use namespace for unwind_protect class
John W. Eaton <jwe@octave.org>
parents: 21740
diff changeset
5487 octave::unwind_protect frame;
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5488
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5489 if (nargin > 1)
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5490 {
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5491 frame.protect_var (buffer_error_messages);
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5492 buffer_error_messages++;
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5493 }
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5494
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5495 int parse_status = 0;
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5496
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5497 bool execution_error = false;
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5498
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5499 octave_value_list tmp;
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5500
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5501 try
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5502 {
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5503 tmp = octave::eval_string (args(0), nargout > 0, parse_status, nargout);
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5504 }
22327
d0562b3159c7 move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22323
diff changeset
5505 catch (const octave::execution_exception&)
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5506 {
23110
af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23100
diff changeset
5507 octave::interpreter::recover_from_exception ();
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5508
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5509 execution_error = true;
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5510 }
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5511
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5512 if (nargin > 1 && (parse_status != 0 || execution_error))
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5513 {
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5514 // Set up for letting the user print any messages from
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5515 // errors that occurred in the first part of this eval().
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5516
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5517 buffer_error_messages--;
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5518
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5519 tmp = octave::eval_string (args(1), nargout > 0, parse_status, nargout);
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5520
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5521 if (nargout > 0)
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5522 retval = tmp;
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5523 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5524 else
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5525 {
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5526 if (nargout > 0)
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5527 retval = tmp;
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5528
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5529 // FIXME: we should really be rethrowing whatever exception occurred,
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5530 // not just throwing an execution exception.
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5531 if (execution_error)
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5532 octave_throw_execution_exception ();
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5533 }
3021
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5534
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5535 return retval;
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5536 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe]
jwe
parents: 3016
diff changeset
5537
7562
c827f5673321 move tests to individual source files
John W. Eaton <jwe@octave.org>
parents: 7351
diff changeset
5538 /*
c827f5673321 move tests to individual source files
John W. Eaton <jwe@octave.org>
parents: 7351
diff changeset
5539
14084
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5540 %!shared x
7562
c827f5673321 move tests to individual source files
John W. Eaton <jwe@octave.org>
parents: 7351
diff changeset
5541 %! x = 1;
14084
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5542
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5543 %!assert (eval ("x"), 1)
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5544 %!assert (eval ("x;"))
21317
a4faec57f4c8 maint: remove semicolon after %!assert tests to follow Octave conventions.
Rik <rik@octave.org>
parents: 21301
diff changeset
5545 %!assert (eval ("x;"), 1)
14084
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5546
7562
c827f5673321 move tests to individual source files
John W. Eaton <jwe@octave.org>
parents: 7351
diff changeset
5547 %!test
14084
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5548 %! y = eval ("x");
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5549 %! assert (y, 1);
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5550
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5551 %!test
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5552 %! y = eval ("x;");
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5553 %! assert (y, 1);
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5554
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5555 %!test
21580
ecce63c99c3f maint: Add semicolons to terminate code in %! blocks.
Rik <rik@octave.org>
parents: 21416
diff changeset
5556 %! eval ("x = 1;");
14084
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5557 %! assert (x,1);
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5558
7562
c827f5673321 move tests to individual source files
John W. Eaton <jwe@octave.org>
parents: 7351
diff changeset
5559 %!test
c827f5673321 move tests to individual source files
John W. Eaton <jwe@octave.org>
parents: 7351
diff changeset
5560 %! eval ("flipud = 2;");
14084
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5561 %! assert (flipud, 2);
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5562
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5563 %!function y = __f ()
7562
c827f5673321 move tests to individual source files
John W. Eaton <jwe@octave.org>
parents: 7351
diff changeset
5564 %! eval ("flipud = 2;");
c827f5673321 move tests to individual source files
John W. Eaton <jwe@octave.org>
parents: 7351
diff changeset
5565 %! y = flipud;
14084
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5566 %!endfunction
5aba9fa234cf Modernize %!tests for eval()
Rik <octave@nomad.inbox5.com>
parents: 13970
diff changeset
5567 %!assert (__f(), 2)
7562
c827f5673321 move tests to individual source files
John W. Eaton <jwe@octave.org>
parents: 7351
diff changeset
5568
14533
e6aa044253eb Allow comma at the end of an assignment list (bug #35645)
Max Brister <max@2bass.com>
parents: 14512
diff changeset
5569 % bug #35645
e6aa044253eb Allow comma at the end of an assignment list (bug #35645)
Max Brister <max@2bass.com>
parents: 14512
diff changeset
5570 %!test
e6aa044253eb Allow comma at the end of an assignment list (bug #35645)
Max Brister <max@2bass.com>
parents: 14512
diff changeset
5571 %! [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
5572 %! [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
5573
21581
6fab85c1538f maint: Follow Octave conventions for use of semicolon in BIST tests.
Rik <rik@octave.org>
parents: 21580
diff changeset
5574 %!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
5575
7562
c827f5673321 move tests to individual source files
John W. Eaton <jwe@octave.org>
parents: 7351
diff changeset
5576 */
c827f5673321 move tests to individual source files
John W. Eaton <jwe@octave.org>
parents: 7351
diff changeset
5577
23553
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
5578 DEFMETHOD (assignin, interp, args, ,
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
5579 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
5580 @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
5581 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
5582 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
5583 @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
5584 @end deftypefn */)
4297
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe]
jwe
parents: 4246
diff changeset
5585 {
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe]
jwe
parents: 4246
diff changeset
5586 octave_value_list retval;
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe]
jwe
parents: 4246
diff changeset
5587
20818
cef0448a6ed2 eliminate unnecessary uses of nargin
John W. Eaton <jwe@octave.org>
parents: 20798
diff changeset
5588 if (args.length () != 3)
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5589 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5590
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5591 std::string context = args(0).xstring_value ("assignin: CONTEXT must be a string");
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5592
21743
f4d7d0eb5b0c use namespace for unwind_protect class
John W. Eaton <jwe@octave.org>
parents: 21740
diff changeset
5593 octave::unwind_protect frame;
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5594
23553
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
5595 octave::call_stack& cs = interp.get_call_stack ();
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
5596
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5597 if (context == "caller")
23553
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
5598 cs.goto_caller_frame ();
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5599 else if (context == "base")
23553
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
5600 cs.goto_base_frame ();
4297
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe]
jwe
parents: 4246
diff changeset
5601 else
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5602 error ("assignin: CONTEXT must be \"caller\" or \"base\"");
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5603
23553
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
5604 frame.add_method (cs, &octave::call_stack::pop);
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5605
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5606 std::string nm = args(1).xstring_value ("assignin: VARNAME must be a string");
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5607
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5608 if (valid_identifier (nm))
21369
105224df2330 also disallow assignment to keywords in assignin (bug #46459)
John W. Eaton <jwe@octave.org>
parents: 21361
diff changeset
5609 {
105224df2330 also disallow assignment to keywords in assignin (bug #46459)
John W. Eaton <jwe@octave.org>
parents: 21361
diff changeset
5610 // Put the check here so that we don't slow down assignments
105224df2330 also disallow assignment to keywords in assignin (bug #46459)
John W. Eaton <jwe@octave.org>
parents: 21361
diff changeset
5611 // generally. Any that go through Octave's parser should have
105224df2330 also disallow assignment to keywords in assignin (bug #46459)
John W. Eaton <jwe@octave.org>
parents: 21361
diff changeset
5612 // already been checked.
105224df2330 also disallow assignment to keywords in assignin (bug #46459)
John W. Eaton <jwe@octave.org>
parents: 21361
diff changeset
5613
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22094
diff changeset
5614 if (octave::is_keyword (nm))
21369
105224df2330 also disallow assignment to keywords in assignin (bug #46459)
John W. Eaton <jwe@octave.org>
parents: 21361
diff changeset
5615 error ("assignin: invalid assignment to keyword '%s'", nm.c_str ());
105224df2330 also disallow assignment to keywords in assignin (bug #46459)
John W. Eaton <jwe@octave.org>
parents: 21361
diff changeset
5616
23693
b9378eff6d13 move symbol_table class inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23673
diff changeset
5617 octave::symbol_table::scope *scope = interp.get_current_scope ();
23611
91c8f006ed8b remove additional functions from symbol_table class
John W. Eaton <jwe@octave.org>
parents: 23603
diff changeset
5618
91c8f006ed8b remove additional functions from symbol_table class
John W. Eaton <jwe@octave.org>
parents: 23603
diff changeset
5619 if (scope)
91c8f006ed8b remove additional functions from symbol_table class
John W. Eaton <jwe@octave.org>
parents: 23603
diff changeset
5620 scope->assign (nm, args(2));
21369
105224df2330 also disallow assignment to keywords in assignin (bug #46459)
John W. Eaton <jwe@octave.org>
parents: 21361
diff changeset
5621 }
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5622 else
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5623 error ("assignin: invalid variable name in argument VARNAME");
4297
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe]
jwe
parents: 4246
diff changeset
5624
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe]
jwe
parents: 4246
diff changeset
5625 return retval;
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe]
jwe
parents: 4246
diff changeset
5626 }
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe]
jwe
parents: 4246
diff changeset
5627
21369
105224df2330 also disallow assignment to keywords in assignin (bug #46459)
John W. Eaton <jwe@octave.org>
parents: 21361
diff changeset
5628 /*
105224df2330 also disallow assignment to keywords in assignin (bug #46459)
John W. Eaton <jwe@octave.org>
parents: 21361
diff changeset
5629
21581
6fab85c1538f maint: Follow Octave conventions for use of semicolon in BIST tests.
Rik <rik@octave.org>
parents: 21580
diff changeset
5630 %!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
5631
105224df2330 also disallow assignment to keywords in assignin (bug #46459)
John W. Eaton <jwe@octave.org>
parents: 21361
diff changeset
5632 */
105224df2330 also disallow assignment to keywords in assignin (bug #46459)
John W. Eaton <jwe@octave.org>
parents: 21361
diff changeset
5633
23553
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
5634 DEFMETHOD (evalin, interp, args, nargout,
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
5635 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
5636 @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
5637 @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
5638 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
5639 @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
5640 @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
5641 @end deftypefn */)
4245
610671be8792 [project @ 2002-12-28 04:02:31 by jwe]
jwe
parents: 4244
diff changeset
5642 {
610671be8792 [project @ 2002-12-28 04:02:31 by jwe]
jwe
parents: 4244
diff changeset
5643 octave_value_list retval;
610671be8792 [project @ 2002-12-28 04:02:31 by jwe]
jwe
parents: 4244
diff changeset
5644
610671be8792 [project @ 2002-12-28 04:02:31 by jwe]
jwe
parents: 4244
diff changeset
5645 int nargin = args.length ();
610671be8792 [project @ 2002-12-28 04:02:31 by jwe]
jwe
parents: 4244
diff changeset
5646
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5647 if (nargin < 2)
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5648 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5649
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5650 std::string context = args(0).xstring_value ("evalin: CONTEXT must be a string");
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5651
21743
f4d7d0eb5b0c use namespace for unwind_protect class
John W. Eaton <jwe@octave.org>
parents: 21740
diff changeset
5652 octave::unwind_protect frame;
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5653
23553
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
5654 octave::call_stack& cs = interp.get_call_stack ();
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
5655
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5656 if (context == "caller")
23553
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
5657 cs.goto_caller_frame ();
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5658 else if (context == "base")
23553
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
5659 cs.goto_base_frame ();
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5660 else
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5661 error ("evalin: CONTEXT must be \"caller\" or \"base\"");
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5662
23553
14723784b9f2 don't use singleton for call_stack
John W. Eaton <jwe@octave.org>
parents: 23533
diff changeset
5663 frame.add_method (cs, &octave::call_stack::pop);
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5664
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5665 if (nargin > 2)
4245
610671be8792 [project @ 2002-12-28 04:02:31 by jwe]
jwe
parents: 4244
diff changeset
5666 {
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5667 frame.protect_var (buffer_error_messages);
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5668 buffer_error_messages++;
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5669 }
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5670
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5671 int parse_status = 0;
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5672
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5673 bool execution_error = false;
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5674
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5675 octave_value_list tmp;
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5676
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5677 try
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5678 {
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5679 tmp = octave::eval_string (args(1), nargout > 0,
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5680 parse_status, nargout);
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5681 }
22327
d0562b3159c7 move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 22323
diff changeset
5682 catch (const octave::execution_exception&)
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5683 {
23110
af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23100
diff changeset
5684 octave::interpreter::recover_from_exception ();
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5685
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5686 execution_error = true;
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5687 }
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5688
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5689 if (nargin > 2 && (parse_status != 0 || execution_error))
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5690 {
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5691 // Set up for letting the user print any messages from
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5692 // errors that occurred in the first part of this eval().
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5693
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5694 buffer_error_messages--;
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5695
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5696 tmp = octave::eval_string (args(2), nargout > 0,
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23054
diff changeset
5697 parse_status, nargout);
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5698
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5699 retval = (nargout > 0) ? tmp : octave_value_list ();
4245
610671be8792 [project @ 2002-12-28 04:02:31 by jwe]
jwe
parents: 4244
diff changeset
5700 }
610671be8792 [project @ 2002-12-28 04:02:31 by jwe]
jwe
parents: 4244
diff changeset
5701 else
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5702 {
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5703 if (nargout > 0)
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5704 retval = tmp;
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5705
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5706 // FIXME: we should really be rethrowing whatever
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5707 // exception occurred, not just throwing an
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5708 // execution exception.
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5709 if (execution_error)
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5710 octave_throw_execution_exception ();
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5711 }
4245
610671be8792 [project @ 2002-12-28 04:02:31 by jwe]
jwe
parents: 4244
diff changeset
5712
610671be8792 [project @ 2002-12-28 04:02:31 by jwe]
jwe
parents: 4244
diff changeset
5713 return retval;
610671be8792 [project @ 2002-12-28 04:02:31 by jwe]
jwe
parents: 4244
diff changeset
5714 }
610671be8792 [project @ 2002-12-28 04:02:31 by jwe]
jwe
parents: 4244
diff changeset
5715
22504
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5716 static void
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5717 maybe_print_last_error_message (bool *doit)
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5718 {
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5719 if (doit && *doit)
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5720 // Print error message again, which was lost because of the stderr buffer
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5721 // Note: this keeps error_state and last_error_stack intact
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5722 message_with_id ("error", last_error_id ().c_str (),
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5723 last_error_message ().c_str ());
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5724 }
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5725
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5726 static void
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5727 restore_octave_stdout (std::streambuf *buf)
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5728 {
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5729 octave_stdout.flush ();
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5730 octave_stdout.rdbuf (buf);
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5731 }
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5732
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5733 static void
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5734 restore_octave_stderr (std::streambuf *buf)
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5735 {
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5736 std::cerr.flush ();
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5737 std::cerr.rdbuf (buf);
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5738 }
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5739
21075
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5740 DEFUN (evalc, args, nargout,
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5741 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
5742 @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
5743 @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
5744 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
5745 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
5746
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5747 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
5748
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5749 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
5750 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
5751 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
5752
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5753 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
5754 @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
5755 @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
5756 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
5757
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5758 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5759 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5760 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
5761 @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
5762
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5763 @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
5764 @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
5765 @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
5766 @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
5767 @end deftypefn */)
21075
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5768 {
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5769 int nargin = args.length ();
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5770
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5771 if (nargin == 0 || nargin > 2)
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5772 print_usage ();
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5773
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5774 // redirect stdout/stderr to capturing buffer
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5775 std::ostringstream buffer;
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5776
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5777 std::ostream& out_stream = octave_stdout;
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5778 std::ostream& err_stream = std::cerr;
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5779
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5780 out_stream.flush ();
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5781 err_stream.flush ();
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5782
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5783 std::streambuf* old_out_buf = out_stream.rdbuf (buffer.rdbuf ());
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5784 std::streambuf* old_err_buf = err_stream.rdbuf (buffer.rdbuf ());
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5785
22504
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5786 bool eval_error_occurred = true;
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5787
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5788 octave::unwind_protect frame;
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5789
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5790 frame.add_fcn (maybe_print_last_error_message, &eval_error_occurred);
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5791 frame.add_fcn (restore_octave_stdout, old_out_buf);
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5792 frame.add_fcn (restore_octave_stderr, old_err_buf);
21075
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5793
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5794 // call standard eval function
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5795 octave_value_list retval;
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5796 int eval_nargout = std::max (0, nargout - 1);
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5797
22504
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5798 retval = Feval (args, eval_nargout);
2aa9e8893ea9 Fix crash in evalc (bug #49057).
Mike Miller <mtmiller@octave.org>
parents: 22327
diff changeset
5799 eval_error_occurred = false;
21075
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 retval.prepend (buffer.str ());
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5802 return retval;
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5803 }
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5804
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5805 /*
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5806
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5807 %!assert (evalc ("1"), "ans = 1\n")
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5808 %!assert (evalc ("1;"), "")
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5809
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5810 %!test
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5811 %! [s, y] = evalc ("1");
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5812 %! assert (s, "");
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5813 %! assert (y, 1);
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5814
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5815 %!test
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5816 %! [s, y] = evalc ("1;");
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5817 %! assert (s, "");
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5818 %! assert (y, 1);
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5819
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5820 %!test
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5821 %! assert (evalc ("y = 2"), "y = 2\n");
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5822 %! assert (y, 2);
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5823
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5824 %!test
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5825 %! assert (evalc ("y = 3;"), "");
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5826 %! assert (y, 3);
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5827
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5828 %!test
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5829 %! [s, a, b] = evalc ("deal (1, 2)");
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5830 %! assert (s, "");
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5831 %! assert (a, 1);
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5832 %! assert (b, 2);
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5833
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5834 %!function [a, b] = __f_evalc ()
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5835 %! printf ("foo");
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5836 %! fprintf (stdout, "bar");
21580
ecce63c99c3f maint: Add semicolons to terminate code in %! blocks.
Rik <rik@octave.org>
parents: 21416
diff changeset
5837 %! disp (pi);
21075
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5838 %! a = 1;
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5839 %! b = 2;
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5840 %!endfunction
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5841 %!test
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5842 %! [s, a, b] = evalc ("__f_evalc ()");
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5843 %! assert (s, "foobar 3.1416\n");
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5844 %! assert (a, 1);
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5845 %! assert (b, 2);
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5846
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5847 %!error <foo> (evalc ("error ('foo')"))
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5848 %!error <bar> (evalc ("error ('foo')", "error ('bar')"))
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5849
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5850 %!test
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5851 %! warning ("off", "quiet", "local");
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5852 %! assert (evalc ("warning ('foo')"), "warning: foo\n");
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5853
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5854 %!test
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5855 %! warning ("off", "quiet", "local");
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5856 %! assert (evalc ("error ('foo')", "warning ('bar')"), "warning: bar\n");
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5857
21581
6fab85c1538f maint: Follow Octave conventions for use of semicolon in BIST tests.
Rik <rik@octave.org>
parents: 21580
diff changeset
5858 %!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
5859
21075
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5860 */
5ed379c8decd Add new function evalc to core.
Oliver Heimlich <oheim@posteo.de>
parents: 21073
diff changeset
5861
8311
7124bffc89c7 parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents: 8283
diff changeset
5862 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
5863 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
5864 @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
5865 @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
5866 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
5867 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
5868 @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
5869 @end deftypefn */)
8311
7124bffc89c7 parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents: 8283
diff changeset
5870 {
7124bffc89c7 parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents: 8283
diff changeset
5871 octave_value retval;
7124bffc89c7 parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents: 8283
diff changeset
5872
7124bffc89c7 parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents: 8283
diff changeset
5873 bool debug_flag = octave_debug;
7124bffc89c7 parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents: 8283
diff changeset
5874
7124bffc89c7 parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents: 8283
diff changeset
5875 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
5876 "__parser_debug_flag__");
8311
7124bffc89c7 parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents: 8283
diff changeset
5877
7124bffc89c7 parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents: 8283
diff changeset
5878 octave_debug = debug_flag;
7124bffc89c7 parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents: 8283
diff changeset
5879
7124bffc89c7 parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents: 8283
diff changeset
5880 return retval;
7124bffc89c7 parse.y (F__parser_debug_flag__): New function.
John W. Eaton <jwe@octave.org>
parents: 8283
diff changeset
5881 }
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
5882
17377
15e2ad6372f7 maint: Tweaks to remove compiler warnings.
Rik <rik@octave.org>
parents: 17342
diff changeset
5883 DEFUN (__parse_file__, args, ,
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
5884 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
5885 @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
5886 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
5887 @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
5888 {
091e4df179de new function to help with debugging by parsing .m files without executing them
John W. Eaton <jwe@octave.org>
parents: 17326
diff changeset
5889 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
5890
091e4df179de new function to help with debugging by parsing .m files without executing them
John W. Eaton <jwe@octave.org>
parents: 17326
diff changeset
5891 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
5892
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5893 if (nargin < 1 || nargin > 2)
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5894 print_usage ();
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5895
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5896 std::string file = args(0).xstring_value ("__parse_file__: expecting filename as argument");
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5897
23667
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
5898 std::string full_file
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
5899 = octave::sys::file_ops::tilde_expand (file);
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
5900
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
5901 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
5902
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
5903 std::string dir_name;
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5904
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5905 size_t file_len = file.length ();
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5906
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5907 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
5908 || (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
5909 || (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
5910 {
21732
6a1eded90355 use namespace for system env class
John W. Eaton <jwe@octave.org>
parents: 21730
diff changeset
5911 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
5912 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
5913
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
5914 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
5915 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
5916 {
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
5917 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
5918 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
5919 }
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
5920 }
20798
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5921
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5922 if (nargin == 2)
bb585db6dee2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20785
diff changeset
5923 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
5924
23653
3bb0a937c071 avoid possible memory errors when parsing function files
John W. Eaton <jwe@octave.org>
parents: 23641
diff changeset
5925 octave_value ov_fcn
23667
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
5926 = parse_fcn_file (full_file, file, dir_name, "", "", true, false,
2d4a7ae1f6cd store directory and package names in function when function is parsed
John W. Eaton <jwe@octave.org>
parents: 23655
diff changeset
5927 false, false, "__parse_file__");
17342
091e4df179de new function to help with debugging by parsing .m files without executing them
John W. Eaton <jwe@octave.org>
parents: 17326
diff changeset
5928
091e4df179de new function to help with debugging by parsing .m files without executing them
John W. Eaton <jwe@octave.org>
parents: 17326
diff changeset
5929 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
5930 }